X-Git-Url: http://git.salome-platform.org/gitweb/?p=modules%2Fsmesh.git;a=blobdiff_plain;f=src%2FSMESH%2FSMESH_Gen.hxx;h=17dbe35e63070eb57b0dbbd36bdd81b74d7ed242;hp=891cd876c3297fa9c3481786b5a2a19a9f0c2904;hb=40793ae45e14edfdc3aa185537e495f2c905b3c7;hpb=4791f5b30ea7a9c1247aa551750dc71cb83b99aa

diff --git a/src/SMESH/SMESH_Gen.hxx b/src/SMESH/SMESH_Gen.hxx
index 891cd876c..17dbe35e6 100644
--- a/src/SMESH/SMESH_Gen.hxx
+++ b/src/SMESH/SMESH_Gen.hxx
@@ -31,7 +31,6 @@
 
 #include "Utils_SALOME_Exception.hxx"
 
-#include "SMESH_HypothesisFactory.hxx"
 #include "SMESH_Hypothesis.hxx"
 #include "SMESH_Algo.hxx"
 #include "SMESH_1D_Algo.hxx"
@@ -45,51 +44,63 @@
 
 #include <map>
 
+
 typedef struct studyContextStruct
 {
-  map<int, SMESH_Hypothesis*> mapHypothesis;
-  map<int, SMESH_Mesh*> mapMesh;
-  Handle (SMESHDS_Document) myDocument;
-} StudyContextStruct ;
+	std::map < int, SMESH_Hypothesis * >mapHypothesis;
+	  std::map < int, SMESH_Mesh * >mapMesh;
+	  SMESHDS_Document * myDocument;
+} StudyContextStruct;
 
 class SMESH_Gen
 {
-public:
+ public:
   SMESH_Gen();
   ~SMESH_Gen();
 
-  SMESH_Hypothesis* CreateHypothesis(const char* anHyp, int studyId)
-    throw (SALOME_Exception);
-  SMESH_Mesh* Init(int studyId, const TopoDS_Shape& aShape)
-    throw (SALOME_Exception);
-  bool Compute(::SMESH_Mesh& aMesh, const TopoDS_Shape& aShape)
-    throw (SALOME_Exception);
-  StudyContextStruct* GetStudyContext(int studyId);
+//  SMESH_Hypothesis *CreateHypothesis(const char *anHyp, int studyId)
+//    throw(SALOME_Exception);
+  SMESH_Mesh* CreateMesh(int studyId)
+    throw(SALOME_Exception);
+  bool Compute(::SMESH_Mesh & aMesh, const TopoDS_Shape & aShape);
+
+  bool CheckAlgoState(SMESH_Mesh& aMesh, const TopoDS_Shape& aShape);
+  // notify on bad state of attached algos, return false
+  // if Compute() would fail because of some algo bad state
+
 
-  static int GetShapeDim(const TopoDS_Shape& aShape);
-  SMESH_Algo* GetAlgo(SMESH_Mesh& aMesh, const TopoDS_Shape& aShape);
+  StudyContextStruct *GetStudyContext(int studyId);
+
+  static int GetShapeDim(const TopAbs_ShapeEnum & aShapeType);
+  static int GetShapeDim(const TopoDS_Shape & aShape)
+  { return GetShapeDim( aShape.ShapeType() ); }
+  SMESH_Algo* GetAlgo(SMESH_Mesh & aMesh, const TopoDS_Shape & aShape);
+  static bool IsGlobalHypothesis(const SMESH_Hypothesis* theHyp, SMESH_Mesh& aMesh);
 
   // inherited methods from SALOMEDS::Driver
 
   void Save(int studyId, const char *aUrlOfFile);
-  void Load(int studyId, const char *aUrlOfFile); 
-  void Close(int studyId); 
-  const char* ComponentDataType();
+  void Load(int studyId, const char *aUrlOfFile);
+  void Close(int studyId);
+  const char *ComponentDataType();
+
+  const char *IORToLocalPersistentID(const char *IORString, bool & IsAFile);
+  const char *LocalPersistentIDToIOR(const char *aLocalPersistentID);
+
+  int GetANewId();
 
-  const char* IORToLocalPersistentID(const char* IORString, bool& IsAFile);
-  const char* LocalPersistentIDToIOR(const char* aLocalPersistentID);
+  std::map < int, SMESH_Algo * >_mapAlgo;
+  std::map < int, SMESH_1D_Algo * >_map1D_Algo;
+  std::map < int, SMESH_2D_Algo * >_map2D_Algo;
+  std::map < int, SMESH_3D_Algo * >_map3D_Algo;
 
-  SMESH_HypothesisFactory _hypothesisFactory;
+ private:
 
-  map<int, SMESH_Algo*> _mapAlgo;
-  map<int, SMESH_1D_Algo*> _map1D_Algo;
-  map<int, SMESH_2D_Algo*> _map2D_Algo;
-  map<int, SMESH_3D_Algo*> _map3D_Algo;
+  int _localId;				// unique Id of created objects, within SMESH_Gen entity
+  std::map < int, StudyContextStruct * >_mapStudyContext;
 
-private:
-  int _localId; // unique Id of created objects, within SMESH_Gen entity
-  map<int, StudyContextStruct*> _mapStudyContext;
-  map<int, SMESH_Hypothesis*> _mapHypothesis;
+  // hypotheses managing
+  int _hypId;
 };
 
 #endif