]> Creatis software - clitk.git/blobdiff - vv/vvSlicer.cxx
git://git.creatis.insa-lyon.fr / clitk.git / blobdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | inline | side by side
VTK remove ImmediateModeRendering due to
[clitk.git] / vv / vvSlicer.cxx
diff --git a/vv/vvSlicer.cxx b/vv/vvSlicer.cxx
index db4b0cf525811c16c20b2742fc081d3c06be4336..7405a450bb67f3e35f23aedfbd39abba34cfa8cf 100644 (file)
--- a/vv/vvSlicer.cxx
+++ b/vv/vvSlicer.cxx
@@ -57,6 +57,7 @@
 #include <vtkLight.h>
 #include <vtkLightCollection.h>
 #include <vtkScalarBarActor.h>
+#include <vtkImageProperty.h>
 #include <vtkLookupTable.h>
 
 #include <vtkRenderer.h>
@@ -149,10 +150,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;
 
@@ -169,6 +170,7 @@ vvSlicer::vvSlicer()
   mConcatenatedTransform = vtkSmartPointer<vtkTransform>::New();
   mConcatenatedFusionTransform = vtkSmartPointer<vtkTransform>::New();
   mConcatenatedOverlayTransform = vtkSmartPointer<vtkTransform>::New();
+  mConcatenatedVFTransform = vtkSmartPointer<vtkTransform>::New();
   mFirstSetSliceOrientation = true;
 }
 //------------------------------------------------------------------------------
@@ -322,6 +324,13 @@ double* vvSlicer::GetCurrentPosition()
 }
 //------------------------------------------------------------------------------
 
+//------------------------------------------------------------------------------
+void vvSlicer::SetInterpolationImageReslice(int interpolation)
+{ 
+  mImageReslice->SetInterpolationMode(interpolation);
+}
+//------------------------------------------------------------------------------
+
 //------------------------------------------------------------------------------
 void vvSlicer::SetCurrentPosition(double x, double y, double z, int t)
 { 
@@ -350,7 +359,7 @@ void vvSlicer::SetImage(vvImage::Pointer image)
     mConcatenatedTransform->Identity();
     mConcatenatedTransform->Concatenate(mImage->GetTransform()[0]);
     mConcatenatedTransform->Concatenate(mSlicingTransform);
-    mImageReslice->SetResliceTransform(mConcatenatedTransform);
+    mImageReslice->SetResliceAxes(mConcatenatedTransform->GetMatrix());
 #if VTK_MAJOR_VERSION <= 5
     mImageReslice->SetInput(0, mImage->GetFirstVTKImageData());
 #else
@@ -368,8 +377,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
@@ -383,8 +391,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
 
@@ -414,7 +425,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();
@@ -481,7 +492,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();
@@ -574,15 +585,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
+    mVFReslice->SetInput(0, mVF->GetFirstVTKImageData());
+#else
+    mVFReslice->SetInputData(0, mVF->GetFirstVTKImageData());
+#endif
+    mVFReslice->Update();
+
 #if VTK_MAJOR_VERSION <= 5
-    mVOIFilter->SetInput(vf->GetFirstVTKImageData());
+    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
@@ -626,7 +653,9 @@ void vvSlicer::SetVF(vvImage::Pointer vf)
 #else
     mVFMapper->SetInputConnection(mGlyphFilter->GetOutputPort());
 #endif
+#ifndef VTK_OPENGL2
     mVFMapper->ImmediateModeRenderingOn();
+#endif
     mVFMapper->SetLookupTable(mVFColorLUT);
 
     if (!mVFActor)
@@ -837,10 +866,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()) {
@@ -916,9 +949,9 @@ int vvSlicer::GetTSlice()
 int vvSlicer::GetMaxCurrentTSlice()
 { 
   int t = mCurrentTSlice;
-  if(mOverlay)
+  if(mOverlay && mOverlayActor->GetVisibility())
     t = std::max(t, mCurrentOverlayTSlice);
-  if(mFusion&& (mFusionSequenceCode<0)) //ignore fusionSequence data: for these, the times are not to be related (this way)
+  if(mFusion&& (mFusionSequenceCode<0) && mFusionActor->GetVisibility()) //ignore fusionSequence data: for these, the times are not to be related (this way)
     t = std::max(t, mCurrentFusionTSlice);
   return t;
 }
@@ -967,6 +1000,9 @@ void vvSlicer::SetSliceOrientation(int orientation)
   if(mOverlay)
     AdjustResliceToSliceOrientation(mOverlayReslice);
 
+  if(mVF)
+    AdjustResliceToSliceOrientation(mVFReslice);
+
   // Update the viewer
   
   // Go to current cursor position
@@ -1184,14 +1220,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);
@@ -1630,7 +1667,6 @@ double vvSlicer::GetScalarComponentAsDouble(vtkImageData *image, double X, doubl
   //image->SetUpdateExtent(ix, ix, iy, iy, iz, iz);
   //image->Update();
 #endif
-
   return image->GetScalarComponentAsDouble(ix, iy, iz, component);
 }
 //----------------------------------------------------------------------------
