Changeset 1fa107

Timestamp:

Dec 17, 2009, 2:38: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:

898ae8

Parents:

a5041ec

Message:

Added an action that allows grouping and grouped execution of several actions.

Location:

src

Files:

• Actions/Action.hpp (modified) (1 diff)
• Actions/ActionSequence.cpp (modified) (2 diffs)
• Actions/MakroAction.cpp (added)
• Actions/MakroAction.hpp (added)
• Makefile.am (modified) (1 diff)
• menu.cpp (modified) (1 diff)

src/Actions/Action.hpp

@@ -20 +20 @@
 {
 protected:
+public:
   Action();
   virtual ~Action();
 
-public:
   virtual void call()=0;
   virtual void undo()=0;

src/Actions/ActionSequence.cpp

@@ -12 +12 @@
 
 ActionSequence::ActionSequence()
-{
-  // TODO Auto-generated constructor stub
-
-}
+{}
 
 ActionSequence::~ActionSequence()
-{
-  // TODO Auto-generated destructor stub
-}
+{}
 
 
@@ -28 +23 @@
 
 Action* ActionSequence::removeLastAction(){
-  Action* theAction;
-  theAction = actions.back();
-  actions.pop_back();
-  return theAction;
+  if(actions.empty()) {
+    return 0;
+  }
+  else {
+    Action* theAction;
+    theAction = actions.back();
+    actions.pop_back();
+    return theAction;
+  }
 }
 

src/Makefile.am

@@ -5 +5 @@
 ANALYSISHEADER = analysis_bonds.hpp analysis_correlation.hpp
 
-ACTIONSSOURCE = Actions/Action.cpp Actions/MethodAction.cpp Actions/ActionSequence.cpp
-ACTIONSHEADER = Actions/Action.hpp Actions/MethodAction.hpp Actions/ActionSequence.hpp
+ACTIONSSOURCE = Actions/Action.cpp Actions/MethodAction.cpp Actions/ActionSequence.cpp Actions/MakroAction.cpp
+ACTIONSHEADER = Actions/Action.hpp Actions/MethodAction.hpp Actions/ActionSequence.hpp Actions/MakroAction.hpp
 
 VIEWSOURCE = Views/View.cpp Views/StringView.cpp Views/MethodStringView.cpp Views/StreamStringView.cpp

src/menu.cpp

@@ -1242 +1242 @@
   new SeperatorItem(main_menu);
 
-  MethodAction *setMoleculeAction = new MethodAction(boost::bind(&oldmenu::flipChosen,this,molecules));
+  Action *setMoleculeAction = new MethodAction(boost::bind(&oldmenu::flipChosen,this,molecules));
   new ActionMenuItem('a',"set molecule (in)active",main_menu,setMoleculeAction);
 
-  MethodAction *editMoleculeAction = new MethodAction(boost::bind(&oldmenu::EditMolecules,this,periode, molecules));
+  Action *editMoleculeAction = new MethodAction(boost::bind(&oldmenu::EditMolecules,this,periode, molecules));
   new ActionMenuItem('e',"edit molecules (load, parse, save)",main_menu,editMoleculeAction);
 
-  MethodAction *manipulateMoleculeAction = new MethodAction(boost::bind(&oldmenu::ManipulateMolecules,this,periode, molecules, configuration));
+  Action *manipulateMoleculeAction = new MethodAction(boost::bind(&oldmenu::ManipulateMolecules,this,periode, molecules, configuration));
   new ActionMenuItem('g',"globally manipulate atoms in molecule",main_menu,manipulateMoleculeAction);
 
-  MethodAction *mergeMoleculeAction = new MethodAction(boost::bind(&oldmenu::MergeMolecules,this,periode, molecules));
+  Action *mergeMoleculeAction = new MethodAction(boost::bind(&oldmenu::MergeMolecules,this,periode, molecules));
   new ActionMenuItem('M',"Merge molecules",main_menu,mergeMoleculeAction);
 
-  MethodAction *manipulateAtomsAction = new MethodAction(boost::bind(&oldmenu::ManipulateAtoms,this,periode, molecules, configuration));
+  Action *manipulateAtomsAction = new MethodAction(boost::bind(&oldmenu::ManipulateAtoms,this,periode, molecules, configuration));
   new ActionMenuItem('m',"manipulate atoms",main_menu,manipulateAtomsAction);
 
   new SeperatorItem(main_menu);
 
-  MethodAction *editConfigAction = new MethodAction(boost::bind(&config::Edit,configuration));
+  Action *editConfigAction = new MethodAction(boost::bind(&config::Edit,configuration));
   new ActionMenuItem('c',"edit the current configuration",main_menu,editConfigAction);
 
   new SeperatorItem(main_menu);
 
-  MethodAction *saveConfigAction = new MethodAction(boost::bind(&oldmenu::SaveConfig,this,ConfigFileName, configuration, periode, molecules));
+  Action *saveConfigAction = new MethodAction(boost::bind(&oldmenu::SaveConfig,this,ConfigFileName, configuration, periode, molecules));
   new ActionMenuItem('s',"save current setup to config file",main_menu,saveConfigAction);
 
-  MethodAction *doTestAction = new MethodAction(boost::bind(&oldmenu::testroutine,this,molecules));
+  Action *doTestAction = new MethodAction(boost::bind(&oldmenu::testroutine,this,molecules));
   new ActionMenuItem('T',"call the current test routine",main_menu,doTestAction);
 
-  MethodAction *quitAction = new MethodAction(boost::bind(&TextMenu::doQuit,main_menu));
+  Action *quitAction = new MethodAction(boost::bind(&TextMenu::doQuit,main_menu));
   new ActionMenuItem('q',"quit",main_menu,quitAction);