X-Git-Url: http://git.salome-platform.org/gitweb/?p=modules%2Fsmesh.git;a=blobdiff_plain;f=src%2FSMDS%2FSMDS_MeshGroup.hxx;h=b605737bfab79d92af4df0b1dc95df4acfda169b;hp=052ea2c9041f846d8b274ab4b3b2e75caced2712;hb=4c16067d4281f56bd07d3f92fb63fff9c0c1d169;hpb=a17b36970bc61da1d664453c615754997c925b18

diff --git a/src/SMDS/SMDS_MeshGroup.hxx b/src/SMDS/SMDS_MeshGroup.hxx
index 052ea2c90..b605737bf 100644
--- a/src/SMDS/SMDS_MeshGroup.hxx
+++ b/src/SMDS/SMDS_MeshGroup.hxx
@@ -20,7 +20,7 @@
 // See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
 //
 
-//  SMESH SMDS : implementaion of Salome mesh data structure
+//  SMESH SMDS : implementation of Salome mesh data structure
 //  File   : SMDS_MeshGroup.hxx
 //  Module : SMESH
 //
@@ -29,65 +29,49 @@
 
 #include "SMESH_SMDS.hxx"
 
+#include "SMDS_ElementHolder.hxx"
 #include "SMDS_Mesh.hxx"
 #include <set>
 
-class SMDS_EXPORT SMDS_MeshGroup:public SMDS_MeshObject
-{
-  public:
-        SMDS_MeshGroup(const SMDS_Mesh * theMesh,
-                       const SMDSAbs_ElementType theType = SMDSAbs_All);
-        const SMDS_MeshGroup * AddSubGroup
-                      (const SMDSAbs_ElementType theType = SMDSAbs_All);
-        virtual bool RemoveSubGroup(const SMDS_MeshGroup* theGroup);
-        virtual bool RemoveFromParent();
-
-        const SMDS_Mesh* GetMesh() const { return myMesh; }
-
-        void SetType (const SMDSAbs_ElementType theType);
-        void Clear();
-        bool Add(const SMDS_MeshElement * theElem);
-        bool Remove(const SMDS_MeshElement * theElem);
-        bool IsEmpty() const { return myElements.empty(); }
-        int Extent() const { return myElements.size(); }
-        int Tic() const { return myTic; }
-
-        int SubGroupsNb() const { return myChildren.size(); }
-
-        SMDSAbs_ElementType GetType() const { return myType; }
-
-        bool Contains(const SMDS_MeshElement * theElem) const;
-
-        void InitIterator() const
-        { const_cast<TIterator&>(myIterator) = myElements.begin(); }
-
-        bool More() const { return myIterator != myElements.end(); }
+#include <boost/container/flat_set.hpp>
 
-        const SMDS_MeshElement* Next() const
-        { return *(const_cast<TIterator&>(myIterator))++; }
-
-        void InitSubGroupsIterator() const
-        { const_cast<TGroupIterator&>(myGroupIterator) = myChildren.begin(); }
-
-        bool MoreSubGroups() const { return myGroupIterator != myChildren.end(); }
-
-        const SMDS_MeshGroup* NextSubGroup() const
-        { return *(const_cast<TGroupIterator&>(myGroupIterator))++; }
-
-  private:
-        SMDS_MeshGroup(SMDS_MeshGroup* theParent,
-                       const SMDSAbs_ElementType theType = SMDSAbs_All);
-
-        typedef std::set<const SMDS_MeshElement *>::const_iterator TIterator;
-        typedef std::list<const SMDS_MeshGroup *>::const_iterator TGroupIterator;
-
-        const SMDS_Mesh *                       myMesh;
-        SMDSAbs_ElementType                     myType;
-        std::set<const SMDS_MeshElement*>       myElements; /* - not sorted by ID because it */
-        SMDS_MeshGroup *                        myParent;   /* can contain deleted elements */
-        std::list<const SMDS_MeshGroup*>        myChildren;
-        TIterator                               myIterator;
-        TGroupIterator                          myGroupIterator;
-        int                                     myTic; // to track changes
+class SMDS_EXPORT SMDS_MeshGroup: public SMDS_MeshObject, SMDS_ElementHolder
+{
+ public:
+  SMDS_MeshGroup(const SMDS_Mesh *         theMesh,
+                 const SMDSAbs_ElementType theType = SMDSAbs_All);
+
+  void SetType (const SMDSAbs_ElementType theType);
+  void Clear();
+  void Reserve(size_t nbElems) { myElements.reserve( nbElems ); }
+  bool Add(const SMDS_MeshElement * theElem);
+  bool Remove(const SMDS_MeshElement * theElem);
+  bool IsEmpty() const { return myElements.empty(); }
+  int  Extent() const { return myElements.size(); }
+  int  Tic() const { return myTic; }
+  bool Contains(const SMDS_MeshElement * theElem) const;
+
+  const SMDS_Mesh*     GetMesh() const { return myMesh; }
+  SMDSAbs_ElementType  GetType() const { return myType; }
+  SMDS_ElemIteratorPtr GetElements() const; // WARNING: iterator becomes invalid if group changes
+
+  void operator=( SMDS_MeshGroup && other );
+
+ protected: // methods of SMDS_ElementHolder
+
+  virtual SMDS_ElemIteratorPtr getElements() { return GetElements(); }
+  virtual void tmpClear();
+  virtual void add( const SMDS_MeshElement* element ) { Add( element ); }
+  virtual void compact() { myElements.shrink_to_fit(); }
+
+ private:
+
+  typedef boost::container::flat_set< const SMDS_MeshElement* > TElementSet;
+  typedef TElementSet::const_iterator                           TIterator;
+
+  const SMDS_Mesh *   myMesh;
+  SMDSAbs_ElementType myType;
+  TElementSet         myElements; // not sorted by ID because it can contain deleted elements
+  int                 myTic;      // to track changes
 };
 #endif