Skip to content

Commit

Permalink
Refs #6315. Fixing API changes.
Browse files Browse the repository at this point in the history 
 * vtkPVClipDataSet
   - SetInput to SetInputData
 * vtkPVGlyphFilter
   - SetInput to SetInputData
   - SetSource to SetSourceData
 * vtkStreamingDemandDrivenPipeline
   - UPDATE_TIME_STEPS to UPDATE_TIME_STEP
   - New function only returns a single value
  • Loading branch information
Michael Reuter committed Dec 12, 2012
1 parent 3cc535b commit 258e7da
Show file tree
Hide file tree
Showing 10 changed files with 27 additions and 27 deletions.
6 changes: 3 additions & 3 deletions ...es/ParaviewPlugins/ParaViewFilters/MDEWRebinningCutterOperator/vtkMDEWRebinningCutter.cxx
View file
Original file line number Diff line number Diff line change
Expand Up @@ -59,7 +59,7 @@ class ClipperAdapter : public Mantid::VATES::Clipper

void SetInput(vtkDataSet* input)
{
m_clipper->SetInput(input);
m_clipper->SetInputData(input);
}

void SetClipFunction(vtkImplicitFunction* func)
Expand Down Expand Up @@ -253,10 +253,10 @@ int vtkMDEWRebinningCutter::RequestData(vtkInformation* vtkNotUsed(request), vtk
vtkUnstructuredGrid *output = vtkUnstructuredGrid::SafeDownCast(outInfo->Get(
vtkDataObject::DATA_OBJECT()));

if (outInfo->Has(vtkStreamingDemandDrivenPipeline::UPDATE_TIME_STEPS()))
if (outInfo->Has(vtkStreamingDemandDrivenPipeline::UPDATE_TIME_STEP()))
{
// usually only one actual step requested
m_timestep = outInfo->Get(vtkStreamingDemandDrivenPipeline::UPDATE_TIME_STEPS())[0];
m_timestep = outInfo->Get(vtkStreamingDemandDrivenPipeline::UPDATE_TIME_STEP());
}

std::string scalarName = XMLDefinitions::signalName();
Expand Down
6 changes: 3 additions & 3 deletions ...aviewPlugins/ParaViewFilters/RebinningTransformOperator/vtkRebinningTransformOperator.cxx
View file
Original file line number Diff line number Diff line change
Expand Up @@ -58,7 +58,7 @@ class ClipperAdapter : public Mantid::VATES::Clipper

void SetInput(vtkDataSet* input)
{
m_clipper->SetInput(input);
m_clipper->SetInputData(input);
}

void SetClipFunction(vtkImplicitFunction* func)
Expand Down Expand Up @@ -254,10 +254,10 @@ int vtkRebinningTransformOperator::RequestData(vtkInformation* vtkNotUsed(reques
vtkUnstructuredGrid *output = vtkUnstructuredGrid::SafeDownCast(outInfo->Get(
vtkDataObject::DATA_OBJECT()));

if (outInfo->Has(vtkStreamingDemandDrivenPipeline::UPDATE_TIME_STEPS()))
if (outInfo->Has(vtkStreamingDemandDrivenPipeline::UPDATE_TIME_STEP()))
{
// usually only one actual step requested
m_timestep = outInfo->Get(vtkStreamingDemandDrivenPipeline::UPDATE_TIME_STEPS())[0];
m_timestep = outInfo->Get(vtkStreamingDemandDrivenPipeline::UPDATE_TIME_STEP());
}

std::string scalarName = XMLDefinitions::signalName();
Expand Down
6 changes: 3 additions & 3 deletions Code/Mantid/Vates/ParaviewPlugins/ParaViewReaders/EventNexusReader/vtkEventNexusReader.cxx
View file
Original file line number Diff line number Diff line change
Expand Up @@ -109,10 +109,10 @@ int vtkEventNexusReader::RequestData(vtkInformation * vtkNotUsed(request), vtkIn
//get the info objects
vtkInformation *outInfo = outputVector->GetInformationObject(0);

if (outInfo->Has(vtkStreamingDemandDrivenPipeline::UPDATE_TIME_STEPS()))
if (outInfo->Has(vtkStreamingDemandDrivenPipeline::UPDATE_TIME_STEP()))
{
// usually only one actual step requested
m_time =outInfo->Get(vtkStreamingDemandDrivenPipeline::UPDATE_TIME_STEPS())[0];
m_time =outInfo->Get(vtkStreamingDemandDrivenPipeline::UPDATE_TIME_STEP());
}

FilterUpdateProgressAction<vtkEventNexusReader> loadingProgressUpdate(this, "Loading...");
Expand All @@ -133,7 +133,7 @@ int vtkEventNexusReader::RequestData(vtkInformation * vtkNotUsed(request), vtkIn
vtkBox* box = vtkBox::New();
box->SetBounds(product->GetBounds());
vtkPVClipDataSet* clipper = vtkPVClipDataSet::New();
clipper->SetInput(product);
clipper->SetInputData(product);
clipper->SetClipFunction(box);
clipper->SetInsideOut(true);
clipper->Update();
Expand Down
6 changes: 3 additions & 3 deletions Code/Mantid/Vates/ParaviewPlugins/ParaViewReaders/MDEWNexusReader/vtkMDEWNexusReader.cxx
View file
Original file line number Diff line number Diff line change
Expand Up @@ -110,10 +110,10 @@ int vtkMDEWNexusReader::RequestData(vtkInformation * vtkNotUsed(request), vtkInf
vtkInformation *outInfo = outputVector->GetInformationObject(0);


if (outInfo->Has(vtkStreamingDemandDrivenPipeline::UPDATE_TIME_STEPS()))
if (outInfo->Has(vtkStreamingDemandDrivenPipeline::TIME_STEPS()))
{
// usually only one actual step requested
m_time =outInfo->Get(vtkStreamingDemandDrivenPipeline::UPDATE_TIME_STEPS())[0];
m_time =outInfo->Get(vtkStreamingDemandDrivenPipeline::TIME_STEPS())[0];
}

FilterUpdateProgressAction<vtkMDEWNexusReader> loadingProgressAction(this, "Loading...");
Expand All @@ -133,7 +133,7 @@ int vtkMDEWNexusReader::RequestData(vtkInformation * vtkNotUsed(request), vtkInf
vtkBox* box = vtkBox::New();
box->SetBounds(product->GetBounds());
vtkPVClipDataSet* clipper = vtkPVClipDataSet::New();
clipper->SetInput(product);
clipper->SetInputData(0, product);
clipper->SetClipFunction(box);
clipper->SetInsideOut(true);
clipper->Update();
Expand Down
4 changes: 2 additions & 2 deletions Code/Mantid/Vates/ParaviewPlugins/ParaViewReaders/NexusPeaksReader/vtkNexusPeaksReader.cxx
View file
Original file line number Diff line number Diff line change
Expand Up @@ -91,8 +91,8 @@ int vtkNexusPeaksReader::RequestData(vtkInformation * vtkNotUsed(request), vtkIn
sphere->SetRadius(peakRadius);

vtkPVGlyphFilter *glyphFilter = vtkPVGlyphFilter::New();
glyphFilter->SetInput(structuredMesh);
glyphFilter->SetSource(sphere->GetOutput());
glyphFilter->SetInputData(structuredMesh);
glyphFilter->SetSourceData(sphere->GetOutput());
glyphFilter->Update();
vtkPolyData *glyphed = glyphFilter->GetOutput();

Expand Down
4 changes: 2 additions & 2 deletions Code/Mantid/Vates/ParaviewPlugins/ParaViewReaders/PeaksReader/vtkPeaksReader.cxx
View file
Original file line number Diff line number Diff line change
Expand Up @@ -93,8 +93,8 @@ int vtkPeaksReader::RequestData(vtkInformation * vtkNotUsed(request), vtkInforma
sphere->SetThetaResolution(resolution);

vtkPVGlyphFilter *glyphFilter = vtkPVGlyphFilter::New();
glyphFilter->SetInput(structuredMesh);
glyphFilter->SetSource(sphere->GetOutput());
glyphFilter->SetInputData(structuredMesh);
glyphFilter->SetSourceData(sphere->GetOutput());
glyphFilter->Update();
vtkPolyData *glyphed = glyphFilter->GetOutput();

Expand Down
6 changes: 3 additions & 3 deletions Code/Mantid/Vates/ParaviewPlugins/ParaViewReaders/SQWEventReader/vtkSQWEventReader.cxx
View file
Original file line number Diff line number Diff line change
Expand Up @@ -112,10 +112,10 @@ int vtkSQWEventReader::RequestData(vtkInformation * vtkNotUsed(request), vtkInfo
FilterUpdateProgressAction<vtkSQWEventReader> loadingProgressUpdate(this, "Loading...");
FilterUpdateProgressAction<vtkSQWEventReader> drawingProgressUpdate(this, "Drawing...");

if (outInfo->Has(vtkStreamingDemandDrivenPipeline::UPDATE_TIME_STEPS()))
if (outInfo->Has(vtkStreamingDemandDrivenPipeline::UPDATE_TIME_STEP()))
{
// usually only one actual step requested
m_time =outInfo->Get(vtkStreamingDemandDrivenPipeline::UPDATE_TIME_STEPS())[0];
m_time =outInfo->Get(vtkStreamingDemandDrivenPipeline::UPDATE_TIME_STEP());
}

ThresholdRange_scptr thresholdRange(new IgnoreZerosThresholdRange());
Expand All @@ -133,7 +133,7 @@ int vtkSQWEventReader::RequestData(vtkInformation * vtkNotUsed(request), vtkInfo
vtkBox* box = vtkBox::New();
box->SetBounds(product->GetBounds());
vtkPVClipDataSet* clipper = vtkPVClipDataSet::New();
clipper->SetInput(product);
clipper->SetInputData(product);
clipper->SetClipFunction(box);
clipper->SetInsideOut(true);
clipper->Update();
Expand Down
6 changes: 3 additions & 3 deletions Code/Mantid/Vates/ParaviewPlugins/ParaViewSources/MDEWSource/vtkMDEWSource.cxx
View file
Original file line number Diff line number Diff line change
Expand Up @@ -91,10 +91,10 @@ int vtkMDEWSource::RequestData(vtkInformation *, vtkInformationVector **, vtkInf
vtkInformation *outInfo = outputVector->GetInformationObject(0);


if (outInfo->Has(vtkStreamingDemandDrivenPipeline::UPDATE_TIME_STEPS()))
if (outInfo->Has(vtkStreamingDemandDrivenPipeline::UPDATE_TIME_STEP()))
{
// usually only one actual step requested
m_time =outInfo->Get(vtkStreamingDemandDrivenPipeline::UPDATE_TIME_STEPS())[0];
m_time =outInfo->Get(vtkStreamingDemandDrivenPipeline::UPDATE_TIME_STEP());
}

FilterUpdateProgressAction<vtkMDEWSource> loadingProgressUpdate(this, "Loading...");
Expand All @@ -115,7 +115,7 @@ int vtkMDEWSource::RequestData(vtkInformation *, vtkInformationVector **, vtkInf
vtkBox* box = vtkBox::New();
box->SetBounds(product->GetBounds());
vtkPVClipDataSet* clipper = vtkPVClipDataSet::New();
clipper->SetInput(product);
clipper->SetInputData(product);
clipper->SetClipFunction(box);
clipper->SetInsideOut(true);
clipper->Update();
Expand Down
6 changes: 3 additions & 3 deletions Code/Mantid/Vates/ParaviewPlugins/ParaViewSources/MDHWSource/vtkMDHWSource.cxx
View file
Original file line number Diff line number Diff line change
Expand Up @@ -76,10 +76,10 @@ int vtkMDHWSource::RequestData(vtkInformation *, vtkInformationVector **, vtkInf
//get the info objects
vtkInformation *outInfo = outputVector->GetInformationObject(0);

if (outInfo->Has(vtkStreamingDemandDrivenPipeline::UPDATE_TIME_STEPS()))
if (outInfo->Has(vtkStreamingDemandDrivenPipeline::UPDATE_TIME_STEP()))
{
// Extracts the actual time.
m_time =outInfo->Get(vtkStreamingDemandDrivenPipeline::UPDATE_TIME_STEPS())[0];
m_time =outInfo->Get(vtkStreamingDemandDrivenPipeline::UPDATE_TIME_STEP());
}

FilterUpdateProgressAction<vtkMDHWSource> loadingProgressUpdate(this, "Loading...");
Expand All @@ -100,7 +100,7 @@ int vtkMDHWSource::RequestData(vtkInformation *, vtkInformationVector **, vtkInf
vtkBox* box = vtkBox::New();
box->SetBounds(product->GetBounds());
vtkPVClipDataSet* clipper = vtkPVClipDataSet::New();
clipper->SetInput(product);
clipper->SetInputData(product);
clipper->SetClipFunction(box);
clipper->SetInsideOut(true);
clipper->Update();
Expand Down
4 changes: 2 additions & 2 deletions Code/Mantid/Vates/ParaviewPlugins/ParaViewSources/PeaksSource/vtkPeaksSource.cxx
View file
Original file line number Diff line number Diff line change
Expand Up @@ -84,8 +84,8 @@ int vtkPeaksSource::RequestData(vtkInformation *, vtkInformationVector **,
sphere->SetThetaResolution(resolution);

vtkPVGlyphFilter *glyphFilter = vtkPVGlyphFilter::New();
glyphFilter->SetInput(structuredMesh);
glyphFilter->SetSource(sphere->GetOutput());
glyphFilter->SetInputData(structuredMesh);
glyphFilter->SetSourceData(sphere->GetOutput());
glyphFilter->Update();
vtkPolyData *glyphed = glyphFilter->GetOutput();

Expand Down

0 comments on commit 258e7da

Please sign in to comment.