X-Git-Url: https://git.creatis.insa-lyon.fr/pubgit/?a=blobdiff_plain;f=lib%2FmaracasVisuLib%2Fsrc%2Finterface%2FwxWindows%2Fwidgets%2FvtkClipping3DDataViewer.cxx;h=1e723a13e09b5973e0d1cbf9aa096a721d2c89ac;hb=ba3bf1e05af2b03d6b013606b9d885d8fb0b2cb4;hp=335af08b1429898e41ed6ae1a151dc76840cee95;hpb=cf42d2bd2f87434922bf9f6f3f520b3f8ad2ba64;p=creaMaracasVisu.git

diff --git a/lib/maracasVisuLib/src/interface/wxWindows/widgets/vtkClipping3DDataViewer.cxx b/lib/maracasVisuLib/src/interface/wxWindows/widgets/vtkClipping3DDataViewer.cxx
index 335af08..1e723a1 100644
--- a/lib/maracasVisuLib/src/interface/wxWindows/widgets/vtkClipping3DDataViewer.cxx
+++ b/lib/maracasVisuLib/src/interface/wxWindows/widgets/vtkClipping3DDataViewer.cxx
@@ -201,46 +201,88 @@ void vtkClipping3DDataViewer::SetVisibleVolumeBox(bool visibleBox)
 	_visibleVolumeBox = visibleBox;
 }
 
+
 //-------------------------------------------------------------------
-void vtkClipping3DDataViewer::Configure_Tissue()
+void vtkClipping3DDataViewer::SetImage()
 {
+	int i;
+	vtkImageData *imagedata=_vtkmprbasedata->GetImageData();
+	for (i=0; i< VTKMPRDATA_MAXTISSUE ; i++)
+	{
+//EED 2017-01-01 Migration VTK7
+#if VTK_MAJOR_VERSION <= 5
+		_mCubes[i]->SetInput( imagedata );
+#else
+		_mCubes[i]->SetInputData( imagedata );
+#endif
+	} // for
+//EED 2017-01-01 Migration VTK7
+#if VTK_MAJOR_VERSION <= 5
+	_volumeMapper->SetInput( imagedata );
+#else
+	_volumeMapper->SetInputData( imagedata );
+#endif
+	_volumerendererdata->SetImageData( imagedata );
+}
 
