*** empty log message ***

[bbtk.git] / packages / wxvtk / src / bbwxvtkViewer3D.cxx

diff --git a/packages/wxvtk/src/bbwxvtkViewer3D.cxx b/packages/wxvtk/src/bbwxvtkViewer3D.cxx
index 0cab9e8175a27b9ab1bd7c7582b5569dcfc53ec7..394e35341129eb7f92785d087ba5b6a2956462d0 100644 (file)
--- 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/04/01 14:26:23 $
+  Version:   $Revision: 1.2 $
                                                                                 
   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);
@@ -118,6 +119,7 @@ namespace bbwxvtk
     bbSetInputIn3(NULL);
     bbSetInputIn4(NULL);
     bbSetInputIn5(NULL);
+    bbSetInputObs1(NULL);
     bbSetOutputRenderer( NULL );
     bbSetOutputInteractor( NULL );
   }
@@ -141,23 +143,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);