X-Git-Url: https://git.creatis.insa-lyon.fr/pubgit/?a=blobdiff_plain;f=packages%2Fwxvtk%2Fsrc%2FbbwxvtkViewer3D.cxx;h=de2257f9cc2afb05ddb9c4dd81725ea4c55d337d;hb=baba8ec4d60d8609b87b7506704611d78449d455;hp=6d1537f8a2cb852f862ca38b6920cc9ff2730070;hpb=8c690fedb5ea897b6a69584e1e237cb5dbad97a5;p=bbtk.git

diff --git a/packages/wxvtk/src/bbwxvtkViewer3D.cxx b/packages/wxvtk/src/bbwxvtkViewer3D.cxx
index 6d1537f..de2257f 100644
--- a/packages/wxvtk/src/bbwxvtkViewer3D.cxx
+++ b/packages/wxvtk/src/bbwxvtkViewer3D.cxx
@@ -3,8 +3,8 @@
   Program:   bbtk
   Module:    $RCSfile: bbwxvtkViewer3D.cxx,v $
   Language:  C++
-  Date:      $Date: 2009/05/28 08:12:18 $
-  Version:   $Revision: 1.17 $
+  Date:      $Date: 2010/03/07 13:18:43 $
+  Version:   $Revision: 1.20 $
                                                                                 
   Copyright (c) CREATIS (Centre de Recherche et d'Applications en Traitement de
   l'Image). All rights reserved. See Doc/License.txt or
@@ -210,6 +210,7 @@ void Viewer3DWidget::Refresh(bool eraseBackground , const wxRect* rect )
 	//--------------------------------------------------------------------------
   void Viewer3D::Process() 
   { 
+	  
     if (!bbIsShown()) return;
 //EED	  
 //	  Viewer3DWidget* w = (Viewer3DWidget*)bbGetOutputWidget();
@@ -224,6 +225,7 @@ void Viewer3DWidget::Refresh(bool eraseBackground , const wxRect* rect )
 		  vtkRenderWindowInteractor *interactor = w->GetInteractor();
 		  if (interactor!=NULL)
 		  {
+
 			  if (bbGetInputObs1()!=NULL) 
 			  {
 				  bbGetInputObs1()->SetInteractor(interactor);
@@ -257,7 +259,7 @@ void Viewer3DWidget::Refresh(bool eraseBackground , const wxRect* rect )
 		  {
 			  bbSetOutputRenderer( renderer );
 			  
-			  if (bbGetInputIn1()!=NULL) {renderer->AddActor( bbGetInputIn1() ); }
+			  /*if (bbGetInputIn1()!=NULL) {renderer->AddActor( bbGetInputIn1() ); }
 			  if (bbGetInputIn2()!=NULL) {renderer->AddActor( bbGetInputIn2() ); }
 			  if (bbGetInputIn3()!=NULL) {renderer->AddActor( bbGetInputIn3() ); }
 			  if (bbGetInputIn4()!=NULL) {renderer->AddActor( bbGetInputIn4() ); }
@@ -265,13 +267,27 @@ void Viewer3DWidget::Refresh(bool eraseBackground , const wxRect* rect )
 			  renderer->ResetCamera();
 			  double bounds[6];
 			  renderer->ComputeVisiblePropBounds(bounds);
-			  renderer->ResetCameraClippingRange(bounds);
+			  renderer->ResetCameraClippingRange(bounds);*/
 			  
 		  } // renderer
 		  
 		  		  
 	  } // w && firsttime
 
+	  if(bbGetOutputRenderer()!=NULL){
+		   vtkRenderer *renderer = w->GetRenderer();
+		  if (bbGetInputIn1()!=NULL) {renderer->AddActor( bbGetInputIn1() ); }
+		  if (bbGetInputIn2()!=NULL) {renderer->AddActor( bbGetInputIn2() ); }
+		  if (bbGetInputIn3()!=NULL) {renderer->AddActor( bbGetInputIn3() ); }
+		  if (bbGetInputIn4()!=NULL) {renderer->AddActor( bbGetInputIn4() ); }
+		  if (bbGetInputIn5()!=NULL) {renderer->AddActor( bbGetInputIn5() ); }
+		  renderer->ResetCamera();
+		  double bounds[6];
+		  renderer->ComputeVisiblePropBounds(bounds);
+		  renderer->ResetCameraClippingRange(bounds);
+
+	  }
+
 	  if (w!=NULL)   w->Update();
 
   }