#include "vvSlicerManagerCommand.h"
#include "vvGlyphSource.h"
#include "vvGlyph2D.h"
+#include "vvUtils.h"
#include <vtkVersion.h>
#include <vtkExtentTranslator.h>
#include <vtkLight.h>
#include <vtkLightCollection.h>
#include <vtkScalarBarActor.h>
+#include <vtkImageProperty.h>
#include <vtkLookupTable.h>
#include <vtkRenderer.h>
#include <vtkAssignAttribute.h>
#include <vtkImageAccumulate.h>
#include <vtkImageReslice.h>
-#include <vtkOpenGLImageSliceMapper.h>
#if VTK_MAJOR_VERSION >= 6 || (VTK_MAJOR_VERSION >= 5 && VTK_MINOR_VERSION >= 10)
+# include <vtkOpenGLImageSliceMapper.h>
# include <vtkImageMapper3D.h>
# include <vtkImageSliceMapper.h>
#endif
this->UnInstallPipeline();
mImage = NULL;
mReducedExtent = new int[6];
- mRegisterExtent = new int[6];
+ mRegisterExtent = NULL;
mCurrentTSlice = 0;
mCurrentFusionTSlice = 0;
mCurrentOverlayTSlice = 0;
pdmA = vtkSmartPointer<vtkActor2D>::New();
pdmA->SetMapper(pdm);
- pdmA->GetProperty()->SetColor(255,10,212);
+ pdmA->GetProperty()->SetColor(1,0,0);
pdmA->SetVisibility(0);
pdmA->SetPickable(0);
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;
}
//------------------------------------------------------------------------------
//------------------------------------------------------------------------------
-void vvSlicer::SetCursorColor(int r,int g, int b)
+void vvSlicer::SetCursorColor(double r, double g, double b)
{
pdmA->GetProperty()->SetColor(r,g,b);
}
i!=mSurfaceCutActors.end(); i++)
delete (*i);
delete [] mReducedExtent;
- delete [] mRegisterExtent;
}
//------------------------------------------------------------------------------
}
//------------------------------------------------------------------------------
+//------------------------------------------------------------------------------
+void vvSlicer::SetInterpolationImageReslice(int interpolation)
+{
+ mImageReslice->SetInterpolationMode(interpolation);
+}
+//------------------------------------------------------------------------------
+
//------------------------------------------------------------------------------
void vvSlicer::SetCurrentPosition(double x, double y, double z, int t)
{
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
// Make sure that the required part image has been computed
extent[SliceOrientation*2] = Slice;
extent[SliceOrientation*2+1] = Slice;
-
#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->Update();
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();
#else
mOverlayReslice->SetInputData(0, mOverlay->GetFirstVTKImageData());
#endif
#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();
#else
mFusionReslice->SetInputData(0, mFusion->GetFirstVTKImageData());
#endif
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)
mLandClipper->SetClipFunction(mClipBox);
mLandClipper->InsideOutOn();
#if VTK_MAJOR_VERSION <= 5
- mLandClipper->SetInput(mLandmarks->GetOutput());
+ mLandmarkTransform = vtkSmartPointer<vtkTransformPolyDataFilter>::New();
+ mLandmarkTransform->SetInput(mLandmarks->GetOutput());
+ mConcatenatedTransform->Identity();
+ mConcatenatedTransform->Concatenate(mImage->GetTransform()[0]);
+ mConcatenatedTransform->Concatenate(mSlicingTransform);
+ mLandmarkTransform->SetTransform(mConcatenatedTransform->GetInverse());
+ mLandClipper->SetInput(mLandmarkTransform->GetOutput());
mLandGlyph->SetSource(mCross->GetOutput());
mLandGlyph->SetInput(mLandClipper->GetOutput());
#else
- mLandClipper->SetInputData(mLandmarks->GetOutput());
+ mLandmarkTransform = vtkSmartPointer<vtkTransformPolyDataFilter>::New();
+ mLandmarkTransform->SetInputData(mLandmarks->GetOutput());
+ mConcatenatedTransform->Identity();
+ mConcatenatedTransform->Concatenate(mImage->GetTransform()[0]);
+ mConcatenatedTransform->Concatenate(mSlicingTransform);
+ mLandmarkTransform->SetTransform(mConcatenatedTransform->GetInverse());
+ mLandClipper->SetInputConnection(mLandmarkTransform->GetOutputPort());
mLandGlyph->SetSourceConnection(mCross->GetOutputPort());
mLandGlyph->SetInputConnection(mLandClipper->GetOutputPort());
//mLandMapper->ScalarVisibilityOff();
mLandActor->SetMapper(mLandMapper);
- mLandActor->GetProperty()->SetOpacity(0.995);
+ mLandActor->GetProperty()->SetOpacity(0.995); //in order to get VTK to turn on the alpha-blending in OpenGL
mLandActor->GetProperty()->SetColor(255,10,212);
mLandActor->SetPickable(0);
mLandActor->SetVisibility(true);
this->UpdateDisplayExtent();
- this->GetRenderer()->AddActor(mLandActor);
}
}
//------------------------------------------------------------------------------
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()) {
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;
}
copyExtent(ext, extent);
#endif
- if (extent[5]-extent[4] <= 2)
+ if (extent[5]-extent[4] < 1)
orientation = vtkImageViewer2::SLICE_ORIENTATION_XY;
if (orientation < vtkImageViewer2::SLICE_ORIENTATION_YZ ||
if(mOverlay)
AdjustResliceToSliceOrientation(mOverlayReslice);
+ if(mVF)
+ AdjustResliceToSliceOrientation(mVFReslice);
+
// Update the viewer
// Go to current cursor position
reslice->SetOutputOrigin(origin);
reslice->SetOutputSpacing(spacing);
reslice->UpdateInformation();
+#if VTK_MAJOR_VERSION <= 5
+ reslice->GetOutput()->UpdateInformation();
+#endif
}
//------------------------------------------------------------------------------
//----------------------------------------------------------------------------
void vvSlicer::UpdateDisplayExtent()
{
+ emit UpdateDisplayExtentBegin(mSlicerNumber);
vtkImageData *input = this->GetInput();
-
if (!input || !this->ImageActor) {
return;
}
-
+
#if VTK_MAJOR_VERSION <= 5
input->UpdateInformation();
+#else
+ mRegisterExtent = mImageReslice->GetOutputInformation(0)->Get(vtkStreamingDemandDrivenPipeline::WHOLE_EXTENT());
#endif
this->SetSlice( this->GetSlice() ); //SR: make sure the update let the slice in extents
// Local copy of extent
int w_ext[6];
+#if VTK_MAJOR_VERSION <= 5
int* ext = GetExtent();
+#else
+ int* ext = mImageReslice->GetOutputInformation(0)->Get(vtkStreamingDemandDrivenPipeline::WHOLE_EXTENT());
+#endif
copyExtent(ext, w_ext);
-
+ if (mUseReducedExtent) {
+ copyExtent(mReducedExtent, w_ext);
+ }
// Set slice value
w_ext[ this->SliceOrientation*2 ] = this->Slice;
// Image actor
this->ImageActor->SetVisibility(mImageVisibility);
this->ImageActor->SetDisplayExtent(w_ext);
-#if VTK_MAJOR_VERSION >= 6
- vtkSmartPointer<vtkOpenGLImageSliceMapper> mapperOpenGL= vtkSmartPointer<vtkOpenGLImageSliceMapper>::New();
-
- try {
- mapperOpenGL = dynamic_cast<vtkOpenGLImageSliceMapper*>(GetImageActor()->GetMapper());
- } catch (const std::bad_cast& e) {
- std::cerr << e.what() << std::endl;
- std::cerr << "Conversion error" << std::endl;
- return;
- }
- if (mFirstSetSliceOrientation) {
- copyExtent(ext, mRegisterExtent);
- } else {
- int w_croppingRegion[6];
- if (mUseReducedExtent) {
- copyExtent(mReducedExtent, w_croppingRegion);
- } else {
- copyExtent(mRegisterExtent, w_croppingRegion);
- }
- this->ImageActor->SetDisplayExtent(w_ext);
- w_croppingRegion[ this->SliceOrientation*2 ] = this->Slice;
- w_croppingRegion[ this->SliceOrientation*2+1 ] = this->Slice;
- mapperOpenGL->SetCroppingRegion(w_croppingRegion);
- }
-#endif
#if VTK_MAJOR_VERSION >= 6 || (VTK_MAJOR_VERSION >= 5 && VTK_MINOR_VERSION >= 10)
// Fix for bug #1882
if (mOverlay && mOverlayVisibility) {
AdjustResliceToSliceOrientation(mOverlayReslice);
int overExtent[6];
- this->ConvertImageToImageDisplayExtent(input, w_ext, mOverlayReslice->GetOutput(), overExtent);
#if VTK_MAJOR_VERSION <= 5
+ this->ConvertImageToImageDisplayExtent(input, w_ext, mOverlayReslice->GetOutput(), overExtent);
bool out = ClipDisplayedExtent(overExtent, mOverlayMapper->GetInput()->GetWholeExtent());
#else
- bool out = ClipDisplayedExtent(overExtent, mImage->GetVTKImages()[mCurrentTSlice]->GetInformation()->Get(vtkDataObject::DATA_EXTENT()));
+ this->ConvertImageToImageDisplayExtent(mImageReslice->GetOutputInformation(0), w_ext, mOverlayReslice->GetOutput(), overExtent);
+ bool out = ClipDisplayedExtent(overExtent, mOverlayMapper->GetInputInformation()->Get(vtkStreamingDemandDrivenPipeline::WHOLE_EXTENT()));
#endif
mOverlayActor->SetVisibility(!out);
mOverlayActor->SetDisplayExtent( overExtent );
if (mFusion && mFusionVisibility) {
AdjustResliceToSliceOrientation(mFusionReslice);
int fusExtent[6];
- this->ConvertImageToImageDisplayExtent(input, w_ext, mFusionReslice->GetOutput(), fusExtent);
#if VTK_MAJOR_VERSION <= 5
+ this->ConvertImageToImageDisplayExtent(input, w_ext, mFusionReslice->GetOutput(), fusExtent);
bool out = ClipDisplayedExtent(fusExtent, mFusionMapper->GetInput()->GetWholeExtent());
#else
- bool out = ClipDisplayedExtent(fusExtent, mImage->GetVTKImages()[mCurrentTSlice]->GetInformation()->Get(vtkDataObject::DATA_EXTENT()));
+ this->ConvertImageToImageDisplayExtent(mImageReslice->GetOutputInformation(0), w_ext, mFusionReslice->GetOutput(), fusExtent);
+ bool out = ClipDisplayedExtent(fusExtent, mFusionMapper->GetInputInformation()->Get(vtkStreamingDemandDrivenPipeline::WHOLE_EXTENT()));
#endif
mFusionActor->SetVisibility(!out);
mFusionActor->SetDisplayExtent( fusExtent );
offset = -1;
if (mVF && mVFVisibility) {
+ AdjustResliceToSliceOrientation(mVFReslice);
int vfExtent[6];
#if VTK_MAJOR_VERSION <= 5
mVF->GetVTKImages()[0]->UpdateInformation();
-#else
- //this->UpdateInformation();
-#endif
- this->ConvertImageToImageDisplayExtent(input, w_ext, mVF->GetVTKImages()[0], vfExtent);
-#if VTK_MAJOR_VERSION <= 5
+ this->ConvertImageToImageDisplayExtent(input, w_ext, mVFReslice->GetOutput(), vfExtent);
bool out = ClipDisplayedExtent(vfExtent, mVOIFilter->GetInput()->GetWholeExtent());
#else
- bool out = ClipDisplayedExtent(vfExtent, mImage->GetVTKImages()[mCurrentTSlice]->GetInformation()->Get(vtkDataObject::DATA_EXTENT()));
+ mVOIFilter->Update();
+ this->ConvertImageToImageDisplayExtent(mImageReslice->GetOutputInformation(0), w_ext, mVFReslice->GetOutput(), vfExtent);
+ bool out = ClipDisplayedExtent(vfExtent, mVOIFilter->GetInputInformation()->Get(vtkStreamingDemandDrivenPipeline::WHOLE_EXTENT()));
#endif
mVFActor->SetVisibility(!out);
mVOIFilter->SetVOI(vfExtent);
mGlyphFilter->SetOrientation(orientation[0], orientation[1], orientation[2]);
position[this->SliceOrientation] += offset;
mVFActor->SetPosition(position);
- mVFActor->GetProperty()->SetOpacity(0.995);
+ mVFActor->GetProperty()->SetOpacity(0.995); //in order to get VTK to turn on the alpha-blending in OpenGL
mVFMapper->Update();
}
else if(mVF)
mVFActor->SetVisibility(false);
+
+
+ double boundsT [6];
+ for(unsigned int i=0; i<6; i++)
+ boundsT[i] = ImageActor->GetBounds()[i];
+ boundsT[ this->SliceOrientation*2 ] = ImageActor->GetBounds()[ this->SliceOrientation*2 ]-fabs(this->GetInput()->GetSpacing()[this->SliceOrientation]);
+ boundsT[ this->SliceOrientation*2+1 ] = ImageActor->GetBounds()[ this->SliceOrientation*2+1 ]+fabs(this->GetInput()->GetSpacing()[this->SliceOrientation]);
+
// Landmarks actor
if (mLandActor) {
if (mClipBox) {
- double bounds [6];
- for(unsigned int i=0; i<6; i++)
- bounds[i] = ImageActor->GetBounds()[i];
- bounds[ this->SliceOrientation*2 ] = ImageActor->GetBounds()[ this->SliceOrientation*2 ]-fabs(this->GetInput()->GetSpacing()[this->SliceOrientation]);
- bounds[ this->SliceOrientation*2+1 ] = ImageActor->GetBounds()[ this->SliceOrientation*2+1 ]+fabs(this->GetInput()->GetSpacing()[this->SliceOrientation]);
- mClipBox->SetBounds(bounds);
- UpdateLandmarks();
+ RemoveLandmarks();
}
position[this->SliceOrientation] = offset;
cam->SetClippingRange(range - sumSpacing, range + sumSpacing);
}
}
+
+ if (mLandActor) {
+ if (mClipBox) {
+ DisplayLandmarks();
+ }
+ }
}
+ emit UpdateDisplayExtentEnd(mSlicerNumber);
}
//----------------------------------------------------------------------------
//----------------------------------------------------------------------------
-void vvSlicer::ConvertImageToImageDisplayExtent(vtkImageData *sourceImage, const int sourceExtent[6],
+void vvSlicer::ConvertImageToImageDisplayExtent(vtkInformation *sourceImage, const int sourceExtent[6],
vtkImageData *targetImage, int targetExtent[6])
{
+ double dExtents[6];
+ double *origin, *spacing;
+ origin = sourceImage->Get(vtkDataObject::ORIGIN());
+ spacing = sourceImage->Get(vtkDataObject::SPACING());
+ for(unsigned int i=0; i<6; i++) {
+ // From source voxel coordinates to world coordinates
+ dExtents[i] = origin[i/2] + spacing[i/2] * sourceExtent[i];
+
+ // From world coordinates to floating point target voxel coordinates
+ dExtents[i] = (dExtents[i]- targetImage->GetOrigin()[i/2]) / targetImage->GetSpacing()[i/2];
+
+ // Round to current slice or larger extent
+ if(i/2==this->GetOrientation())
+ targetExtent[i] = itk::Math::Round<double>(dExtents[i]);
+ else if(i%2==1)
+ targetExtent[i] = itk::Math::Ceil<double>(dExtents[i]);
+ else
+ targetExtent[i] = itk::Math::Floor<double>(dExtents[i]);
+ }
+}
+//----------------------------------------------------------------------------
+
+//----------------------------------------------------------------------------
+void vvSlicer::ConvertImageToImageDisplayExtent(vtkImageData *sourceImage, const int sourceExtent[6],
+ vtkImageData *targetImage, int targetExtent[6])
+{
double dExtents[6];
for(unsigned int i=0; i<6; i++) {
// From source voxel coordinates to world coordinates
if(iLocalExtents[i*2 ]>iLocalExtents[i*2+1])
std::swap(iLocalExtents[i*2], iLocalExtents[i*2+1]);
+
+#if VTK_MAJOR_VERSION > 5
+ for(int j=0;j<2; j++) {
+ if(iLocalExtents[i*2+j]< mImageReslice->GetInputInformation()->Get(vtkStreamingDemandDrivenPipeline::WHOLE_EXTENT())[2*i])
+ iLocalExtents[i*2+j] = mImageReslice->GetInputInformation()->Get(vtkStreamingDemandDrivenPipeline::WHOLE_EXTENT())[2*i];
+
+ if(iLocalExtents[i*2+j]> mImageReslice->GetInputInformation()->Get(vtkStreamingDemandDrivenPipeline::WHOLE_EXTENT())[2*i+1])
+ iLocalExtents[i*2+j] = mImageReslice->GetInputInformation()->Get(vtkStreamingDemandDrivenPipeline::WHOLE_EXTENT())[2*i+1];
+ }
+#endif
}
vtkSmartPointer<vtkExtractVOI> voiFilter = vtkSmartPointer<vtkExtractVOI>::New();
//image->SetUpdateExtent(ix, ix, iy, iy, iz, iz);
//image->Update();
#endif
-
return image->GetScalarComponentAsDouble(ix, iy, iz, component);
}
//----------------------------------------------------------------------------
//----------------------------------------------------------------------------
void vvSlicer::Render()
{
-
if (this->mFusion && mFusionActor->GetVisibility() && showFusionLegend) {
legend->SetLookupTable(this->GetFusionMapper()->GetLookupTable());
legend->UseOpacityOn();
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 &&
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 << ' '
<< std::endl;
}
-#endif
ca->SetText(1,worldPos.str().c_str());
std::stringstream slicePos;
std::cerr << "Conversion error" << std::endl;
return;
}
+
if (xCursor >= mapperOpenGL->GetCroppingRegion()[0]-0.5 &&
xCursor < mapperOpenGL->GetCroppingRegion()[1]+0.5 &&
yCursor >= mapperOpenGL->GetCroppingRegion()[2]-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
mFusionMapper->Update();
}
- if (mLandMapper)
- UpdateLandmarks();
+ if (mLandMapper) {
+ RemoveLandmarks();
+ DisplayLandmarks();
+ }
this->GetRenderWindow()->Render();
}
//----------------------------------------------------------------------------
-void vvSlicer::UpdateLandmarks()
+void vvSlicer::RemoveLandmarks()
{
- vtkPolyData *pd = static_cast<vtkPolyData*>(mLandClipper->GetInput());
+ vtkPolyData *pd = static_cast<vtkPolyData*>(mLandmarks->GetOutput());
if (pd->GetPoints()) {
- //mLandGlyph->SetRange(0,1);
- //mLandGlyph->Modified();
- //mLandGlyph->Update();
- mClipBox->Modified();
- mLandClipper->Update();
- mLandMapper->Update();
- //Let's add the captions
//First remove all captions:
for(unsigned int i=0;i<mLandLabelActors.size();i++) {
this->Renderer->RemoveActor2D(mLandLabelActors[i]);
//allActors2D->Remove (mLandLabelActors[i]);
}
mLandLabelActors.clear();
+ }
+}
+//----------------------------------------------------------------------------
+
+
+//----------------------------------------------------------------------------
+void vvSlicer::DisplayLandmarks()
+{
+
+ double bounds [6];
+ for(unsigned int i=0; i<6; i++)
+ bounds[i] = ImageActor->GetBounds()[i];
+ bounds[ this->SliceOrientation*2 ] = ImageActor->GetBounds()[ this->SliceOrientation*2 ]-fabs(this->GetInput()->GetSpacing()[this->SliceOrientation]);
+ bounds[ this->SliceOrientation*2+1 ] = ImageActor->GetBounds()[ this->SliceOrientation*2+1 ]+fabs(this->GetInput()->GetSpacing()[this->SliceOrientation]);
+ mClipBox->SetBounds(bounds);
+
+
+ vtkPolyData *pd = static_cast<vtkPolyData*>(mLandmarks->GetOutput());
+ if (pd->GetPoints()) {
+ this->GetRenderer()->AddActor(mLandActor);
+ //mLandGlyph->SetRange(0,1);
+ //mLandGlyph->Modified();
+ //mLandGlyph->Update();
+ mClipBox->Modified();
+ mLandClipper->Update();
+ mLandMapper->Update();
//Next add the captions to the displayed points
for (vtkIdType id=0; id<mLandClipper->GetOutput()->GetNumberOfPoints(); id++) {
double *position = mLandClipper->GetOutput()->GetPoint(id);
git://git.creatis.insa-lyon.fr / clitk.git / blobdiff