X-Git-Url: http://git.salome-platform.org/gitweb/?a=blobdiff_plain;f=src%2FDriverMED%2FDriverMED_R_SMESHDS_Mesh.h;h=cb72bccdfb911e3ad16cb42ee7ed462d4c71501b;hb=9efbaa6f5e4947bdcfdd04e5412ae1ece49b02fd;hp=c592c30344b14a225795a7da96db379242dee7e9;hpb=c3bf92bd87b770fd81631a3853f7f5bb1ac6a4e8;p=modules%2Fsmesh.git

diff --git a/src/DriverMED/DriverMED_R_SMESHDS_Mesh.h b/src/DriverMED/DriverMED_R_SMESHDS_Mesh.h
index c592c3034..cb72bccdf 100644
--- a/src/DriverMED/DriverMED_R_SMESHDS_Mesh.h
+++ b/src/DriverMED/DriverMED_R_SMESHDS_Mesh.h
@@ -27,62 +27,43 @@
 #ifndef _INCLUDE_DRIVERMED_R_SMESHDS_MESH
 #define _INCLUDE_DRIVERMED_R_SMESHDS_MESH
 
-#include "SMESHDS_Mesh.hxx"
-#include "Mesh_Reader.h"
+#include "Driver_SMESHDS_Mesh.h"
 #include "DriverMED_Family.h"
 
 #include <list>
-extern "C"
-{
-#include <med.h>
-}
-
-using namespace std;
 
+class SMESHDS_Mesh;
 class SMESHDS_Group;
 class SMESHDS_SubMesh;
 
-class DriverMED_R_SMESHDS_Mesh:public Mesh_Reader
+typedef std::pair< std::string, SMDSAbs_ElementType > TNameAndType;
+
+class DriverMED_R_SMESHDS_Mesh: public Driver_SMESHDS_Mesh
 {
  public:
+  virtual Status Perform();
 
-  DriverMED_R_SMESHDS_Mesh();
-  ~DriverMED_R_SMESHDS_Mesh();
-
-  enum ReadStatus {
-    DRS_OK,
-    DRS_EMPTY,          // a MED file contains no mesh with the given name
-    DRS_WARN_RENUMBER,  // a MED file has overlapped ranges of element numbers,
-                        // so the numbers from the file are ignored
-    DRS_WARN_SKIP_ELEM, // some elements were skipped due to incorrect file data
-    DRS_FAIL            // general failure (exception etc.)
-  };
-
-  void Read();
-  ReadStatus ReadMySelf();
-  void Add();
-
-  list<string> GetGroupNames();
+  std::list< TNameAndType > GetGroupNamesAndTypes();
   void GetGroup(SMESHDS_Group* theGroup);
   void CreateAllSubMeshes();
   void GetSubMesh(SMESHDS_SubMesh* theSubMesh, const int theId);
 
-  list<string> GetMeshNames();
-
-  void SetMesh(SMDS_Mesh * aMesh);
-  void SetFile(string);
-  void SetFileId(med_idt);
-  void SetMeshId(int);
-  void SetMeshName(string theMeshName);
+  std::list<std::string> GetMeshNames(Status& theStatus);
+  void SetMeshName(std::string theMeshName);
 
  private:
+  /*!
+   * \brief Ensure aFamily has required ID
+    * \param aFamily - a family to check
+    * \param anID - an ID aFamily should have
+    * \retval bool  - true if successful
+   */
+  bool checkFamilyID(DriverMED_FamilyPtr & aFamily, int anID) const;
 
-  SMDS_Mesh * myMesh;
-  string myFile;
-  med_idt myFileId;
-  int myMeshId;
-  string myMeshName;
-  map<int, DriverMED_FamilyPtr> myFamilies;
+ private:
+  std::string myMeshName;
+  std::map<int, DriverMED_FamilyPtr> myFamilies;
 
 };
+
 #endif