X-Git-Url: https://git.creatis.insa-lyon.fr/pubgit/?a=blobdiff_plain;f=lib%2FmaracasVisuLib%2Fsrc%2Finterface%2FwxWindows%2Fwidgets%2FvtkMPR3DDataViewer.cxx;h=cb1dc1e54e6b971f4456fed694c69f6fe4cc45e0;hb=80b04dc9e3b981e24fe9ae0d81cdeb8af6e6f8c1;hp=242c9bd68a415e957e507a4b342621031bfd4746;hpb=3283472f764535492122c3b2ade020a749c1bd2a;p=creaMaracasVisu.git

diff --git a/lib/maracasVisuLib/src/interface/wxWindows/widgets/vtkMPR3DDataViewer.cxx b/lib/maracasVisuLib/src/interface/wxWindows/widgets/vtkMPR3DDataViewer.cxx
index 242c9bd..cb1dc1e 100644
--- a/lib/maracasVisuLib/src/interface/wxWindows/widgets/vtkMPR3DDataViewer.cxx
+++ b/lib/maracasVisuLib/src/interface/wxWindows/widgets/vtkMPR3DDataViewer.cxx
@@ -34,7 +34,6 @@ vtkMPR3DDataViewer::vtkMPR3DDataViewer()
 	_visiblePosition[2]=false;
 	_ctfun 			= NULL;
 	_vtkmprbasedata	= NULL;
-
 	_ctfun			= NULL;
 	_saggitalColors	= NULL;
 	_saggital		= NULL;
@@ -142,9 +141,18 @@ std::vector<double>*     vtkMPR3DDataViewer::GetctFunVectorBlue()
 //-------------------------------------------------------------------
 void vtkMPR3DDataViewer::SetImage()
 {
-	_saggitalColors->SetInput( _vtkmprbasedata->GetImageData() );
-	_axialColors->SetInput( _vtkmprbasedata->GetImageData() );
-	_coronalColors->SetInput( _vtkmprbasedata->GetImageData() );
+//EED 2017-01-01 Migration VTK7
+#if VTK_MAJOR_VERSION <= 5
+	_saggitalColors	->SetInput( _vtkmprbasedata->GetImageData() );
+	_axialColors	->SetInput( _vtkmprbasedata->GetImageData() );
+	_coronalColors	->SetInput( _vtkmprbasedata->GetImageData() );
+	_outlineData	->SetInput((vtkDataSet *) _vtkmprbasedata->GetImageData() );
+#else
+	_saggitalColors	->SetInputData( _vtkmprbasedata->GetImageData() );
+	_axialColors	->SetInputData( _vtkmprbasedata->GetImageData() );
+	_coronalColors	->SetInputData( _vtkmprbasedata->GetImageData() );
+	_outlineData	->SetInputData((vtkDataSet *) _vtkmprbasedata->GetImageData() );
+#endif
 }
 
 //-------------------------------------------------------------------
@@ -175,13 +183,16 @@ void vtkMPR3DDataViewer::Configure()
     _satLut->SetValueRange (1, 1);
 */
 
-
 	double range[2];
 	double delta;
-	
 	if(_vtkmprbasedata->GetImageData())
 	{
+//EED 2017-01-01 Migration VTK7
+#if VTK_MAJOR_VERSION <= 5
 		_vtkmprbasedata->GetImageData()->Update();
+#else
+		// ..
+#endif
 		_vtkmprbasedata->GetImageData()->Modified();
 		_vtkmprbasedata->GetImageData()->GetScalarRange(range);
 		delta = range[1]-range[0];
@@ -269,45 +280,64 @@ void vtkMPR3DDataViewer::Configure()
 			_saggitalColors = vtkImageMapToColors::New();
 		}
 		_saggitalColors->RemoveAllInputs();
-		_saggitalColors->SetInput( _vtkmprbasedata->GetImageData() );
-		
+
 	//    _saggitalColors->SetLookupTable(_bwLut);
-		
 		_saggitalColors->SetLookupTable(_ctfun);
+//EED 2017-01-01 Migration VTK7
+#if VTK_MAJOR_VERSION <= 5
+		_saggitalColors->SetInput( _vtkmprbasedata->GetImageData() );
+#else
+		_saggitalColors->SetInputData( _vtkmprbasedata->GetImageData() );
+		_saggitalColors->Update();
+#endif
+		
 		
