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

diff --git a/packages/wxvtk/src/bbwxvtkViewer2D.h b/packages/wxvtk/src/bbwxvtkViewer2D.h
index a6651ce..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/07/03 13:59:37 $
-  Version:   $Revision: 1.7 $
+  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,47 +29,21 @@
  * \brief 
  */
 
-
-#ifdef _USE_WXWIDGETS_
-#ifdef _USE_VTK_
-
+#ifdef USE_WXWIDGETS
+#ifdef USE_VTK
 
 #ifndef __bbwxvtkViewer2D_h__
 #define __bbwxvtkViewer2D_h__
 
 #include "vtkImageData.h"
-#include "vtkImageViewer2.h"
+#include "wxvtkImageViewer2.h"
 #include "vtkImplicitPlaneWidget.h"
 
 #include "bbtkWxBlackBox.h"
 #include "wxVTKRenderWindowInteractor.h"
 
-
-
 namespace bbwxvtk
 {
-  class Viewer2D; 
-
-
-  //--------------------------------------------------------------------------
-  class Viewer2DWidget : public wxPanel
-  {
-  public:
-    Viewer2DWidget(Viewer2D* box, wxWindow *parent);
-    ~Viewer2DWidget();
-    void UpdateView();
-	vtkRenderer		*GetRenderer();
-  private:
-    Viewer2D                    *mBox;
-    vtkImageViewer2		*imageViewer;
-    vtkImageData		*backImageData;
-    vtkImageData		*mDefaultImage;
-    wxVTKRenderWindowInteractor *wxvtkrenderwindowinteractor;
-    bool mUpdateCamera;
-
-	vtkImplicitPlaneWidget * maPlane1, * maPlane2, * mbPlane1, * mbPlane2;
-  };
-  
   //------------------------------------------------------------------------
   //------------------------------------------------------------------------
   //------------------------------------------------------------------------
@@ -77,17 +51,22 @@ 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);
-    void Process();
     BBTK_CREATE_WIDGET(CreateWidget);
-    void CreateWidget();
-    void bbUserOnShow();
-    void bbUserConstructor();
+    //   BBTK_ON_SHOW_WIDGET(OnShowWidget);
+    
+    void Process();
+    void CreateWidget(wxWindow*);
+    //    void OnShowWidget();
+
   };
    
   //=================================================================
@@ -95,20 +74,20 @@ 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,"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__
 
-#endif //_USE_VTK_
-#endif //_USE_WXWIDGETS_
+#endif //USE_VTK
+#endif //USE_WXWIDGETS