X-Git-Url: https://git.creatis.insa-lyon.fr/pubgit/?a=blobdiff_plain;f=lib%2FcreaVtk%2FcreaVtkStreamLine.cpp;fp=lib%2FcreaVtk%2FcreaVtkStreamLine.cpp;h=45ae170df5442f1e03fee6c8b94a1ea882e49378;hb=ef9f90810fcc3800acac54a104f14ff505135fd3;hp=51685afb696fcdfeda105521262d2f2cfc910009;hpb=175699379042403d48be1c75d24a6aa9308eb2c1;p=creaVtk.git

diff --git a/lib/creaVtk/creaVtkStreamLine.cpp b/lib/creaVtk/creaVtkStreamLine.cpp
index 51685af..45ae170 100644
--- a/lib/creaVtk/creaVtkStreamLine.cpp
+++ b/lib/creaVtk/creaVtkStreamLine.cpp
@@ -108,27 +108,53 @@ void creaVtkStreamLine::Process()
 
 			if (GetTypeForm()==0) 
 			{
+//EED 2017-01-01 Migration VTK7
+#if VTK_MAJOR_VERSION <= 5
 				_tubefilter->SetInput( _polydata );
+#else
+				_tubefilter->SetInputData( _polydata );
+#endif
 				_tubefilter->SetRadius( GetScaleFactor() );	
 				_tubefilter->SetNumberOfSides(12);
 				_tubefilter->SetVaryRadiusToVaryRadiusOff();		
 				_tubefilter->Modified();
 				_tubefilter->Update();
+//EED 2017-01-01 Migration VTK7
+#if VTK_MAJOR_VERSION <= 5
 				_streamMapper2->SetInput( _tubefilter->GetOutput() );
+#else
+				_streamMapper2->SetInputData( _tubefilter->GetOutput() );
+#endif
 			} 
 			if (GetTypeForm()==1) 
 			{
+//EED 2017-01-01 Migration VTK7
+#if VTK_MAJOR_VERSION <= 5
 				_ribbonfilter->SetInput( _polydata );
+#else
+				_ribbonfilter->SetInputData( _polydata );
+#endif
 				_ribbonfilter->SetWidth( GetScaleFactor() );	
 				_ribbonfilter->SetWidthFactor( GetScaleFactor()*10 );
 				_ribbonfilter->GlobalWarningDisplayOff ();  //EED this is to avoid the "BEVEL WARNING"
 				_ribbonfilter->Modified();
 				_ribbonfilter->Update();
+
+//EED 2017-01-01 Migration VTK7
+#if VTK_MAJOR_VERSION <= 5
 				_streamMapper2->SetInput( _ribbonfilter->GetOutput() );
+#else
+				_streamMapper2->SetInputData( _ribbonfilter->GetOutput() );
+#endif
 			}			
 			if (GetTypeForm()==2) 
 			{
+//EED 2017-01-01 Migration VTK7
+#if VTK_MAJOR_VERSION <= 5
 				_streamMapper2->SetInput( _polydata );
+#else
+				_streamMapper2->SetInputData( _polydata );
+#endif
 			}			
 //EED			_streamMapper2->SetLookupTable(vGreenToRedLut);