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

diff --git a/src/SMESHDS/SMESHDS_Group.hxx b/src/SMESHDS/SMESHDS_Group.hxx
index 444914cee..08ff29bac 100644
--- a/src/SMESHDS/SMESHDS_Group.hxx
+++ b/src/SMESHDS/SMESHDS_Group.hxx
@@ -1,71 +1,76 @@
-//  SMESH SMESHDS : management of mesh data and SMESH document
+// Copyright (C) 2007-2015  CEA/DEN, EDF R&D, OPEN CASCADE
+//
+// Copyright (C) 2003-2007  OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
+// CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS
 //
-//  Copyright (C) 2004  CEA
-// 
-//  This library is free software; you can redistribute it and/or 
-//  modify it under the terms of the GNU Lesser General Public 
-//  License as published by the Free Software Foundation; either 
-//  version 2.1 of the License. 
-// 
-//  This library is distributed in the hope that it will be useful, 
-//  but WITHOUT ANY WARRANTY; without even the implied warranty of 
-//  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU 
-//  Lesser General Public License for more details. 
-// 
-//  You should have received a copy of the GNU Lesser General Public 
-//  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
+// This library is free software; you can redistribute it and/or
+// modify it under the terms of the GNU Lesser General Public
+// License as published by the Free Software Foundation; either
+// version 2.1 of the License, or (at your option) any later version.
 //
+// This library is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+// Lesser General Public License for more details.
 //
+// You should have received a copy of the GNU Lesser General Public
+// 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.com
+//
+
+//  SMESH SMESHDS : management of mesh data and SMESH document
 //  File   : SMESHDS_Group.hxx
-//  Author : Michael Sazonov (OCC)
 //  Module : SMESH
 //  $Header$
-
+//
 #ifndef _SMESHDS_Group_HeaderFile
 #define _SMESHDS_Group_HeaderFile
 
-#include <SMDS_MeshGroup.hxx>
+#include "SMESH_SMESHDS.hxx"
+
 #include <string>
+#include "SMESHDS_GroupBase.hxx"
+#include "SMDS_MeshGroup.hxx"
 
 class SMESHDS_Mesh;
 
-class SMESHDS_Group : public SMDS_MeshGroup
+class SMESHDS_EXPORT 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() const;
 
-  bool Contains (const int theID) const;
+  virtual bool IsEmpty();
+
+  virtual bool Contains (const int theID);
+
+  virtual bool Contains (const SMDS_MeshElement* elem);
+
+  virtual SMDS_ElemIteratorPtr GetElements() const;
+
+  virtual int GetTic() const;
 
   bool Add (const int theID);
+
+  bool Add (const SMDS_MeshElement* theElem );
+
   bool Remove (const int theID);
 
-  int GetID (const int theIndex);
-  // use it for iterations 1..Extent() as alternative to parent's
-  // InitIterator(), More(), Next()
+  void Clear();
 
- private:
-  SMESHDS_Group (const SMESHDS_Group& theOther);
-  // prohibited copy constructor
-  SMESHDS_Group& operator = (const SMESHDS_Group& theOther);
-  // prohibited assign operator
+  SMDS_MeshGroup& SMDSGroup() { return myGroup; }
 
-  const SMDS_MeshElement* findInMesh (const int theID) const;
+ private:
 
-  string myStoreName;
-  int    myCurIndex;
-  int    myCurID;
+  SMDS_MeshGroup myGroup;
 
 };