Changeset 6b932c7

Timestamp:

Jan 2, 2010, 3:53:39 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:

235bed

Parents:

477bb2

Message:

Removed unecessary method stubs from oldmenu class

Location:

src

Files:

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

src/menu.cpp

@@ -899 +899 @@
 
 
-void oldmenu::createNewMolecule(periodentafel *periode,MoleculeListClass *molecules) {
-  molecules->createNewMolecule(periode);
-};
-
-void oldmenu::loadFromXYZ(periodentafel *periode,MoleculeListClass *molecules){
-  molecules->loadFromXYZ(periode);
-}
-
-void oldmenu::changeName(MoleculeListClass *molecules){
-  molecules->changeName();
-}
-
-void oldmenu::setMoleculeFilename(MoleculeListClass *molecules) {
-  molecules->setMoleculeFilename();
-}
-
-void oldmenu::parseXYZIntoMolecule(MoleculeListClass *molecules){
- molecules->parseXYZIntoMolecule();
-};
-
-void oldmenu::eraseMolecule(MoleculeListClass *molecules){
-  molecules->eraseMolecule();
-};
-
 /** Submenu for merging molecules.
  * \param *periode periodentafel
@@ -1175 +1151 @@
   new ActionMenuItem('q',"quit",main_menu,quitAction);
 
+
+
   // build the EditMoleculesMenu
-  Action *createMoleculeAction = new MethodAction(boost::bind(&oldmenu::createNewMolecule,this,periode,molecules));
+  Action *createMoleculeAction = new MethodAction(boost::bind(&MoleculeListClass::createNewMolecule,molecules,periode));
   new ActionMenuItem('c',"create new molecule",edit_molecules_menu,createMoleculeAction);
 
-  Action *loadMoleculeAction = new MethodAction(boost::bind(&oldmenu::loadFromXYZ,this,periode,molecules));
+  Action *loadMoleculeAction = new MethodAction(boost::bind(&MoleculeListClass::loadFromXYZ,molecules,periode));
   new ActionMenuItem('l',"load molecule from xyz file",edit_molecules_menu,loadMoleculeAction);
 
-  Action *changeFilenameAction = new MethodAction(boost::bind(&oldmenu::changeName,this,molecules));
+  Action *changeFilenameAction = new MethodAction(boost::bind(&MoleculeListClass::changeName,molecules));
   new ActionMenuItem('n',"change molecule's name",edit_molecules_menu,changeFilenameAction);
 
-  Action *giveFilenameAction = new MethodAction(boost::bind(&oldmenu::setMoleculeFilename,this,molecules));
+  Action *giveFilenameAction = new MethodAction(boost::bind(&MoleculeListClass::setMoleculeFilename,molecules));
   new ActionMenuItem('N',"give molecules filename",edit_molecules_menu,giveFilenameAction);
 
-  Action *parseAtomsAction = new MethodAction(boost::bind(&oldmenu::parseXYZIntoMolecule,this,molecules));
+  Action *parseAtomsAction = new MethodAction(boost::bind(&MoleculeListClass::parseXYZIntoMolecule,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));
+  Action *eraseMoleculeAction = new MethodAction(boost::bind(&MoleculeListClass::eraseMolecule,molecules));
   new ActionMenuItem('r',"remove a molecule",edit_molecules_menu,eraseMoleculeAction);
 

src/menu.hpp

@@ -26 +26 @@
   void SaveConfig(char *, config *, periodentafel *, MoleculeListClass *);
 
-  // Methods extracted from EditMolecules. Probably to be moved to moleculeListClass
-  void createNewMolecule(periodentafel *periode,MoleculeListClass *molecules);
-  void loadFromXYZ(periodentafel *periode,MoleculeListClass *molecules);
-  void changeName(MoleculeListClass *molecules);
-  void setMoleculeFilename(MoleculeListClass *molecules);
-  void parseXYZIntoMolecule(MoleculeListClass *molecules);
-  void eraseMolecule(MoleculeListClass *molecules);
-
 protected:
   void AddAtoms(periodentafel *, molecule *);