Changeset d09093 for src/UIElements

Timestamp:

Mar 7, 2011, 11:40:27 AM (14 years ago)

Author:

Frederik Heber <heber@…>

Branches:

Action_Thermostats, Add_AtomRandomPerturbation, Add_FitFragmentPartialChargesAction, Add_RotateAroundBondAction, Add_SelectAtomByNameAction, Added_ParseSaveFragmentResults, AddingActions_SaveParseParticleParameters, Adding_Graph_to_ChangeBondActions, Adding_MD_integration_tests, Adding_ParticleName_to_Atom, Adding_StructOpt_integration_tests, AtomFragments, Automaking_mpqc_open, AutomationFragmentation_failures, Candidate_v1.5.4, Candidate_v1.6.0, Candidate_v1.6.1, ChangeBugEmailaddress, ChangingTestPorts, ChemicalSpaceEvaluator, CombiningParticlePotentialParsing, Combining_Subpackages, Debian_Package_split, Debian_package_split_molecuildergui_only, Disabling_MemDebug, Docu_Python_wait, EmpiricalPotential_contain_HomologyGraph, EmpiricalPotential_contain_HomologyGraph_documentation, Enable_parallel_make_install, Enhance_userguide, Enhanced_StructuralOptimization, Enhanced_StructuralOptimization_continued, Example_ManyWaysToTranslateAtom, Exclude_Hydrogens_annealWithBondGraph, FitPartialCharges_GlobalError, Fix_BoundInBox_CenterInBox_MoleculeActions, Fix_ChargeSampling_PBC, Fix_ChronosMutex, Fix_FitPartialCharges, Fix_FitPotential_needs_atomicnumbers, Fix_ForceAnnealing, Fix_IndependentFragmentGrids, Fix_ParseParticles, Fix_ParseParticles_split_forward_backward_Actions, Fix_PopActions, Fix_QtFragmentList_sorted_selection, Fix_Restrictedkeyset_FragmentMolecule, Fix_StatusMsg, Fix_StepWorldTime_single_argument, Fix_Verbose_Codepatterns, Fix_fitting_potentials, Fixes, ForceAnnealing_goodresults, ForceAnnealing_oldresults, ForceAnnealing_tocheck, ForceAnnealing_with_BondGraph, ForceAnnealing_with_BondGraph_continued, ForceAnnealing_with_BondGraph_continued_betteresults, ForceAnnealing_with_BondGraph_contraction-expansion, FragmentAction_writes_AtomFragments, FragmentMolecule_checks_bonddegrees, GeometryObjects, Gui_Fixes, Gui_displays_atomic_force_velocity, ImplicitCharges, IndependentFragmentGrids, IndependentFragmentGrids_IndividualZeroInstances, IndependentFragmentGrids_IntegrationTest, IndependentFragmentGrids_Sole_NN_Calculation, JobMarket_RobustOnKillsSegFaults, JobMarket_StableWorkerPool, JobMarket_unresolvable_hostname_fix, MoreRobust_FragmentAutomation, ODR_violation_mpqc_open, PartialCharges_OrthogonalSummation, PdbParser_setsAtomName, PythonUI_with_named_parameters, QtGui_reactivate_TimeChanged_changes, Recreated_GuiChecks, Rewrite_FitPartialCharges, RotateToPrincipalAxisSystem_UndoRedo, SaturateAtoms_findBestMatching, SaturateAtoms_singleDegree, StoppableMakroAction, Subpackage_CodePatterns, Subpackage_JobMarket, Subpackage_LinearAlgebra, Subpackage_levmar, Subpackage_mpqc_open, Subpackage_vmg, Switchable_LogView, ThirdParty_MPQC_rebuilt_buildsystem, TrajectoryDependenant_MaxOrder, TremoloParser_IncreasedPrecision, TremoloParser_MultipleTimesteps, TremoloParser_setsAtomName, Ubuntu_1604_changes, stable

Children:

dda246

Parents:

197e13

git-author:

Frederik Heber <heber@…> (03/01/11 14:22:07)

git-committer:

Frederik Heber <heber@…> (03/07/11 11:40:27)

Message:

Moved all graph-related Actions into own folder Actions/GraphAction/.

• added new graph menu to MenuDescription.
• added new action menu Graph to CommandLineParser.

Location:

src/UIElements

Files:

• CommandLineUI/CommandLineParser.cpp (modified) (3 diffs)
• CommandLineUI/CommandLineParser.hpp (modified) (1 diff)
• Menu/MenuDescription.cpp (modified) (3 diffs)

src/UIElements/CommandLineUI/CommandLineParser.cpp

@@ -49 +49 @@
   command("Command options"),
   fragmentation("Fragmentation options"),
+  graph("Graph options"),
   molecule("Molecule options"),
+  options("Secondary options"),
   parser("Parser options"),
   selection("Selection options"),
   tesselation("Tesselation options"),
-  world("World options"),
-  options("Secondary options")
+  world("World options")
 {
   // put all options lists into a lookup
@@ -62 +63 @@
   CmdParserLookup["edit"] = &edit;
   CmdParserLookup["fragmentation"] = &fragmentation;
+  CmdParserLookup["graph"] = &graph;
+  CmdParserLookup["options"] = &options;
   CmdParserLookup["molecule"] = &molecule;
   CmdParserLookup["parser"] = &parser;
@@ -67 +70 @@
   CmdParserLookup["tesselation"] = &tesselation;
   CmdParserLookup["world"] = &world;
-  CmdParserLookup["options"] = &options;
 }
 

src/UIElements/CommandLineUI/CommandLineParser.hpp

@@ -124 +124 @@
   po::options_description edit;
   po::options_description fragmentation;
+  po::options_description graph;
   po::options_description molecule;
+  po::options_description options;
   po::options_description parser;
   po::options_description selection;
   po::options_description tesselation;
   po::options_description world;
-  po::options_description options;
 
   po::options_description visible;

src/UIElements/Menu/MenuDescription.cpp

@@ -50 +50 @@
   MenuPositionMap->insert(std::make_pair("edit",TopPosition("",2)));
   MenuPositionMap->insert(std::make_pair("fragmentation",TopPosition("tools",3)));
+  MenuPositionMap->insert(std::make_pair("graph",TopPosition("tools",4)));
   MenuPositionMap->insert(std::make_pair("molecule",TopPosition("edit",2)));
   MenuPositionMap->insert(std::make_pair("parser",TopPosition("edit",3)));
@@ -63 +64 @@
   MenuDescriptionsMap->insert(std::make_pair("edit","Edit"));
   MenuDescriptionsMap->insert(std::make_pair("fragmentation","Fragmentation"));
+  MenuDescriptionsMap->insert(std::make_pair("graph","Graph"));
   MenuDescriptionsMap->insert(std::make_pair("molecule","Parse files into system"));
   MenuDescriptionsMap->insert(std::make_pair("parser","Edit molecules (load, parse, save)"));
@@ -76 +78 @@
   MenuNameMap->insert(std::make_pair("edit","Edit"));
   MenuNameMap->insert(std::make_pair("fragmentation","Fragmentation"));
+  MenuNameMap->insert(std::make_pair("graph","Graph"));
   MenuNameMap->insert(std::make_pair("molecule","Molecules"));
   MenuNameMap->insert(std::make_pair("parser","Input/Output"));