X-Git-Url: https://git.creatis.insa-lyon.fr/pubgit/?a=blobdiff_plain;f=packages%2Fvtk%2Fsrc%2FbbvtkMetaImageWriter.xml;h=21f22d72fcc6b1611ad7d0d08a8c55d423940529;hb=08879a0d59761daa5f4540c551bf97c4919e2e0b;hp=1d278aa64f9933329df63603b5daa97f5b984c81;hpb=f4e6ec1cbeb09c4beead113bf121ab14c4cdc9ac;p=bbtk.git

diff --git a/packages/vtk/src/bbvtkMetaImageWriter.xml b/packages/vtk/src/bbvtkMetaImageWriter.xml
index 1d278aa..21f22d7 100644
--- a/packages/vtk/src/bbvtkMetaImageWriter.xml
+++ b/packages/vtk/src/bbvtkMetaImageWriter.xml
@@ -12,10 +12,18 @@
 
 <input name="Filename"  type="std::string"   nature="file name"   description="Name of the file to write"/>  
 <input name="In" type="vtkImageData*" description="Input image" />
+<input name="Compression" type="bool" description="default(false)   true/false" />
  
  <process><PRE>
    vtkMetaImageWriter* w = vtkMetaImageWriter::New();
+
+
+//EED 2017-01-01 Migration VTK7
+#if VTK_MAJOR_VERSION <= 5
    bbGetInputIn()->Update();
+#else
+	// ...
+#endif
 
 /*
    if (bbGetInputIn() == 0)
@@ -28,14 +36,39 @@
    std::cout << "=======" << spacing[0] << " " << spacing[1] << " " << spacing[2] << std::endl;
 */
 
-   w->SetInput(bbGetInputIn());
-   w->SetCompression(false);  // JPR
-   w->SetFileDimensionality(bbGetInputIn()->GetDataDimension()); // NTU
-   w->SetFileName(bbGetInputFilename().c_str());
-   w->Update(); // Fred  
-   w->Write();
+
+  if (bbGetInputIn()!=NULL)
+  {
+
+//EED 2017-01-01 Migration VTK7
+#if VTK_MAJOR_VERSION <= 5
+     w->SetInput(bbGetInputIn());
+#else
+     w->SetInputData(bbGetInputIn());
+#endif
+     w->SetCompression(bbGetInputCompression());  
+     w->SetFileDimensionality(bbGetInputIn()->GetDataDimension()); // NTU
+     std::string userGivenName = bbGetInputFilename();
+     if (userGivenName.substr(userGivenName.size()-4) != ".mhd")  //JPR
+     { 
+        userGivenName += ".mhd";
+     }
+     w->SetFileName(userGivenName.c_str());  
+     //w->SetFileName(bbGetInputFilename().c_str());  // JPR
+//EEDJuly22-2014     w->Update(); // Fred  
+     w->Write();
+   } // bbGetInputIn()!=NULL
+
    w->Delete();
  </PRE></process>
+
+ <defaultValues>
+  <PRE>
+    bbSetInputCompression(false);
+  </PRE>
+  </defaultValues>
+
+
 </blackbox>