X-Git-Url: http://git.salome-platform.org/gitweb/?a=blobdiff_plain;f=src%2FSMESH%2FSMESH_Gen.hxx;h=f2887c0443a22986355b7b6da4d7346c6b23e141;hb=c15810268833e2cf4972f26c0bbe4249986cf7ea;hp=3a01de04c4386bbb5d4436f6318d313d3b0e238a;hpb=bc37f0b49f9713347749b6325e1c7062de8857ae;p=modules%2Fsmesh.git

diff --git a/src/SMESH/SMESH_Gen.hxx b/src/SMESH/SMESH_Gen.hxx
index 3a01de04c..f2887c044 100644
--- a/src/SMESH/SMESH_Gen.hxx
+++ b/src/SMESH/SMESH_Gen.hxx
@@ -17,7 +17,7 @@
 //  License along with this library; if not, write to the Free Software 
 //  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307 USA 
 // 
-//  See http://www.opencascade.org/SALOME/ or email : webmaster.salome@opencascade.org 
+// See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
 //
 //
 //
@@ -43,12 +43,12 @@
 #include <TopoDS_Shape.hxx>
 
 #include <map>
-using namespace std;
+
 
 typedef struct studyContextStruct
 {
-	map < int, SMESH_Hypothesis * >mapHypothesis;
-	  map < int, SMESH_Mesh * >mapMesh;
+	std::map < int, SMESH_Hypothesis * >mapHypothesis;
+	  std::map < int, SMESH_Mesh * >mapMesh;
 	  SMESHDS_Document * myDocument;
 } StudyContextStruct;
 
@@ -60,7 +60,7 @@ class SMESH_Gen
 
 //  SMESH_Hypothesis *CreateHypothesis(const char *anHyp, int studyId)
 //    throw(SALOME_Exception);
-  SMESH_Mesh* CreateMesh(int studyId)
+  SMESH_Mesh* CreateMesh(int theStudyId, bool theIsEmbeddedMode)
     throw(SALOME_Exception);
   bool Compute(::SMESH_Mesh & aMesh, const TopoDS_Shape & aShape);
 
@@ -68,6 +68,28 @@ class SMESH_Gen
   // notify on bad state of attached algos, return false
   // if Compute() would fail because of some algo bad state
 
+  
+  enum TAlgoStateErrorName { NONE=0, MISSING_ALGO, MISSING_HYPO, NOT_CONFORM_MESH };
+  struct TAlgoStateError
+  {
+    TAlgoStateErrorName _name;
+    const SMESH_Algo*   _algo;
+    int                 _algoDim;
+    bool                _isGlobalAlgo;
+
+    TAlgoStateError(): _algoDim(0),_algo(0),_name(NONE) {}
+    void Set(TAlgoStateErrorName name, const SMESH_Algo* algo, bool isGlobal)
+    { _name = name; _algo = algo; _algoDim = algo->GetDim(); _isGlobalAlgo = isGlobal; }
+    void Set(TAlgoStateErrorName name, const int algoDim,      bool isGlobal)
+    { _name = name; _algo = 0;    _algoDim = algoDim;        _isGlobalAlgo = isGlobal; }
+  };
+
+  bool GetAlgoState(SMESH_Mesh& aMesh, const TopoDS_Shape& aShape,
+                    std::list< SMESH_Gen::TAlgoStateError > & theErrors);
+  // notify on bad state of attached algos, return false
+  // if Compute() would fail because of some algo bad state
+  // theErrors list contains problems description
+
 
   StudyContextStruct *GetStudyContext(int studyId);
 
@@ -75,7 +97,7 @@ class SMESH_Gen
   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);
+  static bool IsGlobalHypothesis(const SMESH_Hypothesis* theHyp, SMESH_Mesh& aMesh);
 
   // inherited methods from SALOMEDS::Driver
 
@@ -89,15 +111,15 @@ class SMESH_Gen
 
   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;
+  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;
 
  private:
 
   int _localId;				// unique Id of created objects, within SMESH_Gen entity
-  map < int, StudyContextStruct * >_mapStudyContext;
+  std::map < int, StudyContextStruct * >_mapStudyContext;
 
   // hypotheses managing
   int _hypId;