Changeset cc04b7 for src/Actions

Timestamp:

Jan 7, 2010, 2:46:34 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:

12b845

Parents:

a56275

Message:

Added a central registry that allows access to actions by name.

Location:

src/Actions

Files:

• Action.cpp (modified) (1 diff)
• Action.hpp (modified) (3 diffs)
• ActionRegistry.cpp (added)
• ActionRegistry.hpp (added)
• ErrorAction.cpp (modified) (1 diff)
• ErrorAction.hpp (modified) (1 diff)
• MakroAction.cpp (modified) (1 diff)
• MakroAction.hpp (modified) (2 diffs)
• MethodAction.cpp (modified) (2 diffs)
• MethodAction.hpp (modified) (2 diffs)

src/Actions/Action.cpp

@@ -6 +6 @@
  */
 
-#include "Action.hpp"
+#include <string>
 
-Action::Action()
-{}
+#include "Actions/Action.hpp"
+#include "Actions/ActionRegistry.hpp"
+
+using namespace std;
+
+Action::Action(std::string _name,bool _doRegister) :
+name(_name)
+{
+  if(_doRegister){
+    ActionRegistry::getRegistry()->registerAction(this);
+  }
+}
 
 Action::~Action()
 {}
+
+const string Action::getName(){
+  return name;
+}

src/Actions/Action.hpp

@@ -8 +8 @@
 #ifndef ACTION_H_
 #define ACTION_H_
+
+#include <string>
 
 /**
@@ -21 +23 @@
 protected:
 public:
-  Action();
+  Action(std::string _name,bool _doRegister=true);
   virtual ~Action();
 
@@ -28 +30 @@
   virtual bool canUndo()=0;
 
+  virtual const std::string getName();
+
+private:
+  std::string name;
 };
 

src/Actions/ErrorAction.cpp

@@ -14 +14 @@
 using namespace std;
 
-ErrorAction::ErrorAction(const char * _errorMsg) :
+ErrorAction::ErrorAction(string _name,const char * _errorMsg,bool _doRegister) :
+Action(_name,_doRegister),
 errorMsg(_errorMsg)
 {

src/Actions/ErrorAction.hpp

@@ -15 +15 @@
 {
 public:
-  ErrorAction(const char *);
+  ErrorAction(std::string _name,const char * _errorMsg,bool _doRegister=true);
   virtual ~ErrorAction();
 

src/Actions/MakroAction.cpp

@@ -6 +6 @@
  */
 
+#include <string>
+
 #include "Actions/MakroAction.hpp"
 #include "Actions/Action.hpp"
 #include "Actions/ActionSequence.hpp"
 
-MakroAction::MakroAction(ActionSequence* _actions) :
+using namespace std;
+
+MakroAction::MakroAction(string _name,ActionSequence* _actions,bool _doRegister) :
+Action(_name,_doRegister),
 actions(_actions)
 {

src/Actions/MakroAction.hpp

@@ -8 +8 @@
 #ifndef MAKROACTION_HPP_
 #define MAKROACTION_HPP_
+
+#include <string>
 
 #include "Actions/Action.hpp"
@@ -21 +23 @@
 {
 public:
-  MakroAction(ActionSequence*);
+  MakroAction(std::string _name,ActionSequence* _actions,bool _doRegister=true);
   virtual ~MakroAction();
 

src/Actions/MethodAction.cpp

@@ -8 +8 @@
 #include <iostream>
 #include <boost/function.hpp>
+#include <string>
 
 #include "MethodAction.hpp"
@@ -13 +14 @@
 using namespace std;
 
-MethodAction::MethodAction(boost::function<void()> _executeMethod) :
+MethodAction::MethodAction(string _name,boost::function<void()> _executeMethod,bool _doRegister) :
+   Action(_name,_doRegister),
 executeMethod(_executeMethod)
 {

src/Actions/MethodAction.hpp

@@ -10 +10 @@
 
 #include <boost/function.hpp>
+#include <string>
 
 #include "Actions/Action.hpp"
@@ -19 +20 @@
 {
 public:
-  MethodAction(boost::function<void()>);
+  MethodAction(std::string _name,boost::function<void()> _executeMethod,bool _doRegister=true);
   virtual ~MethodAction();