Changeset 65b6e0 for src/menu.cpp

Timestamp:

Dec 16, 2009, 12:30:16 PM (16 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, Candidate_v1.7.0, 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:

21c246

Parents:

4aa424

git-author:

Tillmann Crueger <crueger@…> (12/15/09 17:12:30)

git-committer:

Frederik Heber <heber@…> (12/16/09 12:30:16)

Message:

Added basic menu and action framework

• Added action base class
• Added class to make actions from methods
• Added Menu base class
• Added TextMenu class to produce text menus
• Added MenuItem base class for menu items
• Added ActionMenuItem for menu items using an action
• Added SubMenuItem class for menu items presenting a submenu
• Added SeperatorItem class for menu seperators without functioninality

Signed-off-by: Tillmann Crueger <crueger@…>

File:

• src/menu.cpp (modified) (16 diffs)

src/menu.cpp

@@ -24 +24 @@
 #include "periodentafel.hpp"
 
+#include "Menu/Menu.hpp"
+#include "Menu/TextMenu.hpp"
+#include "Menu/ActionMenuItem.hpp"
+#include "Menu/SeperatorItem.hpp"
+#include "Actions/MethodAction.hpp"
+
+
+#include <boost/bind.hpp>
+
 /* copied methods for refactoring */
 /*TODO: Move these methods inside menu class
@@ -34 +43 @@
  * \param *molecule molecules with atoms
  */
-void menu::AddAtoms(periodentafel *periode, molecule *mol)
+void oldmenu::AddAtoms(periodentafel *periode, molecule *mol)
 {
   atom *first, *second, *third, *fourth;
@@ -232 +241 @@
  * \param *mol molecule with all the atoms
  */
-void menu::CenterAtoms(molecule *mol)
+void oldmenu::CenterAtoms(molecule *mol)
 {
   Vector x, y, helper;
@@ -290 +299 @@
  * \param *mol molecule with all the atoms
  */
-void menu::AlignAtoms(periodentafel *periode, molecule *mol)
+void oldmenu::AlignAtoms(periodentafel *periode, molecule *mol)
 {
   atom *first, *second, *third;
@@ -358 +367 @@
  * \param *mol molecule with all the atoms
  */
-void menu::MirrorAtoms(molecule *mol)
+void oldmenu::MirrorAtoms(molecule *mol)
 {
   atom *first, *second, *third;
@@ -405 +414 @@
  * \param *mol molecule with all the atoms
  */
-void menu::RemoveAtoms(molecule *mol)
+void oldmenu::RemoveAtoms(molecule *mol)
 {
   atom *first, *second;
@@ -469 +478 @@
  * \param *mol molecule with all the atoms
  */
-void menu::MeasureAtoms(periodentafel *periode, molecule *mol, config *configuration)
+void oldmenu::MeasureAtoms(periodentafel *periode, molecule *mol, config *configuration)
 {
   atom *first, *second, *third;
@@ -589 +598 @@
  * \param *configuration configuration structure for the to be written config files of all fragments
  */
-void menu::FragmentAtoms(molecule *mol, config *configuration)
+void oldmenu::FragmentAtoms(molecule *mol, config *configuration)
 {
   int Order1;
@@ -612 +621 @@
  * \param *molecules list of molecules whose atoms are to be manipulated
  */
-void menu::ManipulateAtoms(periodentafel *periode, MoleculeListClass *molecules, config *configuration)
+void oldmenu::ManipulateAtoms(periodentafel *periode, MoleculeListClass *molecules, config *configuration)
 {
   atom *first, *second;
@@ -731 +740 @@
  * \param *molecules list of molecule to manipulate
  */
-void menu::ManipulateMolecules(periodentafel *periode, MoleculeListClass *molecules, config *configuration)
+void oldmenu::ManipulateMolecules(periodentafel *periode, MoleculeListClass *molecules, config *configuration)
 {
   atom *first = NULL;
@@ -890 +899 @@
  * \param *molecules list of molecules to add to
  */
-void menu::EditMolecules(periodentafel *periode, MoleculeListClass *molecules)
+void oldmenu::EditMolecules(periodentafel *periode, MoleculeListClass *molecules)
 {
   char choice;  // menu choice char
@@ -1006 +1015 @@
  * \param *molecules list of molecules to add to
  */
-void menu::MergeMolecules(periodentafel *periode, MoleculeListClass *molecules)
+void oldmenu::MergeMolecules(periodentafel *periode, MoleculeListClass *molecules)
 {
   char choice;  // menu choice char
@@ -1120 +1129 @@
  * \param *molecules list of molecules
  */
-void menu::testroutine(MoleculeListClass *molecules)
+void oldmenu::testroutine(MoleculeListClass *molecules)
 {
   // the current test routine checks the functionality of the KeySet&Graph concept:
@@ -1198 +1207 @@
 };
 
-menu::menu()
+oldmenu::oldmenu()
 {
   // TODO Auto-generated constructor stub
 }
 
-menu::~menu()
+oldmenu::~oldmenu()
 {
   // TODO Auto-generated destructor stub
 }
 
-void menu::perform(MoleculeListClass *molecules, config *configuration, periodentafel *periode, char *ConfigFileName)
-{
+void oldmenu::perform(MoleculeListClass *molecules, config *configuration, periodentafel *periode, char *ConfigFileName)
+{
+  TextMenu *main_menu = new TextMenu(Log() << Verbose(0), "Main Menu");
+
+  ActionMenuItem *setMolecule = new ActionMenuItem('a',"set molecule (in)active",main_menu,new MethodAction());
+  ActionMenuItem *editMolecule = new ActionMenuItem('e',"edit molecules (load, parse, save)",main_menu,new MethodAction());
+  ActionMenuItem *manipulateAtomsGlobal = new ActionMenuItem('g',"globally manipulate atoms in molecule",main_menu,new MethodAction());
+  ActionMenuItem *mergeMolecules = new ActionMenuItem('M',"Merge molecules",main_menu,new MethodAction());
+  ActionMenuItem *manipulateAtoms = new ActionMenuItem('m',"manipulate atoms",main_menu,new MethodAction());
+
+  new SeperatorItem(main_menu);
+  ActionMenuItem *editConfig = new ActionMenuItem('c',"edit the current configuration",main_menu,new MethodAction());
+  new SeperatorItem(main_menu);
+  ActionMenuItem *saveSetup = new ActionMenuItem('s',"save current setup to config file",main_menu,new MethodAction());
+  ActionMenuItem *callTest = new ActionMenuItem('T',"call the current test routine",main_menu,new MethodAction());
+
+  MethodAction *quitAction = new MethodAction();
+  quitAction->executeMethod = boost::bind(&TextMenu::doQuit,main_menu);
+  new ActionMenuItem('q',"quit",main_menu,quitAction);
+
+
+  /*main_menu->addItem(setMolecule);
+  main_menu->addItem(editMolecule);
+  main_menu->addItem(manipulateAtomsGlobal);
+  main_menu->addItem(mergeMolecules);
+  main_menu->addItem(manipulateAtoms);
+  //TODO: Seperator
+  main_menu->addItem(editConfig);
+  //TODO: Seperator
+  main_menu->addItem(saveSetup);
+  main_menu->addItem(callTest);
+  main_menu->addItem(quit);
+
+*/
+  main_menu->display();
+
+
+
+#if 0
     char choice;
     int j;
@@ -1279 +1325 @@
     };
   } while (choice != 'q');
+#endif
 };
 
@@ -1287 +1334 @@
  * \param *molecules list of molecules structure with all the atoms and coordinates
  */
-void menu::SaveConfig(char *ConfigFileName, config *configuration, periodentafel *periode, MoleculeListClass *molecules)
+void oldmenu::SaveConfig(char *ConfigFileName, config *configuration, periodentafel *periode, MoleculeListClass *molecules)
 {
   char filename[MAXSTRINGSIZE];