Merge remote-tracking branch 'origin/changeWx28to30' into vtk7itk4wx3

[creaImageIO.git] / src / creaImageIOWxViewer.cpp

diff --git a/src/creaImageIOWxViewer.cpp b/src/creaImageIOWxViewer.cpp
index 7942f624855f791a5044f93a4f93adb3d06f406b..ee2258aa2ea73d8b4b921e1e3dba275799a261dd 100644 (file)
--- a/src/creaImageIOWxViewer.cpp
+++ b/src/creaImageIOWxViewer.cpp
@@ -26,12 +26,11 @@
 */
 
 #include <creaImageIOWxViewer.h>
-#include <creaImageIOSystem.h>
+
 #include <fstream>
 #include <vtkCamera.h>
 #include <vtkRenderer.h>
 #include <vtkImageData.h>
-#include <creawxVTKRenderWindowInteractor.h>
 #include <creaMessageManager.h>
 #include <stdio.h>
 #include <time.h>
@@ -86,7 +85,7 @@ namespace creaImageIO
     mLastImageShown = NULL;
        
        // previewer    
-    mInteractor = new crea::creawxVTKRenderWindowInteractor(this,-1);
+    mInteractor = new crea::wxVTKRenderWindowInteractor(this,-1);
     mInteractor->UseCaptureMouseOn();  
  
     mViewer    = vtkImageViewer2::New();
@@ -145,7 +144,7 @@ namespace creaImageIO
        GimmickDebugMessage(6,"WxViewer::SetImageVector"<<std::endl);
        imagePointers=pointers;
        
-       mslide->SetMax(pointers.size());
+       mslide->SetMax((int)pointers.size());
        mslide->SetMin(1);
        // Refresh don't work, TO MODIFY
        mslide->Refresh();
@@ -208,20 +207,40 @@ namespace creaImageIO
                        <<std::endl);
     if (im==0) return;
 
+//EED 2017-01-01 Migration VTK7
+#if VTK_MAJOR_VERSION <= 5
     mViewer->SetInput(im);
+#else
+    mViewer->SetInputData(im);
+#endif
 
     mViewer->SetSlice( 0 );
 
     int x1,x2,y1,y2,z1,z2;
     double spx,spy,spz;
+//EED 2017-01-01 Migration VTK7
+#if VTK_MAJOR_VERSION <= 5
     im->Update();
+#else
+       // ...
+#endif
+
 
 //std::cout << "in WxViewer::ShowImage PrintSelf() =";
 //im->PrintSelf(std::cout, vtkIndent(2));
 
     im->GetSpacing(spx,spy,spz);
     //im->GetExtent (x1,x2,y1,y2,z1,z2);  // JPR
+
+
+//EED 2017-01-01 Migration VTK7
+#if VTK_MAJOR_VERSION <= 5
     im->GetWholeExtent (x1,x2,y1,y2,z1,z2); 
+#else
+    im->GetExtent (x1,x2,y1,y2,z1,z2); 
+#endif
+
+
 /*       
 std::cout << "in WxViewer::ShowImage GetWholeExtent ext =";
        std::cout << "   [x1]=" << x1;