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

diff --git a/packages/vtk/src/bbvtkMetaImageWriter.xml b/packages/vtk/src/bbvtkMetaImageWriter.xml
index 2d60bd1..21f22d7 100644
--- a/packages/vtk/src/bbvtkMetaImageWriter.xml
+++ b/packages/vtk/src/bbvtkMetaImageWriter.xml
@@ -1,36 +1,74 @@
 <?xml version="1.0" encoding="iso-8859-1"?>
 
-<blackbox name="MetaImageWriter">
+<blackbox name="MetaImageWriter" type="VTK_ImageAlgorithm">
 
 <author>laurent.guigues at creatis.insa-lyon.fr</author>
 <description><PRE>Writes .mhd / .mhd image formats (bbfication of vtkMetaImageWriter)</PRE></description>
 <category>image;read/write</category>
 
 <include>vtkMetaImageWriter.h</include> 
-<include>vtkImageData.h</include> 
+<include>vtkImageData.h</include>
+<vtkobject>vtkMetaImageWriter</vtkobject> 
 
-<input  name="Filename"  type="std::string"   nature="file name"   description="Name of the file to write"/>  
+<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();
-std::cout << "a"<<std::endl;
-//vtkImageData* in = vtkImageData::New();
-//  in->ShallowCopy(bbGetInputIn());
-bbGetInputIn()->Update();
-   w->SetInput(bbGetInputIn());
-   w->SetCompression(false);  // JPR
-   w->SetFileName(bbGetInputFilename().c_str());
-
-bbGetInputIn()->Print(std::cout);
-std::cout << "a '"<< bbGetInputFilename()<<"'"<<std::endl;
-   w->Update();
-   w->Write();
-std::cout << "a"<<std::endl;
+
+
+//EED 2017-01-01 Migration VTK7
+#if VTK_MAJOR_VERSION <= 5
+   bbGetInputIn()->Update();
+#else
+	// ...
+#endif
+
+/*
+   if (bbGetInputIn() == 0)
+      std::cout << "======================= Katastrophe : bbGetInputIn() == 0 " << std::endl;
+   else
+      std::cout << "======================= OK : bbGetInputIn() not NULL " << std::endl;
+
+   bbGetInputIn()->PrintSelf(std::cout, vtkIndent(1));
+   bbGetInputIn()->GetSpacing(spacing);
+   std::cout << "=======" << spacing[0] << " " << spacing[1] << " " << spacing[2] << std::endl;
+*/
+
+
+  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();
-std::cout << "a"<<std::endl;
  </PRE></process>
 
+ <defaultValues>
+  <PRE>
+    bbSetInputCompression(false);
+  </PRE>
+  </defaultValues>
+
+
 </blackbox>