Changeset 326bbe for src/builder.cpp

Timestamp:

Jun 25, 2010, 1:04:13 PM (15 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:

0c5eeb, b0acc3

Parents:

a356f2

Message:

Legacy/oldmenu is no more.

• TextWindow::TextWindow() now properly uses the actions that have been created during the Refactoring of CommandLineUI.
• removed TextWindow::populateEditMolecules() as there is a more general function now
• new Textwindow::populateMenu() - populates the menu by looking at MapOfActions::MenuContainsActionMap.
• new TextWindow::getSuitableShortForm() - educatedly guesses good key for action in menu.
• Hence, Legacy/oldmenu.* is dropped from molecuilder/src/Makefile.am
• new map MapOfActions::MenuContainsActionMap with menu names and all desired actions therein
• new MapOfActions::populateActions() which instantiate all possible actions (moved over from CommandLineWindow)
• DOCU: MapOfActions has full documentation explaining how to add new actions
• main(): CommandLineUI is taken if at least argument it present, otherwise text menu.

Still missing:

• testsuite cases should work for both command line AND text menu (just add by calling with "< input", where input has all the user input needed)

File:

• src/builder.cpp (modified) (2 diffs)

src/builder.cpp

@@ -114 +114 @@
   // print version check whether arguments are present at all
   cout << ESPACKVersion << endl;
-  if (argc < 2) {
-    cout << "Obtain help with " << argv[0] << " -h." << endl;
-    cleanUp();
-    Memory::getState();
-    return(1);
-  }
-
 
   setVerbosity(0);
@@ -145 +138 @@
     }
     // handle remaining arguments by CommandLineParser
-    MapOfActions::getInstance().AddOptionsToParser();
-    map <std::string, std::string> ShortFormToActionMap = MapOfActions::getInstance().getShortFormToActionMap();
-    CommandLineParser::getInstance().Run(argc,argv, ShortFormToActionMap);
-    if (!CommandLineParser::getInstance().isEmpty()) {
+    if (argc>1) {
+      MapOfActions::getInstance().AddOptionsToParser();
+      map <std::string, std::string> ShortFormToActionMap = MapOfActions::getInstance().getShortFormToActionMap();
+      CommandLineParser::getInstance().Run(argc,argv, ShortFormToActionMap);
       DoLog(0) && (Log() << Verbose(0) << "Setting UI to CommandLine." << endl);
       UIFactory::registerFactory(new CommandLineUIFactory::description());