X-Git-Url: http://git.salome-platform.org/gitweb/?p=modules%2Fsmesh.git;a=blobdiff_plain;f=src%2FSMESHDS%2FSMESHDS_Group.hxx;h=b318a0f97d8ad9bac37cb9b3a8d01ee019c5c4a4;hp=444914ceeeac211db88ca94e0efae8167d6e0b27;hb=5ce23baf3aaec1507f239da8595afa38c7842836;hpb=c3bf92bd87b770fd81631a3853f7f5bb1ac6a4e8

diff --git a/src/SMESHDS/SMESHDS_Group.hxx b/src/SMESHDS/SMESHDS_Group.hxx
index 444914cee..b318a0f97 100644
--- a/src/SMESHDS/SMESHDS_Group.hxx
+++ b/src/SMESHDS/SMESHDS_Group.hxx
@@ -21,51 +21,47 @@
 //
 //
 //  File   : SMESHDS_Group.hxx
-//  Author : Michael Sazonov (OCC)
 //  Module : SMESH
 //  $Header$
 
 #ifndef _SMESHDS_Group_HeaderFile
 #define _SMESHDS_Group_HeaderFile
 
-#include <SMDS_MeshGroup.hxx>
 #include <string>
+#include "SMESHDS_GroupBase.hxx"
+#include "SMDS_MeshGroup.hxx"
 
 class SMESHDS_Mesh;
 
-class SMESHDS_Group : public SMDS_MeshGroup
+class SMESHDS_Group : public SMESHDS_GroupBase
 {
  public:
 
-  SMESHDS_Group (const SMESHDS_Mesh*       theMesh,
+  SMESHDS_Group (const int                 theID,
+                 const SMESHDS_Mesh*       theMesh,
                  const SMDSAbs_ElementType theType);
 
-  void SetStoreName (const char* theName)
-  { myStoreName = theName; }
+  virtual void SetType(SMDSAbs_ElementType theType);
 
-  const char* GetStoreName () const
-  { return myStoreName.c_str(); }
+  virtual int Extent();
 
-  bool Contains (const int theID) const;
+  virtual bool IsEmpty();
 
-  bool Add (const int theID);
-  bool Remove (const int theID);
+  virtual bool Contains (const int theID);
 
-  int GetID (const int theIndex);
-  // use it for iterations 1..Extent() as alternative to parent's
-  // InitIterator(), More(), Next()
+  virtual SMDS_ElemIteratorPtr GetElements();
 
- private:
-  SMESHDS_Group (const SMESHDS_Group& theOther);
-  // prohibited copy constructor
-  SMESHDS_Group& operator = (const SMESHDS_Group& theOther);
-  // prohibited assign operator
+  bool SMESHDS_Group::Add (const int theID);
+
+  bool SMESHDS_Group::Remove (const int theID);
+
+  void Clear();
 
-  const SMDS_MeshElement* findInMesh (const int theID) const;
+  SMDS_MeshGroup& SMDSGroup() { return myGroup; }
+
+ private:
 
-  string myStoreName;
-  int    myCurIndex;
-  int    myCurID;
+  SMDS_MeshGroup myGroup;
 
 };