@@ -1650,7 +1686,6 @@ void vvSlicer::Render()
   } else legend->SetVisibility(0);
 
   if (ca->GetVisibility()) {
-
     std::stringstream worldPos(" ");
     double pt[3];
     mConcatenatedTransform->TransformPoint(mCurrent, pt);
@@ -1664,25 +1699,6 @@ void vvSlicer::Render()
         Y <= mImage->GetVTKImages()[mCurrentTSlice]->GetWholeExtent()[3]+0.5 &&
         Z >= mImage->GetVTKImages()[mCurrentTSlice]->GetWholeExtent()[4]-0.5 &&
         Z <= mImage->GetVTKImages()[mCurrentTSlice]->GetWholeExtent()[5]+0.5) {
-
-      
-      int ix, iy, iz;
-      double value = this->GetScalarComponentAsDouble(mImage->GetVTKImages()[mCurrentTSlice], X, Y, Z, ix, iy, iz);
-
-      if(ImageActor->GetVisibility())
-        worldPos << "data value : " << value << std::endl;
-
-      worldPos << "mm : " << lrint(mCurrentBeforeSlicingTransform[0]) << ' '
-                          << lrint(mCurrentBeforeSlicingTransform[1]) << ' '
-                          << lrint(mCurrentBeforeSlicingTransform[2]) << ' '
-                          << mCurrentTSlice
-                          << std::endl;
-      worldPos << "pixel : " << ix << ' '
-                             << iy << ' '
-                             << iz << ' '
-                             << mCurrentTSlice
-                             << std::endl;
-    }
 #else
     if (X >= mImage->GetVTKImages()[mCurrentTSlice]->GetInformation()->Get(vtkDataObject::DATA_EXTENT())[0]-0.5 &&
         X <= mImage->GetVTKImages()[mCurrentTSlice]->GetInformation()->Get(vtkDataObject::DATA_EXTENT())[1]+0.5 &&
@@ -1690,16 +1706,14 @@ void vvSlicer::Render()
         Y <= mImage->GetVTKImages()[mCurrentTSlice]->GetInformation()->Get(vtkDataObject::DATA_EXTENT())[3]+0.5 &&
         Z >= mImage->GetVTKImages()[mCurrentTSlice]->GetInformation()->Get(vtkDataObject::DATA_EXTENT())[4]-0.5 &&
         Z <= mImage->GetVTKImages()[mCurrentTSlice]->GetInformation()->Get(vtkDataObject::DATA_EXTENT())[5]+0.5) {
-
+#endif
       int ix, iy, iz;
       double value = this->GetScalarComponentAsDouble(mImage->GetVTKImages()[mCurrentTSlice], X, Y, Z, ix, iy, iz);
-
       if(ImageActor->GetVisibility())
         worldPos << "data value : " << value << std::endl;
-
-      worldPos << "mm : " << lrint(mCurrentBeforeSlicingTransform[0]) << ' '
-                          << lrint(mCurrentBeforeSlicingTransform[1]) << ' '
-                          << lrint(mCurrentBeforeSlicingTransform[2]) << ' '
+      worldPos << "mm : " << lrint(mCurrent[0]) << ' '
+                          << lrint(mCurrent[1]) << ' '
+                          << lrint(mCurrent[2]) << ' '
                           << mCurrentTSlice
                           << std::endl;
       worldPos << "pixel : " << ix << ' '
@@ -1709,7 +1723,6 @@ void vvSlicer::Render()
                              << std::endl;
     
     }
-#endif
     ca->SetText(1,worldPos.str().c_str());
 
     std::stringstream slicePos;
@@ -1780,6 +1793,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
@@ -1788,6 +1803,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
Public Command Line ITK tools and VV