GetElementType method added

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

diff --git a/src/SMESH_I/SMESH_Mesh_i.hxx b/src/SMESH_I/SMESH_Mesh_i.hxx
index 87b8791b67242fc900b162543756439ab4586dc7..42fac7d5d51e2dec74a1a1e404ba9e109895125b 100644 (file)
--- a/src/SMESH_I/SMESH_Mesh_i.hxx
+++ b/src/SMESH_I/SMESH_Mesh_i.hxx
@@ -42,7 +42,6 @@
 #include "SMESH_subMesh.hxx"
 
 #include "SALOME_GenericObj_i.hh"
-#include "SMESH_Factory.hxx"
 
 class SMESH_Gen_i;
 class SMESH_GroupBase_i;
@@ -51,8 +50,7 @@ class SMESH_GroupBase_i;
 
 class SMESH_Mesh_i:
   public virtual POA_SMESH::SMESH_Mesh,
-  public virtual SALOME::GenericObj_i,
-  public virtual SMESH::Base
+  public virtual SALOME::GenericObj_i
 {
   SMESH_Mesh_i();
   SMESH_Mesh_i(const SMESH_Mesh_i&);
@@ -166,16 +164,16 @@ public:
 
   SALOME_MED::MESH_ptr GetMEDMesh()
     throw (SALOME::SALOME_Exception);
-  
+
   CORBA::Long NbNodes()
     throw (SALOME::SALOME_Exception);
-  
+
   CORBA::Long NbElements()
     throw (SALOME::SALOME_Exception);
-  
+
   CORBA::Long NbEdges()
     throw (SALOME::SALOME_Exception);
-  
+
   CORBA::Long NbFaces()
     throw (SALOME::SALOME_Exception);
 
@@ -184,7 +182,10 @@ public:
 
   CORBA::Long NbQuadrangles()
     throw (SALOME::SALOME_Exception);
-  
+
+  CORBA::Long NbPolygons()
+    throw (SALOME::SALOME_Exception);
+
   CORBA::Long NbVolumes()
     throw (SALOME::SALOME_Exception);
 
@@ -193,13 +194,16 @@ public:
 
   CORBA::Long NbHexas()
     throw (SALOME::SALOME_Exception);
-  
+
   CORBA::Long NbPyramids()
     throw (SALOME::SALOME_Exception);
-  
+
   CORBA::Long NbPrisms()
     throw (SALOME::SALOME_Exception);
-  
+
+  CORBA::Long NbPolyhedrons()
+    throw (SALOME::SALOME_Exception);
+
   CORBA::Long NbSubMesh()
     throw (SALOME::SALOME_Exception);
 
@@ -212,6 +216,9 @@ public:
   SMESH::long_array* GetNodesId()
     throw (SALOME::SALOME_Exception);
   
+  SMESH::ElementType GetElementType( const CORBA::Long id, const bool iselem )
+    throw (SALOME::SALOME_Exception);
+  
   char* Dump();
   
   // Internal methods not available through CORBA