-
 		if(_saggital==NULL)
 		{
 			_saggital = vtkImageActor::New();
+//EED 2017-01-01 Migration VTK7
+#if VTK_MAJOR_VERSION <= 5
 			_saggital->SetInput(_saggitalColors->GetOutput());
+#else
+			_saggital->SetInputData(_saggitalColors->GetOutput());
+#endif
 		}	
 		//_saggitalColors->Update();
 	
-
-
 	// Create the second (axial) plane of the three planes. We use the
 	// same approach as before except that the extent differs.
 
-		
 		if(_axialColors==NULL)
 		{
 			_axialColors = vtkImageMapToColors::New();
 		}
-
 		_axialColors->RemoveAllInputs();
-		_axialColors->SetInput( _vtkmprbasedata->GetImageData() );
 	//    _axialColors->SetLookupTable(_hueLut);
 		_axialColors->SetLookupTable(_ctfun);
 
+		
+//EED 2017-01-01 Migration VTK7
+#if VTK_MAJOR_VERSION <= 5
+		_axialColors->SetInput( _vtkmprbasedata->GetImageData() );
+#else
+		_axialColors->SetInputData( _vtkmprbasedata->GetImageData() );
+		_axialColors->Update();
+#endif
+
 		if(_axial==NULL)
 		{
 			_axial = vtkImageActor::New();
+
+//EED 2017-01-01 Migration VTK7
+#if VTK_MAJOR_VERSION <= 5
 			_axial->SetInput(_axialColors->GetOutput());
+#else
+			_axial->SetInputData(_axialColors->GetOutput());
+#endif
+
 		}
 		
 		//_axialColors->Update();
-	
-
 		// Create the third (coronal) plane of the three planes. We use 
 	// the same approach as before except that the extent differs.
 		if(_coronalColors==NULL)
@@ -315,34 +345,61 @@ void vtkMPR3DDataViewer::Configure()
 			_coronalColors = vtkImageMapToColors::New();
 		}
 		_coronalColors->RemoveAllInputs();
-		_coronalColors->SetInput( _vtkmprbasedata->GetImageData() );
 	//    _coronalColors->SetLookupTable(_satLut);
 		_coronalColors->SetLookupTable(_ctfun);
 
+		
+//EED 2017-01-01 Migration VTK7
+#if VTK_MAJOR_VERSION <= 5
+		_coronalColors->SetInput( _vtkmprbasedata->GetImageData() );
+#else
+		_coronalColors->SetInputData( _vtkmprbasedata->GetImageData() );
+		_coronalColors->Update();
+#endif
+
+
 		if(_coronal==NULL)
 		{
 			_coronal = vtkImageActor::New();
+
+//EED 2017-01-01 Migration VTK7
+#if VTK_MAJOR_VERSION <= 5
 			_coronal->SetInput(_coronalColors->GetOutput());
-		}
-		
-	
+#else
+			_coronal->SetInputData(_coronalColors->GetOutput());
+#endif
 
+		} // if _coronal
+		
 	// An outline provides context around the data.
 	//
 		if(_outlineData==NULL)
 		{
 			_outlineData = vtkOutlineFilter::New();
-		}
+		} // if _outlineData
 		_outlineData->RemoveAllInputs();
 		if(_vtkmprbasedata->GetImageData())
 		{
+//EED 2017-01-01 Migration VTK7
+#if VTK_MAJOR_VERSION <= 5
 			_outlineData->SetInput((vtkDataSet *) _vtkmprbasedata->GetImageData() );
-		}
+#else
+			_outlineData->SetInputData((vtkDataSet *) _vtkmprbasedata->GetImageData() );
+			_outlineData->Update();    
+#endif
+		} // if _image
 
 		if(_mapOutline==NULL)
 		{
 			_mapOutline = vtkPolyDataMapper::New();
+
+//EED 2017-01-01 Migration VTK7
+#if VTK_MAJOR_VERSION <= 5
 			_mapOutline->SetInput(_outlineData->GetOutput());
+#else
+			_mapOutline->SetInputData(_outlineData->GetOutput());
+#endif
+
 		}
 		_mapOutline->Update();    
 		//_mapOutline->RemoveAllInputs();
@@ -354,7 +411,6 @@ void vtkMPR3DDataViewer::Configure()
 			_outline->GetProperty()->SetColor(0,0,0);
 		}
 	}
-	
 	//int ext[6];
 	//_vtkmprbasedata->GetImageData()->GetExtent(ext);
 }