X-Git-Url: https://git.creatis.insa-lyon.fr/pubgit/?a=blobdiff_plain;ds=sidebyside;f=lib%2FmaracasVisuLib%2Fsrc%2Finterface%2FwxWindows%2Fwidgets%2FvtkClipping3DDataViewer.cxx;h=bca71dd8c8e0231095c189490429b3ee9777c22e;hb=547be998e10b62d3b548146513607c227a9829cd;hp=68f8c2b75f5fa08e0e83ec3a3cbc1ccd4155f3f9;hpb=70a5e2bac1fe33d240ff5632d65a915269ff69e3;p=creaMaracasVisu.git

diff --git a/lib/maracasVisuLib/src/interface/wxWindows/widgets/vtkClipping3DDataViewer.cxx b/lib/maracasVisuLib/src/interface/wxWindows/widgets/vtkClipping3DDataViewer.cxx
index 68f8c2b..bca71dd 100644
--- a/lib/maracasVisuLib/src/interface/wxWindows/widgets/vtkClipping3DDataViewer.cxx
+++ b/lib/maracasVisuLib/src/interface/wxWindows/widgets/vtkClipping3DDataViewer.cxx
@@ -42,11 +42,17 @@ vtkClipping3DDataViewer::vtkClipping3DDataViewer()
 	_shade						= false;
 
     _volumerendererdata 	= VolumeRendererData::New();
+
+#if (VTK_MAJOR_VERSION <= 7) 
     _volumeMapper 			= vtkVolumeRayCastMapper::New();
+    _compositeFunction 		= vtkVolumeRayCastCompositeFunction::New();
+	_compositeFunctionMIP 	= vtkVolumeRayCastMIPFunction::New();
+#else 
+    _volumeMapper 			= vtkFixedPointVolumeRayCastMapper::New();
+#endif
+
     _newvol 				= vtkVolume::New();
     _volumeProperty 		= vtkVolumeProperty::New();
-    _compositeFunction 		= vtkVolumeRayCastCompositeFunction::New();
-	 _compositeFunctionMIP 	= vtkVolumeRayCastMIPFunction::New();
 
 }
 //-------------------------------------------------------------------
@@ -64,7 +70,11 @@ vtkClipping3DDataViewer::~vtkClipping3DDataViewer()
 	// Volume
 	_tfun->Delete();
 	_ctfun->Delete();
+#if (VTK_MAJOR_VERSION <= 7) 
 	_compositeFunction->Delete();
+#else 
+	// ..
+#endif
 	_volumeMapper->Delete();
 	_volumeProperty->Delete();
 	_newvol->Delete();
@@ -252,7 +262,7 @@ void vtkClipping3DDataViewer::Configure_Tissue()
 		_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);
+		_tissuePlanes[i]->SetBounds(x1,x2,y1,y2,z1,z2);
 		_tissueClipper[i] = vtkClipPolyData::New();
 		_tissueClipper[i]->SetClipFunction( _tissuePlanes[i] );
 		_tissueClipper[i]->InsideOutOn( );
@@ -262,8 +272,6 @@ void vtkClipping3DDataViewer::Configure_Tissue()
 		_tissueClipper[i]->SetInput( _tissueStripper[i]->GetOutput() );
 #else
 		_tissueClipper[i]->SetInputData( _tissueStripper[i]->GetOutput() );
-		printf("EED vtkClipping3DDataViewer::Configure_Tissue Update\n");
-		_tissueClipper[i]->Update();
 #endif
 
 		_tissueMapper[i] = vtkPolyDataMapper::New( );
@@ -272,6 +280,9 @@ void vtkClipping3DDataViewer::Configure_Tissue()
 #if VTK_MAJOR_VERSION <= 5
 		_tissueMapper[i]->SetInput( _tissueClipper[i]->GetOutput() );
 #else
+		_mCubes[i]->Update();
+		_tissueStripper[i]->Update();
+		_tissueClipper[i]->Update();
 		_tissueMapper[i]->SetInputData( _tissueClipper[i]->GetOutput() );
 		_tissueMapper[i]->Update();
 #endif
@@ -291,19 +302,19 @@ void vtkClipping3DDataViewer::Configure_Tissue()
 		_tissue[i]->GetProperty()->SetSpecular(.3);
 		_tissue[i]->GetProperty()->SetSpecularPower(20);
 		_tissue[i]->GetProperty()->SetOpacity(0.5);
