Merging with WPdev

[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 d7c37b1de10893d4326945f97f63579d86db5ec6..92e431e4f1afc3a983d9a0db1ef598e358850714 100644 (file)
--- a/src/SMESH_I/SMESH_Mesh_i.hxx
+++ b/src/SMESH_I/SMESH_Mesh_i.hxx
@@ -29,6 +29,8 @@
 #ifndef _SMESH_MESH_I_HXX_
 #define _SMESH_MESH_I_HXX_
 
+#include "SMESH.hxx"
+
 #include <SALOMEconfig.h>
 #include CORBA_SERVER_HEADER(SMESH_Mesh)
 #include CORBA_SERVER_HEADER(SMESH_Group)
@@ -48,7 +50,7 @@ class SMESH_GroupBase_i;
 
 #include <map>
 
-class SMESH_Mesh_i:
+class SMESH_I_EXPORT SMESH_Mesh_i:
   public virtual POA_SMESH::SMESH_Mesh,
   public virtual SALOME::GenericObj_i
 {
@@ -166,7 +168,7 @@ public:
     throw (SALOME::SALOME_Exception);
   void ExportUNV( const char* file )
     throw (SALOME::SALOME_Exception);
-  void ExportSTL( const char* file, const bool isascii )
+  void ExportSTL( const char* file, bool isascii )
     throw (SALOME::SALOME_Exception);
 
   SALOME_MED::MESH_ptr GetMEDMesh()
@@ -250,13 +252,13 @@ public:
   SMESH::long_array* GetNodesId()
     throw (SALOME::SALOME_Exception);
   
-  SMESH::ElementType GetElementType( const CORBA::Long id, const bool iselem )
+  SMESH::ElementType GetElementType( CORBA::Long id, bool iselem )
     throw (SALOME::SALOME_Exception);
   
   /*!
    * Returns ID of elements for given submesh
    */
-  SMESH::long_array* GetSubMeshElementsId(const CORBA::Long ShapeID)
+  SMESH::long_array* GetSubMeshElementsId(CORBA::Long ShapeID)
     throw (SALOME::SALOME_Exception);
 
   /*!
@@ -264,13 +266,13 @@ public:
    * If param all==true - returns all nodes, else -
    * returns only nodes on shapes.
    */
-  SMESH::long_array* GetSubMeshNodesId(const CORBA::Long ShapeID, CORBA::Boolean all)
+  SMESH::long_array* GetSubMeshNodesId(CORBA::Long ShapeID, CORBA::Boolean all)
     throw (SALOME::SALOME_Exception);
   
   /*!
    * Returns type of elements for given submesh
    */
-  SMESH::ElementType GetSubMeshElementType(const CORBA::Long ShapeID)
+  SMESH::ElementType GetSubMeshElementType(CORBA::Long ShapeID)
     throw (SALOME::SALOME_Exception);
   
   char* Dump();
@@ -311,72 +313,82 @@ public:
    * Get XYZ coordinates of node as list of double
    * If there is not node for given ID - returns empty list
    */
-  SMESH::double_array* GetNodeXYZ(const CORBA::Long id);
+  SMESH::double_array* GetNodeXYZ(CORBA::Long id);
   
   /*!
    * For given node returns list of IDs of inverse elements
    * If there is not node for given ID - returns empty list
    */
-  SMESH::long_array* GetNodeInverseElements(const CORBA::Long id);
+  SMESH::long_array* GetNodeInverseElements(CORBA::Long id);
 
   /*!
    * If given element is node returns IDs of shape from position
-   * else - return ID of result shape after ::FindShape()
-   * from SMESH_MeshEditor
+   * If there is not node for given ID - returns -1
+   */
+  CORBA::Long GetShapeID(CORBA::Long id);
+
+  /*!
+   * For given element returns ID of result shape after 
+   * ::FindShape() from SMESH_MeshEditor
    * If there is not element for given ID - returns -1
    */
-  CORBA::Long GetShapeID(const CORBA::Long id);
+  CORBA::Long GetShapeIDForElem(CORBA::Long id);
 
   /*!
    * Returns number of nodes for given element
    * If there is not element for given ID - returns -1
    */
-  CORBA::Long GetElemNbNodes(const CORBA::Long id);
+  CORBA::Long GetElemNbNodes(CORBA::Long id);
+
+  /*!
+   * Returns IDs of nodes of given element
+   */
+  SMESH::long_array* GetElemNodes(CORBA::Long id);
 
   /*!
    * Returns ID of node by given index for given element
    * If there is not element for given ID - returns -1
    * If there is not node for given index - returns -2
    */
-  CORBA::Long GetElemNode(const CORBA::Long id, const CORBA::Long index);
+  CORBA::Long GetElemNode(CORBA::Long id, CORBA::Long index);
   
   /*!
    * Returns true if given node is medium node
    * in given quadratic element
    */
-  CORBA::Boolean IsMediumNode(const CORBA::Long ide, const CORBA::Long idn);
+  CORBA::Boolean IsMediumNode(CORBA::Long ide, CORBA::Long idn);
   
   /*!
    * Returns true if given node is medium node
    * in one of quadratic elements
    */
-  CORBA::Boolean IsMediumNodeOfAnyElem(const CORBA::Long idn,
+  CORBA::Boolean IsMediumNodeOfAnyElem(CORBA::Long idn,
                                        SMESH::ElementType theElemType);
   
   /*!
    * Returns number of edges for given element
    */
-  CORBA::Long ElemNbEdges(const CORBA::Long id);
+  CORBA::Long ElemNbEdges(CORBA::Long id);
   
   /*!
    * Returns number of faces for given element
    */
-  CORBA::Long ElemNbFaces(const CORBA::Long id);
+  CORBA::Long ElemNbFaces(CORBA::Long id);
   
   /*!
    * Returns true if given element is polygon
    */
-  CORBA::Boolean IsPoly(const CORBA::Long id);
+  CORBA::Boolean IsPoly(CORBA::Long id);
   
   /*!
    * Returns true if given element is quadratic
    */
-  CORBA::Boolean IsQuadratic(const CORBA::Long id);
+  CORBA::Boolean IsQuadratic(CORBA::Long id);
   
   /*!
    * Returns bary center for given element
    */
-  SMESH::double_array* BaryCenter(const CORBA::Long id);
+  SMESH::double_array* BaryCenter(CORBA::Long id);
 
 
   map<int, SMESH_subMesh_i*> _mapSubMesh_i; //NRI