Merge from V6_main_20120808 08Aug12

[modules/smesh.git] / src / Driver / Driver_Mesh.h

diff --git a/src/Driver/Driver_Mesh.h b/src/Driver/Driver_Mesh.h
index 9840ed034635bcb9f3af05ac8cc9f64f7778e3d9..45861a82a784b15b22d4467fb4f373721894d346 100644 (file)
--- a/src/Driver/Driver_Mesh.h
+++ b/src/Driver/Driver_Mesh.h
@@ -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

 //
 //

+

 //  SMESH Driver : implementaion of driver for reading and writing  
 //  File   : Mesh_Reader.h
 //  Module : SMESH
 //  SMESH Driver : implementaion of driver for reading and writing  
 //  File   : Mesh_Reader.h
 //  Module : SMESH


@@ -27,9 +28,10 @@
 #define _INCLUDE_DRIVER_MESH
 
 #include <string>
 #define _INCLUDE_DRIVER_MESH
 
 #include <string>

+#include <vector>

 
 #ifdef WNT
 
 #ifdef WNT

- #if defined MESHDRIVER_EXPORTS
+ #if defined MESHDRIVER_EXPORTS || defined MeshDriver_EXPORTS

   #define MESHDRIVER_EXPORT __declspec( dllexport )
  #else
   #define MESHDRIVER_EXPORT __declspec( dllimport )
   #define MESHDRIVER_EXPORT __declspec( dllexport )
  #else
   #define MESHDRIVER_EXPORT __declspec( dllimport )


@@ -56,11 +58,16 @@ class MESHDRIVER_EXPORT Driver_Mesh
   virtual Status Perform() = 0;
   void SetMeshId(int theMeshId);
   void SetFile(const std::string& theFileName);
   virtual Status Perform() = 0;
   void SetMeshId(int theMeshId);
   void SetFile(const std::string& theFileName);

+  virtual void SetMeshName(const std::string& theMeshName);
+  virtual std::string GetMeshName() const;

 
  protected:
   std::string myFile;
 
  protected:
   std::string myFile;

+  std::string myMeshName;

   int myMeshId;
 
   int myMeshId;
 

+  Status addMessage(const std::string& msg, const bool isFatal=false);
+  std::vector< std::string > myErrorMessages;

 };
 
 #endif
 };
 
 #endif