X-Git-Url: http://git.salome-platform.org/gitweb/?p=modules%2Fsmesh.git;a=blobdiff_plain;f=src%2FSMDS%2FSMDS_MeshGroup.hxx;h=a670deb5eaa5b7a87f74be0df12db8c07ba35dd3;hp=5df197b27b2440eace92f09e41c33674a0a5dc3b;hb=57b43b4d010e2d0a1529d3c131bbb9d416e63258;hpb=007c0191337598a9431229b2d3dec7fde25d4c4e

diff --git a/src/SMDS/SMDS_MeshGroup.hxx b/src/SMDS/SMDS_MeshGroup.hxx
index 5df197b27..a670deb5e 100644
--- a/src/SMDS/SMDS_MeshGroup.hxx
+++ b/src/SMDS/SMDS_MeshGroup.hxx
@@ -26,127 +26,75 @@
 #ifndef _SMDS_MeshGroup_HeaderFile
 #define _SMDS_MeshGroup_HeaderFile
 
-#ifndef _Standard_HeaderFile
-#include <Standard.hxx>
+#include "SMDS_Mesh.hxx"
+#include <set>
+
+//#ifdef WNT
+//#include <SALOME_WNT.hxx>
+//#else
+//#define SALOME_WNT_EXPORT
+//#endif
+
+#if defined WNT && defined WIN32 && defined SMDS_EXPORTS
+#define SMDS_WNT_EXPORT __declspec( dllexport )
+#else
+#define SMDS_WNT_EXPORT
 #endif
-#ifndef _Handle_SMDS_MeshGroup_HeaderFile
-#include "Handle_SMDS_MeshGroup.hxx"
-#endif
-
-#ifndef _Handle_SMDS_Mesh_HeaderFile
-#include "Handle_SMDS_Mesh.hxx"
-#endif
-#ifndef _SMDSAbs_ElementType_HeaderFile
-#include "SMDSAbs_ElementType.hxx"
-#endif
-#ifndef _SMDS_MapOfMeshElement_HeaderFile
-#include "SMDS_MapOfMeshElement.hxx"
-#endif
-#ifndef _Handle_SMDS_MeshGroup_HeaderFile
-#include "Handle_SMDS_MeshGroup.hxx"
-#endif
-#ifndef _SMDS_ListOfMeshGroup_HeaderFile
-#include "SMDS_ListOfMeshGroup.hxx"
-#endif
-#ifndef _SMDS_MeshObject_HeaderFile
-#include "SMDS_MeshObject.hxx"
-#endif
-#ifndef _Standard_Boolean_HeaderFile
-#include <Standard_Boolean.hxx>
-#endif
-#ifndef _Handle_SMDS_MeshElement_HeaderFile
-#include "Handle_SMDS_MeshElement.hxx"
-#endif
-#ifndef _Standard_Integer_HeaderFile
-#include <Standard_Integer.hxx>
-#endif
-class SMDS_Mesh;
-class Standard_NoSuchObject;
-class Standard_TypeMismatch;
-class SMDS_MeshElement;
-class SMDS_MapOfMeshElement;
-
 
-class SMDS_MeshGroup : public SMDS_MeshObject {
+class SMDS_WNT_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();
 
-public:
+        const SMDS_Mesh* GetMesh() const { return myMesh; }
 
-    inline void* operator new(size_t,void* anAddress) 
-      {
-        return anAddress;
-      }
-    inline void* operator new(size_t size) 
-      { 
-        return Standard::Allocate(size); 
-      }
-    inline void  operator delete(void *anAddress) 
-      { 
-        if (anAddress) Standard::Free((Standard_Address&)anAddress); 
-      }
-//    inline void  operator delete(void *anAddress, size_t size) 
-//      { 
-//        if (anAddress) Standard::Free((Standard_Address&)anAddress,size); 
-//      }
- // Methods PUBLIC
- // 
-Standard_EXPORT SMDS_MeshGroup(const Handle(SMDS_Mesh)& aMesh);
-Standard_EXPORT   Handle_SMDS_MeshGroup AddSubGroup() ;
-Standard_EXPORT virtual  Standard_Boolean RemoveSubGroup(const Handle(SMDS_MeshGroup)& aGroup) ;
-Standard_EXPORT virtual  Standard_Boolean RemoveFromParent() ;
-Standard_EXPORT   void Clear() ;
-Standard_EXPORT   void Add(const Handle(SMDS_MeshElement)& ME) ;
-Standard_EXPORT   void Remove(const Handle(SMDS_MeshElement)& ME) ;
-Standard_EXPORT   Standard_Boolean IsEmpty() const;
-Standard_EXPORT   Standard_Integer Extent() const;
-Standard_EXPORT   SMDSAbs_ElementType Type() const;
-Standard_EXPORT   Standard_Boolean Contains(const Handle(SMDS_MeshElement)& ME) const;
-Standard_EXPORT inline  const SMDS_MapOfMeshElement& Elements() const;
-Standard_EXPORT ~SMDS_MeshGroup();
+        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;
 
- // Type management
- //
- Standard_EXPORT friend Handle_Standard_Type& SMDS_MeshGroup_Type_();
- Standard_EXPORT const Handle(Standard_Type)& DynamicType() const;
- Standard_EXPORT Standard_Boolean	       IsKind(const Handle(Standard_Type)&) const;
+        void InitIterator() const
+        { const_cast<TIterator&>(myIterator) = myElements.begin(); }
 
-protected:
+        bool More() const { return myIterator != myElements.end(); }
 
- // Methods PROTECTED
- // 
+        const SMDS_MeshElement* Next() const
+        { return *(const_cast<TIterator&>(myIterator))++; }
 
+        void InitSubGroupsIterator() const
+        { const_cast<TGroupIterator&>(myGroupIterator) = myChildren.begin(); }
 
- // Fields PROTECTED
- //
+        bool MoreSubGroups() const { return myGroupIterator != myChildren.end(); }
 
+        const SMDS_MeshGroup* NextSubGroup() const
+        { return *(const_cast<TGroupIterator&>(myGroupIterator))++; }
 
-private: 
-
- // Methods PRIVATE
- // 
-Standard_EXPORT SMDS_MeshGroup(const Handle(SMDS_MeshGroup)& parent);
-
-
- // Fields PRIVATE
- //
-Handle_SMDS_Mesh myMesh;
-SMDSAbs_ElementType myType;
-SMDS_MapOfMeshElement myElements;
-Handle_SMDS_MeshGroup myParent;
-SMDS_ListOfMeshGroup myChildren;
+  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;
+	SMDS_MeshGroup *                        myParent;
+	std::list<const SMDS_MeshGroup*>        myChildren;
+        TIterator                               myIterator;
+        TGroupIterator                          myGroupIterator;
 };
-
-
-#include "SMDS_MeshGroup.lxx"
-
-
-
-// other inline functions and methods (like "C++: function call" methods)
-//
-
-
 #endif