compact as soon as all elements removed

[modules/smesh.git] / src / SMESH / SMESH_Mesh.cxx

diff --git a/src/SMESH/SMESH_Mesh.cxx b/src/SMESH/SMESH_Mesh.cxx
index d630792175db9a40c38d1601cbd30248dd95772d..a8a789fbd070853499d55692d9c481ab77fa0960 100644 (file)
--- a/src/SMESH/SMESH_Mesh.cxx
+++ b/src/SMESH/SMESH_Mesh.cxx
@@ -58,6 +58,7 @@
 #include <BRepBndLib.hxx>
 #include <BRepPrimAPI_MakeBox.hxx>
 #include <Bnd_Box.hxx>
+#include <TColStd_MapOfInteger.hxx>
 #include <TopExp.hxx>
 #include <TopExp_Explorer.hxx>
 #include <TopTools_ListIteratorOfListOfShape.hxx>
@@ -65,6 +66,8 @@
 #include <TopTools_MapOfShape.hxx>
 #include <TopoDS_Iterator.hxx>
 
+#include "SMESH_TryCatch.hxx" // include after OCCT headers!
+
 #include "Utils_ExceptHandlers.hxx"
 
 #include <boost/thread/thread.hpp>
@@ -1258,7 +1261,7 @@ void SMESH_Mesh::ExportMED(const char *        file,
                            bool                theAutoDimension)
   throw(SALOME_Exception)
 {
-  Unexpect aCatch(SalomeException);
+  SMESH_TRY;
 
   DriverMED_W_SMESHDS_Mesh myWriter;
   myWriter.SetFile         ( file, MED::EVersion(theVersion) );
@@ -1305,6 +1308,8 @@ void SMESH_Mesh::ExportMED(const char *        file,
   }
   // Perform export
   myWriter.Perform();
+
+  SMESH_CATCH( SMESH::throwSalomeEx );
 }
 
 //================================================================================
@@ -1469,46 +1474,55 @@ double SMESH_Mesh::GetComputeProgress() const
   double totalCost = 1e-100, computedCost = 0;
   const SMESH_subMesh* curSM = _gen->GetCurrentSubMesh();
 
-  // get cost of already treated sub-meshes
-  if ( SMESH_subMesh* mainSM = GetSubMeshContaining( 1 ))
-  {
-    SMESH_subMeshIteratorPtr smIt = mainSM->getDependsOnIterator(/*includeSelf=*/true);
-    while ( smIt->more() )
-    {
-      SMESH_subMesh* sm = smIt->next();
-      if ( sm->GetComputeState() != SMESH_subMesh::NOT_READY )
-      {
-        const int smCost = sm->GetComputeCost();
-        totalCost += smCost;
-        if ( sm != curSM &&
-             ( !sm->IsEmpty() ||
-               sm->GetComputeState() == SMESH_subMesh::FAILED_TO_COMPUTE ))
-        {
-          computedCost += smCost;
-        }
-      }
-    }
-  }
-  // get progress of a current algo 
+  // get progress of a current algo
+  TColStd_MapOfInteger currentSubIds; 
   if ( curSM )
     if ( SMESH_Algo* algo = curSM->GetAlgo() )
     {
+      int algoNotDoneCost = 0, algoDoneCost = 0;
+      const std::vector<SMESH_subMesh*>& smToCompute = algo->SubMeshesToCompute();
+      for ( size_t i = 0; i < smToCompute.size(); ++i )
+      {
+        if ( smToCompute[i]->IsEmpty() )
+          algoNotDoneCost += smToCompute[i]->GetComputeCost();
+        else
+          algoDoneCost += smToCompute[i]->GetComputeCost();
+        currentSubIds.Add( smToCompute[i]->GetId() );
+      }
       double rate = algo->GetProgress();
       if ( 0. < rate && rate < 1.001 )
       {
-        //cout << " rate: " << rate << " cost " << algo->GetComputeCost() << endl;
-        computedCost += rate * algo->GetComputeCost();
+        computedCost += rate * ( algoDoneCost + algoNotDoneCost );
       }
-      else if ( curSM->IsEmpty() )
+      else
       {
-        computedCost += algo->GetProgressByTic() * algo->GetComputeCost();
+        rate = algo->GetProgressByTic();
+        computedCost += algoDoneCost + rate * algoNotDoneCost;
       }
-      else
+      // cout << "rate: "<<rate << " algoNotDoneCost: " << algoNotDoneCost << endl;
+    }
+
+  // get cost of already treated sub-meshes
+  if ( SMESH_subMesh* mainSM = GetSubMeshContaining( 1 ))
+  {
+    SMESH_subMeshIteratorPtr smIt = mainSM->getDependsOnIterator(/*includeSelf=*/true);
+    while ( smIt->more() )
+    {
+      const SMESH_subMesh* sm = smIt->next();
+      const int smCost = sm->GetComputeCost();
+      totalCost += smCost;
+      if ( !currentSubIds.Contains( sm->GetId() ) )
       {
-        computedCost += 0.99 * algo->GetComputeCost();
+        if (( !sm->IsEmpty() ) ||
+            ( sm->GetComputeState() == SMESH_subMesh::FAILED_TO_COMPUTE &&
+              !sm->DependsOn( curSM ) ))
+          computedCost += smCost;
       }
     }
-  //cout << "Total: " << totalCost << " progress: " << computedCost / totalCost << endl;
+  }
+  // cout << "Total: " << totalCost
+  //      << " computed: " << computedCost << " progress: " << computedCost / totalCost
+  //      << " nbElems: " << GetMeshDS()->GetMeshInfo().NbElements() << endl;
   return computedCost / totalCost;
 }