Join modifications from branch BR_DEBUG_3_2_0b1

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

diff --git a/src/SMESH_I/SMESH_Filter_i.hxx b/src/SMESH_I/SMESH_Filter_i.hxx
index b634bfe9d4c7a94cf845635a45b8701dbd13f04f..51ad5893b88f02e1c2a843d732a9be4b11429bff 100644 (file)
--- a/src/SMESH_I/SMESH_Filter_i.hxx
+++ b/src/SMESH_I/SMESH_Filter_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
 //
 //
 //
@@ -239,6 +239,19 @@ namespace SMESH
   };
   
   
+  /*
+    Class       : Volume3D_i
+    Description : Functor for calculating volume of 3D element
+  */
+  class Volume3D_i: public virtual POA_SMESH::Volume3D,
+                    public virtual NumericalFunctor_i
+  {
+  public:
+    Volume3D_i();
+    FunctorType                     GetFunctorType();
+  };
+  
+  
   /*
     Class       : Length_i
     Description : Functor for calculating length of edge
@@ -347,11 +360,14 @@ namespace SMESH
     void                            SetGeom( const TopoDS_Shape& theShape );
     
     void                            SetShapeName( const char* theName );
+    void                            SetShape( const char* theID, const char* theName );
     char*                           GetShapeName();
+    char*                           GetShapeID();
     
   protected:
     Controls::BelongToGeomPtr       myBelongToGeomPtr;
     char*                           myShapeName;
+    char*                           myShapeID;
   };
   
   /*
@@ -368,14 +384,17 @@ namespace SMESH
     void                            SetSurface( GEOM::GEOM_Object_ptr theGeom, ElementType theType );
     
     void                            SetShapeName( const char* theName, ElementType theType );
+    void                            SetShape( const char* theID, const char* theName, ElementType theType );
     char*                           GetShapeName();
-    
+    char*                           GetShapeID();
+
     void                            SetTolerance( CORBA::Double );
     CORBA::Double                   GetTolerance();
     
   protected:
     Controls::ElementsOnSurfacePtr  myElementsOnSurfacePtr;
     char*                           myShapeName;
+    char*                           myShapeID;
     Handle(Standard_Type)           mySurfaceType;
   };
   
@@ -423,11 +442,14 @@ namespace SMESH
     void                            SetGeom( const TopoDS_Shape& theShape );
     
     void                            SetShapeName( const char* theName );
+    void                            SetShape( const char* theID, const char* theName );
     char*                           GetShapeName();
+    char*                           GetShapeID();
     
   protected:
     Controls::LyingOnGeomPtr        myLyingOnGeomPtr;
     char*                           myShapeName;
+    char*                           myShapeID;
   };
   
   /*
@@ -739,6 +761,7 @@ namespace SMESH
     Taper_ptr                 CreateTaper();
     Skew_ptr                  CreateSkew();
     Area_ptr                  CreateArea();
+    Volume3D_ptr              CreateVolume3D();
     Length_ptr                CreateLength();
     Length2D_ptr              CreateLength2D();
     MultiConnection_ptr       CreateMultiConnection();