-	double range[2];
+//-------------------------------------------------------------------
+void vtkClipping3DDataViewer::Configure_Tissue()
+{
 	int i;
-	for (i=0; i< VTKMPRDATA_MAXTISSUE ; i++){
+	double range[2];
+	vtkImageData *imagedata=_vtkmprbasedata->GetImageData();
+	imagedata->GetScalarRange( range );
+	for (i=0; i< VTKMPRDATA_MAXTISSUE ; i++)
+	{
 		// Visualisation - original volume
-		vtkImageData *imagedata=_vtkmprbasedata->GetImageData();
-		imagedata->GetScalarRange( range );
 		_mCubes[i] = vtkMarchingCubes::New( );
+
+//EED 2017-01-01 Migration VTK7
+#if VTK_MAJOR_VERSION <= 5
 		_mCubes[i]->SetInput( imagedata );
+#else
+		_mCubes[i]->SetInputData( imagedata );
+#endif
 
 		_mCubes[i]->SetValue( 0, range[1]*(4+i) / 8 );
 //		_mCubes[i]->SetValue( 0, 1500 );
-
 	    _tissueStripper[i] = vtkStripper::New();
-	    _tissueStripper[i]->SetInput( _mCubes[i]->GetOutput( ) );
-
 
+//EED 2017-01-01 Migration VTK7
+#if VTK_MAJOR_VERSION <= 5
+	    _tissueStripper[i]->SetInput( _mCubes[i]->GetOutput( ) );
+#else
+	    _tissueStripper[i]->SetInputData( _mCubes[i]->GetOutput( ) );
+#endif
 
 		_tissuePlanes[i]  = vtkPlanes::New();
-
 		int x1,x2,y1,y2,z1,z2;
 		imagedata->GetExtent(x1,x2,y1,y2,z1,z2);
 		_tissuePlanes[i]->SetBounds  (x1,x2,y1,y2,z1,z2);
-
 		_tissueClipper[i] = vtkClipPolyData::New();
+
+//EED 2017-01-01 Migration VTK7
+#if VTK_MAJOR_VERSION <= 5
 		_tissueClipper[i]->SetInput( _tissueStripper[i]->GetOutput() );
+#else
+		_tissueClipper[i]->SetInputData( _tissueStripper[i]->GetOutput() );
+#endif
+
 		_tissueClipper[i]->SetClipFunction( _tissuePlanes[i] );
 		_tissueClipper[i]->InsideOutOn( );
-
 		_tissueMapper[i] = vtkPolyDataMapper::New( );
-		_tissueMapper[i]->SetInput( _tissueClipper[i]->GetOutput() );
-		_tissueMapper[i]->ScalarVisibilityOff( );
-//		_tissueMapper[i]->Update();
 
-	}
+//EED 2017-01-01 Migration VTK7
+#if VTK_MAJOR_VERSION <= 5
+		_tissueMapper[i]->SetInput( _tissueClipper[i]->GetOutput() );
+#else
+		_tissueMapper[i]->SetInputData( _tissueClipper[i]->GetOutput() );
+#endif
 
 
+		_tissueMapper[i]->ScalarVisibilityOff( );
+//		_tissueMapper[i]->Update();
+	} // for i  
 
 	// vtkActor tissue
 	for (i=0; i< VTKMPRDATA_MAXTISSUE ; i++){
@@ -348,7 +390,15 @@ void vtkClipping3DDataViewer::Configure_Volume()
 	// EED 13/03/2011
 
  // _volumeMapper = vtkVolumeRayCastMapper::New();
+
+
+//EED 2017-01-01 Migration VTK7
+#if VTK_MAJOR_VERSION <= 5
 	_volumeMapper->SetInput( this->GetVtkMPRBaseData()->GetImageData() );
+#else
+	_volumeMapper->SetInputData( this->GetVtkMPRBaseData()->GetImageData() );
+#endif
+
 
     _volumeMapper->SetVolumeRayCastFunction(_compositeFunction);
 
@@ -384,6 +434,7 @@ void vtkClipping3DDataViewer::Configure_Volume()
 	_observerV->SetvtkVolumeRayCastMapper( _volumeMapper );
 }
 
+//-----------------------------------------------------------------------------
 
 void vtkClipping3DDataViewer::Configure_VolumeBox()
 {
@@ -401,12 +452,15 @@ void vtkClipping3DDataViewer::Configure_VolumeBox()
        //_volumerendererdata->BoundingBoxChanged(event.IsChecked() );
 }
 
+//-----------------------------------------------------------------------------
+
 void vtkClipping3DDataViewer::SetRenderer(vtkRenderer* renderer)
 {
     _volumerendererdata->SetRenderer(renderer);
 
 }
 
+//-----------------------------------------------------------------------------
 void vtkClipping3DDataViewer::SetInteractor(vtkRenderWindowInteractor* interactor)
 {
 
@@ -414,6 +468,7 @@ void vtkClipping3DDataViewer::SetInteractor(vtkRenderWindowInteractor* interacto
 }
 
 
+//-----------------------------------------------------------------------------
 void vtkClipping3DDataViewer::BoxActorChanged(bool changed)
 {
     vector<double> *gv = this->GetGreyValuesTransferenceFVector();
@@ -425,6 +480,7 @@ void vtkClipping3DDataViewer::BoxActorChanged(bool changed)
 
 }
 
+//-----------------------------------------------------------------------------
 void vtkClipping3DDataViewer::UpdateVolumeBox(vector<double> gf, vector<double> vf, vtkColorTransferFunction* ctfun)
 {
         _volumerendererdata->SetLookUpTable((vtkLookupTable*)(ctfun));
@@ -432,6 +488,7 @@ void vtkClipping3DDataViewer::UpdateVolumeBox(vector<double> gf, vector<double>
 }
 
 
+//-----------------------------------------------------------------------------
 void vtkClipping3DDataViewer::updateVolume()
 {
 
@@ -475,13 +532,20 @@ void vtkClipping3DDataViewer::Configure()
   // An outline provides context around the data.
   //
 	_outlineData 	= vtkOutlineFilter::New();
+
+//EED 2017-01-01 Migration VTK7
+#if VTK_MAJOR_VERSION <= 5
     _outlineData->SetInput((vtkDataSet *) _vtkmprbasedata->GetImageData() );
+#else
+    _outlineData->SetInputData((vtkDataSet *) _vtkmprbasedata->GetImageData() );
+#endif
+
 	_mapOutline 	= vtkPolyDataMapper::New();
 
 //EED 4 nov 2015 Estelle 
 //    _mapOutline->SetInput(_outlineData->GetOutput());
 
-	_outline 		= vtkActor::New();
+	_outline 	= vtkActor::New();
     _outline->SetMapper(_mapOutline);
     _outline->GetProperty()->SetColor(0,0,0);
 }
@@ -762,7 +826,14 @@ void vtkClipping3DDataViewer::ReadMeshVTK(char *namefile)
 	vtkDataSetReader *reader = vtkDataSetReader::New();
 	reader->SetFileName(namefile);
 	reader->Update();
+
+//EED 2017-01-01 Migration VTK7
+#if VTK_MAJOR_VERSION <= 5
 	_tissueStripper[3]->SetInput( reader->GetPolyDataOutput()  );
+#else
+	_tissueStripper[3]->SetInputData( reader->GetPolyDataOutput()  );
+#endif
+
 }
 
 void vtkClipping3DDataViewer::setColorTransferFunction(vtkColorTransferFunction* colortable){