Update copyright information

[modules/smesh.git] / src / SMDS / SMDS_MeshGroup.hxx

diff --git a/src/SMDS/SMDS_MeshGroup.hxx b/src/SMDS/SMDS_MeshGroup.hxx
index c5bfcb43216dcdf8dfbd8a5e10a11381224831a6..94a6deb891e30bd54d5b6100824263072b843d46 100644 (file)
--- 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,11 +26,12 @@
 #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 * theMesh,
@@ -45,32 +46,45 @@ class SMDS_MeshGroup:public SMDS_MeshObject
         void SetType (const SMDSAbs_ElementType theType);
         void Clear();
        void Add(const SMDS_MeshElement * theElem);
-       void Remove(const SMDS_MeshElement * theElem);
+       bool 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<iterator&>(myIterator) = myElements.begin(); }
+        { const_cast<TIterator&>(myIterator) = myElements.begin(); }
 
         bool More() const { return myIterator != myElements.end(); }
 
         const SMDS_MeshElement* Next() const
-        { return *(const_cast<iterator&>(myIterator))++; }
+        { 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 set<const SMDS_MeshElement *>::iterator iterator;
+        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;
-       set<const SMDS_MeshElement *>           myElements;
+       std::set<const SMDS_MeshElement *>      myElements;
        SMDS_MeshGroup *                        myParent;
-       list<const SMDS_MeshGroup*>             myChildren;
-        iterator                                myIterator;
+       std::list<const SMDS_MeshGroup*>        myChildren;
+        TIterator                               myIterator;
+        TGroupIterator                          myGroupIterator;
 };
 #endif