X-Git-Url: https://git.creatis.insa-lyon.fr/pubgit/?a=blobdiff_plain;f=packages%2Fwxvtk%2Fsrc%2FbbwxvtkViewer2D.h;h=36bc9cba428020f6e4acf686e18c5b8d34656641;hb=bf1bdd88621c0556024de37768c2d17d12f2a265;hp=cdb26f1c3162bbaa636b950192edb785c182dbde;hpb=70db75992e0ccf5ad1fab5ccf9cec013877ea3d5;p=bbtk.git

diff --git a/packages/wxvtk/src/bbwxvtkViewer2D.h b/packages/wxvtk/src/bbwxvtkViewer2D.h
index cdb26f1..36bc9cb 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/12/11 15:30:17 $
-  Version:   $Revision: 1.15 $
+  Date:      $Date: 2009/09/17 11:17:19 $
+  Version:   $Revision: 1.18 $
                                                                                 
   Copyright (c) CREATIS (Centre de Recherche et d'Applications en Traitement de
   l'Image). All rights reserved. See Doc/License.txt or
@@ -29,11 +29,9 @@
  * \brief 
  */
 
-
 #ifdef USE_WXWIDGETS
 #ifdef USE_VTK
 
-
 #ifndef __bbwxvtkViewer2D_h__
 #define __bbwxvtkViewer2D_h__
 
@@ -44,11 +42,8 @@
 #include "bbtkWxBlackBox.h"
 #include "wxVTKRenderWindowInteractor.h"
 
-
-
 namespace bbwxvtk
 {
-
   //------------------------------------------------------------------------
   //------------------------------------------------------------------------
   //------------------------------------------------------------------------
@@ -56,10 +51,13 @@ namespace bbwxvtk
   class /*BBTK_EXPORT*/ Viewer2D : public 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_INPUT(Slice,       int);
+    BBTK_DECLARE_INPUT(Interpolate, bool);  // JP
+    BBTK_DECLARE_INPUT(Orientation, int);    
+    BBTK_DECLARE_INPUT(In,          vtkImageData *);
+    BBTK_DECLARE_OUTPUT(Out,        int);
+    
     BBTK_DECLARE_OUTPUT(Renderer,vtkRenderer*);
     BBTK_PROCESS(Process);
     BBTK_CREATE_WIDGET(CreateWidget);
@@ -68,7 +66,7 @@ namespace bbwxvtk
     void Process();
     void CreateWidget(wxWindow*);
     //    void OnShowWidget();
-    void bbUserConstructor();
+
   };
    
   //=================================================================
@@ -78,15 +76,15 @@ namespace bbwxvtk
   BBTK_AUTHOR("eduardo.davila@creatis.insa-lyon.fr");
   BBTK_DESCRIPTION("2D Viewer widget (vtk)");
   BBTK_CATEGORY("viewer");
-  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_INPUT(Viewer2D, Slice,       "Initial Slice number",                     int,            "");
+  BBTK_INPUT(Viewer2D, Orientation, "Slicing orientation : 0:yz / 1:xz / 2:xy", int,            "");
+  BBTK_INPUT(Viewer2D, Interpolate, "Pixels interpolation: true/false        ", bool,           ""); // JP
+  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);
   //=================================================================
 
-
 }//namespace bbwxvtk
 
 #endif  //__bbwxvtkViewer2D_h__