Allow to display in all directions for images with size 2 and 3 in 3rd direction

[clitk.git] / vv / vvSlicer.cxx

diff --git a/vv/vvSlicer.cxx b/vv/vvSlicer.cxx
index 46139cd75fa1b6d7bb3a3b66a0d873d25ee6cdbf..2089d41caa3d564e5e076b0e3f94df4710d56fb5 100644 (file)
--- a/vv/vvSlicer.cxx
+++ b/vv/vvSlicer.cxx
@@ -24,6 +24,7 @@
 #include "vvSlicerManagerCommand.h"
 #include "vvGlyphSource.h"
 #include "vvGlyph2D.h"
+#include "vvUtils.h"
 
 #include <vtkVersion.h>
 #include <vtkExtentTranslator.h>
@@ -134,7 +135,7 @@ vvSlicer::vvSlicer()
 
   pdmA = vtkSmartPointer<vtkActor2D>::New();
   pdmA->SetMapper(pdm);
-  pdmA->GetProperty()->SetColor(255,10,212);
+  pdmA->GetProperty()->SetColor(1,0,0);
   pdmA->SetVisibility(0);
   pdmA->SetPickable(0);
 
@@ -150,10 +151,10 @@ vvSlicer::vvSlicer()
 
   legend = vtkSmartPointer<vtkScalarBarActor>::New();
   //legend->SetTitle("test!");
-  legend->SetPosition(0.82,0.18);
-  legend->SetWidth(0.1);
+  legend->SetPosition(0.82,0.08);
+  //legend->SetWidth(0.1);
   legend->SetVisibility(0);
-  legend->SetLabelFormat("%.1f");
+  legend->SetLabelFormat("%.1e");
   this->GetRenderer()->AddActor(legend);
   showFusionLegend = false;
 
@@ -170,6 +171,7 @@ vvSlicer::vvSlicer()
   mConcatenatedTransform = vtkSmartPointer<vtkTransform>::New();
   mConcatenatedFusionTransform = vtkSmartPointer<vtkTransform>::New();
   mConcatenatedOverlayTransform = vtkSmartPointer<vtkTransform>::New();
+  mConcatenatedVFTransform = vtkSmartPointer<vtkTransform>::New();
   mFirstSetSliceOrientation = true;
 }
 //------------------------------------------------------------------------------
@@ -267,7 +269,7 @@ void vvSlicer::ToggleContourSuperposition()
 
 
 //------------------------------------------------------------------------------
-void vvSlicer::SetCursorColor(int r,int g, int b)
+void vvSlicer::SetCursorColor(double r, double g, double b)
 { 
   pdmA->GetProperty()->SetColor(r,g,b);
 }
@@ -351,6 +353,8 @@ void vvSlicer::SetImage(vvImage::Pointer image)
     if (!mImageReslice) {
       mImageReslice = vtkSmartPointer<vtkImageReslice>::New();
       mImageReslice->SetInterpolationModeToLinear();
+      SetInterpolationImageReslice(getInterpolationFavoriteStatus());
+      GetImageActor()->SetInterpolate(getInterpolationFavoriteStatus());
       mImageReslice->AutoCropOutputOn();
       mImageReslice->SetBackgroundColor(-1000,-1000,-1000,1);
     }
@@ -358,8 +362,7 @@ void vvSlicer::SetImage(vvImage::Pointer image)
     mConcatenatedTransform->Identity();
     mConcatenatedTransform->Concatenate(mImage->GetTransform()[0]);
     mConcatenatedTransform->Concatenate(mSlicingTransform);
-    mImageReslice->SetResliceTransform(mConcatenatedTransform);
-    //mImageReslice->SetResliceAxes(mConcatenatedTransform->GetMatrix());
+    mImageReslice->SetResliceAxes(mConcatenatedTransform->GetMatrix());
 #if VTK_MAJOR_VERSION <= 5
     mImageReslice->SetInput(0, mImage->GetFirstVTKImageData());
 #else
@@ -377,8 +380,7 @@ void vvSlicer::SetImage(vvImage::Pointer image)
 #if VTK_MAJOR_VERSION <= 5
     this->GetInput()->GetWholeExtent(extent);
 #else
-    int* ext = mImageReslice->GetInputInformation()->Get(vtkStreamingDemandDrivenPipeline::WHOLE_EXTENT());
-    copyExtent(ext, extent);
+    mImageReslice->GetOutput()->GetExtent(extent);
 #endif
 
     // Prevent crash when reload -> change slice if outside extent
@@ -392,8 +394,11 @@ void vvSlicer::SetImage(vvImage::Pointer image)
 #if VTK_MAJOR_VERSION <= 5
     mImageReslice->GetOutput()->SetUpdateExtent(extent);
     mImageReslice->GetOutput()->Update();
