From: Eduardo DAVILA <davila@localhost.localdomain>
Date: Tue, 3 Oct 2017 14:12:03 +0000 (+0200)
Subject: #135 BBTK Feature New Normal  -  branch vtk7itk4wx3
X-Git-Url: https://git.creatis.insa-lyon.fr/pubgit/?a=commitdiff_plain;h=e269992d2d446784afc40073782311deaa25008f;p=bbtk.git

#135 BBTK Feature New Normal  -  branch vtk7itk4wx3
---

e269992d2d446784afc40073782311deaa25008f
diff --cc packages/wxvtk/src/bbwxvtkViewer2D.cxx
index 23cd7d2,aef4777..26c2d36
--- a/packages/wxvtk/src/bbwxvtkViewer2D.cxx
+++ b/packages/wxvtk/src/bbwxvtkViewer2D.cxx
@@@ -74,22 -62,15 +74,22 @@@ namespace bbwxvt
      Viewer2DWidget(Viewer2D* box, wxWindow *parent);
      ~Viewer2DWidget();
      void UpdateView();
 -    vtkRenderer		*GetRenderer();
 -    vtkImageActor       *GetImageActor();
 +    vtkRenderer					*GetRenderer();
 +    vtkImageActor      			*GetImageActor();
    private:
 -    bool                        mFirstTime;
 -    Viewer2D                    *mBox;
 -    wxvtkImageViewer2		*imageViewer;
 -    vtkImageData		*backImageData;
 -    vtkImageData		*mDefaultImage;
 +    bool         				mFirstTime;
 +    Viewer2D           			*mBox;
 +
 +//EED 2017-01-01 Migration VTK7
 +#if VTK_MAJOR_VERSION <= 5
 +    wxvtkImageViewer2			*imageViewer;
 +#else
 +    vtkImageViewer2				*imageViewer;
 +#endif
 +
 +    vtkImageData				*backImageData;
 +    vtkImageData				*mDefaultImage;
-     wxVTKRenderWindowInteractor *wxvtkrenderwindowinteractor;
+     crea::wxVTKRenderWindowInteractor *wxvtkrenderwindowinteractor;
      bool mUpdateCamera;
  
      vtkImplicitPlaneWidget * maPlane1, * maPlane2, * mbPlane1, * mbPlane2;
@@@ -101,18 -83,11 +101,17 @@@
      mFirstTime(true),
      mBox(box)
    {
-     wxPanel *panel	= this;
- 
-     wxvtkrenderwindowinteractor = new wxVTKRenderWindowInteractor(panel,-1);
+     wxPanel *panel		= this;
+     wxvtkrenderwindowinteractor = new crea::wxVTKRenderWindowInteractor(panel,-1);
      wxvtkrenderwindowinteractor->UseCaptureMouseOn();	
  
 +//EED 2017-01-01 Migration VTK7
 +#if VTK_MAJOR_VERSION <= 5
      imageViewer	= wxvtkImageViewer2::New();
 +#else
 +    imageViewer	= vtkImageViewer2::New();
 +#endif
 +
      imageViewer->SetSlice( 1 );
      imageViewer->SetupInteractor ( wxvtkrenderwindowinteractor );
      
diff --cc packages/wxvtk/src/bbwxvtkViewer2D.h
index 8400ae0,f755890..2acb283
--- a/packages/wxvtk/src/bbwxvtkViewer2D.h
+++ b/packages/wxvtk/src/bbwxvtkViewer2D.h
@@@ -59,7 -59,9 +59,9 @@@
  #include "vtkImplicitPlaneWidget.h"
  
  #include "bbtkWxBlackBox.h"
 +
+ #include "creawxVTKRenderWindowInteractor.h"
+ 
  namespace bbwxvtk
  {
    //------------------------------------------------------------------------