#3207 creaMaracasVisu Feature New Normal branch vtk7itk4wx3-mingw

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

diff --git a/lib/maracasVisuLib/src/interface/wxWindows/widgets/vtkClipping3DDataViewer.h b/lib/maracasVisuLib/src/interface/wxWindows/widgets/vtkClipping3DDataViewer.h
index 0c998de28443cfb425a546aaa6eba842586191d0..4a75a62a35fe8bd8988adc630db3776a690042d1 100644 (file)
--- 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"
 
@@ -80,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);
@@ -141,38 +151,50 @@ public:
 
 
 private:
-       vtkMarchingCubes                *_mCubes[ VTKMPRDATA_MAXTISSUE ];
-       vtkStripper                             *_tissueStripper[ VTKMPRDATA_MAXTISSUE ];
-       vtkPolyDataMapper               *_tissueMapper[ VTKMPRDATA_MAXTISSUE ];
-       vtkPlanes                               *_tissuePlanes[ VTKMPRDATA_MAXTISSUE ];
-       vtkClipPolyData                 *_tissueClipper[ VTKMPRDATA_MAXTISSUE ];
+       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;