From: tbaudier Date: Thu, 3 Dec 2015 15:37:42 +0000 (+0100) Subject: Change some SetInputData into SetInputConnection to be consistent with algorithm... X-Git-Tag: v1.4.0~90^2~1^2 X-Git-Url: https://git.creatis.insa-lyon.fr/pubgit/?a=commitdiff_plain;h=7ae042efea7b958dc573948b4e27981bafa9957e;p=clitk.git Change some SetInputData into SetInputConnection to be consistent with algorithm pipeplines --- diff --git a/itk/clitkMeshToBinaryImageFilter.txx b/itk/clitkMeshToBinaryImageFilter.txx index b67cca0..3c3ccdb 100644 --- a/itk/clitkMeshToBinaryImageFilter.txx +++ b/itk/clitkMeshToBinaryImageFilter.txx @@ -140,7 +140,7 @@ GenerateData() #if VTK_MAJOR_VERSION <= 5 sts->SetInput(extrude->GetOutput()); #else - sts->SetInputData(extrude->GetOutput()); + sts->SetInputConnection(extrude->GetOutputPort()); #endif // When extrude ScaleFactor indicate the extrusion scaling (default = 1) diff --git a/vv/vvAnimatedGIFWriter.cxx b/vv/vvAnimatedGIFWriter.cxx index 5dbf51a..0ab7cb8 100644 --- a/vv/vvAnimatedGIFWriter.cxx +++ b/vv/vvAnimatedGIFWriter.cxx @@ -74,7 +74,7 @@ void vvAnimatedGIFWriter::End() #if VTK_MAJOR_VERSION <= 5 quant->SetInput(RGBvolume->GetOutput()); #else - quant->SetInputData(RGBvolume->GetOutput()); + quant->SetInputConnection(RGBvolume->GetOutputPort()); #endif quant->Update(); @@ -83,7 +83,7 @@ void vvAnimatedGIFWriter::End() #if VTK_MAJOR_VERSION <= 5 cast->SetInput( quant->GetOutput() ); #else - cast->SetInputData( quant->GetOutput() ); + cast->SetInputConnection( quant->GetOutputPort() ); #endif cast->SetOutputScalarTypeToUnsignedChar(); cast->Update(); diff --git a/vv/vvMainWindow.cxx b/vv/vvMainWindow.cxx index 590f3dd..9dea48f 100644 --- a/vv/vvMainWindow.cxx +++ b/vv/vvMainWindow.cxx @@ -3271,7 +3271,7 @@ void vvMainWindow::SaveScreenshotAllSlices() #if VTK_MAJOR_VERSION <= 5 writer->SetInput(windowToImageFilter->GetOutput()); #else - writer->SetInputData(windowToImageFilter->GetOutput()); + writer->SetInputConnection(windowToImageFilter->GetOutputPort()); #endif writer->Write(); } @@ -3329,7 +3329,7 @@ void vvMainWindow::SaveScreenshot(QVTKWidget *widget) #if VTK_MAJOR_VERSION <= 5 imgwriter->SetInput(image); #else - imgwriter->SetInputData(image); + imgwriter->SetInputConnection(w2i->GetOutputPort()); #endif imgwriter->SetFileName(fileName.toStdString().c_str()); imgwriter->Write(); @@ -3403,7 +3403,7 @@ void vvMainWindow::SaveScreenshot(QVTKWidget *widget) #if VTK_MAJOR_VERSION <= 5 vidwriter->SetInput(image); #else - vidwriter->SetInputData(image); + vidwriter->SetInputConnection(w2i->GetOutputPort()); #endif vidwriter->SetFileName(fileName.toStdString().c_str()); vidwriter->Start(); @@ -3416,7 +3416,7 @@ void vvMainWindow::SaveScreenshot(QVTKWidget *widget) #if VTK_MAJOR_VERSION <= 5 vidwriter->SetInput(w2i->GetOutput()); #else - vidwriter->SetInputData(w2i->GetOutput()); + vidwriter->SetInputConnection(w2i->GetOutputPort()); #endif vidwriter->Write(); } diff --git a/vv/vvMesh.cxx b/vv/vvMesh.cxx index fd4faa8..e7045f5 100644 --- a/vv/vvMesh.cxx +++ b/vv/vvMesh.cxx @@ -191,7 +191,7 @@ void vvMesh::ComputeMasks(vtkImageData* sample,bool extrude) #if VTK_MAJOR_VERSION <= 5 sts->SetInput(extrude->GetOutput()); #else - sts->SetInputData(extrude->GetOutput()); + sts->SetInputConnection(extrude->GetOutputPort()); #endif } else { #if VTK_MAJOR_VERSION <= 5 diff --git a/vv/vvMeshActor.cxx b/vv/vvMeshActor.cxx index 04ea49d..d8741aa 100644 --- a/vv/vvMeshActor.cxx +++ b/vv/vvMeshActor.cxx @@ -66,7 +66,7 @@ void vvMeshActor::Init(vvMesh::Pointer mesh,int time_slice,vvImage::Pointer vf) #if VTK_MAJOR_VERSION <= 5 mMapper->SetInput(mMarching->GetOutput()); #else - mMapper->SetInputData(mMarching->GetOutput()); + mMapper->SetInputConnection(mMarching->GetOutputPort()); #endif //The following line allows to display the contour over the image //(http://www.nabble.com/What-happens-when-two-actors-are-at-the-same-depth--td23175458.html) diff --git a/vv/vvSlicer.cxx b/vv/vvSlicer.cxx index 317dc06..65a184e 100644 --- a/vv/vvSlicer.cxx +++ b/vv/vvSlicer.cxx @@ -128,7 +128,7 @@ vvSlicer::vvSlicer() #if VTK_MAJOR_VERSION <= 5 pdm->SetInput(crossCursor->GetOutput()); #else - pdm->SetInputData(crossCursor->GetOutput()); + pdm->SetInputConnection(crossCursor->GetOutputPort(0)); #endif pdmA = vtkSmartPointer::New(); @@ -1549,7 +1549,7 @@ void vvSlicer::GetExtremasAroundMousePointer(double & min, double & max, vtkImag #if VTK_MAJOR_VERSION <= 5 accFilter->SetInput(voiFilter->GetOutput()); #else - accFilter->SetInputData(voiFilter->GetOutput()); + accFilter->SetInputConnection(voiFilter->GetOutputPort(0)); #endif accFilter->Update(); diff --git a/vv/vvSurfaceViewerDialog.cxx b/vv/vvSurfaceViewerDialog.cxx index f50cb09..e8a6acb 100644 --- a/vv/vvSurfaceViewerDialog.cxx +++ b/vv/vvSurfaceViewerDialog.cxx @@ -114,7 +114,7 @@ void vvSurfaceViewerDialog::LoadSurface() #if VTK_MAJOR_VERSION <= 5 mMapper->SetInput(mReaders[mCurrentTime]->GetOutput()); #else - mMapper->SetInputData(mReaders[mCurrentTime]->GetOutput()); + mMapper->SetInputConnection(mReaders[mCurrentTime]->GetOutputPort()); #endif if (!mActor) { @@ -147,7 +147,7 @@ void vvSurfaceViewerDialog::NextTime() #if VTK_MAJOR_VERSION <= 5 mMapper->SetInput(mReaders[mCurrentTime]->GetOutput()); #else - mMapper->SetInputData(mReaders[mCurrentTime]->GetOutput()); + mMapper->SetInputConnection(mReaders[mCurrentTime]->GetOutputPort()); #endif mMapper->Modified(); renderWidget->GetRenderWindow()->Render(); @@ -161,7 +161,7 @@ void vvSurfaceViewerDialog::PreviousTime() #if VTK_MAJOR_VERSION <= 5 mMapper->SetInput(mReaders[mCurrentTime]->GetOutput()); #else - mMapper->SetInputData(mReaders[mCurrentTime]->GetOutput()); + mMapper->SetInputConnection(mReaders[mCurrentTime]->GetOutputPort()); #endif mMapper->Modified(); renderWidget->GetRenderWindow()->Render();