#3418 creaMaracasVisu Feature New Normal - ManualPaint_model with openmp

[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..c3ba219648c39cef58f1e74017e7de8897724d79 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 setVolumeMapper(vtkFixedPointVolumeRayCastMapper* volMapper);
+#endif
        void setVolume(vtkVolume* vol);
        //void setMPR3Dview(wxVtkMPR3DView *wxvtkmpr3Dview1);
        //void setClipping3DView(wxVtkClipping3DView *wxvtkclipping3Dview1);
@@ -211,35 +219,37 @@ private:
        /*
         cancel Button
        */
-       //wxButton                      *cancelBtn;
-       wxBitmapButton          *cancelBtn;
+       //wxButton                                                      *cancelBtn;
+       wxBitmapButton                                          *cancelBtn;
        /*
         save Button
        */
-       wxButton                                *saveDataBtn;   
+       wxButton                                                        *saveDataBtn;   
        /*
        Load Button
        */
-       wxButton                                *loadDataBtn;
+       wxButton                                                        *loadDataBtn;
        /*
        Refresh Button
        */
-       wxButton                                *refreshBtn;
-
-       wxPanel                         *_panextracontrols;
-       
+       wxButton                                                        *refreshBtn;
+       wxPanel                                                         *_panextracontrols;
        
        // the user had pressed refresh
        bool refreshed;
        
-       vtkColorTransferFunction                *_ctfun;
+       vtkColorTransferFunction                        *_ctfun;
        vtkPiecewiseFunction                            *_tfun;
-       vtkVolumeRayCastMapper                  *volumeMapper; 
+#if (VTK_MAJOR_VERSION <= 7) 
+       vtkVolumeRayCastMapper                          *volumeMapper; 
+#else 
+       vtkFixedPointVolumeRayCastMapper        *volumeMapper; 
+#endif
        vtkVolume                                                       *newvol;
 
        //things to refresh
        //wxVtkMPR3DView                                        *wxvtkmpr3Dview;
-       //wxVtkClipping3DView                   *wxvtkclipping3Dview;
+       //wxVtkClipping3DView                           *wxvtkclipping3Dview;
 
        
        wxSizer* getControls(bool extracontrols = false);