#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
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());
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
}
//------------------------------------------------------------------------------
this->ConvertImageToImageDisplayExtent(input, w_ext, mVF->GetVTKImages()[0], vfExtent);
bool out = ClipDisplayedExtent(vfExtent, mVOIFilter->GetInput()->GetWholeExtent());
#else
- //this->UpdateInformation();
+ mVOIFilter->Update();
this->ConvertImageToImageDisplayExtent(mImageReslice->GetOutputInformation(0), w_ext, mVF->GetVTKImages()[0], vfExtent);
bool out = ClipDisplayedExtent(vfExtent, mVOIFilter->GetInputInformation()->Get(vtkStreamingDemandDrivenPipeline::WHOLE_EXTENT()));
#endif
//----------------------------------------------------------------------------
void vvSlicer::RemoveLandmarks()
{
- vtkPolyData *pd = static_cast<vtkPolyData*>(mLandClipper->GetInput());
+ vtkPolyData *pd = static_cast<vtkPolyData*>(mLandmarks->GetOutput());
if (pd->GetPoints()) {
//First remove all captions:
mClipBox->SetBounds(bounds);
- vtkPolyData *pd = static_cast<vtkPolyData*>(mLandClipper->GetInput());
+ 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();