#3107 BBTK Bug New Normal - branch vtk7itk4 compilation with vtk7

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

diff --git a/packages/wxvtk/src/wxvtkImageViewer2.cxx b/packages/wxvtk/src/wxvtkImageViewer2.cxx
index dc3dcfc69586b494efc07ca0b875ca8f7ad4c952..0e96065b9a840aacc6934a110fbc50b21cc105e2 100644 (file)
--- a/packages/wxvtk/src/wxvtkImageViewer2.cxx
+++ b/packages/wxvtk/src/wxvtkImageViewer2.cxx
@@ -379,7 +379,7 @@ void wxvtkImageViewer2::UpdateOrientation()
                          cam->SetFocalPoint(0,0,0);
                        break;
       }
-       
+
 /*             
                switch (this->SliceOrientation)
                {
@@ -468,9 +468,7 @@ void wxvtkImageViewer2::UpdateDisplayExtent()
         this->InteractorStyle->GetAutoAdjustCameraClippingRange())
       {
       this->Renderer->ResetCameraClippingRange();
-      }
-    else
-      {
+      } else {
       vtkCamera *cam = this->Renderer->GetActiveCamera();
       if (cam)
         {
@@ -485,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
 }
 
 //----------------------------------------------------------------------------
@@ -704,6 +702,7 @@ void wxvtkImageViewer2::InstallPipeline()
 #if VTK_MAJOR_VERSION <= 5
     this->ImageActor->SetInput(this->WindowLevel->GetOutput());
 #else
+       this->WindowLevel->Update();
     this->ImageActor->SetInputData(this->WindowLevel->GetOutput());
 #endif
     }