X-Git-Url: https://git.creatis.insa-lyon.fr/pubgit/?a=blobdiff_plain;f=packages%2Fwxvtk%2Fsrc%2FbbwxvtkViewer3D.cxx;h=b81a1dd4700d0f5abc8f367c716643452319632f;hb=070bdd6fb778229318298c5546d0fcdb2eebe450;hp=0cab9e8175a27b9ab1bd7c7582b5569dcfc53ec7;hpb=6415d635327ce5d9058a45cc6f350551af2adff5;p=bbtk.git

diff --git a/packages/wxvtk/src/bbwxvtkViewer3D.cxx b/packages/wxvtk/src/bbwxvtkViewer3D.cxx
index 0cab9e8..b81a1dd 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: 2008/03/03 13:14:27 $
-  Version:   $Revision: 1.1 $
+  Date:      $Date: 2008/05/07 12:59:23 $
+  Version:   $Revision: 1.4 $
                                                                                 
   Copyright (c) CREATIS (Centre de Recherche et d'Applications en Traitement de
   l'Image). All rights reserved. See Doc/License.txt or
@@ -65,7 +65,8 @@ namespace bbwxvtk
    //		camera->SetParallelScale(  spx*(x2-x1)/2.0 );
    renderer->ResetCamera(x1,x2,y1,y2,z1,z2);
    
-   
+   renderer->SetBackground(0.1, 0.1, 0.2);
+  
    wxBoxSizer *sizer = new wxBoxSizer(wxVERTICAL);
    sizer->Add( wxvtkrenderwindowinteractor , 1, wxEXPAND, 0);
    panel->SetSizer(sizer);
@@ -109,7 +110,7 @@ namespace bbwxvtk
   //--------------------------------------------------------------------------
 
 
-  BBTK_USER_BLACK_BOX_IMPLEMENTATION(Viewer3D,bbtk::WxBlackBox);
+  BBTK_BLACK_BOX_IMPLEMENTATION(Viewer3D,bbtk::WxBlackBox);
 
   void Viewer3D::bbUserConstructor() 
   { 
@@ -118,6 +119,11 @@ namespace bbwxvtk
     bbSetInputIn3(NULL);
     bbSetInputIn4(NULL);
     bbSetInputIn5(NULL);
+    bbSetInputObs1(NULL);
+    bbSetInputObs2(NULL);
+    bbSetInputObs3(NULL);
+    bbSetInputObs4(NULL);
+    bbSetInputObs5(NULL);
     bbSetOutputRenderer( NULL );
     bbSetOutputInteractor( NULL );
   }
@@ -141,23 +147,49 @@ namespace bbwxvtk
     Viewer3DWidget* w = new Viewer3DWidget(this,bbGetWxParent());
     w->Update();
     
-    bbSetOutputInteractor( w->GetInteractor() );
-
     vtkRenderer *renderer = w->GetRenderer();
     if (renderer!=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();
-	bbSetOutputRenderer( w->GetRenderer() );
-	
-	
+	bbSetOutputRenderer( renderer );
+
       }
-    
+    vtkRenderWindowInteractor *interactor = w->GetInteractor();
+    if (interactor!=NULL)
+      {
+	if (bbGetInputObs1()!=NULL) 
+	  {
+	    bbGetInputObs1()->SetInteractor(interactor);
+	    bbGetInputObs1()->EnabledOn();
+	  }
+	if (bbGetInputObs2()!=NULL) 
+	  {
+	    bbGetInputObs2()->SetInteractor(interactor);
+	    bbGetInputObs2()->EnabledOn();
+	  }
+	if (bbGetInputObs3()!=NULL) 
+	  {
+	    bbGetInputObs3()->SetInteractor(interactor);
+	    bbGetInputObs3()->EnabledOn();
+	  }
+	if (bbGetInputObs4()!=NULL) 
+	  {
+	    bbGetInputObs4()->SetInteractor(interactor);
+	    bbGetInputObs4()->EnabledOn();
+	  }
+	if (bbGetInputObs5()!=NULL) 
+	  {
+	    bbGetInputObs5()->SetInteractor(interactor);
+	    bbGetInputObs5()->EnabledOn();
+	  }
+	bbSetOutputInteractor(  w->GetInteractor() );
+      }
+        
     bbSetOutputWidget(w);
     
     bbtkDebugDecTab("Core",9);