X-Git-Url: https://git.creatis.insa-lyon.fr/pubgit/?a=blobdiff_plain;f=packages%2Fwxvtk%2Fsrc%2FbbwxvtkViewer2D.h;h=5019b96d54f4d364fa818a3b81c974b66202a797;hb=3928b4ad06b5b5fd142f696f58a7828d064e2883;hp=c2092affce99e8f1d00fd52a2f79fc2b15ea7643;hpb=6bbabb32cba07ce95376c2cdcb804ee97050d453;p=bbtk.git

diff --git a/packages/wxvtk/src/bbwxvtkViewer2D.h b/packages/wxvtk/src/bbwxvtkViewer2D.h
index c2092af..5019b96 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/06/19 09:46:49 $
-  Version:   $Revision: 1.6 $
+  Date:      $Date: 2008/12/08 12:56:17 $
+  Version:   $Revision: 1.12 $
                                                                                 
   Copyright (c) CREATIS (Centre de Recherche et d'Applications en Traitement de
   l'Image). All rights reserved. See Doc/License.txt or
@@ -38,7 +38,7 @@
 #define __bbwxvtkViewer2D_h__
 
 #include "vtkImageData.h"
-#include "vtkImageViewer2.h"
+#include "wxvtkImageViewer2.h"
 #include "vtkImplicitPlaneWidget.h"
 
 #include "bbtkWxBlackBox.h"
@@ -58,16 +58,16 @@ namespace bbwxvtk
     Viewer2DWidget(Viewer2D* box, wxWindow *parent);
     ~Viewer2DWidget();
     void UpdateView();
-	vtkRenderer					 *GetRenderer();
+    vtkRenderer		*GetRenderer();
   private:
-    Viewer2D                     *mBox;
-    vtkImageViewer2				 *imageViewer;
-    vtkImageData				 *backImageData;
-    vtkImageData				 *mDefaultImage;
-    wxVTKRenderWindowInteractor  *wxvtkrenderwindowinteractor;
+    Viewer2D                    *mBox;
+    wxvtkImageViewer2		*imageViewer;
+    vtkImageData		*backImageData;
+    vtkImageData		*mDefaultImage;
+    wxVTKRenderWindowInteractor *wxvtkrenderwindowinteractor;
     bool mUpdateCamera;
 
-	vtkImplicitPlaneWidget * maPlane1, * maPlane2, * mbPlane1, * mbPlane2;
+    vtkImplicitPlaneWidget * maPlane1, * maPlane2, * mbPlane1, * mbPlane2;
   };
   
   //------------------------------------------------------------------------
@@ -83,10 +83,12 @@ namespace bbwxvtk
     BBTK_DECLARE_OUTPUT(Out,int);
     BBTK_DECLARE_OUTPUT(Renderer,vtkRenderer*);
     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 bbUserConstructor();
   };
    
@@ -95,12 +97,12 @@ 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,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,"Position of the slider",int,"");
+  BBTK_OUTPUT(Viewer2D,Out,"Current Slice number",int,"");
   BBTK_OUTPUT(Viewer2D,Renderer,"vtk Renderer",vtkRenderer*,"");
   BBTK_END_DESCRIBE_BLACK_BOX(Viewer2D);
   //=================================================================