Merge from V6_main_20120808 08Aug12

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

diff --git a/src/MEDMEM/MEDMEM_EnsightMedDriver.hxx b/src/MEDMEM/MEDMEM_EnsightMedDriver.hxx
index 2125c91683f1a8ef32830b9e2acaedf85b16affa..54182b91da085b63651d0ea55beda4c65935d379 100644 (file)
--- a/src/MEDMEM/MEDMEM_EnsightMedDriver.hxx
+++ b/src/MEDMEM/MEDMEM_EnsightMedDriver.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_MED_DRIVER_HXX
 #define ENSIGHT_MED_DRIVER_HXX
 
@@ -38,7 +39,6 @@ namespace MEDMEM {
 class MESH;
 class SUPPORT;
 class FIELD_;
-class MED;
 
 // ==============================================================================
 /*!
@@ -50,15 +50,11 @@ class MEDMEM_EXPORT ENSIGHT_MED_DRIVER : public MEDMEM_ENSIGHT::_CaseFileDriver_
 {
 protected:
   
-  MED * _ptrMed;          // Store 'ENSIGHT_DRIVER (0..n)----(1) ENSIGHT' associations
- 
   virtual void openConst()  const;
 
 public :
   ENSIGHT_MED_DRIVER();
-  ENSIGHT_MED_DRIVER(const string & fileName, MED * ptrMed);
-  ENSIGHT_MED_DRIVER(const string & fileName, MED * ptrMed,
-                     MED_EN::med_mode_acces accessMode);
+  ENSIGHT_MED_DRIVER(const string & fileName, MED_EN::med_mode_acces accessMode);
   ENSIGHT_MED_DRIVER(const ENSIGHT_MED_DRIVER & driver);
   virtual ~ENSIGHT_MED_DRIVER();
 
@@ -76,7 +72,7 @@ class MEDMEM_EXPORT ENSIGHT_MED_RDONLY_DRIVER : public virtual ENSIGHT_MED_DRIVE
 {
 public :
   ENSIGHT_MED_RDONLY_DRIVER();
-  ENSIGHT_MED_RDONLY_DRIVER(const string & fileName,  MED * ptrMed);
+  ENSIGHT_MED_RDONLY_DRIVER(const string & fileName, std::vector< FIELD_* >& fields);
   ENSIGHT_MED_RDONLY_DRIVER(const ENSIGHT_MED_RDONLY_DRIVER & driver);
   virtual ~ENSIGHT_MED_RDONLY_DRIVER();
   virtual void write          ( void ) const throw (MEDEXCEPTION) ;
@@ -85,6 +81,7 @@ public :
   GENDRIVER * copy ( void ) const;
 private:
 
+  std::vector< FIELD_* > * _fields;
   bool _isFileStructRead;
 };
 
@@ -99,14 +96,14 @@ private:
 
 class MEDMEM_EXPORT ENSIGHT_MED_WRONLY_DRIVER : public virtual ENSIGHT_MED_DRIVER
 {
+  const std::vector< const FIELD_* > _fields;
 public :
   ENSIGHT_MED_WRONLY_DRIVER();
-  ENSIGHT_MED_WRONLY_DRIVER(const string & fileName,  MED * ptrMed);
+  ENSIGHT_MED_WRONLY_DRIVER(const string & fileName, const std::vector< const FIELD_* >& fields);
   ENSIGHT_MED_WRONLY_DRIVER(const ENSIGHT_MED_WRONLY_DRIVER & driver);
   virtual ~ENSIGHT_MED_WRONLY_DRIVER();
   virtual void write          ( void ) const throw (MEDEXCEPTION) ;
   virtual void read           ( void ) throw (MEDEXCEPTION) ;
-  //virtual void readFileStruct ( void ) throw (MEDEXCEPTION) ;
   GENDRIVER * copy ( void ) const;
 };