#include "vvSlicerManagerCommand.h"
#include "vvGlyphSource.h"
#include "vvGlyph2D.h"
+#include "vvUtils.h"
#include <vtkVersion.h>
#include <vtkExtentTranslator.h>
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;
mConcatenatedTransform = vtkSmartPointer<vtkTransform>::New();
mConcatenatedFusionTransform = vtkSmartPointer<vtkTransform>::New();
mConcatenatedOverlayTransform = vtkSmartPointer<vtkTransform>::New();
+ mConcatenatedVFTransform = vtkSmartPointer<vtkTransform>::New();
mFirstSetSliceOrientation = true;
}
//------------------------------------------------------------------------------
if (!mImageReslice) {
mImageReslice = vtkSmartPointer<vtkImageReslice>::New();
mImageReslice->SetInterpolationModeToLinear();
+ SetInterpolationImageReslice(getInterpolationFavoriteStatus());
+ GetImageActor()->SetInterpolate(getInterpolationFavoriteStatus());
mImageReslice->AutoCropOutputOn();
mImageReslice->SetBackgroundColor(-1000,-1000,-1000,1);
}
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
#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
#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
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();
#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
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();
mFusionActor->GetMapper()->BorderOn();
#endif
+ mFusionActor->SetInterpolate(getInterpolationFavoriteStatus());
this->GetRenderer()->AddActor(mFusionActor);
}
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
#else
mVFMapper->SetInputConnection(mGlyphFilter->GetOutputPort());
#endif
+#ifndef VTK_OPENGL2
mVFMapper->ImmediateModeRenderingOn();
+#endif
mVFMapper->SetLookupTable(mVFColorLUT);
if (!mVFActor)
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()) {
if(mOverlay)
AdjustResliceToSliceOrientation(mOverlayReslice);
+ if(mVF)
+ AdjustResliceToSliceOrientation(mVFReslice);
+
// Update the viewer
// Go to current cursor position
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);
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];
#if VTK_MAJOR_VERSION <= 5
- 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) {
+ 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) {
#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 &&
}
#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
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