+#elif VTK_MAJOR_VERSION >= 8 || (VTK_MAJOR_VERSION == 7 && VTK_MINOR_VERSION >= 1)
+    mImageReslice->UpdateExtent(extent);
+    mImageReslice->Update();
 #else
-    //mImageReslice->SetUpdateExtent(extent);
+    mImageReslice->SetUpdateExtent(extent);
     mImageReslice->Update();
 #endif
 
@@ -423,7 +428,7 @@ void vvSlicer::SetOverlay(vvImage::Pointer overlay)
     mConcatenatedOverlayTransform->Identity();
     mConcatenatedOverlayTransform->Concatenate(mOverlay->GetTransform()[0]);
     mConcatenatedOverlayTransform->Concatenate(mSlicingTransform);
-    mOverlayReslice->SetResliceTransform(mConcatenatedOverlayTransform);
+    mOverlayReslice->SetResliceAxes(mConcatenatedOverlayTransform->GetMatrix());
 #if VTK_MAJOR_VERSION <= 5
     mOverlayReslice->SetInput(0, mOverlay->GetFirstVTKImageData());
     mImageReslice->UpdateInformation();
@@ -453,6 +458,7 @@ void vvSlicer::SetOverlay(vvImage::Pointer overlay)
 #if VTK_MAJOR_VERSION >= 6 || (VTK_MAJOR_VERSION >= 5 && VTK_MINOR_VERSION >= 10)
       mOverlayActor->GetMapper()->BorderOn();
 #endif
+      mOverlayActor->SetInterpolate(getInterpolationFavoriteStatus());
       }
 
     //stupid but necessary : the Overlay need to be rendered before fusion
@@ -490,7 +496,7 @@ void vvSlicer::SetFusion(vvImage::Pointer fusion, int fusionSequenceCode)
     mConcatenatedFusionTransform->Identity();
     mConcatenatedFusionTransform->Concatenate(mFusion->GetTransform()[0]);
     mConcatenatedFusionTransform->Concatenate(mSlicingTransform);
-    mFusionReslice->SetResliceTransform(mConcatenatedFusionTransform);
+    mFusionReslice->SetResliceAxes(mConcatenatedFusionTransform->GetMatrix());
 #if VTK_MAJOR_VERSION <= 5
     mFusionReslice->SetInput(0, mFusion->GetFirstVTKImageData());
     mFusionReslice->UpdateInformation();
@@ -528,6 +534,7 @@ void vvSlicer::SetFusion(vvImage::Pointer fusion, int fusionSequenceCode)
       mFusionActor->GetMapper()->BorderOn();
 #endif
 
+      mFusionActor->SetInterpolate(getInterpolationFavoriteStatus());
       this->GetRenderer()->AddActor(mFusionActor);
     }
 
@@ -583,15 +590,31 @@ void vvSlicer::SetVF(vvImage::Pointer vf)
     mVFVisibility = true;
 
     if (!mAAFilter) {
+      mVFReslice = vtkSmartPointer<vtkImageReslice>::New();
+      mVFReslice->SetInterpolationModeToLinear();
+      mVFReslice->AutoCropOutputOn();
+      mVFReslice->SetBackgroundColor(-1000,-1000,-1000,1);
       mAAFilter= vtkSmartPointer<vtkAssignAttribute>::New();
       mVOIFilter = vtkSmartPointer<vtkExtractVOI>::New();
       mVOIFilter->SetSampleRate(mSubSampling,mSubSampling,mSubSampling);
     }
+
+    mConcatenatedVFTransform->Identity();
+    mConcatenatedVFTransform->Concatenate(mVF->GetTransform()[0]);
+    mConcatenatedVFTransform->Concatenate(mSlicingTransform);
+    mVFReslice->SetResliceAxes(mConcatenatedVFTransform->GetMatrix());
 #if VTK_MAJOR_VERSION <= 5
-    mVOIFilter->SetInput(vf->GetFirstVTKImageData());
+    mVFReslice->SetInput(0, mVF->GetFirstVTKImageData());
+#else
+    mVFReslice->SetInputData(0, mVF->GetFirstVTKImageData());
+#endif
+    mVFReslice->Update();
+
+#if VTK_MAJOR_VERSION <= 5
+    mVOIFilter->SetInput(mVFReslice->GetOutput());
     mAAFilter->SetInput(mVOIFilter->GetOutput());
 #else
-    mVOIFilter->SetInputData(vf->GetFirstVTKImageData());
+    mVOIFilter->SetInputConnection(mVFReslice->GetOutputPort());
     mAAFilter->SetInputConnection(mVOIFilter->GetOutputPort());
 #endif
     ///This tells VTK to use the scalar (pixel) data of the image to draw the little arrows
@@ -635,7 +658,9 @@ void vvSlicer::SetVF(vvImage::Pointer vf)
 #else
     mVFMapper->SetInputConnection(mGlyphFilter->GetOutputPort());
 #endif
