Merge from BR_DEBUG_3_2_0b1

[modules/smesh.git] / src / SMESH / SMESH_Group.hxx

diff --git a/src/SMESH/SMESH_Group.hxx b/src/SMESH/SMESH_Group.hxx
index 5147a44d79bb1fa32df646ab5dfe9bf648495b8a..1b13bc57859985b2efbf44f4820e7f935b151b3d 100644 (file)
--- a/src/SMESH/SMESH_Group.hxx
+++ b/src/SMESH/SMESH_Group.hxx
@@ -16,7 +16,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.salome-platform.org or email : webmaster.salome@opencascade.org
+// See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
 //
 //
 //
@@ -28,27 +28,35 @@
 #ifndef _SMESH_Group_HeaderFile
 #define _SMESH_Group_HeaderFile
 
+#include "SMESH_SMESH.hxx"
+
 #include <SMDSAbs_ElementType.hxx>
 #include <string>
-using namespace std;
+#include <TopoDS_Shape.hxx>
+
 
-class SMESHDS_Group;
+class SMESHDS_GroupBase;
 class SMESH_Mesh;
 
-class SMESH_Group
+class SMESH_EXPORT  SMESH_Group
 {
  public:
 
-  SMESH_Group (const SMESH_Mesh*         theMesh,
+  SMESH_Group (int                       theID,
+               const SMESH_Mesh*         theMesh,
                const SMDSAbs_ElementType theType,
-               const char*               theName);
+               const char*               theName,
+               const TopoDS_Shape&       theShape = TopoDS_Shape());
   ~SMESH_Group ();
 
   void SetName (const char* theName) { myName = theName; }
 
   const char* GetName () const { return myName.c_str(); }
 
-  SMESHDS_Group * GetGroupDS () { return myGroupDS; }
+  SMESHDS_GroupBase * GetGroupDS () { return myGroupDS; }
+
+  void SetColorNumber (int theColorNumber) { myColorNumber = theColorNumber; }
+  int GetColorNumber() const { return myColorNumber; }
 
  private:
   SMESH_Group (const SMESH_Group& theOther);
@@ -56,9 +64,9 @@ class SMESH_Group
   SMESH_Group& operator = (const SMESH_Group& theOther);
   // prohibited assign operator
 
-  SMESHDS_Group * myGroupDS;
-  string          myName;
-
+  SMESHDS_GroupBase * myGroupDS;
+  std::string         myName;
+  int                 myColorNumber;
 };
 
 #endif