Merge V9_dev branch into master

[plugins/ghs3dplugin.git] / src / GHS3DPlugin / GHS3DPlugin_GHS3D.hxx

diff --git a/src/GHS3DPlugin/GHS3DPlugin_GHS3D.hxx b/src/GHS3DPlugin/GHS3DPlugin_GHS3D.hxx
index 7d9a359338913f4baac52f05bc0ca55e69bea17e..a5a527ef43da5cb79945b348242c7cce45b85a95 100644 (file)
--- a/src/GHS3DPlugin/GHS3DPlugin_GHS3D.hxx
+++ b/src/GHS3DPlugin/GHS3DPlugin_GHS3D.hxx
@@ -50,7 +50,8 @@ class TopoDS_Shape;
 class GHS3DPlugin_GHS3D: public SMESH_3D_Algo
 {
 public:
-  GHS3DPlugin_GHS3D(int hypId, int studyId, SMESH_Gen* gen);
+
+  GHS3DPlugin_GHS3D(int hypId, SMESH_Gen* gen);
   virtual ~GHS3DPlugin_GHS3D();
 
   virtual bool CheckHypothesis(SMESH_Mesh&         aMesh,
@@ -75,20 +76,23 @@ public:
 
   bool         importGMFMesh(const char* aGMFFileName, SMESH_Mesh& aMesh);
 
+  virtual double GetProgress() const;
+
+
   static const char* Name() { return "MG-Tetra"; }
 
-  virtual double GetProgress() const;
+  static SMESH_ComputeErrorPtr getErrorDescription(const char*                logFile,
+                                                   const std::string&         log,
+                                                   const _Ghs2smdsConvertor & toSmdsConvertor,
+                                                   const bool                 isOK = false);
 
 protected:
   const GHS3DPlugin_Hypothesis*   _hyp;
   const StdMeshers_ViscousLayers* _viscousLayersHyp;
   std::string                     _genericName;
-   
+
 private:
 
-  bool         storeErrorDescription(const char*                logFile,
-                                     const std::string&         log,
-                                     const _Ghs2smdsConvertor & toSmdsConvertor );
   TopoDS_Shape entryToShape(std::string entry);
 
   int                 _iShape;
@@ -96,8 +100,6 @@ private:
   bool                _keepFiles;
   bool                _removeLogOnSuccess;
   bool                _logInStandardOutput;
-  SALOMEDS::Study_var _study;
-  SMESH_Gen_i*        _smeshGen_i;
 
   bool                _isLibUsed;
   double              _progressAdvance;
@@ -120,6 +122,7 @@ public:
                       SMESH_ProxyMesh::Ptr                        mesh);
 
   const SMDS_MeshElement* getElement(const std::vector<int>& ghsNodes) const;
+  const SMDS_Mesh*        getMesh() const;
 };
 
 #endif