X-Git-Url: http://git.salome-platform.org/gitweb/?p=modules%2Fsmesh.git;a=blobdiff_plain;f=src%2FSMESH%2FSMESH_Mesh.hxx;h=f179f68dc10f9e56b760dc1f389f7784322ff2c1;hp=ef0090d2a0192447b9fd56b9f5a0cb5e3e5b22ae;hb=bb2c60c2b654843ed9727afde458334b108a26f4;hpb=0273fe09c6ef581ae93aaa4fe652676fa42f997e

diff --git a/src/SMESH/SMESH_Mesh.hxx b/src/SMESH/SMESH_Mesh.hxx
index ef0090d2a..f179f68dc 100644
--- a/src/SMESH/SMESH_Mesh.hxx
+++ b/src/SMESH/SMESH_Mesh.hxx
@@ -31,13 +31,9 @@
 
 #include "SMESHDS_Document.hxx"
 #include "SMESHDS_Mesh.hxx"
+#include "SMESHDS_Command.hxx"
 #include "SMESH_Hypothesis.hxx"
 #include "SMESH_subMesh.hxx"
-#include "SMESHDS_ListOfCommand.hxx"
-//#include "SMESHDS_ListOfAsciiString.hxx"
-//#include "SMESHDS_ListIteratorOfListOfAsciiString.hxx"
-
-
 #include "Utils_SALOME_Exception.hxx"
 
 #include <TopExp.hxx>
