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

diff --git a/packages/wxvtk/src/bbwxvtkViewer2D.h b/packages/wxvtk/src/bbwxvtkViewer2D.h
index b0a9d82..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/11/13 14:46:48 $
-  Version:   $Revision: 1.9 $
+  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,28 +48,7 @@
 
 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;
-  };
-  
   //------------------------------------------------------------------------
   //------------------------------------------------------------------------
   //------------------------------------------------------------------------
@@ -84,11 +63,11 @@ namespace bbwxvtk
     BBTK_DECLARE_OUTPUT(Renderer,vtkRenderer*);
     BBTK_PROCESS(Process);
     BBTK_CREATE_WIDGET(CreateWidget);
-    BBTK_ON_SHOW_WIDGET(OnShowWidget);
+    //   BBTK_ON_SHOW_WIDGET(OnShowWidget);
     
     void Process();
-    void CreateWidget();
-    void OnShowWidget();
+    void CreateWidget(wxWindow*);
+    //    void OnShowWidget();
     void bbUserConstructor();
   };
    
@@ -112,5 +91,5 @@ namespace bbwxvtk
 
 #endif  //__bbwxvtkViewer2D_h__
 
-#endif //_USE_VTK_
-#endif //_USE_WXWIDGETS_
+#endif //USE_VTK
+#endif //USE_WXWIDGETS