X-Git-Url: http://git.salome-platform.org/gitweb/?p=modules%2Fsmesh.git;a=blobdiff_plain;f=src%2FSMESHDS%2FSMESHDS_SubMesh.hxx;h=53802ecb4b6ac68557c070646ab06f898e5707de;hp=a872c9c746dabea69fb3f292f41c1c9a11759d62;hb=2d46bce2985c40bfac0593abad88d590a8efca48;hpb=b64e58d0115eccb2b35fea2b2f787f1be4c44ef2

diff --git a/src/SMESHDS/SMESHDS_SubMesh.hxx b/src/SMESHDS/SMESHDS_SubMesh.hxx
index a872c9c74..53802ecb4 100644
--- a/src/SMESHDS/SMESHDS_SubMesh.hxx
+++ b/src/SMESHDS/SMESHDS_SubMesh.hxx
@@ -27,123 +27,34 @@
 #ifndef _SMESHDS_SubMesh_HeaderFile
 #define _SMESHDS_SubMesh_HeaderFile
 
-#ifndef _Standard_HeaderFile
-#include <Standard.hxx>
-#endif
-#ifndef _Handle_SMESHDS_SubMesh_HeaderFile
-#include "Handle_SMESHDS_SubMesh.hxx"
-#endif
-
-#ifndef _Handle_SMDS_Mesh_HeaderFile
-#include "Handle_SMDS_Mesh.hxx"
-#endif
-#ifndef _SMDS_MapOfMeshElement_HeaderFile
-#include "SMDS_MapOfMeshElement.hxx"
-#endif
-#ifndef _Standard_Boolean_HeaderFile
-#include <Standard_Boolean.hxx>
-#endif
-#ifndef _TColStd_ListOfInteger_HeaderFile
-#include <TColStd_ListOfInteger.hxx>
-#endif
-#ifndef _MMgt_TShared_HeaderFile
-#include <MMgt_TShared.hxx>
-#endif
-#ifndef _Handle_SMDS_MeshElement_HeaderFile
-#include "Handle_SMDS_MeshElement.hxx"
-#endif
-#ifndef _Handle_SMDS_MeshNode_HeaderFile
-#include "Handle_SMDS_MeshNode.hxx"
-#endif
-#ifndef _Standard_Integer_HeaderFile
-#include <Standard_Integer.hxx>
-#endif
-class SMDS_Mesh;
-class SMDS_MeshElement;
-class SMDS_MeshNode;
-class SMDS_MapOfMeshElement;
-class TColStd_ListOfInteger;
-
-
-class SMESHDS_SubMesh : public MMgt_TShared {
-
-public:
-
-    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 SMESHDS_SubMesh(const Handle(SMDS_Mesh)& M);
-Standard_EXPORT   void AddElement(const Handle(SMDS_MeshElement)& ME) ;
-Standard_EXPORT   void RemoveElement(const Handle(SMDS_MeshElement)& ME) ;
-Standard_EXPORT   void AddNode(const Handle(SMDS_MeshNode)& ME) ;
-Standard_EXPORT   void RemoveNode(const Handle(SMDS_MeshNode)& ME) ;
-Standard_EXPORT   Standard_Integer NbElements() ;
-Standard_EXPORT  const SMDS_MapOfMeshElement& GetElements() ;
-Standard_EXPORT  const TColStd_ListOfInteger& GetIDElements() ;
-Standard_EXPORT   Standard_Integer NbNodes() ;
-Standard_EXPORT  const SMDS_MapOfMeshElement& GetNodes() ;
-Standard_EXPORT  const TColStd_ListOfInteger& GetIDNodes() ;
-Standard_EXPORT ~SMESHDS_SubMesh();
-
-
-
-
- // Type management
- //
- Standard_EXPORT friend Handle_Standard_Type& SMESHDS_SubMesh_Type_();
- Standard_EXPORT const Handle(Standard_Type)& DynamicType() const;
- Standard_EXPORT Standard_Boolean	       IsKind(const Handle(Standard_Type)&) const;
-
-protected:
-
- // Methods PROTECTED
- // 
-
-
- // Fields PROTECTED
- //
-
-
-private: 
-
- // Methods PRIVATE
- // 
-
-
- // Fields PRIVATE
- //
-Handle_SMDS_Mesh myMesh;
-SMDS_MapOfMeshElement myElements;
-SMDS_MapOfMeshElement myNodes;
-Standard_Boolean myListOfEltIDIsUpdate;
-TColStd_ListOfInteger myListOfEltID;
-Standard_Boolean myListOfNodeIDIsUpdate;
-TColStd_ListOfInteger myListOfNodeID;
-
-
+#include "SMDS_Mesh.hxx"
+#include <vector>
+#include <set>
+
+using namespace std;
+
+class SMESHDS_SubMesh
+{
+  public:
+	SMESHDS_SubMesh(const SMDS_Mesh * M);
+	void AddElement(const SMDS_MeshElement * ME);
+	void RemoveElement(const SMDS_MeshElement * ME);
+	void AddNode(const SMDS_MeshNode * ME);
+	void RemoveNode(const SMDS_MeshNode * ME);
+	int NbElements() const;
+	const set<const SMDS_MeshElement*> & GetElements();
+	const vector<int> & GetIDElements();
+	int NbNodes() const;
+	const set<const SMDS_MeshNode*> & GetNodes() const;
+	const vector<int> & GetIDNodes();
+	 ~SMESHDS_SubMesh();
+  private:
+	const SMDS_Mesh * myMesh;
+	set<const SMDS_MeshElement*> myElements;
+	set<const SMDS_MeshNode*> myNodes;
+	bool myListOfEltIDIsUpdate;
+	vector<int> myListOfEltID;
+	bool myListOfNodeIDIsUpdate;
+	vector<int> myListOfNodeID;
 };
-
-
-
-
-
-// other inline functions and methods (like "C++: function call" methods)
-//
-
-
 #endif