X-Git-Url: http://git.salome-platform.org/gitweb/?a=blobdiff_plain;f=src%2FDriverMED%2FDriverMED_R_SMESHDS_Mesh.h;h=ac3d0b1305b8d635cb051c5713d87bdd1b469b26;hb=c46bd4f9bb602f9863c817bcd622b1b70d5af1e9;hp=6074843118dfa9ab1a9f788f663248c42e316e81;hpb=4791f5b30ea7a9c1247aa551750dc71cb83b99aa;p=modules%2Fsmesh.git

diff --git a/src/DriverMED/DriverMED_R_SMESHDS_Mesh.h b/src/DriverMED/DriverMED_R_SMESHDS_Mesh.h
index 607484311..ac3d0b130 100644
--- a/src/DriverMED/DriverMED_R_SMESHDS_Mesh.h
+++ b/src/DriverMED/DriverMED_R_SMESHDS_Mesh.h
@@ -17,7 +17,7 @@
 //  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.opencascade.org/SALOME/ or email : webmaster.salome@opencascade.org 
+// See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
 //
 //
 //
@@ -27,37 +27,46 @@
 #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;
+  bool buildMeshGrille(const MED::PWrapper& theWrapper,
+		       const MED::PMeshInfo& theMeshInfo);
+
+ private:
+  std::string myMeshName;
+  std::map<int, DriverMED_FamilyPtr> myFamilies;
 
 };
+
 #endif