X-Git-Url: https://git.creatis.insa-lyon.fr/pubgit/?a=blobdiff_plain;f=packages%2Fvtk%2Fsrc%2FbbvtkMetaImageWriter.xml;h=21f22d72fcc6b1611ad7d0d08a8c55d423940529;hb=d19c5512748aa8e2dd5c3d01d9ec680ded1f17ce;hp=24789f33dc5aab7077885b3d0bf3f34871236516;hpb=b7dd1ccf2db9c018dabadd835739aba15f3664ba;p=bbtk.git diff --git a/packages/vtk/src/bbvtkMetaImageWriter.xml b/packages/vtk/src/bbvtkMetaImageWriter.xml index 24789f3..21f22d7 100644 --- a/packages/vtk/src/bbvtkMetaImageWriter.xml +++ b/packages/vtk/src/bbvtkMetaImageWriter.xml @@ -12,10 +12,18 @@ +
    vtkMetaImageWriter* w = vtkMetaImageWriter::New();
+
+
+//EED 2017-01-01 Migration VTK7
+#if VTK_MAJOR_VERSION <= 5
    bbGetInputIn()->Update();
+#else
+	// ...
+#endif
 
 /*
    if (bbGetInputIn() == 0)
@@ -29,18 +37,38 @@
 */
 
 
-   w->SetInput(bbGetInputIn());
-   w->SetCompression(false);  // JPR
-   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
-   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();
  
+ + +
+    bbSetInputCompression(false);
+  
+
+ +