@@ -63,103 +59,83 @@ class SMESH_Gen;
 
 class SMESH_Mesh
 {
-public:
-  SMESH_Mesh();
-  SMESH_Mesh(int localId,
-	     int studyId,
-	     SMESH_Gen* gen,
-	     const Handle(SMESHDS_Document)& myDocument);
+  public:
+	SMESH_Mesh();
+	SMESH_Mesh(int localId, int studyId, SMESH_Gen * gen,
+		SMESHDS_Document * myDocument);
 
-  virtual ~SMESH_Mesh();
+	virtual ~ SMESH_Mesh();
 
-  void ShapeToMesh(const TopoDS_Shape& aShape)
-    throw (SALOME_Exception);
+	void ShapeToMesh(const TopoDS_Shape & aShape) throw(SALOME_Exception);
 
-  bool AddHypothesis(const TopoDS_Shape& aSubShape,
-		     int anHypId)
-    throw (SALOME_Exception);
+	bool AddHypothesis(const TopoDS_Shape & aSubShape, int anHypId)
+		throw(SALOME_Exception);
 
-  bool RemoveHypothesis(const TopoDS_Shape& aSubShape,
-			int anHypId)
-    throw (SALOME_Exception);
+	bool RemoveHypothesis(const TopoDS_Shape & aSubShape, int anHypId)
+		throw(SALOME_Exception);
 
-  const list<SMESHDS_Hypothesis*>&
-  GetHypothesisList(const TopoDS_Shape& aSubShape)
-    throw (SALOME_Exception);
+	const list <const SMESHDS_Hypothesis * >&
+		GetHypothesisList(const TopoDS_Shape & aSubShape)
+		throw(SALOME_Exception);
 
-  const SMESHDS_ListOfCommand& GetLog()
-    throw (SALOME_Exception);
+	const list<SMESHDS_Command*> & GetLog() throw(SALOME_Exception);
 
 //   const SMESHDS_ListOfAsciiString& GetLog()
 //     throw (SALOME_Exception);
 
-  void ClearLog()
-    throw (SALOME_Exception);
-
-  int GetId();
- 
-  const Handle(SMESHDS_Mesh)& GetMeshDS();
-
-  SMESH_Gen* GetGen();
-
-  SMESH_subMesh* GetSubMesh(const TopoDS_Shape & aSubShape)
-    throw (SALOME_Exception);
-
-  SMESH_subMesh* GetSubMeshContaining(const TopoDS_Shape & aSubShape)
-    throw (SALOME_Exception);
-
-  const list <SMESH_subMesh*>&
-  GetSubMeshUsingHypothesis(SMESHDS_Hypothesis* anHyp)
-    throw (SALOME_Exception);
-
-  void ExportDAT( const char* file )
-    throw (SALOME_Exception);
-  void ExportMED( const char* file )
-    throw (SALOME_Exception);
-  void ExportUNV( const char* file )
-    throw (SALOME_Exception);
-    
-  int NbNodes()
-    throw (SALOME_Exception);
-  
-  int NbEdges()
-    throw (SALOME_Exception);
-  
-  int NbFaces()
-    throw (SALOME_Exception);
-
-  int NbTriangles()
-    throw (SALOME_Exception);
-
-  int NbQuadrangles()
-    throw (SALOME_Exception);
-  
-  int NbVolumes()
-    throw (SALOME_Exception);
-
-  int NbTetras()
-    throw (SALOME_Exception);
-
-  int NbHexas()
-    throw (SALOME_Exception);
-  
-  int NbSubMesh()
-    throw (SALOME_Exception);
-  
-
-private:
-
-  int _id;          // id given by creator (unique within the creator instance)
-  int _studyId;
-  int _idDoc;       // id given by SMESHDS_Document
-  bool _isShapeToMesh; // set to true when a shape is given (only once)
-  list<SMESHDS_Hypothesis*> _subShapeHypothesisList;
-  list<SMESH_subMesh*> _subMeshesUsingHypothesisList;
-  Handle (SMESHDS_Document) _myDocument;
-  Handle (SMESHDS_Mesh) _myMeshDS;
-  TopTools_IndexedMapOfShape _subShapes;
-  map<int, SMESH_subMesh*> _mapSubMesh;
-  SMESH_Gen* _gen;
+	void ClearLog() throw(SALOME_Exception);
+
+	int GetId();
+
+	SMESHDS_Mesh * GetMeshDS();
+
+	SMESH_Gen *GetGen();
+
+	SMESH_subMesh *GetSubMesh(const TopoDS_Shape & aSubShape)
+		throw(SALOME_Exception);
+
+	SMESH_subMesh *GetSubMeshContaining(const TopoDS_Shape & aSubShape)
+		throw(SALOME_Exception);
+
+	const list < SMESH_subMesh * >&
+		GetSubMeshUsingHypothesis(SMESHDS_Hypothesis * anHyp)
+		throw(SALOME_Exception);
+
+	void ExportDAT(const char *file) throw(SALOME_Exception);
+	void ExportMED(const char *file) throw(SALOME_Exception);
+	void ExportUNV(const char *file) throw(SALOME_Exception);
+
+	int NbNodes() throw(SALOME_Exception);
+
+	int NbEdges() throw(SALOME_Exception);
+
+	int NbFaces() throw(SALOME_Exception);
+
+	int NbTriangles() throw(SALOME_Exception);
+
+	int NbQuadrangles() throw(SALOME_Exception);
+
+	int NbVolumes() throw(SALOME_Exception);
+
+	int NbTetras() throw(SALOME_Exception);
+
+	int NbHexas() throw(SALOME_Exception);
+
+	int NbSubMesh() throw(SALOME_Exception);
+
+  private:
+
+	int _id;					// id given by creator (unique within the creator instance)
+	int _studyId;
+	int _idDoc;					// id given by SMESHDS_Document
+	bool _isShapeToMesh;		// set to true when a shape is given (only once)
+	list<const SMESHDS_Hypothesis *> _subShapeHypothesisList;
+	list <SMESH_subMesh *> _subMeshesUsingHypothesisList;
+	SMESHDS_Document * _myDocument;
+	SMESHDS_Mesh * _myMeshDS;
+	TopTools_IndexedMapOfShape _subShapes;
+	map <int, SMESH_subMesh *>_mapSubMesh;
+	SMESH_Gen *_gen;
 };
 
 #endif