X-Git-Url: https://git.creatis.insa-lyon.fr/pubgit/?a=blobdiff_plain;f=lib%2FmaracasVisuLib%2Fsrc%2Finterface%2FwxWindows%2Fwidgets%2FwxMaracasMultipleVolumeRendererManager.h;h=2ed4cd8fa5d93e990c28d6ba1f4219dfb49c24f9;hb=15112ae15da4222831b0e8e7c9be87daf9e99a1c;hp=93e476324e8340075d101a03fa8f5f98bc916815;hpb=79df2a7fc2b468bc2e7279ac77c0148269fe6aee;p=creaMaracasVisu.git

diff --git a/lib/maracasVisuLib/src/interface/wxWindows/widgets/wxMaracasMultipleVolumeRendererManager.h b/lib/maracasVisuLib/src/interface/wxWindows/widgets/wxMaracasMultipleVolumeRendererManager.h
index 93e4763..2ed4cd8 100644
--- a/lib/maracasVisuLib/src/interface/wxWindows/widgets/wxMaracasMultipleVolumeRendererManager.h
+++ b/lib/maracasVisuLib/src/interface/wxWindows/widgets/wxMaracasMultipleVolumeRendererManager.h
@@ -1,10 +1,35 @@
+/*# ---------------------------------------------------------------------
+#
+# 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.
+# ------------------------------------------------------------------------ */
+
 /*=========================================================================
 
   Program:   wxMaracas
   Module:    $RCSfile: wxMaracasMultipleVolumeRendererManager.h,v $
   Language:  C++
-  Date:      $Date: 2009/11/09 19:14:56 $
-  Version:   $Revision: 1.5 $
+  Date:      $Date: 2012/11/15 14:14:35 $
+  Version:   $Revision: 1.8 $
 
   Copyright: (c) 2002, 2003
   License:
@@ -47,7 +72,7 @@ public:
 	/**
 	**	Adds a volume
 	**/
-	int addVolume(vtkImageData* img, std::string dataname) throw (char*);	
+	int addVolume(int idTP, vtkImageData* img, std::string dataname) throw (char*);	
 	
 	/**
 	**	loads a prop3D from a nSTL file
@@ -90,6 +115,8 @@ public:
 	** Given an id search the data in the vector
 	**/
 	wxMaracasMultipleVolumeRendererManagerData* getViewData(int id)throw(char*);
+
+	void changeCompositeMIPFunction(int id, int function) throw (char *);
 	
 	/**
 	** Deletes given actor