Changeset e3ce0e for src/Actions

Timestamp:

Jun 20, 2018, 8:20:43 AM (7 years ago)

Author:

Frederik Heber <frederik.heber@…>

Branches:

AutomationFragmentation_failures, Candidate_v1.6.1, ChemicalSpaceEvaluator, Exclude_Hydrogens_annealWithBondGraph, ForceAnnealing_with_BondGraph_contraction-expansion, StoppableMakroAction

Children:

4b2adf

Parents:

559293

git-author:

Frederik Heber <frederik.heber@…> (09/13/17 17:20:35)

git-committer:

Frederik Heber <frederik.heber@…> (06/20/18 08:20:43)

Message:

MakroAction allows getting the internal ActionSequence's current step.

Location:

src/Actions

Files:

• ActionSequence.cpp (modified) (3 diffs)
• ActionSequence.hpp (modified) (1 diff)
• MakroAction.cpp (modified) (1 diff)
• MakroAction.hpp (modified) (2 diffs)

src/Actions/ActionSequence.cpp

@@ -47 +47 @@
 
 ActionSequence::ActionSequence() :
-    loop(1)
+    loop(1),
+    step(0)
 {}
 
 ActionSequence::ActionSequence(const ActionSequence &_other) :
-    loop(1)
+    loop(1),
+    step(0)
 {
   // we need to override copy cstor as we have pointer referenced objects
@@ -114 +116 @@
 void ActionSequence::callAll()
 {
-  for (size_t i=0;i<loop;++i)
+  for (step=0;step<loop;++step)
     for(actionSet::iterator it=actions.begin(); it!=actions.end(); it++){
       // we want to have a global bookkeeping for all actions in the sequence, so
@@ -128 +130 @@
 {
   stateSet states;
-  for (size_t i=0;i<loop;++i)
+  for (step=0;step<loop;++step)
     for(actionSet::iterator it=actions.begin(); it!=actions.end(); it++){
       // we want to have a global bookkeeping for all actions in the sequence, so

src/Actions/ActionSequence.hpp

@@ -67 +67 @@
   void setLoop(unsigned int _loop)
   { loop = _loop; }
+
+  unsigned int getStep() const
+  { return step; }
+
 private:
   actionSet actions;
   //!> how often the sequence is repeated
   unsigned int loop;
+  //!> current step (used in loops)
+  unsigned int step;
 };
 

src/Actions/MakroAction.cpp

@@ -88 +88 @@
 }
 
+unsigned int MakroAction::getLoop() const
+{
+  return actions.getLoop();
+}
+
+unsigned int MakroAction::getStep() const
+{
+  return actions.getStep();
+}
+
 bool MakroAction::removeAction(const std::string &name)
 {

src/Actions/MakroAction.hpp

@@ -54 +54 @@
   virtual void unprepare(ActionRegistry &AR);
 
+  void setLoop(unsigned int _loop);
+
+  unsigned int getLoop() const;
+
+  unsigned int getStep() const;
+
 protected:
   virtual ~MakroAction();
@@ -78 +84 @@
   virtual ActionState::ptr performRedo(ActionState::ptr);
 
-  void setLoop(unsigned int _loop);
-
 private:
   /** fillDialog is used to spawn sequence queries, hence must not be modified by