Change cursor & mouse value

Now the value after registration in pixel line (& co.) is the same than with the version 1.3.0

diff --git a/vv/vvSlicer.cxx b/vv/vvSlicer.cxx
index 7efaf2675c4caa351f090d1ce2de2a5d3e397972..4c5fcfb44f6fbc08f336ea85a83f904d26f69327 100644 (file)
--- a/vv/vvSlicer.cxx
+++ b/vv/vvSlicer.cxx
@@ -1620,17 +1620,16 @@ double vvSlicer::GetScalarComponentAsDouble(vtkImageData *image, double X, doubl
   image->SetUpdateExtent(ix, ix, iy, iy, iz, iz);
   image->Update();
 #else
-  if (ix < image->GetInformation()->Get(vtkDataObject::DATA_EXTENT())[0] ||
-      ix > image->GetInformation()->Get(vtkDataObject::DATA_EXTENT())[1] ||
-      iy < image->GetInformation()->Get(vtkDataObject::DATA_EXTENT())[2] ||
-      iy > image->GetInformation()->Get(vtkDataObject::DATA_EXTENT())[3] ||
-      iz < image->GetInformation()->Get(vtkDataObject::DATA_EXTENT())[4] ||
-      iz > image->GetInformation()->Get(vtkDataObject::DATA_EXTENT())[5] )
+  if (ix < mImageReslice->GetOutputInformation(0)->Get(vtkStreamingDemandDrivenPipeline::WHOLE_EXTENT())[0] ||
+      ix > mImageReslice->GetOutputInformation(0)->Get(vtkStreamingDemandDrivenPipeline::WHOLE_EXTENT())[1] ||
+      iy < mImageReslice->GetOutputInformation(0)->Get(vtkStreamingDemandDrivenPipeline::WHOLE_EXTENT())[2] ||
+      iy > mImageReslice->GetOutputInformation(0)->Get(vtkStreamingDemandDrivenPipeline::WHOLE_EXTENT())[3] ||
+      iz < mImageReslice->GetOutputInformation(0)->Get(vtkStreamingDemandDrivenPipeline::WHOLE_EXTENT())[4] ||
+      iz > mImageReslice->GetOutputInformation(0)->Get(vtkStreamingDemandDrivenPipeline::WHOLE_EXTENT())[5] )
     return std::numeric_limits<double>::quiet_NaN();
   //image->SetUpdateExtent(ix, ix, iy, iy, iz, iz);
   //image->Update();
 #endif
-
   return image->GetScalarComponentAsDouble(ix, iy, iz, component);
 }
 //----------------------------------------------------------------------------
