=== MAJOR RELEASE ====

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

diff --git a/packages/wxvtk/src/bbwxvtkViewer3D.h b/packages/wxvtk/src/bbwxvtkViewer3D.h
index 43b924d25ef27067fb9f14cf892733a84d1f5b8e..a9f441f8047abc647d8aee7e86d2768341386180 100644 (file)
--- 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/03/03 13:14:27 $
-  Version:   $Revision: 1.1 $
+  Date:      $Date: 2008/04/18 12:59:53 $
+  Version:   $Revision: 1.5 $
                                                                                 
   Copyright (c) CREATIS (Centre de Recherche et d'Applications en Traitement de
   l'Image). All rights reserved. See Doc/License.txt or
@@ -71,12 +71,17 @@ namespace bbwxvtk
   
   class /*BBTK_EXPORT*/ Viewer3D : public bbtk::WxBlackBox
   {    
-    BBTK_USER_BLACK_BOX_INTERFACE(Viewer3D,bbtk::WxBlackBox);
+    BBTK_BLACK_BOX_INTERFACE(Viewer3D,bbtk::WxBlackBox);
     BBTK_DECLARE_INPUT(In1, vtkProp3D *);
     BBTK_DECLARE_INPUT(In2, vtkProp3D *);
     BBTK_DECLARE_INPUT(In3, vtkProp3D *);
     BBTK_DECLARE_INPUT(In4, vtkProp3D *);
     BBTK_DECLARE_INPUT(In5, vtkProp3D *);
+    BBTK_DECLARE_INPUT(Obs1, vtkInteractorObserver *);
+    BBTK_DECLARE_INPUT(Obs2, vtkInteractorObserver *);
+    BBTK_DECLARE_INPUT(Obs3, vtkInteractorObserver *);
+    BBTK_DECLARE_INPUT(Obs4, vtkInteractorObserver *);
+    BBTK_DECLARE_INPUT(Obs5, vtkInteractorObserver *);
     BBTK_DECLARE_OUTPUT(Renderer,vtkRenderer*);
     BBTK_DECLARE_OUTPUT(Interactor,wxVTKRenderWindowInteractor*);
     BBTK_PROCESS(Process);
@@ -94,13 +99,19 @@ namespace bbwxvtk
   BBTK_NAME("Viewer3D");
   BBTK_AUTHOR("eduardo.davila@creatis.insa-lyon.fr");
   BBTK_DESCRIPTION("3D Viewer (vtk)");
-  BBTK_INPUT(Viewer3D,In1,"Input actor",vtkProp3D *);
-  BBTK_INPUT(Viewer3D,In2,"Input actor",vtkProp3D *);
-  BBTK_INPUT(Viewer3D,In3,"Input actor",vtkProp3D *);
-  BBTK_INPUT(Viewer3D,In4,"Input actor",vtkProp3D *);
-  BBTK_INPUT(Viewer3D,In5,"Input actor",vtkProp3D *);
-  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_CATEGORY("viewer");
+  BBTK_INPUT(Viewer3D,In1,"Input actor",vtkProp3D *,"");
+  BBTK_INPUT(Viewer3D,In2,"Input actor",vtkProp3D *,"");
+  BBTK_INPUT(Viewer3D,In3,"Input actor",vtkProp3D *,"");
+  BBTK_INPUT(Viewer3D,In4,"Input actor",vtkProp3D *,"");
+  BBTK_INPUT(Viewer3D,In5,"Input actor",vtkProp3D *,"");
+  BBTK_INPUT(Viewer3D,Obs1,"Input observer",vtkInteractorObserver *,"");
+  BBTK_INPUT(Viewer3D,Obs2,"Input observer",vtkInteractorObserver *,"");
+  BBTK_INPUT(Viewer3D,Obs3,"Input observer",vtkInteractorObserver *,"");
+  BBTK_INPUT(Viewer3D,Obs4,"Input observer",vtkInteractorObserver *,"");
+  BBTK_INPUT(Viewer3D,Obs5,"Input observer",vtkInteractorObserver *,"");
+  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);
   //=================================================================