Merge branch 'master' into extentSimon

diff --combined vv/vvSlicer.cxx
index 7cbd504358988426319be2edd432b1579df0456f,46139cd75fa1b6d7bb3a3b66a0d873d25ee6cdbf..26d2ac254b2b4ee41139e9dae963db7c70cce882
--- 1/vv/vvSlicer.cxx
--- 2/vv/vvSlicer.cxx
+++ b/vv/vvSlicer.cxx
@@@ -57,6 -57,7 +57,7 @@@
  #include <vtkLight.h>
  #include <vtkLightCollection.h>
  #include <vtkScalarBarActor.h>
+ #include <vtkImageProperty.h>
  #include <vtkLookupTable.h>
  
  #include <vtkRenderer.h>
@@@ -322,6 -323,13 +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 +359,7 @@@ void vvSlicer::SetImage(vvImage::Pointe
      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
@@@ -998,7 -1007,7 +1007,7 @@@ void vvSlicer::SetSliceOrientation(int 
    
    if (this->Renderer && this->GetInput()) {
      double scale = this->Renderer->GetActiveCamera()->GetParallelScale();
 -    this->Renderer->ResetCamera();
 +    ResetCamera();
      this->Renderer->GetActiveCamera()->SetParallelScale(scale);
    }
  
@@@ -1230,15 -1239,7 +1239,15 @@@ void vvSlicer::UpdateDisplayExtent(
    if (this->Renderer) {
      if (this->InteractorStyle &&
          this->InteractorStyle->GetAutoAdjustCameraClippingRange()) {
 +      double positionCamera[3], originTemp[3];
 +      this->Renderer->GetActiveCamera()->GetPosition(positionCamera);
        this->Renderer->ResetCameraClippingRange();
 +      originTemp[0] = mImage->GetVTKImages()[mCurrentTSlice]->GetOrigin()[0];
 +      originTemp[1] = mImage->GetVTKImages()[mCurrentTSlice]->GetOrigin()[1];
 +      originTemp[2] = mImage->GetVTKImages()[mCurrentTSlice]->GetOrigin()[2];
 +      mConcatenatedTransform->GetInverse()->TransformPoint(originTemp, originTemp);
 +      positionCamera[this->SliceOrientation] = originTemp[this->SliceOrientation]-1;
 +      this->Renderer->GetActiveCamera()->SetPosition(positionCamera);
      } else {
        vtkCamera *cam = this->Renderer->GetActiveCamera();
        if (cam) {
@@@ -1400,6 -1401,7 +1409,6 @@@ void vvSlicer::SetRenderWindow(int orie
  
    this->GetRenderer()->AddActor(pdmA);
    this->GetRenderer()->AddActor(ca);
 -  this->GetRenderer()->ResetCamera();
  
    //this is just a mapping between the labeling of the orientations presented to the user and
    //the one used by vtk
@@@ -1637,7 -1639,6 +1646,6 @@@ double vvSlicer::GetScalarComponentAsDo
    //image->SetUpdateExtent(ix, ix, iy, iy, iz, iz);
    //image->Update();
  #endif
- 
    return image->GetScalarComponentAsDouble(ix, iy, iz, component);
  }
  //----------------------------------------------------------------------------
@@@ -1657,7 -1658,6 +1665,6 @@@ void vvSlicer::Render(
    } else legend->SetVisibility(0);
  
    if (ca->GetVisibility()) {
- 
      std::stringstream worldPos(" ");
      double pt[3];
      mConcatenatedTransform->TransformPoint(mCurrent, pt);
@@@ -1671,25 -1671,6 +1678,6 @@@
          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 &&
@@@ -1697,16 -1678,14 +1685,14 @@@
          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 << ' '
@@@ -1716,7 -1695,6 +1702,6 @@@
                               << std::endl;
      
      }
- #endif
      ca->SetText(1,worldPos.str().c_str());
  
      std::stringstream slicePos;