#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 bb360a714fd89fbec3a8ca0dc942d68e88c92bbc..c3ba219648c39cef58f1e74017e7de8897724d79 100644 (file)
--- a/lib/maracasVisuLib/src/interface/wxWindows/widgets/pPlotter/HistogramDialog.h
+++ b/lib/maracasVisuLib/src/interface/wxWindows/widgets/pPlotter/HistogramDialog.h
@@ -148,7 +148,7 @@ public:
 #if (VTK_MAJOR_VERSION <= 7) 
        void setVolumeMapper(vtkVolumeRayCastMapper* volMapper);
 #else 
-       void setFixedPointVolumeMapper(vtkFixedPointVolumeRayCastMapper* volMapper);
+       void setVolumeMapper(vtkFixedPointVolumeRayCastMapper* volMapper);
 #endif
        void setVolume(vtkVolume* vol);
        //void setMPR3Dview(wxVtkMPR3DView *wxvtkmpr3Dview1);
@@ -219,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;
-       vtkPiecewiseFunction                    *_tfun;
-       vtkVolumeRayCastMapper                  *volumeMapper; 
-       vtkVolume                                               *newvol;
+       vtkColorTransferFunction                        *_ctfun;
+       vtkPiecewiseFunction                            *_tfun;
+#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);