Changeset 096214

Timestamp:

Jan 2, 2010, 3:28:29 PM (15 years ago)

Author:

Tillmann Crueger <crueger@…>

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:

477bb2

Parents:

7c6f73

Message:

Made EditMoleculesMenu a Submenu inside the MainMenu

Location:

src

Files:

• menu.cpp (modified) (5 diffs)
• menu.hpp (modified) (1 diff)

src/menu.cpp

@@ -29 +29 @@
 #include "Menu/SeperatorItem.hpp"
 #include "Menu/DisplayMenuItem.hpp"
+#include "Menu/SubMenuItem.hpp"
 #include "Actions/MethodAction.hpp"
 #include "Views/StreamStringView.hpp"
@@ -986 +987 @@
 };
 
-
-/** Submenu for creating new molecules.
- * \param *periode periodentafel
- * \param *molecules list of molecules to add to
- */
-void oldmenu::EditMolecules(periodentafel *periode, MoleculeListClass *molecules)
-{
-  TextMenu *edit_molecules_menu = new TextMenu(Log() << Verbose(0), "Edit Molecules");
-
-  Action *createMoleculeAction = new MethodAction(boost::bind(&oldmenu::createNewMolecule,this,periode,molecules));
-  new ActionMenuItem('c',"create new molecule",edit_molecules_menu,createMoleculeAction);
-
-  Action *loadMoleculeAction = new MethodAction(boost::bind(&oldmenu::loadFromXYZ,this,periode,molecules));
-  new ActionMenuItem('l',"load molecule from xyz file",edit_molecules_menu,loadMoleculeAction);
-
-  Action *changeFilenameAction = new MethodAction(boost::bind(&oldmenu::changeName,this,molecules));
-  new ActionMenuItem('n',"change molecule's name",edit_molecules_menu,changeFilenameAction);
-
-  Action *giveFilenameAction = new MethodAction(boost::bind(&oldmenu::setMoleculeFilename,this,molecules));
-  new ActionMenuItem('N',"give molecules filename",edit_molecules_menu,giveFilenameAction);
-
-  Action *parseAtomsAction = new MethodAction(boost::bind(&oldmenu::parseXYZIntoMolecule,this,molecules));
-  new ActionMenuItem('p',"parse atoms in xyz file into molecule",edit_molecules_menu,parseAtomsAction);
-
-  Action *eraseMoleculeAction = new MethodAction(boost::bind(&oldmenu::eraseMolecule,this,molecules));
-  new ActionMenuItem('r',"remove a molecule",edit_molecules_menu,eraseMoleculeAction);
-
-  Action *returnAction = new MethodAction(boost::bind(&TextMenu::doQuit,edit_molecules_menu));
-  MenuItem *returnItem = new ActionMenuItem('q',"return to Main menu",edit_molecules_menu,returnAction);
-
-  edit_molecules_menu->addDefault(returnItem);
-
-
-  edit_molecules_menu->display();
-
-  delete edit_molecules_menu;
-  delete createMoleculeAction;
-  delete loadMoleculeAction;
-  delete changeFilenameAction;
-  delete giveFilenameAction;
-  delete parseAtomsAction;
-  delete eraseMoleculeAction;
-  delete returnAction;
-
-#if 0
-  char choice;  // menu choice char
-
-  Log() << Verbose(0) << "==========EDIT MOLECULES=====================" << endl;
-  Log() << Verbose(0) << "c - create new molecule" << endl;
-  Log() << Verbose(0) << "l - load molecule from xyz file" << endl;
-  Log() << Verbose(0) << "n - change molecule's name" << endl;
-  Log() << Verbose(0) << "N - give molecules filename" << endl;
-  Log() << Verbose(0) << "p - parse atoms in xyz file into molecule" << endl;
-  Log() << Verbose(0) << "r - remove a molecule" << endl;
-  Log() << Verbose(0) << "all else - go back" << endl;
-  Log() << Verbose(0) << "===============================================" << endl;
-  Log() << Verbose(0) << "INPUT: ";
-  cin >> choice;
-
-  switch (choice) {
-    default:
-      Log() << Verbose(0) << "Not a valid choice." << endl;
-      break;
-    case 'c':
-        createNewMolecule(periode,molecules);
-      break;
-
-    case 'l': // load from XYZ file
-      loadFromXYZ(periode,molecules);
-      break;
-
-    case 'n':
-      changeName(molecules);
-      break;
-
-    case 'N':
-      setMoleculeFilename(molecules);
-      break;
-
-    case 'p': // parse XYZ file
-      parseXYZIntoMolecule(molecules);
-      break;
-
-    case 'r':
-      eraseMolecule(molecules);
-      break;
-  }
-#endif
-};
-
-
 /** Submenu for merging molecules.
  * \param *periode periodentafel
@@ -1301 +1211 @@
   new ActionMenuItem('a',"set molecule (in)active",main_menu,setMoleculeAction);
 
-  Action *editMoleculeAction = new MethodAction(boost::bind(&oldmenu::EditMolecules,this,periode, molecules));
-  new ActionMenuItem('e',"edit molecules (load, parse, save)",main_menu,editMoleculeAction);
+  TextMenu *edit_molecules_menu = new TextMenu(Log() << Verbose(0), "Edit Molecules");
+  new SubMenuItem('e',"edit molecules (load, parse, save)",main_menu,edit_molecules_menu);
 
   Action *manipulateMoleculeAction = new MethodAction(boost::bind(&oldmenu::ManipulateMolecules,this,periode, molecules, configuration));
@@ -1329 +1239 @@
   new ActionMenuItem('q',"quit",main_menu,quitAction);
 
+  // build the EditMoleculesMenu
+  Action *createMoleculeAction = new MethodAction(boost::bind(&oldmenu::createNewMolecule,this,periode,molecules));
+  new ActionMenuItem('c',"create new molecule",edit_molecules_menu,createMoleculeAction);
+
+  Action *loadMoleculeAction = new MethodAction(boost::bind(&oldmenu::loadFromXYZ,this,periode,molecules));
+  new ActionMenuItem('l',"load molecule from xyz file",edit_molecules_menu,loadMoleculeAction);
+
+  Action *changeFilenameAction = new MethodAction(boost::bind(&oldmenu::changeName,this,molecules));
+  new ActionMenuItem('n',"change molecule's name",edit_molecules_menu,changeFilenameAction);
+
+  Action *giveFilenameAction = new MethodAction(boost::bind(&oldmenu::setMoleculeFilename,this,molecules));
+  new ActionMenuItem('N',"give molecules filename",edit_molecules_menu,giveFilenameAction);
+
+  Action *parseAtomsAction = new MethodAction(boost::bind(&oldmenu::parseXYZIntoMolecule,this,molecules));
+  new ActionMenuItem('p',"parse atoms in xyz file into molecule",edit_molecules_menu,parseAtomsAction);
+
+  Action *eraseMoleculeAction = new MethodAction(boost::bind(&oldmenu::eraseMolecule,this,molecules));
+  new ActionMenuItem('r',"remove a molecule",edit_molecules_menu,eraseMoleculeAction);
+
+  Action *returnAction = new MethodAction(boost::bind(&TextMenu::doQuit,edit_molecules_menu));
+  MenuItem *returnItem = new ActionMenuItem('q',"return to Main menu",edit_molecules_menu,returnAction);
+
+  edit_molecules_menu->addDefault(returnItem);
 
   main_menu->display();
 
 
+  delete main_menu;
+
+  // delete all actions and views contained in Menu
+  // TODO: find a better way to handle this
+
   delete moleculeView;
 
   delete setMoleculeAction;
-  delete editMoleculeAction;
   delete manipulateMoleculeAction;
   delete mergeMoleculeAction;
@@ -1345 +1282 @@
   delete quitAction;
 
-  delete main_menu;
+  delete createMoleculeAction;
+  delete loadMoleculeAction;
+  delete changeFilenameAction;
+  delete giveFilenameAction;
+  delete parseAtomsAction;
+  delete eraseMoleculeAction;
+  delete returnAction;
 };
 

src/menu.hpp

@@ -38 +38 @@
   void AlignAtoms(periodentafel *, molecule *);
   void CenterAtoms(molecule *);
-  void EditMolecules(periodentafel *, MoleculeListClass *);
   void FragmentAtoms(molecule *, config *);
   void ManipulateAtoms(periodentafel *, MoleculeListClass *, config *);