0021480: EDF 2084 SMESH: SIGSEGV when validating Netgen3D hypothesis

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

diff --git a/src/SMESH/SMESH_Mesh.cxx b/src/SMESH/SMESH_Mesh.cxx
index 61cfc4a94454bf03d7004a8fd63ce1455ecf086c..aa36feb281a41279b87d5607dc842025674dc701 100644 (file)
--- a/src/SMESH/SMESH_Mesh.cxx
+++ b/src/SMESH/SMESH_Mesh.cxx
@@ -528,7 +528,7 @@ SMESH_Hypothesis::Hypothesis_Status
 
   SMESH_Hypothesis::Hypothesis_Status ret = subMesh->AlgoStateEngine(event, anHyp);
 
-  // subShapes
+  // sub-shapes
   if (!SMESH_Hypothesis::IsStatusFatal(ret) &&
       anHyp->GetDim() <= SMESH_Gen::GetShapeDim(aSubShape)) // is added on father
   {
@@ -602,7 +602,7 @@ SMESH_Hypothesis::Hypothesis_Status
       subMesh->CheckConcurentHypothesis( anHyp->GetType() ) != SMESH_Hypothesis::HYP_OK)
     ret = SMESH_Hypothesis::HYP_CONCURENT;
 
-  // subShapes
+  // sub-shapes
   if (!SMESH_Hypothesis::IsStatusFatal(ret) &&
       anHyp->GetDim() <= SMESH_Gen::GetShapeDim(aSubShape)) // is removed from father
   {
@@ -884,7 +884,7 @@ throw(SALOME_Exception)
 }
 //================================================================================
 /*!
- * \brief Return submeshes of groups containing the given subshape
+ * \brief Return submeshes of groups containing the given sub-shape
  */
 //================================================================================
 
@@ -988,6 +988,9 @@ void SMESH_Mesh::NotifySubMeshesHypothesisModification(const SMESH_Hypothesis* h
 {
   Unexpect aCatch(SalomeException);
 
+  if ( !GetMeshDS()->IsUsedHypothesis( hyp ))
+    return;
+
   const SMESH_Algo *foundAlgo = 0;
   SMESH_HypoFilter algoKind, compatibleHypoKind;
   list <const SMESHDS_Hypothesis * > usedHyps;
@@ -1384,6 +1387,18 @@ int SMESH_Mesh::NbQuadrangles(SMDSAbs_ElementOrder order) const throw(SALOME_Exc
   return _myMeshDS->GetMeshInfo().NbQuadrangles(order);
 }
 
+//================================================================================
+/*!
+ * \brief Return number of biquadratic quadrangles in the mesh
+ */
+//================================================================================
+
+int SMESH_Mesh::NbBiQuadQuadrangles() const throw(SALOME_Exception)
+{
+  Unexpect aCatch(SalomeException);
+  return _myMeshDS->GetMeshInfo().NbBiQuadQuadrangles();
+}
+
 //================================================================================
 /*!
  * \brief Return the number of polygonal faces in the mesh
@@ -1432,6 +1447,18 @@ int SMESH_Mesh::NbHexas(SMDSAbs_ElementOrder order) const throw(SALOME_Exception
   return _myMeshDS->GetMeshInfo().NbHexas(order);
 }
 
+//================================================================================
+/*!
+ * \brief  Return number of triquadratic hexahedrons in the mesh
+ */
+//================================================================================
+
+int SMESH_Mesh::NbTriQuadraticHexas() const throw(SALOME_Exception)
+{
+  Unexpect aCatch(SalomeException);
+  return _myMeshDS->GetMeshInfo().NbTriQuadHexas();
+}
+
 //================================================================================
 /*!
  * \brief  Return number of pyramids of given order in the mesh
@@ -1456,6 +1483,18 @@ int SMESH_Mesh::NbPrisms(SMDSAbs_ElementOrder order) const throw(SALOME_Exceptio
   return _myMeshDS->GetMeshInfo().NbPrisms(order);
 }
 
+//================================================================================
+/*!
+ * \brief  Return number of hexagonal prisms in the mesh
+ */
+//================================================================================
+
+int SMESH_Mesh::NbHexagonalPrisms() const throw(SALOME_Exception)
+{
+  Unexpect aCatch(SalomeException);
+  return _myMeshDS->GetMeshInfo().NbHexPrisms();
+}
+
 //================================================================================
 /*!
  * \brief  Return number of polyhedrons in the mesh
@@ -1751,6 +1790,9 @@ SMESH_Group* SMESH_Mesh::ConvertToStandalone ( int theGroupID )
   while ( anItr->more() )
     aNewGrpDS->Add( (anItr->next())->GetID() );
 
+  // set color
+  aNewGrpDS->SetColor( anOldGrpDS->GetColor() );
+
   // remove old group
   delete anOldGrp;