X-Git-Url: https://git.creatis.insa-lyon.fr/pubgit/?a=blobdiff_plain;f=packages%2Fwxvtk%2Fsrc%2FbbwxvtkViewer2D.h;h=476c8389a9569ba569bd8506917ac0c424191774;hb=667c0cc301ab18f7a861b6947990b51aa36df999;hp=d24947c74200da42f9e748574e0479ad0367e38a;hpb=141959873bfc3610f427de9a7690458a8b18bd2a;p=bbtk.git

diff --git a/packages/wxvtk/src/bbwxvtkViewer2D.h b/packages/wxvtk/src/bbwxvtkViewer2D.h
index d24947c..476c838 100644
--- a/packages/wxvtk/src/bbwxvtkViewer2D.h
+++ b/packages/wxvtk/src/bbwxvtkViewer2D.h
@@ -3,8 +3,8 @@
   Program:   bbtk
   Module:    $RCSfile: bbwxvtkViewer2D.h,v $
   Language:  C++
-  Date:      $Date: 2008/03/10 12:28:44 $
-  Version:   $Revision: 1.2 $
+  Date:      $Date: 2008/09/10 12:01:48 $
+  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
@@ -58,14 +58,16 @@ namespace bbwxvtk
     Viewer2DWidget(Viewer2D* box, wxWindow *parent);
     ~Viewer2DWidget();
     void UpdateView();
+	vtkRenderer		*GetRenderer();
   private:
-    Viewer2D                     *mBox;
-    vtkImageViewer2		 *imageViewer;
-    vtkImageData		 *backImageData;
-    wxVTKRenderWindowInteractor  *wxvtkrenderwindowinteractor;
-
-    vtkImplicitPlaneWidget * maPlane1, * maPlane2, * mbPlane1, * mbPlane2;
-
+    Viewer2D                    *mBox;
+    vtkImageViewer2		*imageViewer;
+    vtkImageData		*backImageData;
+    vtkImageData		*mDefaultImage;
+    wxVTKRenderWindowInteractor *wxvtkrenderwindowinteractor;
+    bool mUpdateCamera;
+
+	vtkImplicitPlaneWidget * maPlane1, * maPlane2, * mbPlane1, * mbPlane2;
   };
   
   //------------------------------------------------------------------------
@@ -74,16 +76,18 @@ namespace bbwxvtk
   
   class /*BBTK_EXPORT*/ Viewer2D : public bbtk::WxBlackBox
   {    
-    BBTK_USER_BLACK_BOX_INTERFACE(Viewer2D,bbtk::WxBlackBox);
+    BBTK_BLACK_BOX_INTERFACE(Viewer2D,bbtk::WxBlackBox);
     BBTK_DECLARE_INPUT(Slice,int);
     BBTK_DECLARE_INPUT(Orientation,int);
     BBTK_DECLARE_INPUT(In,vtkImageData *);
     BBTK_DECLARE_OUTPUT(Out,int);
+    BBTK_DECLARE_OUTPUT(Renderer,vtkRenderer*);
     BBTK_PROCESS(Process);
     void Process();
     BBTK_CREATE_WIDGET(CreateWidget);
     void CreateWidget();
     void bbUserOnShow();
+    void bbUserConstructor();
   };
    
   //=================================================================
@@ -91,12 +95,13 @@ namespace bbwxvtk
   BBTK_BEGIN_DESCRIBE_BLACK_BOX(Viewer2D,bbtk::WxBlackBox);
   BBTK_NAME("Viewer2D");
   BBTK_AUTHOR("eduardo.davila@creatis.insa-lyon.fr");
-  BBTK_DESCRIPTION("Viewer2D widget (vtk)");
+  BBTK_DESCRIPTION("2D Viewer widget (vtk)");
   BBTK_CATEGORY("viewer");
-  BBTK_INPUT(Viewer2D,Slice,"Position of the slider",int);
-  BBTK_INPUT(Viewer2D,Orientation,"Slicing orientation : 0:yz / 1:xz / 2:xy",int);
-  BBTK_INPUT(Viewer2D,In,"Input Image",vtkImageData *);
-  BBTK_OUTPUT(Viewer2D,Out,"Position of the slider",int);
+  BBTK_INPUT(Viewer2D,Slice,"Initial Slice number",int,"");
+  BBTK_INPUT(Viewer2D,Orientation,"Slicing orientation : 0:yz / 1:xz / 2:xy",int,"");
+  BBTK_INPUT(Viewer2D,In,"Input Image",vtkImageData *,"");
+  BBTK_OUTPUT(Viewer2D,Out,"Current Slice number",int,"");
+  BBTK_OUTPUT(Viewer2D,Renderer,"vtk Renderer",vtkRenderer*,"");
   BBTK_END_DESCRIBE_BLACK_BOX(Viewer2D);
   //=================================================================