X-Git-Url: https://git.creatis.insa-lyon.fr/pubgit/?a=blobdiff_plain;f=packages%2Fwxvtk%2Fsrc%2FbbwxvtkViewer3D.h;h=cac53bafc23970df4bb7547708c0abc7fb2ed494;hb=315c4b62d90c40f8cccd821a5ba961bf51367bb0;hp=a9f441f8047abc647d8aee7e86d2768341386180;hpb=4ad5b5ee44357ad873bc8c43230defb6d0a79879;p=bbtk.git

diff --git a/packages/wxvtk/src/bbwxvtkViewer3D.h b/packages/wxvtk/src/bbwxvtkViewer3D.h
index a9f441f..cac53ba 100644
--- a/packages/wxvtk/src/bbwxvtkViewer3D.h
+++ b/packages/wxvtk/src/bbwxvtkViewer3D.h
@@ -3,8 +3,8 @@
   Program:   bbtk
   Module:    $RCSfile: bbwxvtkViewer3D.h,v $
   Language:  C++
-  Date:      $Date: 2008/04/18 12:59:53 $
-  Version:   $Revision: 1.5 $
+  Date:      $Date: 2009/05/28 08:12:18 $
+  Version:   $Revision: 1.14 $
                                                                                 
   Copyright (c) CREATIS (Centre de Recherche et d'Applications en Traitement de
   l'Image). All rights reserved. See Doc/License.txt or
@@ -39,12 +39,14 @@
 
 #include <vtkRenderer.h>
 #include <vtkRenderWindow.h>
+#include <vtkInteractorStyleTrackballCamera.h>
 
 #include "bbtkWxBlackBox.h"
 #include "wxVTKRenderWindowInteractor.h"
 
 
 
+
 namespace bbwxvtk
 {
   class Viewer3D; 
@@ -52,16 +54,19 @@ namespace bbwxvtk
   class Viewer3DWidget : public wxPanel
   {
   public:
-    Viewer3DWidget(Viewer3D* box, wxWindow *parent);
+    Viewer3DWidget(Viewer3D* box, wxWindow *parent, bool stereo);
     ~Viewer3DWidget();
 
     void Update();
     vtkRenderer *GetRenderer();
     wxVTKRenderWindowInteractor * GetInteractor();
+    virtual void Refresh(bool eraseBackground = true, const wxRect* rect = NULL);
+
   private:
-    Viewer3D                     *mBox;
+    Viewer3D*            mBox;
     vtkRenderer                  *renderer;
     vtkRenderWindow              *renderwindow;
+    vtkInteractorStyleTrackballCamera *interactorstyle;
     wxVTKRenderWindowInteractor  *wxvtkrenderwindowinteractor;
   };
   
@@ -82,15 +87,21 @@ namespace bbwxvtk
     BBTK_DECLARE_INPUT(Obs3, vtkInteractorObserver *);
     BBTK_DECLARE_INPUT(Obs4, vtkInteractorObserver *);
     BBTK_DECLARE_INPUT(Obs5, vtkInteractorObserver *);
+    BBTK_DECLARE_INPUT(Stereo, bool);
     BBTK_DECLARE_OUTPUT(Renderer,vtkRenderer*);
     BBTK_DECLARE_OUTPUT(Interactor,wxVTKRenderWindowInteractor*);
     BBTK_PROCESS(Process);
-    void Process();
     BBTK_CREATE_WIDGET(CreateWidget);
-    void CreateWidget();
+    BBTK_ON_SHOW_WIDGET(OnShowWidget);
+  
+    void Process();
+    void CreateWidget(wxWindow*);
+    void OnShowWidget();
+
+    void DisableObservers();
 
   protected:
-    virtual void bbUserConstructor();
+    bool firsttime;
   };
    
   //=================================================================
@@ -98,7 +109,7 @@ namespace bbwxvtk
   BBTK_BEGIN_DESCRIBE_BLACK_BOX(Viewer3D,bbtk::WxBlackBox);
   BBTK_NAME("Viewer3D");
   BBTK_AUTHOR("eduardo.davila@creatis.insa-lyon.fr");
-  BBTK_DESCRIPTION("3D Viewer (vtk)");
+  BBTK_DESCRIPTION("3D Viewer widget (vtk)");
   BBTK_CATEGORY("viewer");
   BBTK_INPUT(Viewer3D,In1,"Input actor",vtkProp3D *,"");
   BBTK_INPUT(Viewer3D,In2,"Input actor",vtkProp3D *,"");
@@ -110,6 +121,7 @@ namespace bbwxvtk
   BBTK_INPUT(Viewer3D,Obs3,"Input observer",vtkInteractorObserver *,"");
   BBTK_INPUT(Viewer3D,Obs4,"Input observer",vtkInteractorObserver *,"");
   BBTK_INPUT(Viewer3D,Obs5,"Input observer",vtkInteractorObserver *,"");
+  BBTK_INPUT(Viewer3D,Stereo,"Stereo with Red-Blue filter.  False/True  (default False)",bool,"");
   BBTK_OUTPUT(Viewer3D,Renderer,"Renderer to which actors can be added.",vtkRenderer*,"");
   BBTK_OUTPUT(Viewer3D,Interactor,"Interactor with which vtk widgets can interact",wxVTKRenderWindowInteractor*,"");
   BBTK_END_DESCRIBE_BLACK_BOX(Viewer3D);