X-Git-Url: http://git.salome-platform.org/gitweb/?a=blobdiff_plain;f=src%2FSMDS%2FSMDS_MeshGroup.hxx;h=f23b601b7a48d1e4fdd9dfe369cfd9872aa62e28;hb=6da23ffa6f06803ad0216eae378de16cb293a4d8;hp=f73c1dd1f4a79bc51ab36f6b070e0c755940ec38;hpb=13b8c20dfc9f5bedf2dd4699ac1e05a8d4227791;p=modules%2Fsmesh.git

diff --git a/src/SMDS/SMDS_MeshGroup.hxx b/src/SMDS/SMDS_MeshGroup.hxx
index f73c1dd1f..f23b601b7 100644
--- a/src/SMDS/SMDS_MeshGroup.hxx
+++ b/src/SMDS/SMDS_MeshGroup.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.opencascade.org or email : webmaster@opencascade.org 
+//  See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
 //
 //
 //
@@ -26,32 +26,65 @@
 #ifndef _SMDS_MeshGroup_HeaderFile
 #define _SMDS_MeshGroup_HeaderFile
 
+#include "SMESH_SMDS.hxx"
+
 #include "SMDS_Mesh.hxx"
 #include <set>
-using namespace std;
 
-class SMDS_MeshGroup:public SMDS_MeshObject
+class SMDS_EXPORT SMDS_MeshGroup:public SMDS_MeshObject
 {
   public:
-	SMDS_MeshGroup(const SMDS_Mesh * aMesh);
-	const SMDS_MeshGroup * AddSubGroup();
-	virtual bool RemoveSubGroup(const SMDS_MeshGroup* aGroup);
+	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();
-	void Clear();
-	void Add(const SMDS_MeshElement * ME);
-	void Remove(const SMDS_MeshElement * ME);
-	bool IsEmpty() const;
-	int Extent() const;
-	SMDSAbs_ElementType Type() const;
-	bool Contains(const SMDS_MeshElement * ME) const;
-	
-	 ~SMDS_MeshGroup();
+
+        const SMDS_Mesh* GetMesh() const { return myMesh; }
+
+        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(); }
+
+	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(); }
+
+        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* parent);
-	const SMDS_Mesh *myMesh;
-	SMDSAbs_ElementType myType;
-	set<const SMDS_MeshElement *> myElements;
-	SMDS_MeshGroup * myParent;
-	list<const SMDS_MeshGroup*> myChildren;
+	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;
+	SMDS_MeshGroup *                        myParent;
+	std::list<const SMDS_MeshGroup*>        myChildren;
+        TIterator                               myIterator;
+        TGroupIterator                          myGroupIterator;
 };
 #endif