-		if (i==0) _tissue[i]->GetProperty()->SetColor(0.85, 0.85   , 0.85   );
-		if (i==1) _tissue[i]->GetProperty()->SetColor(0, 0  ,  1  );
-		if (i==2) _tissue[i]->GetProperty()->SetColor(0.85, 0.20   , 0.20   );
-		if (i==3) _tissue[i]->GetProperty()->SetColor(0, 1   , 0   );
-	}
+		if (i==0) { _tissue[i]->GetProperty()->SetColor(0.85, 0.85   , 0.85   ); 	}
+		if (i==1) { _tissue[i]->GetProperty()->SetColor(0, 0  ,  1  ); 				}
+		if (i==2) { _tissue[i]->GetProperty()->SetColor(0.85, 0.20   , 0.20   );	}
+		if (i==3) { _tissue[i]->GetProperty()->SetColor(0, 1   , 0   );				}
+	} // for
 
   	for (i=0; i< VTKMPRDATA_MAXTISSUE ; i++)
 	{
 		_observerS[i] = boxSurfaceObserver::New();
 		_observerS[i]->SetPlanes( GetTissuePlanes(i) );
 		_observerS[i]->SetActor( _tissue[i] );
-	}
-
+		_observerS[i]->SetFilters( _mCubes[i], _tissueStripper[i] ,_tissueClipper[i] );
+	} // for
 }
 
 //-----------------------------------------------------------------------------
@@ -397,9 +408,12 @@ void vtkClipping3DDataViewer::Configure_Volume()
 #endif
 
 
+#if (VTK_MAJOR_VERSION <= 7) 
     _volumeMapper->SetVolumeRayCastFunction(_compositeFunction);
-
-   // _volumeMapper->SetVolumeRayCastFunction(_compositeFunctionMIP);
+	// _volumeMapper->SetVolumeRayCastFunction(_compositeFunctionMIP);
+#else 
+	// ..
+#endif
 	
 //
 	_volumeMapper->SetClippingPlanes( _volumePlanes );
@@ -428,7 +442,12 @@ void vtkClipping3DDataViewer::Configure_Volume()
     _observerV = boxSurfaceObserver::New();
 	_observerV->SetPlanes( _volumePlanes );
 	_observerV->SetActor( _newvol );
+	
+#if (VTK_MAJOR_VERSION <= 7) 
 	_observerV->SetvtkVolumeRayCastMapper( _volumeMapper );
+#else 
+	_observerV->SetvtkFixedPointVolumeRayCastMapper( _volumeMapper );
+#endif
 }
 
 //-----------------------------------------------------------------------------
@@ -489,16 +508,20 @@ void vtkClipping3DDataViewer::UpdateVolumeBox(vector<double> gf, vector<double>
 void vtkClipping3DDataViewer::updateVolume()
 {
 
+#if (VTK_MAJOR_VERSION <= 7) 
     if(_isRayCasting)
     {
         _volumeMapper->SetVolumeRayCastFunction(_compositeFunction);
         _volumerendererdata->changeCompositeMIPFunction(0);
-    }
-    else if(_isMIP)
-    {
+    }    else if(_isMIP) {
         _volumeMapper->SetVolumeRayCastFunction(_compositeFunctionMIP);
         _volumerendererdata->changeCompositeMIPFunction(1);
     }
+#else 
+	// ...   here Composition of MIP
+	printf("EED vtkClipping3DDataViewer::updateVolume ...   here Composition or MIP \n");
+#endif
+
 
     if(_interpolation)
     {
@@ -533,6 +556,14 @@ void vtkClipping3DDataViewer::Configure()
 void vtkClipping3DDataViewer::SetIsovalue(int idTissue, int isoValue)
 {
 	_mCubes[idTissue]->SetValue(0, isoValue);
+//EED 2017-01-01 Migration VTK7
+#if VTK_MAJOR_VERSION <= 5
+	// ..
+#else
+	_mCubes[idTissue]->Update();
+	_tissueStripper[idTissue]->Update();
+	_tissueClipper[idTissue]->Update();
+#endif
 }
 //-------------------------------------------------------------------
 double vtkClipping3DDataViewer::GetIsovalue(int idTissue)
@@ -545,7 +576,12 @@ vtkVolume* vtkClipping3DDataViewer::GetVolumeActor()
    return _newvol;
 }
 //-------------------------------------------------------------------
-vtkVolumeRayCastMapper* vtkClipping3DDataViewer::GetVolumeMapper(){
+#if (VTK_MAJOR_VERSION <= 7) 
+	vtkVolumeRayCastMapper* vtkClipping3DDataViewer::GetVolumeMapper()
+#else 
+	vtkFixedPointVolumeRayCastMapper* vtkClipping3DDataViewer::GetVolumeMapper()
+#endif
+{
 	return _volumeMapper;
 }
 //-------------------------------------------------------------------