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

diff --git a/packages/wxvtk/src/bbwxvtkViewer2D.h b/packages/wxvtk/src/bbwxvtkViewer2D.h
index 34d5d55..cdb26f1 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/04/08 06:59:33 $
-  Version:   $Revision: 1.3 $
+  Date:      $Date: 2008/12/11 15:30:17 $
+  Version:   $Revision: 1.15 $
                                                                                 
   Copyright (c) CREATIS (Centre de Recherche et d'Applications en Traitement de
   l'Image). All rights reserved. See Doc/License.txt or
@@ -30,15 +30,15 @@
  */
 
 
-#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"
@@ -48,42 +48,27 @@
 
 namespace bbwxvtk
 {
-  class Viewer2D; 
 
-
-  //--------------------------------------------------------------------------
-  class Viewer2DWidget : public wxPanel
-  {
-  public:
-    Viewer2DWidget(Viewer2D* box, wxWindow *parent);
-    ~Viewer2DWidget();
-    void UpdateView();
-  private:
-    Viewer2D                     *mBox;
-    vtkImageViewer2		 *imageViewer;
-    vtkImageData		 *backImageData;
-    wxVTKRenderWindowInteractor  *wxvtkrenderwindowinteractor;
-
-    vtkImplicitPlaneWidget * maPlane1, * maPlane2, * mbPlane1, * mbPlane2;
-
-  };
-  
   //------------------------------------------------------------------------
   //------------------------------------------------------------------------
   //------------------------------------------------------------------------
   
   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();
+    //   BBTK_ON_SHOW_WIDGET(OnShowWidget);
+    
+    void Process();
+    void CreateWidget(wxWindow*);
+    //    void OnShowWidget();
+    void bbUserConstructor();
   };
    
   //=================================================================
@@ -91,12 +76,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,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);
   //=================================================================
 
@@ -105,5 +91,5 @@ namespace bbwxvtk
 
 #endif  //__bbwxvtkViewer2D_h__
 
-#endif //_USE_VTK_
-#endif //_USE_WXWIDGETS_
+#endif //USE_VTK
+#endif //USE_WXWIDGETS