Join modifications from BR_Dev_For_4_0 tag V4_1_1.

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

diff --git a/src/SMESH_I/SMESH_Pattern_i.hxx b/src/SMESH_I/SMESH_Pattern_i.hxx
index 70520d877fa9b6db835dc772438cdf099a475bf4..7a5a92cbfa1a495d8c1b8634d9100ea692ec1741 100644 (file)
--- a/src/SMESH_I/SMESH_Pattern_i.hxx
+++ b/src/SMESH_I/SMESH_Pattern_i.hxx
@@ -17,7 +17,7 @@
 //  License along with this library; if not, write to the Free Software 
 //  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307 USA 
 // 
-//  See http://www.opencascade.org/SALOME/ or email : webmaster.salome@opencascade.org 
+// See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
 //
 //
 //
@@ -30,6 +30,8 @@
 #ifndef SMESH_Pattern_I_HeaderFile
 #define SMESH_Pattern_I_HeaderFile
 
+#include "SMESH.hxx"
+
 #include "SALOMEconfig.h"
 #include CORBA_SERVER_HEADER(SMESH_Pattern)
 #include CORBA_SERVER_HEADER(SMESH_Mesh)
@@ -41,7 +43,7 @@
 class SMESH_Gen_i;
 class SMESH_Mesh;
 
-class SMESH_Pattern_i:
+class SMESH_I_EXPORT SMESH_Pattern_i:
   public virtual POA_SMESH::SMESH_Pattern
 {
  public:
@@ -65,7 +67,24 @@ class SMESH_Pattern_i:
                                      GEOM::GEOM_Object_ptr theVertex000,
                                      GEOM::GEOM_Object_ptr theVertex001);
 
-  CORBA::Boolean MakeMesh(SMESH::SMESH_Mesh_ptr theMesh);
+  SMESH::point_array* ApplyToMeshFaces(SMESH::SMESH_Mesh_ptr    theMesh,
+                                       const SMESH::long_array& theFacesIDs,
+                                       CORBA::Long              theNodeIndexOnKeyPoint1,
+                                       CORBA::Boolean           theReverse);
+
+  SMESH::point_array* ApplyToHexahedrons(SMESH::SMESH_Mesh_ptr    theMesh,
+                                         const SMESH::long_array& theVolumesIDs,
+                                         CORBA::Long              theNode000Index,
+                                         CORBA::Long              theNode001Index);
+
+  //for omniORB conflict compilation
+  /*CORBA::Boolean MakeMesh (SMESH::SMESH_Mesh_ptr theMesh,
+                           const CORBA::Boolean  CreatePolygons,
+                           const CORBA::Boolean  CreatePolyedrs);*/
+
+  CORBA::Boolean MakeMesh (SMESH::SMESH_Mesh_ptr theMesh,
+                           CORBA::Boolean  CreatePolygons,
+                           CORBA::Boolean  CreatePolyedrs);
 
   SMESH::SMESH_Pattern::ErrorCode GetErrorCode();
 
@@ -77,13 +96,11 @@ class SMESH_Pattern_i:
 
   SMESH::long_array* GetKeyPoints();
 
-  SMESH::array_of_long_array* GetElementPoints();
+  SMESH::array_of_long_array* GetElementPoints(CORBA::Boolean applied);
 
 
  private:
 
-  TopoDS_Shape getShape( GEOM::GEOM_Object_ptr & theGeomObject );
-
   ::SMESH_Mesh* getMesh( SMESH::SMESH_Mesh_ptr & theMesh );
 
   ::SMESH_Pattern myPattern;