Compute Progress bar: ignore sub-meshes that are NOT_READY to compute

diff --git a/src/SMESH/SMESH_Mesh.cxx b/src/SMESH/SMESH_Mesh.cxx
index 3c3dca37fa017cf9042db31a4b12d1746227757c..d630792175db9a40c38d1601cbd30248dd95772d 100644 (file)
--- a/src/SMESH/SMESH_Mesh.cxx
+++ b/src/SMESH/SMESH_Mesh.cxx
@@ -1476,13 +1476,16 @@ double SMESH_Mesh::GetComputeProgress() const
     while ( smIt->more() )
     {
       SMESH_subMesh* sm = smIt->next();
-      const int smCost = sm->GetComputeCost();
-      totalCost += smCost;
-      if ( sm != curSM &&
-           ( !sm->IsEmpty() ||
-             sm->GetComputeState() == SMESH_subMesh::FAILED_TO_COMPUTE ))
+      if ( sm->GetComputeState() != SMESH_subMesh::NOT_READY )
       {
-        computedCost += smCost;
+        const int smCost = sm->GetComputeCost();
+        totalCost += smCost;
+        if ( sm != curSM &&
+             ( !sm->IsEmpty() ||
+               sm->GetComputeState() == SMESH_subMesh::FAILED_TO_COMPUTE ))
+        {
+          computedCost += smCost;
+        }
       }
     }
   }
@@ -1496,10 +1499,14 @@ double SMESH_Mesh::GetComputeProgress() const
         //cout << " rate: " << rate << " cost " << algo->GetComputeCost() << endl;
         computedCost += rate * algo->GetComputeCost();
       }
-      else
+      else if ( curSM->IsEmpty() )
       {
         computedCost += algo->GetProgressByTic() * algo->GetComputeCost();
       }
+      else
+      {
+        computedCost += 0.99 * algo->GetComputeCost();
+      }
     }
   //cout << "Total: " << totalCost << " progress: " << computedCost / totalCost << endl;
   return computedCost / totalCost;

diff --git a/src/SMESH/SMESH_subMesh.cxx b/src/SMESH/SMESH_subMesh.cxx
index a78efcdfca195cc80e6b9b60df106719fac02af6..7b7fc75b9249fb05df5605905086d243a36776e1 100644 (file)
--- a/src/SMESH/SMESH_subMesh.cxx
+++ b/src/SMESH/SMESH_subMesh.cxx
@@ -2089,7 +2089,8 @@ TopoDS_Shape SMESH_subMesh::getCollection(SMESH_Gen * theGen,
   {
     const TopoDS_Shape& S = anExplorer.Current();
     SMESH_subMesh* subMesh = _father->GetSubMesh( S );
-    theComputeCost += subMesh->GetComputeCost();
+    if ( subMesh->GetComputeState() != NOT_READY )
+      theComputeCost += subMesh->GetComputeCost();
     if ( subMesh == this )
     {
       aBuilder.Add( aCompound, S );
@@ -2109,7 +2110,8 @@ TopoDS_Shape SMESH_subMesh::getCollection(SMESH_Gen * theGen,
       while ( smIt->more() )
       {
         SMESH_subMesh* sm = smIt->next();
-        if ( sm->IsEmpty() )
+        if ( sm->GetComputeState() != NOT_READY &&
+             sm->IsEmpty() )
           theComputeCost += sm->GetComputeCost();
       }
     }