X-Git-Url: http://git.salome-platform.org/gitweb/?a=blobdiff_plain;f=src%2Fengine%2FForEachLoop.cxx;h=bafdb85d6153fb09e07c16b32a7b033fa9106e22;hb=c9208a8ef7f32a620d9650908588320ff159a167;hp=76eebb5a7cb21c1c31591441469a042c970fdc46;hpb=9c338829ffc313e9bec055ab2dc5cf9fec9f1fb7;p=modules%2Fyacs.git diff --git a/src/engine/ForEachLoop.cxx b/src/engine/ForEachLoop.cxx index 76eebb5a7..bafdb85d6 100644 --- a/src/engine/ForEachLoop.cxx +++ b/src/engine/ForEachLoop.cxx @@ -526,7 +526,8 @@ void ForEachLoop::exUpdateState() { //internal graph update int i; - int nbOfBr(_nbOfBranches->getIntValue()),nbOfElts(_splitterNode.getNumberOfElements()),nbOfEltsDone(0); + int nbOfElts(_splitterNode.getNumberOfElements()),nbOfEltsDone(0); + int nbOfBr(_nbOfBranches->getNumberOfBranches(nbOfElts)); if(_passedData) { _passedData->checkCompatibilyWithNb(nbOfElts); @@ -1168,8 +1169,9 @@ list ForEachLoop::getProgressWeight() const int ForEachLoop::getNbOfElementsToBeProcessed() const { - int nbBranches = _nbOfBranches->getIntValue(); - return _splitterNode.getNumberOfElements() + int nbOfElems(_splitterNode.getNumberOfElements()); + int nbBranches = _nbOfBranches->getNumberOfBranches(nbOfElems); + return nbOfElems + (_initNode ? nbBranches:0) + (_finalizeNode ? nbBranches:0) ; }