X-Git-Url: https://git.creatis.insa-lyon.fr/pubgit/?a=blobdiff_plain;f=vv%2FvvSlicer.cxx;h=9a19cdf330ce9dda2ca9fa878112cdb9e5c7133c;hb=bff12b935c8c8f9c55f474e7b773fa8fa9d84865;hp=7efaf2675c4caa351f090d1ce2de2a5d3e397972;hpb=e55d86a6f36d877a88649cc0494be51aa6eba5e0;p=clitk.git

diff --git a/vv/vvSlicer.cxx b/vv/vvSlicer.cxx
index 7efaf26..9a19cdf 100644
--- 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>
@@ -322,6 +323,13 @@ double* vvSlicer::GetCurrentPosition()
 }
 //------------------------------------------------------------------------------
 
+//------------------------------------------------------------------------------
+void vvSlicer::SetInterpolationImageReslice(int interpolation)
+{ 
+  mImageReslice->SetInterpolationMode(interpolation);
+}
+//------------------------------------------------------------------------------
+
 //------------------------------------------------------------------------------
 void vvSlicer::SetCurrentPosition(double x, double y, double z, int t)
 { 
@@ -351,6 +359,7 @@ void vvSlicer::SetImage(vvImage::Pointer image)
     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
@@ -384,7 +393,7 @@ void vvSlicer::SetImage(vvImage::Pointer image)
     mImageReslice->GetOutput()->SetUpdateExtent(extent);
     mImageReslice->GetOutput()->Update();
 #else
-    //mImageReslice->SetUpdateExtent(extent);
+    mImageReslice->SetUpdateExtent(extent);
     mImageReslice->Update();
 #endif
 
@@ -1630,7 +1639,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 +1658,6 @@ void vvSlicer::Render()
   } else legend->SetVisibility(0);
 
   if (ca->GetVisibility()) {
-
     std::stringstream worldPos(" ");
     double pt[3];
     mConcatenatedTransform->TransformPoint(mCurrent, pt);
@@ -1664,25 +1671,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 +1678,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 +1695,6 @@ void vvSlicer::Render()
                              << std::endl;
     
     }
-#endif
     ca->SetText(1,worldPos.str().c_str());
 
     std::stringstream slicePos;