@@ -1652,54 +1651,34 @@ void vvSlicer::Render()
   if (ca->GetVisibility()) {
 
     std::stringstream worldPos(" ");
-    double pt[3];
-    mConcatenatedTransform->TransformPoint(mCurrent, pt);
-    double X = (pt[0] - mImage->GetVTKImages()[mCurrentTSlice]->GetOrigin()[0])/mImage->GetVTKImages()[mCurrentTSlice]->GetSpacing()[0];
-    double Y = (pt[1] - mImage->GetVTKImages()[mCurrentTSlice]->GetOrigin()[1])/mImage->GetVTKImages()[mCurrentTSlice]->GetSpacing()[1];
-    double Z = (pt[2] - mImage->GetVTKImages()[mCurrentTSlice]->GetOrigin()[2])/mImage->GetVTKImages()[mCurrentTSlice]->GetSpacing()[2];
+    double X = (mCurrent[0] - this->GetInput()->GetOrigin()[0])/this->GetInput()->GetSpacing()[0];
+    double Y = (mCurrent[1] - this->GetInput()->GetOrigin()[1])/this->GetInput()->GetSpacing()[1];
+    double Z = (mCurrent[2] - this->GetInput()->GetOrigin()[2])/this->GetInput()->GetSpacing()[2];
 #if VTK_MAJOR_VERSION <= 5
-    if (X >= mImage->GetVTKImages()[mCurrentTSlice]->GetWholeExtent()[0]-0.5 &&
-        X <= mImage->GetVTKImages()[mCurrentTSlice]->GetWholeExtent()[1]+0.5 &&
-        Y >= mImage->GetVTKImages()[mCurrentTSlice]->GetWholeExtent()[2]-0.5 &&
-        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;
-    }
+    if (X >= this->GetInput()->GetWholeExtent()[0]-0.5 &&
+        X <= this->GetInput()->GetWholeExtent()[1]+0.5 &&
+        Y >= this->GetInput()->GetWholeExtent()[2]-0.5 &&
+        Y <= this->GetInput()->GetWholeExtent()[3]+0.5 &&
+        Z >= this->GetInput()->GetWholeExtent()[4]-0.5 &&
+        Z <= this->GetInput()->GetWholeExtent()[5]+0.5) {
 #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 &&
-        Y >= mImage->GetVTKImages()[mCurrentTSlice]->GetInformation()->Get(vtkDataObject::DATA_EXTENT())[2]-0.5 &&
-        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) {
-
+    int extentImageReslice[6];
+    this->GetRegisterExtent(extentImageReslice);
+    if (X >= extentImageReslice[0]-0.5 &&
+        X <= extentImageReslice[1]+0.5 &&
+        Y >= extentImageReslice[2]-0.5 &&
+        Y <= extentImageReslice[3]+0.5 &&
+        Z >= extentImageReslice[4]-0.5 &&
+        Z <= extentImageReslice[5]+0.5) {
+#endif
       int ix, iy, iz;
-      double value = this->GetScalarComponentAsDouble(mImage->GetVTKImages()[mCurrentTSlice], X, Y, Z, ix, iy, iz);
+      double value = this->GetScalarComponentAsDouble(this->GetInput(), 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 +1688,6 @@ void vvSlicer::Render()
                              << std::endl;
     
     }
-#endif
     ca->SetText(1,worldPos.str().c_str());
 
     std::stringstream slicePos;

diff --git a/vv/vvSlicer.h b/vv/vvSlicer.h
index 5027d16e6fd0256b3bc3f32b75c8a307c9cfc511..30a0d7a3ae45e875d762532eeecc5e88ad772d17 100644 (file)
--- a/vv/vvSlicer.h
+++ b/vv/vvSlicer.h
@@ -123,7 +123,7 @@ public:
   void SetDisplayMode(bool i);
   void FlipHorizontalView();
   void FlipVerticalView();
-  static double GetScalarComponentAsDouble(vtkImageData *image, double X, double Y, double Z, int &ix, int &iy, int &iz, int component=0);
+  double GetScalarComponentAsDouble(vtkImageData *image, double X, double Y, double Z, int &ix, int &iy, int &iz, int component=0);
   void Render();
   ///Sets the camera to fit the image in the window
   void ResetCamera();

diff --git a/vv/vvSlicerManager.cxx b/vv/vvSlicerManager.cxx
index fc6c6f2c3fc24df002b14852bdd5fedae4d19329..c9966b8acc8201f90cd208f0cb8268ae52b50995 100644 (file)
--- a/vv/vvSlicerManager.cxx
+++ b/vv/vvSlicerManager.cxx
@@ -1107,13 +1107,10 @@ void vvSlicerManager::UpdateInfoOnCursorPosition(int slicer)
   xyz[0] = x;\r
   xyz[1] = y;\r
   xyz[2] = z;\r
-  mSlicers[slicer]->GetConcatenatedTransform()->TransformPoint(xyz, xyzTransform);\r
-  double XTransform = (xyzTransform[0] - mSlicers[slicer]->GetImage()->GetVTKImages()[GetTSlice()]->GetOrigin()[0])/\r
-    mSlicers[slicer]->GetImage()->GetVTKImages()[GetTSlice()]->GetSpacing()[0];\r
-  double YTransform = (xyzTransform[1] - mSlicers[slicer]->GetImage()->GetVTKImages()[GetTSlice()]->GetOrigin()[1])/\r
-    mSlicers[slicer]->GetImage()->GetVTKImages()[GetTSlice()]->GetSpacing()[1];\r
-  double ZTransform = (xyzTransform[2] - mSlicers[slicer]->GetImage()->GetVTKImages()[GetTSlice()]->GetOrigin()[2])/\r
-    mSlicers[slicer]->GetImage()->GetVTKImages()[GetTSlice()]->GetSpacing()[2];\r
+  mSlicers[slicer]->GetSlicingTransform()->GetInverse()->TransformPoint(xyz, xyzTransform);\r
+  double XTransform = (xyzTransform[0] - mSlicers[slicer]->GetInput()->GetOrigin()[0])/mSlicers[slicer]->GetInput()->GetSpacing()[0];\r
+  double YTransform = (xyzTransform[1] - mSlicers[slicer]->GetInput()->GetOrigin()[1])/mSlicers[slicer]->GetInput()->GetSpacing()[1];\r
+  double ZTransform = (xyzTransform[2] - mSlicers[slicer]->GetInput()->GetOrigin()[2])/mSlicers[slicer]->GetInput()->GetSpacing()[2];\r
   double value = -VTK_DOUBLE_MAX;\r
   int displayVec = 0;\r
   double xVec=0, yVec=0, zVec=0, valueVec=0;\r