#3207 creaMaracasVisu Feature New Normal branch vtk7itk4wx3-mingw

[creaMaracasVisu.git] / lib / maracasVisuLib / src / interface / wxWindows / widgets / wxMaracasMultipleVolumeRendererManagerData.h

diff --git a/lib/maracasVisuLib/src/interface/wxWindows/widgets/wxMaracasMultipleVolumeRendererManagerData.h b/lib/maracasVisuLib/src/interface/wxWindows/widgets/wxMaracasMultipleVolumeRendererManagerData.h
index 147704a4a66bfcffaac0aff76793ef95c121744b..3f43407ef8c38834e0c3412abf89eac72fa0135e 100644 (file)
--- a/lib/maracasVisuLib/src/interface/wxWindows/widgets/wxMaracasMultipleVolumeRendererManagerData.h
+++ b/lib/maracasVisuLib/src/interface/wxWindows/widgets/wxMaracasMultipleVolumeRendererManagerData.h
@@ -26,9 +26,7 @@
 #ifndef wxMaracasMultipleVolumeRendererManagerData_H_
 #define wxMaracasMultipleVolumeRendererManagerData_H_
 
-#include <vtkVolumeRayCastCompositeFunction.h>
 #include <vtkPlanes.h>
-#include <vtkVolumeRayCastMapper.h>
 #include <vtkVolumeProperty.h>
 #include <vtkVolume.h>
 #include <vtkPiecewiseFunction.h>
@@ -36,7 +34,16 @@
 #include <vtkImageData.h>
 #include <vtkProp3D.h>
 #include <vtkRenderer.h>
-#include <vtkVolumeRayCastMIPFunction.h>
+
+
+#if (VTK_MAJOR_VERSION <= 7) 
+       #include <vtkVolumeRayCastCompositeFunction.h>
+       #include <vtkVolumeRayCastMIPFunction.h>
+       #include <vtkVolumeRayCastMapper.h>
+#else 
+       #include <vtkFixedPointVolumeRayCastMapper.h>
+#endif
+
 
 #include <vector>
 
@@ -123,14 +130,22 @@ private:
         */
        int _id;                
 
-       vtkVolumeRayCastCompositeFunction       *_compositeFunction;
+
+
        vtkPlanes                                                       *_volumePlanes;
-       vtkVolumeRayCastMapper                          *_volumeMapper;
        vtkVolumeProperty                                       *_volumeProperty;
        vtkVolume                                                       *_newvol;
-       vtkPiecewiseFunction* _tfun;
-       vtkColorTransferFunction* _ctfun;
-       vtkVolumeRayCastMIPFunction* _MIPFunction;
+       vtkPiecewiseFunction                            *_tfun;
+       vtkColorTransferFunction                        *_ctfun;
+       
+#if (VTK_MAJOR_VERSION <= 7) 
+       vtkVolumeRayCastMIPFunction                     *_MIPFunction;
+       vtkVolumeRayCastCompositeFunction       *_compositeFunction;
+       vtkVolumeRayCastMapper                          *_volumeMapper;
+#else 
+       vtkFixedPointVolumeRayCastMapper        *_volumeMapper;
+#endif
+       
 
        
 };