Integration of PAL/SALOME V2.1.0c from OCC

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

diff --git a/src/SMESH_I/SMESH_subMesh_i.hxx b/src/SMESH_I/SMESH_subMesh_i.hxx
index 0708405e5f746ce661cc2b56e92967bb097c4fcf..5c1ae0a3ab5bf32dd7b440f2db35804e9c1343bd 100644 (file)
--- a/src/SMESH_I/SMESH_subMesh_i.hxx
+++ b/src/SMESH_I/SMESH_subMesh_i.hxx
@@ -33,30 +33,36 @@
 #include CORBA_SERVER_HEADER(SMESH_Mesh)
 #include CORBA_SERVER_HEADER(SMESH_Hypothesis)
 #include CORBA_CLIENT_HEADER(GEOM_Gen)
-#include CORBA_CLIENT_HEADER(GEOM_Shape)
 #include CORBA_CLIENT_HEADER(MED)
 
+#include "SALOME_GenericObj_i.hh"
+
 class SMESH_Gen_i;
 class SMESH_Mesh_i;
 
 class SMESH_subMesh_i:
-  public POA_SMESH::SMESH_subMesh
+  public virtual POA_SMESH::SMESH_subMesh,
+  public virtual SALOME::GenericObj_i
 {
 public:
   SMESH_subMesh_i();
-  SMESH_subMesh_i(SMESH_Gen_i* gen_i,
-                 SMESH_Mesh_i* mesh_i,
-                 int localId);
+  SMESH_subMesh_i( PortableServer::POA_ptr thePOA,
+                   SMESH_Gen_i*            gen_i,
+                  SMESH_Mesh_i*           mesh_i,
+                  int                     localId );
   ~SMESH_subMesh_i();
 
   CORBA::Long GetNumberOfElements()
     throw (SALOME::SALOME_Exception);
   
-  CORBA::Long  GetNumberOfNodes()
+  CORBA::Long  GetNumberOfNodes( CORBA::Boolean all )
     throw (SALOME::SALOME_Exception);
   
   SMESH::long_array* GetElementsId()
     throw (SALOME::SALOME_Exception);
+
+  SMESH::long_array* GetElementsByType( SMESH::ElementType theElemType )
+    throw (SALOME::SALOME_Exception);
   
   SMESH::long_array* GetNodesId()
     throw (SALOME::SALOME_Exception);