PR: display submeshes and groups

[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 2813ceb32c3176231fc9f21f0e770c813fcb88c7..2720de2c73b981c3a92316c5291d137b8358dab2 100644 (file)
--- a/src/SMESH_I/SMESH_subMesh_i.cxx
+++ b/src/SMESH_I/SMESH_subMesh_i.cxx
@@ -59,9 +59,9 @@ SMESH_subMesh_i::SMESH_subMesh_i()
 //=============================================================================
 
 SMESH_subMesh_i::SMESH_subMesh_i( PortableServer::POA_ptr thePOA,
-                                 SMESH_Gen_i*            gen_i,
-                                 SMESH_Mesh_i*           mesh_i,
-                                 int                     localId )
+                                  SMESH_Gen_i*            gen_i,
+                                  SMESH_Mesh_i*           mesh_i,
+                                  int                     localId )
      : SALOME::GenericObj_i( thePOA )
 {
   MESSAGE("SMESH_subMesh_i::SMESH_subMesh_i");
@@ -458,11 +458,11 @@ GEOM::GEOM_Object_ptr SMESH_subMesh_i::GetSubShape()
       TopoDS_Shape S = _mesh_i->_mapSubMesh[ _localId ]->GetSubShape();
       if ( !S.IsNull() ) {
         aShapeObj = _gen_i->ShapeToGeomObject( S );
-       //mzn: N7PAL16232, N7PAL16233
-       //In some cases it's possible that GEOM_Client contains the shape same to S, but
-       //with another orientation.
-       if (aShapeObj->_is_nil())
-         aShapeObj = _gen_i->ShapeToGeomObject( S.Reversed() );
+        //mzn: N7PAL16232, N7PAL16233
+        //In some cases it's possible that GEOM_Client contains the shape same to S, but
+        //with another orientation.
+        if (aShapeObj->_is_nil())
+          aShapeObj = _gen_i->ShapeToGeomObject( S.Reversed() );
       }
     }
   }
@@ -531,26 +531,16 @@ SMESH::long_array* SMESH_subMesh_i::GetMeshInfo()
   for (int i = SMESH::Entity_Node; i < SMESH::Entity_Last; i++)
     aRes[i] = 0;
   
-  ::SMESH_subMesh* aSubMesh = _mesh_i->_mapSubMesh[_localId];
-  SMESHDS_SubMesh* aSubMeshDS = 0;
-  if (aSubMesh) aSubMeshDS = aSubMesh->GetSubMeshDS();
-  if (!aSubMeshDS) 
-    return aRes._retn();
-
-  // get own number of nodes
-  aRes[ SMESH::Entity_Node ] = aSubMeshDS->NbNodes();
+  // get number of nodes
+  aRes[ SMESH::Entity_Node ] = GetNumberOfNodes(true);
  
-  // get own elements statistic
-  SMESH_Mesh_i::CollectMeshInfo( aSubMeshDS->GetElements(), aRes );
+  ::SMESH_subMesh* aSubMesh = _mesh_i->_mapSubMesh[_localId];
 
   // get statistic from child sub-meshes
   TListOfSubMeshes smList;
   if ( getSubMeshes( aSubMesh, smList ) )
     for ( TListOfSubMeshes::iterator sm = smList.begin(); sm != smList.end(); ++sm )
-    {
-      aRes[ SMESH::Entity_Node ]+= (*sm)->NbNodes();
       SMESH_Mesh_i::CollectMeshInfo( (*sm)->GetElements(), aRes );
-    }
 
   return aRes._retn();
 }