Fix typo by Kunda

[modules/smesh.git] / src / SMESH_I / SMESH_subMesh_i.cxx

diff --git a/src/SMESH_I/SMESH_subMesh_i.cxx b/src/SMESH_I/SMESH_subMesh_i.cxx
index 720a1509ba6554323aca3cd355870dcc25b84cce..0162de2b5ecd2f29fb4c307101bf8f0384628ecc 100644 (file)
--- a/src/SMESH_I/SMESH_subMesh_i.cxx
+++ b/src/SMESH_I/SMESH_subMesh_i.cxx
@@ -1,4 +1,4 @@
-// Copyright (C) 2007-2016  CEA/DEN, EDF R&D, OPEN CASCADE
+// Copyright (C) 2007-2019  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
@@ -27,6 +27,7 @@
 //
 #include "SMESH_subMesh_i.hxx"
 
+#include "SMESHDS_Mesh.hxx"
 #include "SMESHDS_SubMesh.hxx"
 #include "SMESH_Gen_i.hxx"
 #include "SMESH_Mesh_i.hxx"
@@ -95,6 +96,8 @@ typedef list<SMESHDS_SubMesh*> TListOfSubMeshes;
 bool getSubMeshes(::SMESH_subMesh*  theSubMesh,
                   TListOfSubMeshes& theSubMeshList)
 {
+  if ( !theSubMesh )
+    return false; // "invalid sub-mesh" created by SMESH_Gen_i::CopyMeshWithGeom()
   size_t size = theSubMeshList.size();
 
   // check all child sub-meshes of one complexity,
@@ -484,14 +487,19 @@ SMESH::long_array* SMESH_subMesh_i::GetNbElementsByType()
     aRes[ SMESH::NODE ] = GetNumberOfNodes(true);
 
     ::SMESH_subMesh* aSubMesh = _mesh_i->_mapSubMesh[_localId];
-    if ( SMESHDS_SubMesh* smDS = aSubMesh->GetSubMeshDS() )
+    TListOfSubMeshes smList;
+    if ( getSubMeshes( aSubMesh, smList ))
     {
-      SMDS_ElemIteratorPtr eIt = smDS->GetElements();
-      if ( eIt->more() )
-        aRes[ eIt->next()->GetType() ] = smDS->NbElements();
+      TListOfSubMeshes::iterator smDS = smList.begin();
+      for ( ; smDS != smList.end(); ++smDS )
+      {
+        SMDS_ElemIteratorPtr eIt = (*smDS)->GetElements();
+        if ( eIt->more() )
+          aRes[ eIt->next()->GetType() ] = (*smDS)->NbElements();
+      }
     }
   }
-  return aRes._retn();  
+  return aRes._retn();
 }
 
 
@@ -508,26 +516,37 @@ SMESH::array_of_ElementType* SMESH_subMesh_i::GetTypes()
   SMESH::array_of_ElementType_var types = new SMESH::array_of_ElementType;
 
   ::SMESH_subMesh* aSubMesh = _mesh_i->_mapSubMesh[_localId];
-  if ( SMESHDS_SubMesh* smDS = aSubMesh->GetSubMeshDS() )
+
+  TListOfSubMeshes smList;
+  if ( getSubMeshes( aSubMesh, smList ))
   {
-    SMDS_ElemIteratorPtr eIt = smDS->GetElements();
-    if ( eIt->more() )
-    {
-      types->length( 1 );
-      types[0] = SMESH::ElementType( eIt->next()->GetType());
-    }
-    else if ( smDS->GetNodes()->more() )
+    TListOfSubMeshes::iterator smDS = smList.begin();
+    for ( ; smDS != smList.end(); ++smDS )
     {
-      TopoDS_Shape shape = aSubMesh->GetSubShape();
-      while ( !shape.IsNull() && shape.ShapeType() == TopAbs_COMPOUND )
+      SMDS_ElemIteratorPtr eIt = (*smDS)->GetElements();
+      if ( eIt->more() )
       {
-        TopoDS_Iterator it( shape );
-        shape = it.More() ? it.Value() : TopoDS_Shape();
+        types->length( 1 );
+        types[0] = SMESH::ElementType( eIt->next()->GetType());
+        break;
       }
-      if ( !shape.IsNull() && shape.ShapeType() == TopAbs_VERTEX )
+    }
+
+    if ( types->length() == 0 )
+    {
+      for ( smDS = smList.begin(); smDS != smList.end(); ++smDS )
       {
-        types->length( 1 );
-        types[0] = SMESH::NODE;
+        if ( (*smDS)->GetNodes()->more() )
+        {
+          int smID = (*smDS)->GetID();
+          TopoDS_Shape shape = (*smDS)->GetParent()->IndexToShape( smID );
+          if ( !shape.IsNull() && shape.ShapeType() == TopAbs_VERTEX )
+          {
+            types->length( 1 );
+            types[0] = SMESH::NODE;
+            break;
+          }
+        }
       }
     }
   }
@@ -565,3 +584,30 @@ SALOMEDS::TMPFile* SMESH_subMesh_i::GetVtkUgStream()
   SALOMEDS::TMPFile_var SeqFile;
   return SeqFile._retn();
 }
+
+//=======================================================================
+//function : SMESH_Invalid_subMesh_i
+//purpose  : constructor of "invalid sub-mesh" created by SMESH_Gen_i::CopyMeshWithGeom()
+//=======================================================================
+
+SMESH_Invalid_subMesh_i::SMESH_Invalid_subMesh_i( PortableServer::POA_ptr thePOA,
+                                                  SMESH_Gen_i*            gen_i,
+                                                  SMESH_Mesh_i*           mesh_i,
+                                                  int                     localId,
+                                                  GEOM::GEOM_Object_ptr   shape )
+  : SALOME::GenericObj_i( thePOA ),
+    SMESH_subMesh_i( thePOA, gen_i, mesh_i, localId )
+{
+  _geom = GEOM::GEOM_Object::_duplicate( shape );
+}
+
+//=======================================================================
+//function : GetSubShape
+//purpose  : return geometry which is not a sub-shape of the main shape
+//=======================================================================
+
+GEOM::GEOM_Object_ptr SMESH_Invalid_subMesh_i::GetSubShape()
+  throw (SALOME::SALOME_Exception)
+{
+  return GEOM::GEOM_Object::_duplicate( _geom );
+}