#if VTK_MAJOR_VERSION <= 5
pdm->SetInput(crossCursor->GetOutput());
#else
- pdm->SetInputData(crossCursor->GetOutput());
+ pdm->SetInputConnection(crossCursor->GetOutputPort(0));
#endif
pdmA = vtkSmartPointer<vtkActor2D>::New();
#else
mOverlayReslice->SetInputData(0, mOverlay->GetFirstVTKImageData());
#endif
- mImageReslice->UpdateInformation();
mOverlayReslice->Update();
if (!mOverlayMapper)
#if VTK_MAJOR_VERSION <= 5
mOverlayMapper->SetInput(mOverlayReslice->GetOutput());
#else
- mOverlayMapper->SetInputData(mOverlayReslice->GetOutput());
+ mOverlayMapper->SetInputConnection(mOverlayReslice->GetOutputPort(0));
#endif
if (!mOverlayActor) {
#if VTK_MAJOR_VERSION <= 5
mFusionMapper->SetInput(mFusionReslice->GetOutput());
#else
- mFusionMapper->SetInputData(mFusionReslice->GetOutput());
+ mFusionMapper->SetInputConnection(mFusionReslice->GetOutputPort(0));
#endif
if (!mFusionActor) {
mAAFilter->SetInput(mVOIFilter->GetOutput());
#else
mVOIFilter->SetInputData(vf->GetFirstVTKImageData());
- mAAFilter->SetInputData(mVOIFilter->GetOutput());
+ mAAFilter->SetInputConnection(mVOIFilter->GetOutputPort());
#endif
///This tells VTK to use the scalar (pixel) data of the image to draw the little arrows
mAAFilter->Assign(vtkDataSetAttributes::SCALARS, vtkDataSetAttributes::VECTORS, vtkAssignAttribute::POINT_DATA);
mGlyphFilter->SetInput(mAAFilter->GetOutput());
mGlyphFilter->SetSource(mArrow->GetOutput());
#else
- mGlyphFilter->SetInputData(mAAFilter->GetOutput());
- mGlyphFilter->SetSourceData(mArrow->GetOutput());
+ mGlyphFilter->SetInputConnection(mAAFilter->GetOutputPort());
+ mGlyphFilter->SetSourceConnection(mArrow->GetOutputPort());
#endif
mGlyphFilter->ScalingOn();
mGlyphFilter->SetScaleModeToScaleByVector();
#if VTK_MAJOR_VERSION <= 5
mVFMapper->SetInput(mGlyphFilter->GetOutput());
#else
- mVFMapper->SetInputData(mGlyphFilter->GetOutput());
+ mVFMapper->SetInputConnection(mGlyphFilter->GetOutputPort());
#endif
mVFMapper->ImmediateModeRenderingOn();
mVFMapper->SetLookupTable(mVFColorLUT);
#else
mLandClipper->SetInputData(mLandmarks->GetOutput());
- mLandGlyph->SetSourceData(mCross->GetOutput());
- mLandGlyph->SetInputData(mLandClipper->GetOutput());
+ mLandGlyph->SetSourceConnection(mCross->GetOutputPort());
+ mLandGlyph->SetInputConnection(mLandClipper->GetOutputPort());
#endif
//mLandGlyph->SetIndexModeToScalar();
//mLandGlyph->SetRange(0,1);
//mLandMapper->ScalarVisibilityOff();
mLandActor->SetMapper(mLandMapper);
+ mLandActor->GetProperty()->SetOpacity(0.995);
mLandActor->GetProperty()->SetColor(255,10,212);
mLandActor->SetPickable(0);
mLandActor->SetVisibility(true);
#else
mOverlayReslice->SetInputData( mOverlay->GetVTKImages()[mCurrentOverlayTSlice] );
#endif
-
// Update overlay transform
mConcatenatedOverlayTransform->Identity();
mConcatenatedOverlayTransform->Concatenate(mOverlay->GetTransform()[mCurrentOverlayTSlice]);
// Image actor
this->ImageActor->SetVisibility(mImageVisibility);
-#if VTK_MAJOR_VERSION <= 5
this->ImageActor->SetDisplayExtent(w_ext);
-#else
+#if VTK_MAJOR_VERSION >= 6
vtkSmartPointer<vtkOpenGLImageSliceMapper> mapperOpenGL= vtkSmartPointer<vtkOpenGLImageSliceMapper>::New();
+
try {
mapperOpenGL = dynamic_cast<vtkOpenGLImageSliceMapper*>(GetImageActor()->GetMapper());
} catch (const std::bad_cast& e) {
}
if (mFirstSetSliceOrientation) {
copyExtent(ext, mRegisterExtent);
- this->ImageActor->SetDisplayExtent(w_ext); //initialisation
} else {
int w_croppingRegion[6];
- copyExtent(mRegisterExtent, w_croppingRegion);
+ 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);
+ mapperOpenGL->SetCroppingRegion(w_croppingRegion);
}
#endif
#if VTK_MAJOR_VERSION <= 5
bool out = ClipDisplayedExtent(overExtent, mOverlayMapper->GetInput()->GetWholeExtent());
#else
- bool out = ClipDisplayedExtent(overExtent, mOverlayMapper->GetInput()->GetInformation()->Get(vtkDataObject::DATA_EXTENT()));
+ bool out = ClipDisplayedExtent(overExtent, mImage->GetVTKImages()[mCurrentTSlice]->GetInformation()->Get(vtkDataObject::DATA_EXTENT()));
#endif
mOverlayActor->SetVisibility(!out);
mOverlayActor->SetDisplayExtent( overExtent );
#if VTK_MAJOR_VERSION <= 5
bool out = ClipDisplayedExtent(fusExtent, mFusionMapper->GetInput()->GetWholeExtent());
#else
- bool out = ClipDisplayedExtent(fusExtent, mFusionMapper->GetInput()->GetInformation()->Get(vtkDataObject::DATA_EXTENT()));
+ bool out = ClipDisplayedExtent(fusExtent, mImage->GetVTKImages()[mCurrentTSlice]->GetInformation()->Get(vtkDataObject::DATA_EXTENT()));
#endif
mFusionActor->SetVisibility(!out);
mFusionActor->SetDisplayExtent( fusExtent );
#if VTK_MAJOR_VERSION <= 5
bool out = ClipDisplayedExtent(vfExtent, mVOIFilter->GetInput()->GetWholeExtent());
#else
- bool out = ClipDisplayedExtent(vfExtent, mVOIFilter->GetInput()->GetInformation()->Get(vtkDataObject::DATA_EXTENT()));
+ bool out = ClipDisplayedExtent(vfExtent, mImage->GetVTKImages()[mCurrentTSlice]->GetInformation()->Get(vtkDataObject::DATA_EXTENT()));
#endif
mVFActor->SetVisibility(!out);
mVOIFilter->SetVOI(vfExtent);
int orientation[3] = {1,1,1};
orientation[this->SliceOrientation] = 0;
mGlyphFilter->SetOrientation(orientation[0], orientation[1], orientation[2]);
- mVFMapper->Update();
-
position[this->SliceOrientation] += offset;
mVFActor->SetPosition(position);
+ mVFActor->GetProperty()->SetOpacity(0.995);
+ mVFMapper->Update();
+
}
else if(mVF)
mVFActor->SetVisibility(false);
#if VTK_MAJOR_VERSION <= 5
accFilter->SetInput(voiFilter->GetOutput());
#else
- accFilter->SetInputData(voiFilter->GetOutput());
+ accFilter->SetInputConnection(voiFilter->GetOutputPort(0));
#endif
accFilter->Update();