X-Git-Url: https://git.creatis.insa-lyon.fr/pubgit/?a=blobdiff_plain;f=packages%2Fwxvtk%2Fsrc%2FbbwxvtkViewer3D.h;h=cac53bafc23970df4bb7547708c0abc7fb2ed494;hb=baba8ec4d60d8609b87b7506704611d78449d455;hp=754bed886f8a393ba4bdb97eabe522c364bbf3c5;hpb=0278e44db6547b325fe00f4ffc5a9cabac5a8534;p=bbtk.git

diff --git a/packages/wxvtk/src/bbwxvtkViewer3D.h b/packages/wxvtk/src/bbwxvtkViewer3D.h
index 754bed8..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/06/26 18:45:58 $
-  Version:   $Revision: 1.8 $
+  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
@@ -63,7 +63,7 @@ namespace bbwxvtk
     virtual void Refresh(bool eraseBackground = true, const wxRect* rect = NULL);
 
   private:
-    Viewer3D                     *mBox;
+    Viewer3D*            mBox;
     vtkRenderer                  *renderer;
     vtkRenderWindow              *renderwindow;
     vtkInteractorStyleTrackballCamera *interactorstyle;
@@ -91,13 +91,17 @@ namespace bbwxvtk
     BBTK_DECLARE_OUTPUT(Renderer,vtkRenderer*);
     BBTK_DECLARE_OUTPUT(Interactor,wxVTKRenderWindowInteractor*);
     BBTK_PROCESS(Process);
-    void Process();
     BBTK_CREATE_WIDGET(CreateWidget);
-    void CreateWidget();
-    void bbUserOnShow();
+    BBTK_ON_SHOW_WIDGET(OnShowWidget);
+  
+    void Process();
+    void CreateWidget(wxWindow*);
+    void OnShowWidget();
+
+    void DisableObservers();
 
   protected:
-    virtual void bbUserConstructor();
+    bool firsttime;
   };
    
   //=================================================================
@@ -105,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 *,"");