X-Git-Url: https://git.creatis.insa-lyon.fr/pubgit/?a=blobdiff_plain;f=bbtk%2Fsrc%2FbbcreaMaracasVisuRenderingViewer.cxx;h=3882bc6074542c34a0ae553dc150759c3391af8a;hb=d2fc2645728a4aea4f0aa0febfa1d7a894ab3ff1;hp=2fe9e07a5fa685aae83e44ebcf0eb6f38003b996;hpb=28c74ab5eb531ce001260e9bc3fcb0151fcfc56b;p=creaMaracasVisu.git

diff --git a/bbtk/src/bbcreaMaracasVisuRenderingViewer.cxx b/bbtk/src/bbcreaMaracasVisuRenderingViewer.cxx
index 2fe9e07..3882bc6 100644
--- a/bbtk/src/bbcreaMaracasVisuRenderingViewer.cxx
+++ b/bbtk/src/bbcreaMaracasVisuRenderingViewer.cxx
@@ -16,16 +16,16 @@ void RenderingViewer::Process()
 	vtkImageData* _img2 = bbGetInputIn2();
 	vtkImageData* _img3 = bbGetInputIn3();
 	vtkImageData* _img4 = bbGetInputIn4(); 
+
 	vtkRenderer* renderer = bbGetInputRenderer();
-	//vtkRenderer* rendererSA = bbGetInputRendererSA();
-	//vtkRenderer* rendererSB = bbGetInputRendererSB();
-	//vtkRenderer* rendererSC = bbGetInputRendererSC();
 
 	if(view != NULL)
 	{
+		view->setVtkBaseView( (wxVtk3DBaseView*) bbGetInputwxVtkBaseView() );
+
 		if(renderer != NULL && _currentrenderer != renderer)
 		{
-			view->setRenderer(renderer/*, rendererSA, rendererSB, rendererSC*/);
+			view->setRenderer(renderer);
 			_currentrenderer = renderer;
 			//_currentrendererSA = rendererSA;
 			//_currentrendererSB = rendererSB;
@@ -35,40 +35,30 @@ void RenderingViewer::Process()
 		{
 			if(_img1 !=NULL)
 			{
-				((wxMaracasRenderTabbedPanel*)view->getTabbedPanel())->addVolume(_img1, "INPUT 1");
-				((wxMaracasRenderTabbedPanel*)view->getTabbedPanel())->addSurface1(_img1, "INPUT 1");
-				((wxMaracasRenderTabbedPanel*)view->getTabbedPanel())->addSurface2(_img1, "INPUT 1");
-				((wxMaracasRenderTabbedPanel*)view->getTabbedPanel())->addSurface3(_img1, "INPUT 1");
+				view->addVolumes(_img1, "","INPUT 1");
 			}
 			if(_img2 !=NULL)
 			{
-				((wxMaracasRenderTabbedPanel*)view->getTabbedPanel())->addVolume(_img2, "INPUT 2");
-				((wxMaracasRenderTabbedPanel*)view->getTabbedPanel())->addSurface1(_img2, "INPUT 2");
-				((wxMaracasRenderTabbedPanel*)view->getTabbedPanel())->addSurface2(_img2, "INPUT 2");
-				((wxMaracasRenderTabbedPanel*)view->getTabbedPanel())->addSurface3(_img2, "INPUT 2");
+				view->addVolumes(_img2, "", "INPUT 2");
 			}
 			if(_img3 !=NULL)
 			{
-				((wxMaracasRenderTabbedPanel*)view->getTabbedPanel())->addVolume(_img3, "INPUT 3");
-				((wxMaracasRenderTabbedPanel*)view->getTabbedPanel())->addSurface1(_img3, "INPUT 3");
-				((wxMaracasRenderTabbedPanel*)view->getTabbedPanel())->addSurface2(_img3, "INPUT 3");
-				((wxMaracasRenderTabbedPanel*)view->getTabbedPanel())->addSurface3(_img3, "INPUT 3");
+				view->addVolumes(_img3, "", "INPUT 3");
 			}
 			if(_img4 !=NULL)
 			{
-				((wxMaracasRenderTabbedPanel*)view->getTabbedPanel())->addVolume(_img4, "INPUT 4");
-				((wxMaracasRenderTabbedPanel*)view->getTabbedPanel())->addSurface1(_img4, "INPUT 4");
-				((wxMaracasRenderTabbedPanel*)view->getTabbedPanel())->addSurface2(_img4, "INPUT 4");
-				((wxMaracasRenderTabbedPanel*)view->getTabbedPanel())->addSurface3(_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()
 {