regression of SMESH_TEST/Grids/smesh/bugs/L9

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

diff --git a/src/SMESH/SMESH_Mesh.cxx b/src/SMESH/SMESH_Mesh.cxx
index 9416618c5c433325ec980dc4d6b39a5bdc6bd2df..77e9c489aa42cee0f5f3a952543c251357b159d1 100644 (file)
--- a/src/SMESH/SMESH_Mesh.cxx
+++ b/src/SMESH/SMESH_Mesh.cxx
@@ -1,4 +1,4 @@
-// Copyright (C) 2007-2011  CEA/DEN, EDF R&D, OPEN CASCADE
+// Copyright (C) 2007-2012  CEA/DEN, EDF R&D, OPEN CASCADE
 //
 // Copyright (C) 2003-2007  OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
 // CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS
@@ -26,6 +26,7 @@
 //  Module : SMESH
 //
 #include "SMESH_Mesh.hxx"
+#include "SMESH_MesherHelper.hxx"
 #include "SMESH_subMesh.hxx"
 #include "SMESH_Gen.hxx"
 #include "SMESH_Hypothesis.hxx"
@@ -108,7 +109,7 @@ SMESH_Mesh::SMESH_Mesh(int               theLocalId,
   _isAutoColor   = false;
   _isModified    = false;
   _shapeDiagonal = 0.0;
-  _rmGroupCallUp = 0;
+  _callUp = 0;
   _myMeshDS->ShapeToMesh( PseudoShape() );
 }
 
@@ -131,7 +132,7 @@ SMESH_Mesh::SMESH_Mesh():
   _isAutoColor( false ),
   _isModified( false ),
   _shapeDiagonal( 0.0 ),
-  _rmGroupCallUp( 0 )
+  _callUp( 0 )
 {
 }
 
@@ -170,11 +171,14 @@ SMESH_Mesh::~SMESH_Mesh()
   // delete sub-meshes
   map <int, SMESH_subMesh*>::iterator sm = _mapSubMesh.begin();
   for ( ; sm != _mapSubMesh.end(); ++sm )
+  {
     delete sm->second;
+    sm->second = 0;
+  }
   _mapSubMesh.clear();
 
-  if ( _rmGroupCallUp) delete _rmGroupCallUp;
-  _rmGroupCallUp = 0;
+  if ( _callUp) delete _callUp;
+  _callUp = 0;
 
   // remove self from studyContext
   if ( _gen )
@@ -184,12 +188,24 @@ SMESH_Mesh::~SMESH_Mesh()
   }
   if ( _myDocument )
     _myDocument->RemoveMesh( _id );
+  _myDocument = 0;
 
   if ( _myMeshDS )
     // delete _myMeshDS, in a thread in order not to block closing a study with large meshes
     boost::thread aThread(boost::bind( & deleteMeshDS, _myMeshDS ));
 }
 
+//================================================================================
+/*!
+ * \brief Return true if a mesh with given id exists
+ */
+//================================================================================
+
+bool SMESH_Mesh::MeshExists( int meshId ) const
+{
+  return _myDocument ? _myDocument->GetMesh( meshId ) : false;
+}
+
 //=============================================================================
 /*!
  * \brief Set geometry to be meshed
@@ -311,6 +327,18 @@ double SMESH_Mesh::GetShapeDiagonalSize() const
   return _shapeDiagonal;
 }
 
+//================================================================================
+/*!
+ * \brief Load mesh from study file
+ */
+//================================================================================
+
+void SMESH_Mesh::Load()
+{
+  if (_callUp)
+    _callUp->Load();
+}
+
 //=======================================================================
 /*!
  * \brief Remove all nodes and elements
@@ -876,7 +904,6 @@ SMESH_subMesh *SMESH_Mesh::GetSubMesh(const TopoDS_Shape & aSubShape)
   {
     aSubMesh = new SMESH_subMesh(index, this, _myMeshDS, aSubShape);
     _mapSubMesh[index] = aSubMesh;
-    ClearMeshOrder();
   }
   return aSubMesh;
 }
@@ -941,17 +968,27 @@ SMESH_Mesh::GetGroupSubMeshesContaining(const TopoDS_Shape & aSubShape) const
   for ( i_sm = _mapSubMesh.rbegin(); i_sm != _mapSubMesh.rend(); ++i_sm) {
     SMESHDS_SubMesh * ds = i_sm->second->GetSubMeshDS();
     if ( ds && ds->IsComplexSubmesh() ) {
-      TopExp_Explorer exp( i_sm->second->GetSubShape(), aSubShape.ShapeType() );
-      for ( ; exp.More(); exp.Next() ) {
-        if ( aSubShape.IsSame( exp.Current() )) {
-          found.push_back( i_sm->second );
-          break;
-        }
+      if ( SMESH_MesherHelper::IsSubShape( aSubShape, i_sm->second->GetSubShape() ))
+      {
+        found.push_back( i_sm->second );
+        //break;
       }
     } else {
-      break;
+      break; // the rest sub-meshes are not those of groups
     }
   }
+
+  if ( found.empty() ) // maybe the main shape is a COMPOUND (issue 0021530)
+  {
+    if ( SMESH_subMesh * mainSM = GetSubMeshContaining(1))
+      if ( mainSM->GetSubShape().ShapeType() == TopAbs_COMPOUND )
+      {
+        TopoDS_Iterator it( mainSM->GetSubShape() );
+        if ( it.Value().ShapeType() == aSubShape.ShapeType() &&
+             SMESH_MesherHelper::IsSubShape( aSubShape, mainSM->GetSubShape() ))
+          found.push_back( mainSM );
+      }
+  }
   return found;
 }
 //=======================================================================
@@ -1028,6 +1065,9 @@ void SMESH_Mesh::NotifySubMeshesHypothesisModification(const SMESH_Hypothesis* h
   if ( !GetMeshDS()->IsUsedHypothesis( hyp ))
     return;
 
+  if (_callUp)
+    _callUp->HypothesisModified();
+
   const SMESH_Algo *foundAlgo = 0;
   SMESH_HypoFilter algoKind, compatibleHypoKind;
   list <const SMESHDS_Hypothesis * > usedHyps;
@@ -1669,15 +1709,15 @@ list<int> SMESH_Mesh::GetGroupIds() const
 
 //================================================================================
 /*!
- * \brief Set a caller of RemoveGroup() at level of CORBA API implementation.
+ * \brief Set a caller of methods at level of CORBA API implementation.
  * The set upCaller will be deleted by SMESH_Mesh
  */
 //================================================================================
 
-void SMESH_Mesh::SetRemoveGroupCallUp( TRmGroupCallUp* upCaller )
+void SMESH_Mesh::SetCallUp( TCallUp* upCaller )
 {
-  if ( _rmGroupCallUp ) delete _rmGroupCallUp;
-  _rmGroupCallUp = upCaller;
+  if ( _callUp ) delete _callUp;
+  _callUp = upCaller;
 }
 
 //=============================================================================
@@ -1693,8 +1733,8 @@ bool SMESH_Mesh::RemoveGroup (const int theGroupID)
   GetMeshDS()->RemoveGroup( _mapGroup[theGroupID]->GetGroupDS() );
   delete _mapGroup[theGroupID];
   _mapGroup.erase (theGroupID);
-  if (_rmGroupCallUp)
-    _rmGroupCallUp->RemoveGroup( theGroupID );
+  if (_callUp)
+    _callUp->RemoveGroup( theGroupID );
   return true;
 }