X-Git-Url: http://git.salome-platform.org/gitweb/?a=blobdiff_plain;ds=sidebyside;f=src%2FSMESH_I%2FSMESH_Gen_i.hxx;h=7a22deae399c388ee99a251af161aca80076a0a0;hb=61c36a7e0c3f43b3aedd77ef20793ff15620defe;hp=1a045328542cbdf72919f7b0999aa9b0f35f7e8c;hpb=4791f5b30ea7a9c1247aa551750dc71cb83b99aa;p=modules%2Fsmesh.git

diff --git a/src/SMESH_I/SMESH_Gen_i.hxx b/src/SMESH_I/SMESH_Gen_i.hxx
index 1a0453285..7a22deae3 100644
--- a/src/SMESH_I/SMESH_Gen_i.hxx
+++ b/src/SMESH_I/SMESH_Gen_i.hxx
@@ -82,6 +82,12 @@ public:
                              GEOM::GEOM_Shape_ptr aShape)
     throw (SALOME::SALOME_Exception);
 
+  SMESH::SMESH_Mesh_ptr Init(GEOM::GEOM_Gen_ptr geomEngine,
+                             CORBA::Long studyId,
+                             GEOM::GEOM_Shape_ptr aShape,
+							 int meshID)
+    throw (SALOME::SALOME_Exception);
+
   CORBA::Boolean Compute(SMESH::SMESH_Mesh_ptr aMesh,
                          GEOM::GEOM_Shape_ptr aShape)
     throw (SALOME::SALOME_Exception);
@@ -96,6 +102,8 @@ public:
                                    const SMESH::shape_array& listOfSubShape)
     throw (SALOME::SALOME_Exception);
 
+	SMESH::SMESH_Mesh_ptr Import(CORBA::Long studyId, const char* fileName,
+		const char* fileType);
 
   // inherited methods from SALOMEDS::Driver
 
@@ -153,9 +161,26 @@ protected:
                                GEOM::GEOM_Shape_ptr aShape);
   
 private:
+	void loadMesh(char * name, HDFfile * hdf_file, char * meshFile,
+		SALOMEDS::Study_var study);
+	void loadHypothesis(char * name, HDFfile * hdf_file, char * hypothesisFile,
+		int studyId);
+	void loadAlgorithms(char * name, HDFfile * hdf_file, char * algorithmsFile,
+		int studyId);
+	void loadAppliedHypothesis(HDFgroup * hdfGroupMeshId, bool _found,
+		SALOMEDS::Study_var Study, SMESH::SMESH_Mesh_var myNewMesh,
+		GEOM::GEOM_Shape_var aShape);
+	GEOM::GEOM_Gen_var getGeomEngine();
+	GEOM::GEOM_Shape_var getShape(SALOMEDS::Study_var Study, char * refFromFile);
+
+void loadAppliedAlgorithms(HDFgroup * hdfGroupMeshId, 
+	bool _found, SALOMEDS::Study_var Study, SMESH::SMESH_Mesh_var myNewMesh, 
+	GEOM::GEOM_Shape_var aShape);
+void loadSubMeshes(HDFgroup * hdfGroupMeshId, char * msgname,
+	SALOMEDS::Study_var Study, SMESH::SMESH_Mesh_var myNewMesh);
+			
   SMESH_HypothesisFactory_i _hypothesisFactory_i;
   ::SMESH_Gen _impl;  // no namespace here
-  int _localId; // unique Id of created objects, within SMESH_Gen_i entity
 
   map<int, StudyContext_iStruct*> _mapStudyContext_i;
   map <string, string> _SMESHCorbaObj;