X-Git-Url: https://git.creatis.insa-lyon.fr/pubgit/?a=blobdiff_plain;f=lib%2FmaracasVisuLib%2Fsrc%2Finterface%2FwxWindows%2Fwidgets%2FvtkClipping3DDataViewer.h;h=4a75a62a35fe8bd8988adc630db3776a690042d1;hb=f9901e756bb82bd333310b47607875331616bb29;hp=2822ca362155a76d04fee6b5ff64cd1dc34258b4;hpb=b80b4dcc301c1c2c63c0f76cd06b0a434350f7a7;p=creaMaracasVisu.git

diff --git a/lib/maracasVisuLib/src/interface/wxWindows/widgets/vtkClipping3DDataViewer.h b/lib/maracasVisuLib/src/interface/wxWindows/widgets/vtkClipping3DDataViewer.h
index 2822ca3..4a75a62 100644
--- a/lib/maracasVisuLib/src/interface/wxWindows/widgets/vtkClipping3DDataViewer.h
+++ b/lib/maracasVisuLib/src/interface/wxWindows/widgets/vtkClipping3DDataViewer.h
@@ -32,9 +32,14 @@
 #include "vtkStripper.h"
 #include "vtkLODActor.h"
 #include "vtkMarchingCubes.h"
-#include "vtkVolumeRayCastMapper.h"
+#if (VTK_MAJOR_VERSION <= 7) 
+	#include "vtkVolumeRayCastCompositeFunction.h"
+	#include "vtkVolumeRayCastMIPFunction.h"
+	#include "vtkVolumeRayCastMapper.h"
+#else 
+	#include <vtkFixedPointVolumeRayCastMapper.h>
+#endif
 #include "boxSurfaceObserver.h"
-#include "vtkVolumeRayCastCompositeFunction.h"
 #include <vtkPiecewiseFunction.h>
 #include "vtkVolumeProperty.h"
 #include "vtkPolyDataMapper.h"
@@ -44,7 +49,6 @@
 #include "vtkOutlineFilter.h"
 #include "vtkRenderWindowInteractor.h"
 
-#include "vtkVolumeRayCastMIPFunction.h"
 
 #include "volumerendererdata.h"
 
@@ -57,7 +61,8 @@ public:
 	virtual ~vtkClipping3DDataViewer();
 
 //	vtkImageActor*			GetImageActor(int id);
-	vtkActor*				GetOutlineActor();
+
+
 	vtkClipPolyData*		GetTissueClipper(int id);
 	vtkPolyDataMapper*		GetTissueMapper(int id);
 	vtkPlanes*				GetTissuePlanes(int id);
@@ -79,7 +84,13 @@ public:
 	double					GetIsovalue(int idTissue);
 
 	vtkVolume				*GetVolumeActor();
-	vtkVolumeRayCastMapper  *GetVolumeMapper();
+	
+#if (VTK_MAJOR_VERSION <= 7) 
+	vtkVolumeRayCastMapper  			*GetVolumeMapper();
+#else 
+	vtkFixedPointVolumeRayCastMapper  	*GetVolumeMapper();
+#endif
+
 	vtkPlanes				*GetVolumePlanes();
 
 	void					SetVtkMPRBaseData(vtkMPRBaseData *vtkmprbasedata);
@@ -140,43 +151,50 @@ public:
 
 
 private:
