*** 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 394e35341129eb7f92785d087ba5b6a2956462d0..bb2d69394acfddbe9ef519697d4ba4b357932734 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/04/01 14:26:23 $
-  Version:   $Revision: 1.2 $
+  Date:      $Date: 2008/06/10 19:19:55 $
+  Version:   $Revision: 1.7 $
                                                                                 
   Copyright (c) CREATIS (Centre de Recherche et d'Applications en Traitement de
   l'Image). All rights reserved. See Doc/License.txt or
@@ -28,7 +28,6 @@
 #include "bbwxvtkPackage.h"
 
 #include "vtkCamera.h"
-#include "vtkInteractorStyleTrackballCamera.h"
 
 
 
@@ -37,7 +36,7 @@ namespace bbwxvtk
   BBTK_ADD_BLACK_BOX_TO_PACKAGE(wxvtk,Viewer3D);
   
   //-------------------------------------------------------------------------
-  Viewer3DWidget::Viewer3DWidget(Viewer3D* box, wxWindow *parent)
+  Viewer3DWidget::Viewer3DWidget(Viewer3D* box, wxWindow *parent, bool stereo)
     : 
     wxPanel( parent, -1, wxDefaultPosition, wxDefaultSize, wxTAB_TRAVERSAL),
     mBox(box)
@@ -49,10 +48,19 @@ namespace bbwxvtk
 
    renderer     = vtkRenderer::New();
    renderwindow = vtkRenderWindow::New();
+
    renderwindow->AddRenderer(renderer);
+
+   if (stereo==true){
+      renderwindow->SetStereoCapableWindow(1);
+      //renderwindow->SetStereoTypeToCrystalEyes();  
+      renderwindow->SetStereoTypeToRedBlue();
+      renderwindow->SetStereoRender(1);
+   }
+
    wxvtkrenderwindowinteractor->SetRenderWindow(renderwindow);
    
-   vtkInteractorStyleTrackballCamera *interactorstyle = vtkInteractorStyleTrackballCamera ::New();
+   interactorstyle = vtkInteractorStyleTrackballCamera ::New();
    interactorstyle->SetInteractor (  wxvtkrenderwindowinteractor );
    wxvtkrenderwindowinteractor->SetInteractorStyle( interactorstyle );
    
@@ -79,7 +87,10 @@ namespace bbwxvtk
   //-------------------------------------------------------------------------
   Viewer3DWidget::~Viewer3DWidget()
   {
-    wxvtkrenderwindowinteractor->Delete();
+    renderwindow->Delete();
+    renderer->Delete();
+    interactorstyle->Delete();
+    delete wxvtkrenderwindowinteractor;
   }
   //-------------------------------------------------------------------------
   
@@ -110,7 +121,7 @@ namespace bbwxvtk
   //--------------------------------------------------------------------------
 
 
-  BBTK_USER_BLACK_BOX_IMPLEMENTATION(Viewer3D,bbtk::WxBlackBox);
+  BBTK_BLACK_BOX_IMPLEMENTATION(Viewer3D,bbtk::WxBlackBox);
 
   void Viewer3D::bbUserConstructor() 
   { 
@@ -120,6 +131,11 @@ namespace bbwxvtk
     bbSetInputIn4(NULL);
     bbSetInputIn5(NULL);
     bbSetInputObs1(NULL);
+    bbSetInputObs2(NULL);
+    bbSetInputObs3(NULL);
+    bbSetInputObs4(NULL);
+    bbSetInputObs5(NULL);
+    bbSetInputStereo(false);
     bbSetOutputRenderer( NULL );
     bbSetOutputInteractor( NULL );
   }
@@ -140,21 +156,10 @@ namespace bbwxvtk
   {
     bbtkDebugMessageInc("Core",9,"Viewer3D::CreateWidget()"<<std::endl);
 
-    Viewer3DWidget* w = new Viewer3DWidget(this,bbGetWxParent());
+    Viewer3DWidget* w = new Viewer3DWidget(this,bbGetWxParent(),bbGetInputStereo());
     w->Update();
     
-    vtkRenderer *renderer = w->GetRenderer();
-    if (renderer!=NULL)
-      {
-       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( renderer );
 
-      }
     vtkRenderWindowInteractor *interactor = w->GetInteractor();
     if (interactor!=NULL)
       {
@@ -186,6 +191,19 @@ namespace bbwxvtk
        bbSetOutputInteractor(  w->GetInteractor() );
       }
         
+
+    vtkRenderer *renderer = w->GetRenderer();
+    if (renderer!=NULL)
+      {
+       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( renderer );
+         }
+
     bbSetOutputWidget(w);
     
     bbtkDebugDecTab("Core",9);