X-Git-Url: https://git.creatis.insa-lyon.fr/pubgit/?a=blobdiff_plain;f=bbtk_creaVtk_PKG%2Fsrc%2FbbcreaVtkScreenShot.cxx;h=cac537a890fc80e414117082108fadab39dc85ad;hb=464deff51f697881cd76b3cfb934859cd7c31df7;hp=35a5998a0f05ec31e1987ada7cd368b4336bc4f8;hpb=3d95096f97588894dd9a5ffbb8b2c8e6c111cd29;p=creaVtk.git

diff --git a/bbtk_creaVtk_PKG/src/bbcreaVtkScreenShot.cxx b/bbtk_creaVtk_PKG/src/bbcreaVtkScreenShot.cxx
index 35a5998..cac537a 100644
--- a/bbtk_creaVtk_PKG/src/bbcreaVtkScreenShot.cxx
+++ b/bbtk_creaVtk_PKG/src/bbcreaVtkScreenShot.cxx
@@ -37,17 +37,29 @@ void ScreenShot::Process()
 //    bbSetOutputOut( bbGetInputIn() );
 //    std::cout << "Output value = " <<bbGetOutputOut() << std::endl;
   
-      vtkWindowToImageFilter *wif = vtkWindowToImageFilter::New();
+      	vtkWindowToImageFilter *wif = vtkWindowToImageFilter::New();
+		if (bbGetInputSize().size()==2) 
+		{
+			bbGetInputvtkRenderer()->GetVTKWindow()->SetSize( bbGetInputSize()[0], bbGetInputSize()[1] );
+		}
       	wif->SetInput( bbGetInputvtkRenderer()->GetVTKWindow() );
-      	wif->SetMagnification( bbGetInputScale()[0] );
-//      	wif->SetScale( bbGetInputScale()[0], bbGetInputScale()[1] );
+//      	wif->SetMagnification( bbGetInputScale()[0] );
+      	wif->SetScale( bbGetInputScale()[0], bbGetInputScale()[1] );
       	wif->SetInputBufferTypeToRGB();
       	wif->ReadFrontBufferOff();
       	wif->Update();
-      vtkPNGWriter *writer = vtkPNGWriter::New();
-	writer->SetFileName( bbGetInputFileName().c_str() );
-	writer->SetInput(wif->GetOutput());
-	writer->Write();	
+      	vtkPNGWriter *writer = vtkPNGWriter::New();
+		writer->SetFileName( bbGetInputFileName().c_str() );
+
+//EED 2017-01-01 Migration VTK7
+#if VTK_MAJOR_VERSION <= 5
+		writer->SetInput( wif->GetOutput() );
+#else
+		writer->SetInputData( wif->GetOutput() );
+#endif
+
+
+		writer->Write();	
 
 /*
 	vtkFFMPEGWriter *writer2 = vtkFFMPEGWriter::New();