X-Git-Url: http://git.salome-platform.org/gitweb/?a=blobdiff_plain;f=src%2FSMESH_I%2FSMESH_Mesh_i.hxx;h=42fac7d5d51e2dec74a1a1e404ba9e109895125b;hb=f7a79421091ec31b578a24054f83f42babba0333;hp=87b8791b67242fc900b162543756439ab4586dc7;hpb=c111d3b52022abe32107b0b3737c2a6ff4137164;p=modules%2Fsmesh.git diff --git a/src/SMESH_I/SMESH_Mesh_i.hxx b/src/SMESH_I/SMESH_Mesh_i.hxx index 87b8791b6..42fac7d5d 100644 --- 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