+#ifndef VTK_OPENGL2
     mVFMapper->ImmediateModeRenderingOn();
+#endif
     mVFMapper->SetLookupTable(mVFColorLUT);
 
     if (!mVFActor)
@@ -846,10 +871,14 @@ void vvSlicer::SetTSlice(int t, bool updateLinkedImages)
   if (mVF && mVFActor->GetVisibility()) {
     if (mVF->GetVTKImages().size() > (unsigned int)mCurrentTSlice)
 #if VTK_MAJOR_VERSION <= 5
-      mVOIFilter->SetInput(mVF->GetVTKImages()[mCurrentTSlice]);
+      mVFReslice->SetInput(mVF->GetVTKImages()[mCurrentTSlice]);
 #else
-      mVOIFilter->SetInputData(mVF->GetVTKImages()[mCurrentTSlice]);
+      mVFReslice->SetInputData(mVF->GetVTKImages()[mCurrentTSlice]);
 #endif
+      // Update overlay transform
+      mConcatenatedVFTransform->Identity();
+      mConcatenatedVFTransform->Concatenate(mVF->GetTransform()[mCurrentTSlice]);
+      mConcatenatedVFTransform->Concatenate(mSlicingTransform);
   }
   //update the overlay
   if (mOverlay && mOverlayActor->GetVisibility()) {
@@ -959,7 +988,7 @@ void vvSlicer::SetSliceOrientation(int orientation)
     copyExtent(ext, extent);
 #endif
 
-  if (extent[5]-extent[4] <= 2)
+  if (extent[5]-extent[4] < 1)
     orientation = vtkImageViewer2::SLICE_ORIENTATION_XY;
 
   if (orientation < vtkImageViewer2::SLICE_ORIENTATION_YZ ||
@@ -976,6 +1005,9 @@ void vvSlicer::SetSliceOrientation(int orientation)
   if(mOverlay)
     AdjustResliceToSliceOrientation(mOverlayReslice);
 
+  if(mVF)
+    AdjustResliceToSliceOrientation(mVFReslice);
+
   // Update the viewer
   
   // Go to current cursor position
@@ -1193,14 +1225,15 @@ void vvSlicer::UpdateDisplayExtent()
     offset = -1;
   
   if (mVF && mVFVisibility) {
+    AdjustResliceToSliceOrientation(mVFReslice);
     int vfExtent[6];
 #if VTK_MAJOR_VERSION <= 5
     mVF->GetVTKImages()[0]->UpdateInformation();
-    this->ConvertImageToImageDisplayExtent(input, w_ext, mVF->GetVTKImages()[0], vfExtent);
+    this->ConvertImageToImageDisplayExtent(input, w_ext, mVFReslice->GetOutput(), vfExtent);
     bool out = ClipDisplayedExtent(vfExtent, mVOIFilter->GetInput()->GetWholeExtent());
 #else
     mVOIFilter->Update();
-    this->ConvertImageToImageDisplayExtent(mImageReslice->GetOutputInformation(0), w_ext, mVF->GetVTKImages()[0], vfExtent);
+    this->ConvertImageToImageDisplayExtent(mImageReslice->GetOutputInformation(0), w_ext, mVFReslice->GetOutput(), vfExtent);
     bool out = ClipDisplayedExtent(vfExtent, mVOIFilter->GetInputInformation()->Get(vtkStreamingDemandDrivenPipeline::WHOLE_EXTENT()));
 #endif
     mVFActor->SetVisibility(!out);
@@ -1765,6 +1798,8 @@ void vvSlicer::Render()
     }
 #if VTK_MAJOR_VERSION <= 5
     mOverlayMapper->GetOutput()->SetUpdateExtent(mOverlayActor->GetDisplayExtent());
+#elif VTK_MAJOR_VERSION >= 8 || (VTK_MAJOR_VERSION == 7 && VTK_MINOR_VERSION >= 1)
+    mOverlayMapper->UpdateExtent(mOverlayActor->GetDisplayExtent());
 #else
     mOverlayMapper->SetUpdateExtent(mOverlayActor->GetDisplayExtent());
 #endif
@@ -1773,6 +1808,8 @@ void vvSlicer::Render()
   if (mFusion && mFusionActor->GetVisibility()) {
 #if VTK_MAJOR_VERSION <= 5
     mFusionMapper->GetOutput()->SetUpdateExtent(mFusionActor->GetDisplayExtent());
+#elif VTK_MAJOR_VERSION >= 8 || (VTK_MAJOR_VERSION == 7 && VTK_MINOR_VERSION >= 1)
+    mFusionMapper->UpdateExtent(mFusionActor->GetDisplayExtent());
 #else
     mFusionMapper->SetUpdateExtent(mFusionActor->GetDisplayExtent());
 #endif