Changeset 9c1324 for src

Timestamp:

Jul 11, 2013, 9:44:01 PM (12 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:

39986b

Parents:

bcb593

git-author:

Frederik Heber <heber@…> (07/11/13 21:39:02)

git-committer:

Frederik Heber <heber@…> (07/11/13 21:44:01)

Message:

Equipped MakroAction with some boost::preprocessor magic, ActionSequence with loop.

• ActionSequence now has a loop integer specifying how often the sequence is repeated. This is required to have actions in a loop but each of them generate their dialog only once.

Location:

src/Actions

Files:

• ActionSequence.cpp (modified) (3 diffs)
• ActionSequence.hpp (modified) (2 diffs)
• Makefile.am (modified) (1 diff)
• MakroAction.cpp (modified) (3 diffs)
• MakroAction.hpp (modified) (1 diff)
• MakroAction_impl_header.hpp (added)
• MakroAction_impl_pre.hpp (added)

src/Actions/ActionSequence.cpp

@@ -43 +43 @@
 using namespace MoleCuilder;
 
-ActionSequence::ActionSequence()
+ActionSequence::ActionSequence() :
+    loop(1)
 {}
 
@@ -78 +79 @@
 // Each action registers itself with the history
 void ActionSequence::callAll(){
-  for(actionSet::iterator it=actions.begin(); it!=actions.end(); it++){
-    // we want to have a global bookkeeping for all actions in the sequence, so
-    // we bypass the normal call
-    (*it)->call();
-  }
+  for (int i=0;i<loop;++i)
+    for(actionSet::iterator it=actions.begin(); it!=actions.end(); it++){
+      // we want to have a global bookkeeping for all actions in the sequence, so
+      // we bypass the normal call
+      (*it)->call();
+    }
 }
 
@@ -90 +92 @@
 ActionSequence::stateSet ActionSequence::callAll(bool){
   stateSet states;
-  for(actionSet::iterator it=actions.begin(); it!=actions.end(); it++){
-    // we want to have a global bookkeeping for all actions in the sequence, so
-    // we bypass the normal call
-    Action::state_ptr state = (*it)->performCall();
-    states.push_back(state);
-  }
+  for (int i=0;i<loop;++i)
+    for(actionSet::iterator it=actions.begin(); it!=actions.end(); it++){
+      // we want to have a global bookkeeping for all actions in the sequence, so
+      // we bypass the normal call
+      Action::state_ptr state = (*it)->performCall();
+      states.push_back(state);
+    }
   return states;
 }

src/Actions/ActionSequence.hpp

@@ -36 +36 @@
   void addAction(Action*);
   Action* removeLastAction();
+  unsigned int getLoop() const
+  { return loop; }
 
   void callAll();
@@ -47 +49 @@
   stateSet undoAll(stateSet);
   stateSet redoAll(stateSet);
+  void setLoop(unsigned int _loop)
+  { loop = _loop; }
 private:
   actionSet actions;
+  //!> how often the sequence is repeated
+  unsigned int loop;
 };
 

src/Actions/Makefile.am

@@ -36 +36 @@
   Actions/GlobalListOfActions.hpp \
   Actions/MakroAction.hpp \
+  Actions/MakroAction_impl_header.hpp \
+  Actions/MakroAction_impl_pre.hpp \
   Actions/ManipulateAtomsProcess.hpp \
   Actions/MethodAction.hpp \

src/Actions/MakroAction.cpp

@@ -40 +40 @@
 #include "Actions/MakroAction.hpp"
 #include "Actions/Action.hpp"
+#include "Actions/ActionExceptions.hpp"
 #include "Actions/ActionSequence.hpp"
 #include "CodePatterns/Assert.hpp"
+#include "UIElements/Dialog.hpp"
+#include "UIElements/UIFactory.hpp"
 
 using namespace MoleCuilder;
@@ -78 +81 @@
 {}
 
+void MakroAction::setLoop(unsigned int _loop)
+{
+  actions.setLoop(_loop);
+}
+
 Dialog* MakroAction::fillDialog(Dialog *dialog) {
   return actions.fillAllDialogs(dialog);
@@ -83 +91 @@
 
 Action::state_ptr MakroAction::performCall(){
+  {
+    // create and run our dialog and also of all members of the sequence
+    Dialog* dialog = actions.fillAllDialogs(createDialog());
+    if (dialog->hasQueries()) {
+      if (!dialog->display())
+        // dialog error or aborted -> throw exception
+        throw ActionFailureException() << ActionNameString(getName());
+    }
+    delete(dialog);
+  }
   ActionSequence::stateSet states = actions.callAll(true);
   return Action::state_ptr(new MakroActionState(states));

src/Actions/MakroAction.hpp

@@ -49 +49 @@
   virtual Action::state_ptr performRedo(Action::state_ptr);
 
+  void setLoop(unsigned int _loop);
+
 private:
   ActionSequence &actions;