Merge from V6_main_20120808 08Aug12

[modules/med.git] / src / MEDMEM / MEDMEM_EnsightMeshDriver.hxx

diff --git a/src/MEDMEM/MEDMEM_EnsightMeshDriver.hxx b/src/MEDMEM/MEDMEM_EnsightMeshDriver.hxx
index 066c83f16c963833c9be018e265636d1664829a4..807ad37e7ba76cbf080b5daca93648774e69ad80 100644 (file)
--- a/src/MEDMEM/MEDMEM_EnsightMeshDriver.hxx
+++ b/src/MEDMEM/MEDMEM_EnsightMeshDriver.hxx
@@ -1,24 +1,25 @@
-//  Copyright (C) 2007-2008  CEA/DEN, EDF R&D, OPEN CASCADE
+// Copyright (C) 2007-2012  CEA/DEN, EDF R&D, OPEN CASCADE
 //
-//  Copyright (C) 2003-2007  OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
-//  CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS
+// Copyright (C) 2003-2007  OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
+// CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS
 //
-//  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.
+// 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.
 //
-//  This library is distributed in the hope that it will be useful,
-//  but WITHOUT ANY WARRANTY; without even the implied warranty of
-//  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-//  Lesser General Public License for more details.
+// This library is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+// Lesser General Public License for more details.
 //
-//  You should have received a copy of the GNU Lesser General Public
-//  License along with this library; if not, write to the Free Software
-//  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307 USA
+// You should have received a copy of the GNU Lesser General Public
+// 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.salome-platform.org/ or email : webmaster.salome@opencascade.com
+// See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
 //
+
 #ifndef ENSIGHT_MESH_DRIVER_HXX
 #define ENSIGHT_MESH_DRIVER_HXX
 
@@ -30,7 +31,7 @@
 
 namespace MEDMEM {
 
-  class MESH;
+  class GMESH;
   class SUPPORT;
 
 // ==============================================================================
@@ -45,15 +46,15 @@ class MEDMEM_EXPORT ENSIGHT_MESH_DRIVER : public MEDMEM_ENSIGHT::_CaseFileDriver
 {
 protected:
 
-  MESH *       _ptrMesh;
+  GMESH *      _ptrMesh;
   std::string  _meshName;
 
   virtual void openConst(bool checkDataFile=false) const;
 
 public :
   ENSIGHT_MESH_DRIVER() ;
-  ENSIGHT_MESH_DRIVER(const std::string & fileName,  MESH * ptrMesh) ;
-  ENSIGHT_MESH_DRIVER(const std::string & fileName,  MESH * ptrMesh,
+  ENSIGHT_MESH_DRIVER(const std::string & fileName,  GMESH * ptrMesh) ;
+  ENSIGHT_MESH_DRIVER(const std::string & fileName,  GMESH * ptrMesh,
                       MED_EN::med_mode_acces accessMode);
   ENSIGHT_MESH_DRIVER(const ENSIGHT_MESH_DRIVER & driver) ;
   virtual ~ENSIGHT_MESH_DRIVER() ;
@@ -64,7 +65,7 @@ public :
   virtual void        setMeshName(const string & meshName);
   virtual std::string getMeshName() const;
 
-  MESH* getMesh() { return _ptrMesh; }
+  GMESH* getMesh() { return _ptrMesh; }
 };
 
 // ==============================================================================
@@ -122,7 +123,9 @@ class MEDMEM_EXPORT ENSIGHT_MESH_WRONLY_DRIVER : public virtual ENSIGHT_MESH_DRI
 public :
   //!< write a mesh;
   // to be appended, a mesh mush have same nb of groups and dimension as already present ones
-  ENSIGHT_MESH_WRONLY_DRIVER(const std::string & fileName,  MESH * ptrMesh, bool append=false);
+  ENSIGHT_MESH_WRONLY_DRIVER(const std::string & fileName,
+                             const GMESH * ptrMesh,
+                             bool append=false);
 
   ENSIGHT_MESH_WRONLY_DRIVER();
   ENSIGHT_MESH_WRONLY_DRIVER(const ENSIGHT_MESH_WRONLY_DRIVER & driver);