X-Git-Url: http://git.salome-platform.org/gitweb/?p=modules%2Fsmesh.git;a=blobdiff_plain;f=src%2FDriverMED%2FDriverMED_R_SMESHDS_Mesh.h;h=cb72bccdfb911e3ad16cb42ee7ed462d4c71501b;hp=6074843118dfa9ab1a9f788f663248c42e316e81;hb=87fd8ca50b1fe004fc046c66c5b5df6199861981;hpb=8b4ba0cdff7660465a9ea7b26ef0df0757afed97

diff --git a/src/DriverMED/DriverMED_R_SMESHDS_Mesh.h b/src/DriverMED/DriverMED_R_SMESHDS_Mesh.h
index 607484311..cb72bccdf 100644
--- a/src/DriverMED/DriverMED_R_SMESHDS_Mesh.h
+++ b/src/DriverMED/DriverMED_R_SMESHDS_Mesh.h
@@ -27,37 +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 <vector>
-extern "C"
-{
-#include <med.h>
-}
+#include <list>
+
+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;
 
-  public :
-    DriverMED_R_SMESHDS_Mesh();
-    ~DriverMED_R_SMESHDS_Mesh();
+class DriverMED_R_SMESHDS_Mesh: public Driver_SMESHDS_Mesh
+{
+ public:
+  virtual Status Perform();
 
-    void Read();
-    void ReadMySelf();
-    void Add();
+  std::list< TNameAndType > GetGroupNamesAndTypes();
+  void GetGroup(SMESHDS_Group* theGroup);
+  void CreateAllSubMeshes();
+  void GetSubMesh(SMESHDS_SubMesh* theSubMesh, const int theId);
 
-    void SetMesh(Handle(SMDS_Mesh)& aMesh);
-    void SetFile(string);
-    void SetFileId(med_idt);
-    void SetMeshId(int);
+  std::list<std::string> GetMeshNames(Status& theStatus);
+  void SetMeshName(std::string theMeshName);
 
-    void LinkMeshToShape(string , string , vector<int>);
+ 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;
 
-private :
-    Handle_SMDS_Mesh myMesh;
-    string myFile; 
-    med_idt myFileId;
-    int myMeshId;
+ private:
+  std::string myMeshName;
+  std::map<int, DriverMED_FamilyPtr> myFamilies;
 
 };
+
 #endif