X-Git-Url: http://git.salome-platform.org/gitweb/?a=blobdiff_plain;f=src%2FGHS3DPlugin%2FGHS3DPlugin_GHS3D.hxx;h=27796de47da94cab065c984c70ab4ed8dd356acc;hb=918eb82c152b6b09bf6f7045e8f8a0047e2f3a44;hp=30ba8b0e5758d58e129166199b0791b6d9e7259a;hpb=744c914fb53e3676e3ec45080046ef1274f43522;p=plugins%2Fghs3dplugin.git

diff --git a/src/GHS3DPlugin/GHS3DPlugin_GHS3D.hxx b/src/GHS3DPlugin/GHS3DPlugin_GHS3D.hxx
index 30ba8b0..27796de 100644
--- a/src/GHS3DPlugin/GHS3DPlugin_GHS3D.hxx
+++ b/src/GHS3DPlugin/GHS3DPlugin_GHS3D.hxx
@@ -1,9 +1,9 @@
-// Copyright (C) 2004-2013  CEA/DEN, EDF R&D
+// Copyright (C) 2004-2014  CEA/DEN, EDF R&D
 //
 // This library is free software; you can redistribute it and/or
 // modify it under the terms of the GNU Lesser General Public
 // License as published by the Free Software Foundation; either
-// version 2.1 of the License.
+// version 2.1 of the License, or (at your option) any later version.
 //
 // This library is distributed in the hope that it will be useful,
 // but WITHOUT ANY WARRANTY; without even the implied warranty of
@@ -26,9 +26,10 @@
 #ifndef _GHS3DPlugin_GHS3D_HXX_
 #define _GHS3DPlugin_GHS3D_HXX_
 
-#include "SMESH_Algo.hxx"
-#include "SMESH_Gen.hxx"
-#include "SMESH_Gen_i.hxx"
+#include <SMESH_Algo.hxx>
+#include <SMESH_Gen.hxx>
+#include <SMESH_Gen_i.hxx>
+#include <SMESH_ProxyMesh.hxx>
 
 #include <map>
 #include <vector>
@@ -79,7 +80,7 @@ public:
 
   bool         importGMFMesh(const char* aGMFFileName, SMESH_Mesh& aMesh);
 
-  static const char* Name() { return "GHS3D_3D"; }
+  static const char* Name() { return "MG-Tetra"; }
 
 protected:
   const GHS3DPlugin_Hypothesis*   _hyp;
@@ -96,6 +97,7 @@ private:
   int  _nbShape;
   bool _keepFiles;
   bool _removeLogOnSuccess;
+  bool _logInStandardOutput;
   SALOMEDS::Study_var myStudy;
   SMESH_Gen_i* smeshGen_i;
 
@@ -103,17 +105,20 @@ private:
 };
 
 /*!
- * \brief Convertor of GHS3D elements to SMDS ones
+ * \brief Convertor of MG-Tetra elements to SMDS ones
  */
 class _Ghs2smdsConvertor
 {
   const std::map <int,const SMDS_MeshNode*> * _ghs2NodeMap;
   const std::vector <const SMDS_MeshNode*> *  _nodeByGhsId;
+  SMESH_ProxyMesh::Ptr                        _mesh;
 
 public:
-  _Ghs2smdsConvertor( const std::map <int,const SMDS_MeshNode*> & ghs2NodeMap);
+  _Ghs2smdsConvertor( const std::map <int,const SMDS_MeshNode*> & ghs2NodeMap,
+                      SMESH_ProxyMesh::Ptr                        mesh);
 
-  _Ghs2smdsConvertor( const std::vector <const SMDS_MeshNode*> &  nodeByGhsId);
+  _Ghs2smdsConvertor( const std::vector <const SMDS_MeshNode*> &  nodeByGhsId,
+                      SMESH_ProxyMesh::Ptr                        mesh);
 
   const SMDS_MeshElement* getElement(const std::vector<int>& ghsNodes) const;
 };