Manage initnode and finalizenode in the foreachloop progress bar.

[modules/yacs.git] / src / engine / ForLoop.cxx

diff --git a/src/engine/ForLoop.cxx b/src/engine/ForLoop.cxx
index 94e3167b22e52d95e6bafabe67736b5442652a8f..140a949828c5c75c5e11deefbbf7797294a1b09c 100644 (file)
--- a/src/engine/ForLoop.cxx
+++ b/src/engine/ForLoop.cxx
@@ -296,21 +296,20 @@ std::string ForLoop::getProgress() const
  */
 list<ProgressWeight> ForLoop::getProgressWeight() const
 {
-       list<ProgressWeight> ret;
-       list<Node *> setOfNode=edGetDirectDescendants();
-       int nbStepsDone=getNbOfTurns();
-       int nbStepsTotal=getNbSteps();
-       for(list<Node *>::const_iterator iter=setOfNode.begin();iter!=setOfNode.end();iter++)
-         {
-                 list<ProgressWeight> myCurrentSet=(*iter)->getProgressWeight();
-                       for(list<ProgressWeight>::iterator iter=myCurrentSet.begin();iter!=myCurrentSet.end();iter++)
-                               {
-                                       (*iter).weightDone=((*iter).weightTotal) * nbStepsDone;
-                                       (*iter).weightTotal*=nbStepsTotal;
-                               }
-                       ret.insert(ret.end(),myCurrentSet.begin(),myCurrentSet.end());
-
-         }
-       return ret;
+  list<ProgressWeight> ret;
+  list<Node *> setOfNode=edGetDirectDescendants();
+  int nbStepsDone=getNbOfTurns();
+  int nbStepsTotal=getNbSteps();
+  for(list<Node *>::const_iterator iter=setOfNode.begin();iter!=setOfNode.end();iter++)
+    {
+      list<ProgressWeight> myCurrentSet=(*iter)->getProgressWeight();
+        for(list<ProgressWeight>::iterator iter=myCurrentSet.begin();iter!=myCurrentSet.end();iter++)
+          {
+            (*iter).weightDone=((*iter).weightTotal) * nbStepsDone;
+            (*iter).weightTotal*=nbStepsTotal;
+          }
+        ret.insert(ret.end(),myCurrentSet.begin(),myCurrentSet.end());
+    }
+  return ret;
 }