DCQ : Merge with Ecole_Ete_a6.

[modules/smesh.git] / src / SMESH / SMESH_Gen.hxx

diff --git a/src/SMESH/SMESH_Gen.hxx b/src/SMESH/SMESH_Gen.hxx
index 27b4a8abc6f00c0d5c0b98d1322d3688d93c716c..3a01de04c4386bbb5d4436f6318d313d3b0e238a 100644 (file)
--- 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"
@@ -55,43 +54,53 @@ typedef struct studyContextStruct
 
 class SMESH_Gen
 {
-  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, int meshID = -1)
-               throw(SALOME_Exception);
-       bool Compute(::SMESH_Mesh & aMesh, const TopoDS_Shape & aShape)
-               throw(SALOME_Exception);
-       StudyContextStruct *GetStudyContext(int studyId);
-
-       static int GetShapeDim(const TopoDS_Shape & aShape);
-       SMESH_Algo *GetAlgo(SMESH_Mesh & aMesh, const TopoDS_Shape & aShape);
-       SMESH_Mesh *Import(int studyId, const char * fileName, const char * fileType);
- 
-       // 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();
-
-       const char *IORToLocalPersistentID(const char *IORString, bool & IsAFile);
-       const char *LocalPersistentIDToIOR(const char *aLocalPersistentID);
-
-       SMESH_HypothesisFactory _hypothesisFactory;
-
-         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;
-
-  private:
-       int _localId;                           // unique Id of created objects, within SMESH_Gen entity
-         map < int, StudyContextStruct * >_mapStudyContext;
-         map < int, SMESH_Hypothesis * >_mapHypothesis;
+ public:
+  SMESH_Gen();
+  ~SMESH_Gen();
+
+//  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
+
+
+  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 IsGlobalAlgo(const SMESH_Algo* theAlgo, 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();
+
+  const char *IORToLocalPersistentID(const char *IORString, bool & IsAFile);
+  const char *LocalPersistentIDToIOR(const char *aLocalPersistentID);
+
+  int GetANewId();
+
+  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;
+
+ private:
+
+  int _localId;                                // unique Id of created objects, within SMESH_Gen entity
+  map < int, StudyContextStruct * >_mapStudyContext;
+
+  // hypotheses managing
+  int _hypId;
 };
 
 #endif