X-Git-Url: http://git.salome-platform.org/gitweb/?p=modules%2Fsmesh.git;a=blobdiff_plain;f=src%2FSMDS%2FSMDS_MeshGroup.hxx;h=3b39c7022fd7ba344e884d38ae026c1bc138d81f;hp=ef2264c12f695c5776cce27251c88a38df5eb993;hb=19fe2e412fa1cb1fd33d7a2580b2483280db811e;hpb=090aff07266d376ae028ae43434bdea7c0a0f9bb

diff --git a/src/SMDS/SMDS_MeshGroup.hxx b/src/SMDS/SMDS_MeshGroup.hxx
index ef2264c12..3b39c7022 100644
--- a/src/SMDS/SMDS_MeshGroup.hxx
+++ b/src/SMDS/SMDS_MeshGroup.hxx
@@ -1,76 +1,75 @@
-//  SMESH SMDS : implementaion of Salome mesh data structure
+// Copyright (C) 2007-2016  CEA/DEN, EDF R&D, OPEN CASCADE
 //
-//  Copyright (C) 2003  OPEN CASCADE
-// 
-//  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.opencascade.org or email : webmaster@opencascade.org 
+// Copyright (C) 2003-2007  OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
+// CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS
 //
+// 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 SMDS : implementation of Salome mesh data structure
 //  File   : SMDS_MeshGroup.hxx
 //  Module : SMESH
-
+//
 #ifndef _SMDS_MeshGroup_HeaderFile
 #define _SMDS_MeshGroup_HeaderFile
 
+#include "SMESH_SMDS.hxx"
+
+#include "SMDS_ElementHolder.hxx"
 #include "SMDS_Mesh.hxx"
 #include <set>
 
-
-class SMDS_MeshGroup:public SMDS_MeshObject
+class SMDS_EXPORT SMDS_MeshGroup: public SMDS_MeshObject, SMDS_ElementHolder
 {
-  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; }
+ public:
+  SMDS_MeshGroup(const SMDS_Mesh *         theMesh,
+                 const SMDSAbs_ElementType theType = SMDSAbs_All);
 
-        void SetType (const SMDSAbs_ElementType theType);
-        void Clear();
-	void Add(const SMDS_MeshElement * theElem);
-	void Remove(const SMDS_MeshElement * theElem);
-	bool IsEmpty() const { return myElements.empty(); }
-	int Extent() const { return myElements.size(); }
+  void SetType (const SMDSAbs_ElementType theType);
+  void Clear();
+  void Reserve(size_t 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;
 
-        SMDSAbs_ElementType GetType() const { return myType; }
+  const SMDS_Mesh*     GetMesh() const { return myMesh; }
+  SMDSAbs_ElementType  GetType() const { return myType; }
+  SMDS_ElemIteratorPtr GetElements() const; // WARNING: iterator becomes invalid if group changes
 
-	bool Contains(const SMDS_MeshElement * theElem) const;
+  void operator=( SMDS_MeshGroup && other );
 
-        void InitIterator() const
-        { const_cast<TIterator&>(myIterator) = myElements.begin(); }
+ protected: // methods of SMDS_ElementHolder
 
-        bool More() const { return myIterator != myElements.end(); }
+  virtual SMDS_ElemIteratorPtr getElements() { return GetElements(); }
+  virtual void tmpClear();
+  virtual void add( const SMDS_MeshElement* element ) { Add( element ); }
+  virtual void compact() {}
 
-        const SMDS_MeshElement* Next() const
-        { return *(const_cast<TIterator&>(myIterator))++; }
+ private:
 
-  private:
-	SMDS_MeshGroup(SMDS_MeshGroup* theParent,
-                       const SMDSAbs_ElementType theType = SMDSAbs_All);
+  typedef std::set< const SMDS_MeshElement* > TElementSet;
+  typedef TElementSet::const_iterator         TIterator;
 
-        typedef std::set<const SMDS_MeshElement *>::const_iterator TIterator;
-	const SMDS_Mesh *                       myMesh;
-	SMDSAbs_ElementType                     myType;
-	std::set<const SMDS_MeshElement *>      myElements;
-	SMDS_MeshGroup *                        myParent;
-	std::list<const SMDS_MeshGroup*>        myChildren;
-        TIterator                               myIterator;
+  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