Fix for bug PAL10409 (Filter "Belong to geom" fails if 2 geom shapes have the same...

[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 7a09289e05fbc6563a1e1cf789d95cc9ff421867..b75de5652847837ddd0c1f7f02f066094064d9ea 100644 (file)
--- a/src/SMESH_I/SMESH_Filter_i.hxx
+++ b/src/SMESH_I/SMESH_Filter_i.hxx
@@ -347,11 +347,14 @@ public:
   void                            SetGeom( const TopoDS_Shape& theShape );
 
   void                            SetShapeName( const char* theName );
   void                            SetGeom( const TopoDS_Shape& theShape );
 
   void                            SetShapeName( const char* theName );

+  void                            SetShape( const char* theID, const char* theName );

   char*                           GetShapeName();
   char*                           GetShapeName();

+  char*                           GetShapeID();

 
 protected:
   Controls::BelongToGeomPtr       myBelongToGeomPtr;
   char*                           myShapeName;
 
 protected:
   Controls::BelongToGeomPtr       myBelongToGeomPtr;
   char*                           myShapeName;

+  char*                           myShapeID;

 };
 
 /*
 };
 
 /*


@@ -368,7 +371,9 @@ public:
   void                            SetSurface( GEOM::GEOM_Object_ptr theGeom, ElementType theType );
 
   void                            SetShapeName( const char* theName, ElementType theType );
   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*                           GetShapeName();

+  char*                           GetShapeID();

 
   void                            SetTolerance( CORBA::Double );
   CORBA::Double                   GetTolerance();
 
   void                            SetTolerance( CORBA::Double );
   CORBA::Double                   GetTolerance();


@@ -376,6 +381,7 @@ public:
 protected:
   Controls::ElementsOnSurfacePtr  myElementsOnSurfacePtr;
   char*                           myShapeName;
 protected:
   Controls::ElementsOnSurfacePtr  myElementsOnSurfacePtr;
   char*                           myShapeName;

+  char*                           myShapeID;

   Handle(Standard_Type)           mySurfaceType;
 };
 
   Handle(Standard_Type)           mySurfaceType;
 };
 


@@ -423,11 +429,14 @@ public:
   void                            SetGeom( const TopoDS_Shape& theShape );
   
   void                            SetShapeName( const char* theName );
   void                            SetGeom( const TopoDS_Shape& theShape );
   
   void                            SetShapeName( const char* theName );

+  void                            SetShape( const char* theID, const char* theName );

   char*                           GetShapeName();
   char*                           GetShapeName();

+  char*                           GetShapeID();

   
 protected:
   Controls::LyingOnGeomPtr        myLyingOnGeomPtr;
   char*                           myShapeName;
   
 protected:
   Controls::LyingOnGeomPtr        myLyingOnGeomPtr;
   char*                           myShapeName;

+  char*                           myShapeID;

 };
 
 /*
 };
 
 /*