#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
// 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();
#else
- mImageReslice->SetUpdateExtent(extent);
+ //mImageReslice->SetUpdateExtent(extent);
mImageReslice->Update();
#endif
mOverlayReslice->SetResliceTransform(mConcatenatedOverlayTransform);
#if VTK_MAJOR_VERSION <= 5
mOverlayReslice->SetInput(0, mOverlay->GetFirstVTKImageData());
+ mImageReslice->UpdateInformation();
#else
mOverlayReslice->SetInputData(0, mOverlay->GetFirstVTKImageData());
#endif
mFusionReslice->SetResliceTransform(mConcatenatedFusionTransform);
#if VTK_MAJOR_VERSION <= 5
mFusionReslice->SetInput(0, mFusion->GetFirstVTKImageData());
+ mFusionReslice->UpdateInformation();
#else
mFusionReslice->SetInputData(0, mFusion->GetFirstVTKImageData());
#endif
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);
}
}
//------------------------------------------------------------------------------
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;
}
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;
// 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);
}
- cout << mUseReducedExtent<< " " << w_ext[0] << " " << w_ext[1] << " " << w_ext[2] << " " << w_ext[3] << " " << w_ext[4] << " " << w_ext[5] << endl;
// Set slice value
w_ext[ this->SliceOrientation*2 ] = this->Slice;
if (mOverlay && mOverlayVisibility) {
AdjustResliceToSliceOrientation(mOverlayReslice);
int overExtent[6];
- this->ConvertImageToImageDisplayExtent(mImageReslice->GetOutputInformation(0), 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(mImageReslice->GetOutputInformation(0), 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 );
int vfExtent[6];
#if VTK_MAJOR_VERSION <= 5
mVF->GetVTKImages()[0]->UpdateInformation();
-#else
- //this->UpdateInformation();
-#endif
- this->ConvertImageToImageDisplayExtent(mImageReslice->GetOutputInformation(0), w_ext, mVF->GetVTKImages()[0], vfExtent);
-#if VTK_MAJOR_VERSION <= 5
+ this->ConvertImageToImageDisplayExtent(input, w_ext, mVF->GetVTKImages()[0], 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, mVF->GetVTKImages()[0], 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],
+ vtkImageData *targetImage, int targetExtent[6])
+{
+ double dExtents[6];
+ for(unsigned int i=0; i<6; i++) {
+ // From source voxel coordinates to world coordinates
+ dExtents[i] = sourceImage->GetOrigin()[i/2] + sourceImage->GetSpacing()[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]);
+ }
+}
+//----------------------------------------------------------------------------
+
//----------------------------------------------------------------------------
bool vvSlicer::ClipDisplayedExtent(int extent[6], int refExtent[6])
{
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();
#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);
}
//----------------------------------------------------------------------------
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 << ' '
<< std::endl;
}
-#endif
ca->SetText(1,worldPos.str().c_str());
std::stringstream slicePos;
#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