Update to match the changes in SMDS

[modules/smesh.git] / src / DriverMED / DriverMED_W_SMESHDS_Document.cxx

diff --git a/src/DriverMED/DriverMED_W_SMESHDS_Document.cxx b/src/DriverMED/DriverMED_W_SMESHDS_Document.cxx
index be8b84a2b7a199b8d97279952eed12421945c408..e04bac2185397f93ac069be6a2a077d1abde28cb 100644 (file)
--- a/src/DriverMED/DriverMED_W_SMESHDS_Document.cxx
+++ b/src/DriverMED/DriverMED_W_SMESHDS_Document.cxx
@@ -31,19 +31,22 @@ using namespace std;
 
 #include <stdio.h>
 
-extern "C" 
+extern "C"
 {
-  Document_Writer* Wmaker() {
-    return new DriverMED_W_SMESHDS_Document;
-  }
+       Document_Writer *Wmaker()
+       {
+               return new DriverMED_W_SMESHDS_Document;
+       }
 }
 
-DriverMED_W_SMESHDS_Document::DriverMED_W_SMESHDS_Document() {
-;
+DriverMED_W_SMESHDS_Document::DriverMED_W_SMESHDS_Document()
+{
+       ;
 }
 
-DriverMED_W_SMESHDS_Document::~DriverMED_W_SMESHDS_Document() {
-;
+DriverMED_W_SMESHDS_Document::~DriverMED_W_SMESHDS_Document()
+{
+       ;
 }
 
 //void DriverMED_W_SMESHDS_Document::SetFile(string aFile) {
@@ -54,47 +57,47 @@ DriverMED_W_SMESHDS_Document::~DriverMED_W_SMESHDS_Document() {
 //myDocument = aDocument;
 //}
 
-void DriverMED_W_SMESHDS_Document::Write() {
+void DriverMED_W_SMESHDS_Document::Write()
+{
 
-  med_err ret = 0;
-  med_idt fid;
-  med_int nmaa,numero,nb_of_meshes;
-  med_mode_switch mode_coo;
-  med_connectivite typ_con;
+       med_err ret = 0;
+       med_idt fid;
+       med_int nmaa, numero, nb_of_meshes;
+       med_mode_switch mode_coo;
+       med_connectivite typ_con;
 
-  SCRUTE(myFile);
-  Handle(SMESHDS_Mesh) myMesh;
+       SCRUTE(myFile);
+       SMESHDS_Mesh * myMesh;
 
   /******** Nombre de maillages ********/
-  nb_of_meshes = myDocument->NbMeshes(); //voir avec Yves
-  MESSAGE("nb_of_meshes = "<<nb_of_meshes<<"\n");
-  SCRUTE(nb_of_meshes);
-  //nb_of_meshes = 1;
-  numero = 0;
-
-  string myClass = string("SMESHDS_Mesh");
-  string myExtension = string("MED");
-
-  //while (numero<nb_of_meshes) {
-  //numero++;
-  //myMesh = myDocument->GetMesh(numero);
-
-  myDocument->InitMeshesIterator();
-  if (nb_of_meshes!=0)
-  for (;myDocument->MoreMesh();myDocument->NextMesh()) {
-    numero++;
-    myMesh = myDocument->CurrentMesh();
-
-    DriverMED_W_SMESHDS_Mesh* myWriter = new DriverMED_W_SMESHDS_Mesh;
-
-    myWriter->SetMesh(myMesh);
-    myWriter->SetFile(myFile);
-    //myWriter->SetFileId(fid);
-    myWriter->SetMeshId(numero);
-
-    //myWriter->Write();
-    myWriter->Add();
-  }
-
-
+       nb_of_meshes = myDocument->NbMeshes();  //voir avec Yves
+       MESSAGE("nb_of_meshes = " << nb_of_meshes << "\n");
+       SCRUTE(nb_of_meshes);
+       //nb_of_meshes = 1;
+       numero = 0;
+
+       string myClass = string("SMESHDS_Mesh");
+       string myExtension = string("MED");
+
+       //while (numero<nb_of_meshes) {
+       //numero++;
+       //myMesh = myDocument->GetMesh(numero);
+
+       myDocument->InitMeshesIterator();
+       if (nb_of_meshes != 0)
+               while(myDocument->MoreMesh())
+               {
+                       numero++;
+                       myMesh = myDocument->NextMesh();
+
+                       DriverMED_W_SMESHDS_Mesh *myWriter = new DriverMED_W_SMESHDS_Mesh;
+
+                       myWriter->SetMesh(myMesh);
+                       myWriter->SetFile(myFile);
+                       //myWriter->SetFileId(fid);
+                       myWriter->SetMeshId(numero);
+
+                       //myWriter->Write();
+                       myWriter->Add();
+               }
 }