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

diff --git a/lib/creaVtk/creaVtkStreamLine.cpp b/lib/creaVtk/creaVtkStreamLine.cpp
index fedfcb6..45ae170 100644
--- a/lib/creaVtk/creaVtkStreamLine.cpp
+++ b/lib/creaVtk/creaVtkStreamLine.cpp
@@ -58,7 +58,6 @@ void creaVtkStreamLine::SetPolyData( vtkPolyData* polydata)
 //---------------------------------------------
 void creaVtkStreamLine::Process()
 {
-	printf("EED creaVtkStreamLine::Process Start \n");
 
 	if (_polydata!=NULL)
 	{
@@ -106,36 +105,57 @@ void creaVtkStreamLine::Process()
 
 			_polydata->Modified();
 
-	printf("EED creaVtkStreamLine::Process 0 %p \n", _polydata);
 
 			if (GetTypeForm()==0) 
 			{
-	printf("EED creaVtkStreamLine::Process 1 \n");
+//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) 
 			{
-	printf("EED creaVtkStreamLine::Process 2 \n");
+//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) 
 			{
-	printf("EED creaVtkStreamLine::Process 3 \n");
+//EED 2017-01-01 Migration VTK7
+#if VTK_MAJOR_VERSION <= 5
 				_streamMapper2->SetInput( _polydata );
+#else
+				_streamMapper2->SetInputData( _polydata );
+#endif
 			}			
-	printf("EED creaVtkStreamLine::Process 4 \n");
 //EED			_streamMapper2->SetLookupTable(vGreenToRedLut);
 
 /*			
@@ -147,27 +167,19 @@ for (int ivelocity=0; ivelocity<=4000; ivelocity++ )
 }
 _polydata->GetPointData()->AddArray(_velocity);
 */
-			printf("EED creaVtkStreamLine::Process A \n" );
-
-			vtkPointData 	*data	= _polydata->GetPointData();
 
-printf("EED -------------------------------------------\n");
-			_polydata->Print(std::cout);
-printf("EED -------------------------------------------\n");
-			data->Print(std::cout);
-printf("EED -------------------------------------------\n");
 
 //			vtkFieldData 	*data	= _polydata->GetFieldData();
 //			vtkDataArray	*da		= pointdata->GetArray("Normals");
 			
-			int i,sizeDa = data->GetNumberOfArrays();
-			printf("EED creaVtkStreamLine::Process  sizeDa %d \n", sizeDa );
-			for (i=0;i<sizeDa;i++)
-			{
-				printf("EED creaVtkStreamLine::Process-name %d, %s \n", i, data->GetArrayName(i) );
-				data->GetArray(i)->Print(std::cout);
-printf("EED -------------------------------------------\n");
-			}
+//			vtkPointData 	*data	= _polydata->GetPointData();
+//			int i,sizeDa = data->GetNumberOfArrays();
+//			printf("EED creaVtkStreamLine::Process  sizeDa %d \n", sizeDa );
+//			for (i=0;i<sizeDa;i++)
+//			{
+//				printf("EED creaVtkStreamLine::Process-name %d, %s \n", i, data->GetArrayName(i) );
+//				data->GetArray(i)->Print(std::cout);
+//			}
 
 
 
@@ -252,7 +264,6 @@ printf("EED -------------------------------------------\n");
 	VisibilityActor(); 
    } // polydata
 
-	printf("EED creaVtkStreamLine::Process End \n");
 
 }