X-Git-Url: http://git.salome-platform.org/gitweb/?a=blobdiff_plain;f=src%2Fengine%2FProc.cxx;h=2eaaddaebe1799ec09b25fb53ee6be51f3f25c23;hb=89f536fa20e516d2de5339f741956dd1473f46a4;hp=4cb7429557d682721059287de61881aa0e0fe619;hpb=43fb0be2d7c9fee7ea58272e85275c6b38a96cea;p=modules%2Fyacs.git

diff --git a/src/engine/Proc.cxx b/src/engine/Proc.cxx
index 4cb742955..2eaaddaeb 100644
--- a/src/engine/Proc.cxx
+++ b/src/engine/Proc.cxx
@@ -232,17 +232,17 @@ std::string Proc::getNodeProgress(int numId)
 
 int Proc::getGlobalProgressPercent()
 {
-	list<pair <int,int> > weightList = getProgressWeight();
-	int weightDone = 0;
-	int weightTotal = 0;
-	int progressPercent = 0;
-	for(list<pair <int,int> >::const_iterator iter=weightList.begin();iter!=weightList.end();iter++)
-	  {
-		  weightDone += (*iter).first;
-			weightTotal += (*iter).second;
-	  }
+  list<ProgressWeight> weightList = getProgressWeight();
+  int weightDone = 0;
+  int weightTotal = 0;
+  int progressPercent = 0;
+  for(list<ProgressWeight>::const_iterator iter=weightList.begin();iter!=weightList.end();iter++)
+    {
+      weightDone += (*iter).weightDone;
+      weightTotal += (*iter).weightTotal;
+    }
   if (weightTotal > 0)
-  	progressPercent = int(float(weightDone) / float(weightTotal) * 100);
+    progressPercent = int(float(weightDone) / float(weightTotal) * 100);
   return progressPercent;
 }