X-Git-Url: https://git.creatis.insa-lyon.fr/pubgit/?a=blobdiff_plain;f=bbtk%2Fsrc%2FbbcreaMaracasVisuRenderingViewer.cxx;h=6193963c59e38f8eda4da37d89eb027872854306;hb=880273de17de05d1237a5e8db513b58902b15d6e;hp=e45a883370f82250906c202fc25d15202c804fa9;hpb=52134c6f15827d0ae9ea8cf0ffaa15867ab87dcc;p=creaMaracasVisu.git

diff --git a/bbtk/src/bbcreaMaracasVisuRenderingViewer.cxx b/bbtk/src/bbcreaMaracasVisuRenderingViewer.cxx
index e45a883..6193963 100644
--- a/bbtk/src/bbcreaMaracasVisuRenderingViewer.cxx
+++ b/bbtk/src/bbcreaMaracasVisuRenderingViewer.cxx
@@ -1,7 +1,33 @@
+/*# ---------------------------------------------------------------------
+#
+# 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.
+# ------------------------------------------------------------------------ */
+
 #include "bbcreaMaracasVisuRenderingViewer.h"
 #include "bbcreaMaracasVisuPackage.h"
 
 #include "wxMaracasRendererView.h"
+#include "wxMaracasRenderTabbedPanel.h"
 
 namespace bbcreaMaracasVisu
 {
@@ -10,48 +36,54 @@ BBTK_ADD_BLACK_BOX_TO_PACKAGE(creaMaracasVisu,RenderingViewer)
 BBTK_BLACK_BOX_IMPLEMENTATION(RenderingViewer,bbtk::WxBlackBox);
 void RenderingViewer::Process()
 {
-    
 	wxMaracasRendererView* view = (wxMaracasRendererView*)bbGetOutputWidget();
 	vtkImageData* _img1 = bbGetInputIn1();
 	vtkImageData* _img2 = bbGetInputIn2();
 	vtkImageData* _img3 = bbGetInputIn3();
 	vtkImageData* _img4 = bbGetInputIn4(); 
+
 	vtkRenderer* renderer = bbGetInputRenderer();
 
-	if(view!=NULL)
+	if(view != NULL)
 	{
-		if(renderer!=NULL&&_currentrenderer != renderer)
+		view->setVtkBaseView( (wxVtk3DBaseView*) bbGetInputwxVtkBaseView() );
+
+		if(renderer != NULL && _currentrenderer != renderer)
 		{
-			view->setRenderer(renderer);			
+			view->setRenderer(renderer);
 			_currentrenderer = renderer;
+			//_currentrendererSA = rendererSA;
+			//_currentrendererSB = rendererSB;
+			//_currentrendererSC = rendererSC;
 		}
-		if(_currentrenderer!=NULL)
+		if(_currentrenderer!=NULL /*&& _currentrendererSA!=NULL && _currentrendererSB!=NULL && _currentrendererSC!=NULL*/)
 		{
 			if(_img1 !=NULL)
 			{
-				view->addVolume(_img1, "INPUT 1");
+				view->addVolumes(_img1, "","INPUT 1");
 			}
 			if(_img2 !=NULL)
 			{
-				view->addVolume(_img2, "INPUT 2");
+				view->addVolumes(_img2, "", "INPUT 2");
 			}
 			if(_img3 !=NULL)
 			{
-				view->addVolume(_img3, "INPUT 3");
+				view->addVolumes(_img3, "", "INPUT 3");
 			}
 			if(_img4 !=NULL)
 			{
-				view->addVolume(_img4, "INPUT 4");
+				view->addVolumes(_img4, "", "INPUT 4");
 			}
 		}		
 	} 
-  
+
+	bbSetOutputImageFiles( view->getFiles() );
+
 }
 void RenderingViewer::CreateWidget(wxWindow* parent)
 {
 	wxMaracasRendererView* surrend = wxMaracasRendererView::getInstance(parent);
 	bbSetOutputWidget(surrend);
-  
 }
 void RenderingViewer::bbUserSetDefaultValues()
 {