#3207 creaMaracasVisu Feature New Normal branch vtk7itk4wx3-mingw

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

diff --git a/lib/maracasVisuLib/src/interface/wxWindows/widgets/pPlotter/HistogramDialog.h b/lib/maracasVisuLib/src/interface/wxWindows/widgets/pPlotter/HistogramDialog.h
index 5ac1e398857d340b6fcbdf0fe47cb760a1c4d54b..bb360a714fd89fbec3a8ca0dc942d68e88c92bbc 100644 (file)
--- a/lib/maracasVisuLib/src/interface/wxWindows/widgets/pPlotter/HistogramDialog.h
+++ b/lib/maracasVisuLib/src/interface/wxWindows/widgets/pPlotter/HistogramDialog.h
@@ -48,7 +48,11 @@
  //#include <vector>
  #include <vtkPiecewiseFunction.h>
  #include <vtkColorTransferFunction.h>
- #include <vtkVolumeRayCastMapper.h>
+#if (VTK_MAJOR_VERSION <= 7) 
+       #include <vtkVolumeRayCastMapper.h>
+#else 
+       #include <vtkFixedPointVolumeRayCastMapper.h>
+#endif
  #include <vtkVolume.h>
  //#include "../wxMPRWidget.h"
 
@@ -141,7 +145,11 @@ public:
        bool getRefreshed();
        void setCTF(vtkColorTransferFunction* cf);
        void setTF(vtkPiecewiseFunction* tf);
+#if (VTK_MAJOR_VERSION <= 7) 
        void setVolumeMapper(vtkVolumeRayCastMapper* volMapper);
+#else 
+       void setFixedPointVolumeMapper(vtkFixedPointVolumeRayCastMapper* volMapper);
+#endif
        void setVolume(vtkVolume* vol);
        //void setMPR3Dview(wxVtkMPR3DView *wxvtkmpr3Dview1);
        //void setClipping3DView(wxVtkClipping3DView *wxvtkclipping3Dview1);
@@ -233,9 +241,9 @@ private:
        bool refreshed;
        
        vtkColorTransferFunction                *_ctfun;
-       vtkPiecewiseFunction                            *_tfun;
+       vtkPiecewiseFunction                    *_tfun;
        vtkVolumeRayCastMapper                  *volumeMapper; 
-       vtkVolume                                                       *newvol;
+       vtkVolume                                               *newvol;
 
        //things to refresh
        //wxVtkMPR3DView                                        *wxvtkmpr3Dview;