X-Git-Url: https://git.creatis.insa-lyon.fr/pubgit/?a=blobdiff_plain;f=lib%2FmaracasVisuLib%2Fsrc%2Finterface%2FwxWindows%2Fwidgets%2FpPlotter%2FHistogramDialog.h;h=c3ba219648c39cef58f1e74017e7de8897724d79;hb=255f774ce4100c0b84e6b5efa5c64d0db77f8a61;hp=038f464bf1c732ecde16411ff98137f96d6cd440;hpb=e4ef2b5df5aac431ff3b806f83b7dd5e55e89d86;p=creaMaracasVisu.git

diff --git a/lib/maracasVisuLib/src/interface/wxWindows/widgets/pPlotter/HistogramDialog.h b/lib/maracasVisuLib/src/interface/wxWindows/widgets/pPlotter/HistogramDialog.h
index 038f464..c3ba219 100644
--- 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);
@@ -206,40 +214,42 @@ private:
 	/*
 	 ok Button
 	*/
-	//wxButton		*okBtn;
+	//wxButton			*okBtn;
 	wxBitmapButton		*okBtn;
 	/*
 	 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;
+#if (VTK_MAJOR_VERSION <= 7) 
 	vtkVolumeRayCastMapper				*volumeMapper; 
+#else 
+	vtkFixedPointVolumeRayCastMapper	*volumeMapper; 
+#endif
 	vtkVolume							*newvol;
 
 	//things to refresh
-	//wxVtkMPR3DView						*wxvtkmpr3Dview;
-	//wxVtkClipping3DView					*wxvtkclipping3Dview;
+	//wxVtkMPR3DView					*wxvtkmpr3Dview;
+	//wxVtkClipping3DView				*wxvtkclipping3Dview;
 
 	
 	wxSizer* getControls(bool extracontrols = false);