Compute Progress bar

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

diff --git a/src/SMESH/SMESH_subMesh.cxx b/src/SMESH/SMESH_subMesh.cxx
index fbd593e8bf361e2c754d575f94e4b0c07679fd07..a78efcdfca195cc80e6b9b60df106719fac02af6 100644 (file)
--- a/src/SMESH/SMESH_subMesh.cxx
+++ b/src/SMESH/SMESH_subMesh.cxx
@@ -104,6 +104,7 @@ SMESH_subMesh::SMESH_subMesh(int                  Id,
     _algoState = NO_ALGO;
     _computeState = NOT_READY;
   }
+  _computeCost = 0; // how costly is to compute this sub-mesh
 }
 
 //=============================================================================
@@ -355,6 +356,35 @@ bool SMESH_subMesh::SubMeshesComputed(bool * isFailedToCompute/*=0*/) const
   return subMeshesComputed;
 }
 
+//================================================================================
+/*!
+ * \brief Return cost of computing this sub-mesh. The cost depends on the shape type
+ * and number of sub-meshes this one DependsOn().
+ *  \return int - the computation cost in abstract units.
+ */
+//================================================================================
+
+int SMESH_subMesh::GetComputeCost() const
+{
+  if ( !_computeCost )
+  {
+    int computeCost;
+    switch ( _subShape.ShapeType() ) {
+    case TopAbs_SOLID:
+    case TopAbs_SHELL: computeCost = 1000; break;
+    case TopAbs_FACE:  computeCost = 100; break;
+    case TopAbs_EDGE:  computeCost = 10; break;
+    default:           computeCost = 1;
+    }
+    SMESH_subMeshIteratorPtr childIt = getDependsOnIterator(/*includeSelf=*/false);
+    while ( childIt->more() )
+      computeCost += childIt->next()->GetComputeCost();
+
+    ((SMESH_subMesh*)this)->_computeCost = computeCost;
+  }
+  return _computeCost;
+}
+
 //=============================================================================
 /*!
  *
@@ -1049,6 +1079,9 @@ SMESH_Hypothesis::Hypothesis_Status
   if ( stateChange && _algoState == HYP_OK ) // hyp becomes OK
     algo->SetEventListener( this );
 
+  if ( event == REMOVE_ALGO || event == REMOVE_FATHER_ALGO )
+    _algo = 0;
+
   notifyListenersOnEvent( event, ALGO_EVENT, anHyp );
 
   if ( stateChange && oldAlgoState == HYP_OK ) { // hyp becomes KO
@@ -1248,8 +1281,7 @@ void SMESH_subMesh::cleanDependsOn( SMESH_Algo* algoRequiringCleaning/*=0*/ )
 
 void SMESH_subMesh::DumpAlgoState(bool isMain)
 {
-        int dim = SMESH_Gen::GetShapeDim(_subShape);
-//   if (dim < 1) return;
+  // if (dim < 1) return;
         if (isMain)
         {
                 const map < int, SMESH_subMesh * >&subMeshes = DependsOn();
@@ -1261,8 +1293,9 @@ void SMESH_subMesh::DumpAlgoState(bool isMain)
                         sm->DumpAlgoState(false);
                 }
         }
-        int type = _subShape.ShapeType();
-        MESSAGE("dim = " << dim << " type of shape " << type);
+        //int type = _subShape.ShapeType();
+        MESSAGE("dim = " << SMESH_Gen::GetShapeDim(_subShape) <<
+                " type of shape " << _subShape.ShapeType());
         switch (_algoState)
         {
         case NO_ALGO:
@@ -1459,13 +1492,14 @@ bool SMESH_subMesh::ComputeStateEngine(int event)
           break;
         }
         TopoDS_Shape shape = _subShape;
