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=d6fb1d5d3e478c70b90f5a4e27874e1478905195;hp=8e9ece3e656942c30c50be79ddd2d57782e91414;hpb=f70f07396065237d1d4fabea4e9524ad4d9c7d13;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 8e9ece3..c3ba219 100644
--- a/lib/maracasVisuLib/src/interface/wxWindows/widgets/pPlotter/HistogramDialog.h
+++ b/lib/maracasVisuLib/src/interface/wxWindows/widgets/pPlotter/HistogramDialog.h
@@ -1,3 +1,28 @@
+/*# ---------------------------------------------------------------------
+#
+# Copyright (c) CREATIS (Centre de Recherche en Acquisition et Traitement de l'Image
+#                        pour la Sant�)
+# Authors : Eduardo Davila, Frederic Cervenansky, Claire Mouton
+# Previous Authors : Laurent Guigues, Jean-Pierre Roux
+# CreaTools website : www.creatis.insa-lyon.fr/site/fr/creatools_accueil
+#
+#  This software is governed by the CeCILL-B license under French law and
+#  abiding by the rules of distribution of free software. You can  use,
+#  modify and/ or redistribute the software under the terms of the CeCILL-B
+#  license as circulated by CEA, CNRS and INRIA at the following URL
+#  http://www.cecill.info/licences/Licence_CeCILL-B_V1-en.html
+#  or in the file LICENSE.txt.
+#
+#  As a counterpart to the access to the source code and  rights to copy,
+#  modify and redistribute granted by the license, users are provided only
+#  with a limited warranty  and the software's author,  the holder of the
+#  economic rights,  and the successive licensors  have only  limited
+#  liability.
+#
+#  The fact that you are presently reading this means that you have had
+#  knowledge of the CeCILL-B license and that you accept its terms.
+# ------------------------------------------------------------------------ */
+
 
 #ifndef __HISTOGRAMSDIALOG__
 #define __HISTOGRAMSDIALOG__
@@ -23,9 +48,13 @@
  //#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"
+ //#include "../wxMPRWidget.h"
 
 #include "HistogramDialogComboBoxItem.h"
 #include <wx/checkbox.h>
@@ -116,10 +145,14 @@ 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);
+	//void setMPR3Dview(wxVtkMPR3DView *wxvtkmpr3Dview1);
+	//void setClipping3DView(wxVtkClipping3DView *wxvtkclipping3Dview1);
 
 	//--------------------
 	// plotter Information
@@ -181,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);