Changeset f54cda for src

Timestamp:

Sep 19, 2013, 8:23:52 PM (11 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, 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:

76096d

Parents:

c5177f

git-author:

Frederik Heber <heber@…> (08/21/13 09:27:08)

git-committer:

Frederik Heber <heber@…> (09/19/13 20:23:52)

Message:

Action::call() is private, replaced by ActionQueue::queueAction().

Location:

src/Actions

Files:

• Action.hpp (modified) (4 diffs)
• ActionQueue.cpp (modified) (1 diff)
• ActionQueue.hpp (modified) (2 diffs)
• Action_impl_pre.hpp (modified) (2 diffs)
• GraphAction/SubgraphDissectionAction.cpp (modified) (2 diffs)
• MakroAction_impl_pre.hpp (modified) (2 diffs)
• ManipulateAtomsProcess.hpp (modified) (3 diffs)
• Reaction_impl_pre.hpp (modified) (2 diffs)

src/Actions/Action.hpp

@@ -29 +29 @@
 namespace MoleCuilder {
   class ActionHistory;
+  class ActionQueue;
   class ActionRegistry;
   class ActionSequence;
@@ -83 +84 @@
 class Action
 {
+  //!> grant ActionQueue access to undo() and redo()
   friend class ActionHistory;
+  //!> grant ActionQueue access to call()
+  friend class ActionQueue;
+  //!> grant ActionRegistry access to cstors (for ActionRegistry::fillRegistry())
   friend class ActionRegistry;
+  //!> grant ActionSequence access to Action's private stuff
   friend class ActionSequence;
+  //!> grant all Registry templates access to cstor and dstor (for Registry<T>::cleanup())
   template <typename T> friend class ::Registry;
   //!> TextMenu needs to instantiate some specific Actions, grant access to cstor
@@ -112 +119 @@
   virtual ~Action();
 
-public:
   /**
    * This method is used to call an action. The basic operations for the Action
@@ -128 +134 @@
   void call(enum QueryOptions state = Interactive);
 
+public:
   /**
    * This method provides a flag that indicates if an undo mechanism is implemented

src/Actions/ActionQueue.cpp

@@ -60 +60 @@
 }
 
-void ActionQueue::queueAction(const std::string &name)
+void ActionQueue::queueAction(const std::string &name, enum Action::QueryOptions state)
 {
   Action* _action = AR->getActionByName(name);
   queue.push_back(_action);
-  _action->call();
+  _action->call(state);
+}
+
+void ActionQueue::queueAction(Action *_action, enum Action::QueryOptions state)
+{
+  queue.push_back(_action);
+  _action->call(state);
 }
 

src/Actions/ActionQueue.hpp

@@ -19 +19 @@
 #include <vector>
 
+#include "Actions/Action.hpp"
 #include "Actions/ActionState.hpp"
 
 namespace MoleCuilder {
 
-class Action;
 class ActionHistory;
 class ActionRegistry;
@@ -42 +42 @@
   /** Queues the Action with \a name to be called.
    *
+   * \param name token of Action to queue
+   * \param state whether Actions needs to be filled via a Dialog or not
    */
-  void queueAction(const std::string &name);
+  void queueAction(const std::string &name, enum Action::QueryOptions state = Action::Interactive);
+
+  /** Queues the Action with \a name to be called.
+   *
+   * \param _action action to add
+   * \param state whether Actions needs to be filled via a Dialog or not
+   */
+  void queueAction(Action *_action, enum Action::QueryOptions state = Action::Interactive);
 
   /** Returns the spawned action by token \a name.

src/Actions/Action_impl_pre.hpp

@@ -296 +296 @@
 #include BOOST_PP_LOCAL_ITERATE()
 #endif
-  ToCall->call(Action::NonInteractive);
+  ActionQueue::getInstance().queueAction( ToCall, Action::NonInteractive);
 };
 
@@ -313 +313 @@
 #include BOOST_PP_LOCAL_ITERATE()
 #endif
-  ToCall->call(MoleCuilder::Action::NonInteractive);
+  ActionQueue::getInstance().queueAction( ToCall, Action::NonInteractive);
 };
 

src/Actions/GraphAction/SubgraphDissectionAction.cpp

@@ -159 +159 @@
 #include BOOST_PP_LOCAL_ITERATE()
 #endif
-  ToCall->call(Action::NonInteractive);
+  ActionQueue::getInstance().queueAction( ToCall, Action::NonInteractive);
 };
 
@@ -176 +176 @@
 #include BOOST_PP_LOCAL_ITERATE()
 #endif
-  ToCall->call(MoleCuilder::Action::NonInteractive);
+  ActionQueue::getInstance().queueAction( ToCall, Action::NonInteractive);
 };
 

src/Actions/MakroAction_impl_pre.hpp

@@ -297 +297 @@
 #include BOOST_PP_LOCAL_ITERATE()
 #endif
-  ToCall->call(Action::NonInteractive);
+  ActionQueue::getInstance().queueAction( ToCall, Action::NonInteractive);
 };
 
@@ -314 +314 @@
 #include BOOST_PP_LOCAL_ITERATE()
 #endif
-  ToCall->call(MoleCuilder::Action::NonInteractive);
+  ActionQueue::getInstance().queueAction( ToCall, Action::NonInteractive);
 };
 

src/Actions/ManipulateAtomsProcess.hpp

@@ -21 +21 @@
 #include "Descriptors/AtomDescriptor.hpp"
 
+class manipulateAtomsTest;
 class World;
 
@@ -29 +30 @@
 class ManipulateAtomsProcess : public Process
 {
+  friend class ::manipulateAtomsTest;
 public:
   ManipulateAtomsProcess(boost::function<void(atom*)> _operation, AtomDescriptor descr,const ActionTrait &_trait);
@@ -37 +39 @@
 
   virtual void doManipulate(World *);
+
+private:
+  /** Wrap function Action::call() to allow manipulateAtomsTest access.
+   *
+   */
+  void call(enum QueryOptions state = Interactive)
+  { Process::call(state); }
 
 protected:

src/Actions/Reaction_impl_pre.hpp

@@ -201 +201 @@
 #include BOOST_PP_LOCAL_ITERATE()
 #endif
-  ToCall->call(Action::NonInteractive);
-
-  return static_cast<Reaction< RETURNTYPE > *>(ToCall)->getResult();
+  ActionQueue::getInstance().queueAction( ToCall, Action::NonInteractive);
+  Reaction< RETURNTYPE > * resultaction = static_cast<Reaction< RETURNTYPE > *>(ToCall);
+  ASSERT( resultaction != NULL,
+      "  COMMAND - static cast to Reaction type failed.");
+  ASSERT( resultaction->hasResult (),
+      " _COMMAND - result is not done yet?");
+  return resultaction->getResult();
 };
 
@@ -220 +224 @@
 #include BOOST_PP_LOCAL_ITERATE()
 #endif
-  ToCall->call(MoleCuilder::Action::NonInteractive);
-
-  return static_cast<Reaction< RETURNTYPE > *>(ToCall)->getResult();
+  ActionQueue::getInstance().queueAction( ToCall, Action::NonInteractive);
+  Reaction< RETURNTYPE > * resultaction = static_cast<Reaction< RETURNTYPE > *>(ToCall);
+  ASSERT( resultaction != NULL,
+      "  COMMAND - static cast to Reaction type failed.");
+  ASSERT( resultaction->hasResult (),
+      " _COMMAND - result is not done yet?");
+  return resultaction->getResult();
 };