X-Git-Url: https://git.creatis.insa-lyon.fr/pubgit/?a=blobdiff_plain;f=lib%2FmaracasVisuLib%2Fsrc%2Finterface%2FwxWindows%2Fwidgets%2FwxMaracasMultipleVolumeRendererManagerData.h;h=3f43407ef8c38834e0c3412abf89eac72fa0135e;hb=c759b7f356f197cac69e058fe355b2afc5daabf1;hp=0f395511e15415e686da4bede4f02783db6d6d66;hpb=e7d3c47803d3341d27c134738499e92a1fef426c;p=creaMaracasVisu.git

diff --git a/lib/maracasVisuLib/src/interface/wxWindows/widgets/wxMaracasMultipleVolumeRendererManagerData.h b/lib/maracasVisuLib/src/interface/wxWindows/widgets/wxMaracasMultipleVolumeRendererManagerData.h
index 0f39551..3f43407 100644
--- a/lib/maracasVisuLib/src/interface/wxWindows/widgets/wxMaracasMultipleVolumeRendererManagerData.h
+++ b/lib/maracasVisuLib/src/interface/wxWindows/widgets/wxMaracasMultipleVolumeRendererManagerData.h
@@ -1,9 +1,32 @@
+/*# ---------------------------------------------------------------------
+#
+# 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 wxMaracasMultipleVolumeRendererManagerData_H_
 #define wxMaracasMultipleVolumeRendererManagerData_H_
 
-#include <vtkVolumeRayCastCompositeFunction.h>
 #include <vtkPlanes.h>
-#include <vtkVolumeRayCastMapper.h>
 #include <vtkVolumeProperty.h>
 #include <vtkVolume.h>
 #include <vtkPiecewiseFunction.h>
@@ -11,7 +34,16 @@
 #include <vtkImageData.h>
 #include <vtkProp3D.h>
 #include <vtkRenderer.h>
-#include <vtkVolumeRayCastMIPFunction.h>
+
+
+#if (VTK_MAJOR_VERSION <= 7) 
+	#include <vtkVolumeRayCastCompositeFunction.h>
+	#include <vtkVolumeRayCastMIPFunction.h>
+	#include <vtkVolumeRayCastMapper.h>
+#else 
+	#include <vtkFixedPointVolumeRayCastMapper.h>
+#endif
+
 
 #include <vector>
 
@@ -98,14 +130,22 @@ private:
 	 */
 	int _id;		
 
-	vtkVolumeRayCastCompositeFunction	*_compositeFunction;
+
+
 	vtkPlanes							*_volumePlanes;
-	vtkVolumeRayCastMapper				*_volumeMapper;
 	vtkVolumeProperty					*_volumeProperty;
 	vtkVolume							*_newvol;
-	vtkPiecewiseFunction* _tfun;
-	vtkColorTransferFunction* _ctfun;
-	vtkVolumeRayCastMIPFunction* _MIPFunction;
+	vtkPiecewiseFunction				*_tfun;
+	vtkColorTransferFunction			*_ctfun;
+	
+#if (VTK_MAJOR_VERSION <= 7) 
+	vtkVolumeRayCastMIPFunction			*_MIPFunction;
+	vtkVolumeRayCastCompositeFunction	*_compositeFunction;
+	vtkVolumeRayCastMapper				*_volumeMapper;
+#else 
+	vtkFixedPointVolumeRayCastMapper	*_volumeMapper;
+#endif
+	
 
 	
 };