+        int computeCost = GetComputeCost();
         // check submeshes needed
         if (_father->HasShapeToMesh() ) {
           bool subComputed = false, subFailed = false;
           if (!algo->OnlyUnaryInput()) {
-            if ( event == COMPUTE &&
-                 ( algo->NeedDiscreteBoundary() || algo->SupportSubmeshes() ))
-              shape = getCollection( gen, algo, subComputed, subFailed );
+            if ( event == COMPUTE /*&&
+                 ( algo->NeedDiscreteBoundary() || algo->SupportSubmeshes() )*/)
+              shape = getCollection( gen, algo, subComputed, subFailed, computeCost);
             else
               subComputed = SubMeshesComputed( & subFailed );
           }
@@ -1498,6 +1532,8 @@ bool SMESH_subMesh::ComputeStateEngine(int event)
           OCC_CATCH_SIGNALS;
 #endif
           algo->InitComputeError();
+          algo->GetComputeCost() = computeCost;
+
           MemoryReserve aMemoryReserve;
           SMDS_Mesh::CheckMemory();
           Kernel_Utils::Localizer loc;
@@ -1512,7 +1548,7 @@ bool SMESH_subMesh::ComputeStateEngine(int event)
           {
             ret = algo->Compute((*_father), shape);
           }
-          if ( !_computeError || ( !ret && _computeError->IsOK() ) ) // algo can set _computeError of submesh
+          if ( !_computeError || (/* !ret && */_computeError->IsOK() ) ) // algo can set _computeError of submesh
             _computeError = algo->GetComputeError();
         }
         catch ( ::SMESH_ComputeError& comperr ) {
@@ -2025,7 +2061,8 @@ void SMESH_subMesh::removeSubMeshElementsAndNodes()
 TopoDS_Shape SMESH_subMesh::getCollection(SMESH_Gen * theGen,
                                           SMESH_Algo* theAlgo,
                                           bool &      theSubComputed,
-                                          bool &      theSubFailed)
+                                          bool &      theSubFailed,
+                                          int  &      theComputeCost)
 {
   theSubComputed = SubMeshesComputed( & theSubFailed );
 
@@ -2045,11 +2082,14 @@ TopoDS_Shape SMESH_subMesh::getCollection(SMESH_Gen * theGen,
   BRep_Builder aBuilder;
   aBuilder.MakeCompound( aCompound );
 
+  theComputeCost = 0;
+
   TopExp_Explorer anExplorer( mainShape, _subShape.ShapeType() );
   for ( ; anExplorer.More(); anExplorer.Next() )
   {
     const TopoDS_Shape& S = anExplorer.Current();
     SMESH_subMesh* subMesh = _father->GetSubMesh( S );
+    theComputeCost += subMesh->GetComputeCost();
     if ( subMesh == this )
     {
       aBuilder.Add( aCompound, S );
@@ -2063,6 +2103,16 @@ TopoDS_Shape SMESH_subMesh::getCollection(SMESH_Gen * theGen,
       if ( !subMesh->SubMeshesComputed() )
         theSubComputed = false;
     }
+    if ( !theAlgo->NeedDiscreteBoundary() )
+    {
+      SMESH_subMeshIteratorPtr smIt = subMesh->getDependsOnIterator(/*includeSelf=*/false);
+      while ( smIt->more() )
+      {
+        SMESH_subMesh* sm = smIt->next();
+        if ( sm->IsEmpty() )
+          theComputeCost += sm->GetComputeCost();
+      }
+    }
   }
 
   return aCompound;
@@ -2258,19 +2308,22 @@ void SMESH_subMesh::notifyListenersOnEvent( const int         event,
                                             const event_type  eventType,
                                             SMESH_Hypothesis* hyp)
 {
-  map< EventListener*, EventListenerData* >::iterator l_d = _eventListeners.begin();
-  for ( ; l_d != _eventListeners.end();  )
+  list< pair< EventListener*, EventListenerData* > > eventListeners( _eventListeners.begin(),
+                                                                     _eventListeners.end());
+  list< pair< EventListener*, EventListenerData* > >::iterator l_d = eventListeners.begin();
+  for ( ; l_d != eventListeners.end(); ++l_d )
   {
-    std::pair< EventListener*, EventListenerData* > li_da = *l_d++; /* copy to enable removal
-                                                                       of a listener from
-                                                                       _eventListeners by
-                                                                       its ProcessEvent() */
+    std::pair< EventListener*, EventListenerData* > li_da = *l_d;
+    if ( !_eventListeners.count( li_da.first )) continue;
+
     if ( li_da.first->myBusySM.insert( this ).second )
     {
-      const size_t nbListenersBefore = _eventListeners.size();
+      const bool isDeletable = li_da.first->IsDeletable();
+
       li_da.first->ProcessEvent( event, eventType, this, li_da.second, hyp );
-      if ( nbListenersBefore == _eventListeners.size() )
-        li_da.first->myBusySM.erase( this ); // a listener hopefully not removed
+
+      if ( !isDeletable || _eventListeners.count( li_da.first ))
+        li_da.first->myBusySM.erase( this ); // a listener is hopefully not dead
     }
   }
 }