-	vtkMarchingCubes		*_mCubes[ VTKMPRDATA_MAXTISSUE ];
-	vtkStripper				*_tissueStripper[ VTKMPRDATA_MAXTISSUE ];
-	vtkPolyDataMapper		*_tissueMapper[ VTKMPRDATA_MAXTISSUE ];
-	vtkPlanes				*_tissuePlanes[ VTKMPRDATA_MAXTISSUE ];
-	vtkClipPolyData			*_tissueClipper[ VTKMPRDATA_MAXTISSUE ];
-
-	// outline
-	vtkOutlineFilter		*_outlineData;
-	vtkPolyDataMapper		*_mapOutline;
-	vtkActor				*_outline;
+	vtkMarchingCubes					*_mCubes[ VTKMPRDATA_MAXTISSUE ];
+	vtkStripper							*_tissueStripper[ VTKMPRDATA_MAXTISSUE ];
+	vtkPolyDataMapper					*_tissueMapper[ VTKMPRDATA_MAXTISSUE ];
+	vtkPlanes							*_tissuePlanes[ VTKMPRDATA_MAXTISSUE ];
+	vtkClipPolyData						*_tissueClipper[ VTKMPRDATA_MAXTISSUE ];
 
 	/// Volume
-	vtkPiecewiseFunction		*_tfun;
-	vtkColorTransferFunction	*_ctfun;
+	vtkPiecewiseFunction				*_tfun;
+	vtkColorTransferFunction			*_ctfun;
 //	vtkVolumeRayCastCompositeFunction	*_compositeFunction;
-	vtkPlanes					*_volumePlanes;
-	vtkVolumeRayCastMapper		*_volumeMapper;
-	vtkVolumeProperty			*_volumeProperty;
-	vtkVolume					*_newvol;
-	vtkMPRBaseData				*_vtkmprbasedata;
-	bool						_visibleVolume;
-   	bool						_visibleVolumeBox;
-	bool						_representationType[VTKMPRDATA_MAXTISSUE];
-	bool						_visibleTissue[VTKMPRDATA_MAXTISSUE];
-	vtkActor					*_tissue[VTKMPRDATA_MAXTISSUE];
-	boxSurfaceObserver			*_observerV;
-	boxSurfaceObserver			*_observerS[VTKMPRDATA_MAXTISSUE];
-
-	std::vector<double>			greyValuesTransferenceFVector;
-	std::vector<double>			intensityValuesTransferenceFVector;
-	std::vector<double>			redColorsOfColorTransferenceFVector;
-	std::vector<double>			greenColorsOfColorTransferenceFVector;
-	std::vector<double>			blueColorsOfColorTransferenceFVector;
-	std::vector<double>			greyValueColorsOfColorTransferenceFVector;
-
+	vtkPlanes							*_volumePlanes;
+	
+#if (VTK_MAJOR_VERSION <= 7) 
+	vtkVolumeRayCastMapper				*_volumeMapper;
+#else 
+	vtkFixedPointVolumeRayCastMapper	*_volumeMapper;
+#endif
+	
+	
+	vtkVolumeProperty					*_volumeProperty;
+	vtkVolume							*_newvol;
+	vtkMPRBaseData						*_vtkmprbasedata;
+	bool								_visibleVolume;
+   	bool								_visibleVolumeBox;
+	bool								_representationType[VTKMPRDATA_MAXTISSUE];
+	bool								_visibleTissue[VTKMPRDATA_MAXTISSUE];
+	vtkActor							*_tissue[VTKMPRDATA_MAXTISSUE];
+	boxSurfaceObserver					*_observerV;
+	boxSurfaceObserver					*_observerS[VTKMPRDATA_MAXTISSUE];
+
+	std::vector<double>					greyValuesTransferenceFVector;
+	std::vector<double>					intensityValuesTransferenceFVector;
+	std::vector<double>					redColorsOfColorTransferenceFVector;
+	std::vector<double>					greenColorsOfColorTransferenceFVector;
+	std::vector<double>					blueColorsOfColorTransferenceFVector;
+	std::vector<double>					greyValueColorsOfColorTransferenceFVector;
+
+#if (VTK_MAJOR_VERSION <= 7) 
 	vtkVolumeRayCastCompositeFunction   *_compositeFunction;
 	vtkVolumeRayCastMIPFunction         *_compositeFunctionMIP ;
+#else 
+	// ..
+#endif
+
 
 	bool _isRayCasting;
   	bool _isMIP;