#3212 BBTK Feature New Normal - vtk8itk4wx3-mingw64

[bbtk.git] / packages / wxvtk / src / wxvtkImageViewer2.cxx

diff --git a/packages/wxvtk/src/wxvtkImageViewer2.cxx b/packages/wxvtk/src/wxvtkImageViewer2.cxx
index adf4c66218bbe8a0095bab8e3201f7ae13351eae..0e96065b9a840aacc6934a110fbc50b21cc105e2 100644 (file)
--- a/packages/wxvtk/src/wxvtkImageViewer2.cxx
+++ b/packages/wxvtk/src/wxvtkImageViewer2.cxx
@@ -53,7 +53,13 @@
 #include "vtkRenderWindowInteractor.h"
 #include "vtkRenderer.h"
 
+//EED 2017-01-01 Migration VTK7
+#if VTK_MAJOR_VERSION <= 5
 vtkCxxRevisionMacro(wxvtkImageViewer2, "$Revision: 1.8 $");
+#else
+  //...
+#endif
+
 vtkStandardNewMacro(wxvtkImageViewer2);
 
 //----------------------------------------------------------------------------
@@ -222,8 +228,15 @@ void wxvtkImageViewer2::GetSliceRange(int &min, int &max)
   vtkImageData *input = this->GetInput();
   if (input)
     {
+
+//EED 2017-01-01 Migration VTK7
+#if VTK_MAJOR_VERSION <= 5
     input->UpdateInformation();
     int *w_ext = input->GetWholeExtent();
+#else
+    int *w_ext = input->GetExtent();
+#endif
+
     min = w_ext[this->SliceOrientation * 2];
     max = w_ext[this->SliceOrientation * 2 + 1];
     }
@@ -235,8 +248,15 @@ int* wxvtkImageViewer2::GetSliceRange()
   vtkImageData *input = this->GetInput();
   if (input)
     {
+//EED 2017-01-01 Migration VTK7
+#if VTK_MAJOR_VERSION <= 5
     input->UpdateInformation();
+printf("EED Warning wxvtkImageViewer2::GetSliceRange  GetWholeExtent()[2] ??? /n");
     return input->GetWholeExtent() + this->SliceOrientation * 2;
+#else
+printf("EED Warning wxvtkImageViewer2::GetSliceRange  GetExtent()[2] ??? /n");
+    return input->GetExtent() + this->SliceOrientation * 2;
+#endif
     }
   return NULL;
 }
@@ -359,7 +379,7 @@ void wxvtkImageViewer2::UpdateOrientation()
                          cam->SetFocalPoint(0,0,0);
                        break;
       }
-       
+
 /*             
                switch (this->SliceOrientation)
                {
@@ -398,8 +418,13 @@ void wxvtkImageViewer2::UpdateDisplayExtent()
     }
 
   //  std::cout << "--- wxvtkImageViewer2::UpdateDisplayExtent()"<<std::endl;
+//EED 2017-01-01 Migration VTK7
+#if VTK_MAJOR_VERSION <= 5
   input->UpdateInformation();
   int *w_ext = input->GetWholeExtent();
+#else
+  int *w_ext = input->GetExtent();
+#endif
 
   //   std::cout << "ext = "
   //   <<w_ext[0]<<" - "<<w_ext[1]<<" ; "
@@ -443,9 +468,7 @@ void wxvtkImageViewer2::UpdateDisplayExtent()
         this->InteractorStyle->GetAutoAdjustCameraClippingRange())
       {
       this->Renderer->ResetCameraClippingRange();
-      }
-    else
-      {
+      } else {
       vtkCamera *cam = this->Renderer->GetActiveCamera();
       if (cam)
         {
@@ -460,9 +483,9 @@ void wxvtkImageViewer2::UpdateDisplayExtent()
          spacing[2]; // JPR??
         cam->SetClippingRange(
           range - avg_spacing * 3.0, range + avg_spacing * 3.0);
-        }
-      }
-    }
+        } // if cam
+      } // if InteractorStyle
+    } // if Renderer
 }
 
 //----------------------------------------------------------------------------
@@ -538,10 +561,17 @@ public:
 
       if (event == vtkCommand::ResetWindowLevelEvent)
         {
+
+//EED 2017-01-01 Migration VTK7
+#if VTK_MAJOR_VERSION <= 5
         this->IV->GetInput()->UpdateInformation();
         this->IV->GetInput()->SetUpdateExtent
           (this->IV->GetInput()->GetWholeExtent());
         this->IV->GetInput()->Update();
+#else
+  //...
+#endif
+
         double *range = this->IV->GetInput()->GetScalarRange();
         this->IV->SetColorWindow(range[1] - range[0]);
         this->IV->SetColorLevel(0.5 * (range[1] + range[0]));
@@ -668,7 +698,13 @@ void wxvtkImageViewer2::InstallPipeline()
 
   if (this->ImageActor && this->WindowLevel)
     {
+//EED 2017-01-01 Migration VTK7
+#if VTK_MAJOR_VERSION <= 5
     this->ImageActor->SetInput(this->WindowLevel->GetOutput());
+#else
+       this->WindowLevel->Update();
+    this->ImageActor->SetInputData(this->WindowLevel->GetOutput());
+#endif
     }
 }
 
@@ -677,7 +713,12 @@ void wxvtkImageViewer2::UnInstallPipeline()
 {
   if (this->ImageActor)
     {
+//EED 2017-01-01 Migration VTK7
+#if VTK_MAJOR_VERSION <= 5
     this->ImageActor->SetInput(NULL);
+#else
+    this->ImageActor->SetInputData(NULL);
+#endif
     }
 
   if (this->Renderer && this->ImageActor)
@@ -709,8 +750,15 @@ void wxvtkImageViewer2::Render()
        input)
       {
 
+
+//EED 2017-01-01 Migration VTK7
+#if VTK_MAJOR_VERSION <= 5
       input->UpdateInformation();
       int *w_ext = input->GetWholeExtent();
+#else
+      int *w_ext = input->GetExtent();
+#endif
+
       int xs = 0, ys = 0;
 
       //       std::cout << "wxvtkImageViewer2::Render ext = "
@@ -784,7 +832,13 @@ int wxvtkImageViewer2::GetOffScreenRendering()
 void wxvtkImageViewer2::SetInput(vtkImageData *in)
 {
   //  std::cout << "### wxvtkImageViewer2::SetInput"<<std::endl;
+//EED 2017-01-01 Migration VTK7
+#if VTK_MAJOR_VERSION <= 5
   this->WindowLevel->SetInput(in);
+#else
+  this->WindowLevel->SetInputData(in);
+#endif
+
   this->UpdateDisplayExtent();
   // LG 03/12/08
   //  FirstRender = 1;