X-Git-Url: https://git.creatis.insa-lyon.fr/pubgit/?a=blobdiff_plain;f=packages%2Fwxvtk%2Fsrc%2FbbwxvtkViewer3D.cxx;h=48abcec6987bef81071d641ccecc4f6c2328b9bf;hb=31e21c4bf4e9051ae07b5ca010d2e9b74c4dc06d;hp=4f057191e11b4f4425634c1f4595aa5f71fc34ce;hpb=4ad5b5ee44357ad873bc8c43230defb6d0a79879;p=bbtk.git

diff --git a/packages/wxvtk/src/bbwxvtkViewer3D.cxx b/packages/wxvtk/src/bbwxvtkViewer3D.cxx
index 4f05719..48abcec 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/04/18 12:59:53 $
-  Version:   $Revision: 1.3 $
+  Date:      $Date: 2008/06/26 18:45:58 $
+  Version:   $Revision: 1.8 $
                                                                                 
   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,14 +87,19 @@ namespace bbwxvtk
   //-------------------------------------------------------------------------
   Viewer3DWidget::~Viewer3DWidget()
   {
-    wxvtkrenderwindowinteractor->Delete();
+    renderwindow->Delete();
+    renderer->Delete();
+    interactorstyle->Delete();
+    delete wxvtkrenderwindowinteractor;
   }
   //-------------------------------------------------------------------------
   
   //-------------------------------------------------------------------------
   void Viewer3DWidget::Update()
   {
+    wxvtkrenderwindowinteractor->Update();
     wxvtkrenderwindowinteractor->Render();
+    renderer->ResetCameraClippingRange();
   }
   //-------------------------------------------------------------------------
 
@@ -104,6 +117,13 @@ namespace bbwxvtk
   }
   //-------------------------------------------------------------------------
 
+void Viewer3DWidget::Refresh(bool eraseBackground , const wxRect* rect )
+{
+//  wxPanel::Refresh(false,rect);
+}
+
+
+
   //--------------------------------------------------------------------------
   //-------------------------------------------------------------------------
   //--------------------------------------------------------------------------
@@ -120,6 +140,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 +165,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,12 +200,32 @@ 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);
     
   }
 
+  // This callback is necessary to get actual processing of the view 
+  // when window is shown
+  void  Viewer3D::bbUserOnShow()
+  {
+    ((Viewer3DWidget*)bbGetOutputWidget())->Update();
+  }
+
 
 }//namespace bbwxvtk