X-Git-Url: http://git.salome-platform.org/gitweb/?p=modules%2Fsmesh.git;a=blobdiff_plain;f=src%2FSMESHDS%2FSMESHDS_Document.hxx;h=4da7a3c470cb4ae431f8ec8c5584f2932f15a09a;hp=8f77ee4c6d8bd69347d804b5f83babcdab153267;hb=253bd8edea0f44d01e65f1fb085d04428544bd14;hpb=4791f5b30ea7a9c1247aa551750dc71cb83b99aa

diff --git a/src/SMESHDS/SMESHDS_Document.hxx b/src/SMESHDS/SMESHDS_Document.hxx
index 8f77ee4c6..4da7a3c47 100644
--- a/src/SMESHDS/SMESHDS_Document.hxx
+++ b/src/SMESHDS/SMESHDS_Document.hxx
@@ -27,126 +27,37 @@
 #ifndef _SMESHDS_Document_HeaderFile
 #define _SMESHDS_Document_HeaderFile
 
-#ifndef _Standard_HeaderFile
-#include <Standard.hxx>
-#endif
-#ifndef _Handle_SMESHDS_Document_HeaderFile
-#include "Handle_SMESHDS_Document.hxx"
-#endif
-
-#ifndef _Standard_Integer_HeaderFile
-#include <Standard_Integer.hxx>
-#endif
-#ifndef _SMESHDS_DataMapOfIntegerMesh_HeaderFile
-#include "SMESHDS_DataMapOfIntegerMesh.hxx"
-#endif
-#ifndef _SMESHDS_DataMapOfIntegerPtrHypothesis_HeaderFile
-#include "SMESHDS_DataMapOfIntegerPtrHypothesis.hxx"
-#endif
-#ifndef _SMESHDS_DataMapIteratorOfDataMapOfIntegerMesh_HeaderFile
-#include "SMESHDS_DataMapIteratorOfDataMapOfIntegerMesh.hxx"
-#endif
-#ifndef _SMESHDS_DataMapIteratorOfDataMapOfIntegerPtrHypothesis_HeaderFile
-#include "SMESHDS_DataMapIteratorOfDataMapOfIntegerPtrHypothesis.hxx"
-#endif
-#ifndef _MMgt_TShared_HeaderFile
-#include <MMgt_TShared.hxx>
-#endif
-#ifndef _Handle_SMESHDS_Mesh_HeaderFile
-#include "Handle_SMESHDS_Mesh.hxx"
-#endif
-#ifndef _SMESHDS_PtrHypothesis_HeaderFile
-#include "SMESHDS_PtrHypothesis.hxx"
-#endif
-#ifndef _Standard_Boolean_HeaderFile
-#include <Standard_Boolean.hxx>
-#endif
-class SMESHDS_Mesh;
-
-
-class SMESHDS_Document : 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_Document(const Standard_Integer UserID);
-Standard_EXPORT   Standard_Integer NewMesh() ;
-Standard_EXPORT   void RemoveMesh(const Standard_Integer MeshID) ;
-Standard_EXPORT   Handle_SMESHDS_Mesh GetMesh(const Standard_Integer MeshID) ;
-Standard_EXPORT   void AddHypothesis(const SMESHDS_PtrHypothesis& H) ;
-Standard_EXPORT   void RemoveHypothesis(const Standard_Integer HypID) ;
-Standard_EXPORT   SMESHDS_PtrHypothesis GetHypothesis(const Standard_Integer HypID) ;
-Standard_EXPORT   Standard_Integer NbMeshes() ;
-Standard_EXPORT   Standard_Integer NbHypothesis() ;
-Standard_EXPORT   void InitMeshesIterator() ;
-Standard_EXPORT   void NextMesh() ;
-Standard_EXPORT   Standard_Boolean MoreMesh() ;
-Standard_EXPORT   Handle_SMESHDS_Mesh CurrentMesh() ;
-Standard_EXPORT   void InitHypothesisIterator() ;
-Standard_EXPORT   void NextHypothesis() ;
-Standard_EXPORT   Standard_Boolean MoreHypothesis() ;
-Standard_EXPORT   SMESHDS_PtrHypothesis CurrentHypothesis() ;
-Standard_EXPORT ~SMESHDS_Document();
-
-
-
-
- // Type management
- //
- Standard_EXPORT friend Handle_Standard_Type& SMESHDS_Document_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
- //
-Standard_Integer myUserID;
-SMESHDS_DataMapOfIntegerMesh myMeshes;
-SMESHDS_DataMapOfIntegerPtrHypothesis myHypothesis;
-SMESHDS_DataMapIteratorOfDataMapOfIntegerMesh myMeshesIt;
-SMESHDS_DataMapIteratorOfDataMapOfIntegerPtrHypothesis myHypothesisIt;
-
-
+#include <map>
+#include "SMESHDS_Mesh.hxx"
+#include "SMESHDS_Hypothesis.hxx"
+using namespace std;
+
+class SMESHDS_Document
+{
+  public:
+	SMESHDS_Document(int UserID);
+	int NewMesh();
+	void RemoveMesh(int MeshID);
+	SMESHDS_Mesh * GetMesh(int MeshID);
+	void AddHypothesis(SMESHDS_Hypothesis * H);
+	void RemoveHypothesis(int HypID);
+	SMESHDS_Hypothesis * GetHypothesis(int HypID);
+	int NbMeshes();
+	int NbHypothesis();
+	void InitMeshesIterator();
+	SMESHDS_Mesh * NextMesh();
+	bool MoreMesh();	
+	void InitHypothesisIterator();
+	SMESHDS_Hypothesis * NextHypothesis();
+	bool MoreHypothesis();	
+	 ~SMESHDS_Document();
+
+  private:
+	int myUserID;
+	map<int,SMESHDS_Mesh*> myMeshes;
+	map<int,SMESHDS_Hypothesis*> myHypothesis;
+	map<int,SMESHDS_Mesh*>::iterator myMeshesIt;
+	map<int,SMESHDS_Hypothesis*>::iterator myHypothesisIt;
 };
 
-
-
-
-
-// other inline functions and methods (like "C++: function call" methods)
-//
-
-
 #endif