X-Git-Url: https://git.creatis.insa-lyon.fr/pubgit/?a=blobdiff_plain;ds=sidebyside;f=lib%2FmaracasVisuLib%2Fsrc%2Finterface%2FwxWindows%2Fwidgets%2FwxMaracasMultipleVolumeRendererView.h;h=030f68525227d42cd014a17562b556272ec46c34;hb=dea0efc567d8332b2e7eb936e3ba4ac1c11b2542;hp=c23b67611c857db56d1e0ced04dc6e053135917e;hpb=0006c401e6399555e1cfa83989a3343ccce51813;p=creaMaracasVisu.git

diff --git a/lib/maracasVisuLib/src/interface/wxWindows/widgets/wxMaracasMultipleVolumeRendererView.h b/lib/maracasVisuLib/src/interface/wxWindows/widgets/wxMaracasMultipleVolumeRendererView.h
index c23b676..030f685 100644
--- a/lib/maracasVisuLib/src/interface/wxWindows/widgets/wxMaracasMultipleVolumeRendererView.h
+++ b/lib/maracasVisuLib/src/interface/wxWindows/widgets/wxMaracasMultipleVolumeRendererView.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: wxMaracasMultipleVolumeRendererView.h,v $
   Language:  C++
-  Date:      $Date: 2009/07/20 10:06:12 $
-  Version:   $Revision: 1.2 $
+  Date:      $Date: 2012/11/15 14:14:35 $
+  Version:   $Revision: 1.7 $
 
   Copyright: (c) 2002, 2003
   License:
@@ -62,20 +87,24 @@ public:
 
 	void addVolumeViewPanel(wxMaracasMultipleVolumeRendererPanel* irmview, std::string dataname);
 
-	 vtkPiecewiseFunction* GetTransferFunction(int volumeid);
-	 vtkColorTransferFunction* GetColorFunction(int volumeid);
+	vtkPiecewiseFunction* GetTransferFunction(int volumeid);
+	vtkColorTransferFunction* GetColorFunction(int volumeid);
+
+	std::vector<vtkImageData*> GetOutputImages();
+
+	void changeCompositeMIPFunction(int id, int function);
+
+	wxMaracasMultipleVolumeRendererManager* getVolumeRenderManager();
 
 private:
 	static wxMaracasMultipleVolumeRendererView* instance;
 
 	wxMaracasMultipleVolumeRendererManager* volmanager;
-
 	wxAuiManager* wxauimanager;
+	wxToolBar* _toolb;
 	
 	std::string _path;
-
-	wxToolBar* _toolb;
-
+    std::vector<vtkImageData*> imgVect;
 };
 
 class ToolBarEventHandlerMultipleVolumeRenderer : public wxEvtHandler{