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 2e885b7fcac338f034f4076cac9e3f6a7541fd4d..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
 //
 //
 //
@@ -360,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;
   };
   
   /*
@@ -381,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;
   };
   
@@ -436,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;
   };
   
   /*