Commit 3d50a5cd authored by Amy Squillacote's avatar Amy Squillacote

ENH: For consistency's sake, use RequestUpdateExtent instead of ComputeInputUpdateExtent.

parent 3ce5a0b6
......@@ -22,7 +22,7 @@
#include "vtkStreamingDemandDrivenPipeline.h"
#include "vtkTrivialProducer.h"
vtkCxxRevisionMacro(vtkPolyDataAlgorithm, "1.9");
vtkCxxRevisionMacro(vtkPolyDataAlgorithm, "1.10");
vtkStandardNewMacro(vtkPolyDataAlgorithm);
//----------------------------------------------------------------------------
......@@ -98,7 +98,7 @@ int vtkPolyDataAlgorithm::ProcessRequest(vtkInformation* request,
if(request->Has(vtkStreamingDemandDrivenPipeline::REQUEST_UPDATE_EXTENT()))
{
return this->ComputeInputUpdateExtent(request, inputVector, outputVector);
return this->RequestInputUpdateExtent(request, inputVector, outputVector);
}
// execute information
......
......@@ -93,7 +93,7 @@ protected:
// This is called by the superclass.
// This is the method you should override.
virtual int ComputeInputUpdateExtent(vtkInformation*,
virtual int RequestInputUpdateExtent(vtkInformation*,
vtkInformationVector**,
vtkInformationVector*)
{
......
......@@ -34,7 +34,7 @@
#include <math.h>
vtkCxxRevisionMacro(vtkContourFilter, "1.111");
vtkCxxRevisionMacro(vtkContourFilter, "1.112");
vtkStandardNewMacro(vtkContourFilter);
vtkCxxSetObjectMacro(vtkContourFilter,ScalarTree,vtkScalarTree);
......@@ -92,9 +92,9 @@ unsigned long vtkContourFilter::GetMTime()
return mTime;
}
int vtkContourFilter::ComputeInputUpdateExtent(vtkInformation*,
vtkInformationVector** inputVector,
vtkInformationVector*)
int vtkContourFilter::RequestUpdateExtent(vtkInformation*,
vtkInformationVector** inputVector,
vtkInformationVector*)
{
vtkInformation* inInfo = inputVector[0]->GetInformationObject(0);
inInfo->Set(vtkStreamingDemandDrivenPipeline::EXACT_EXTENT(), 1);
......
......@@ -146,9 +146,9 @@ protected:
virtual int RequestData(vtkInformation* request,
vtkInformationVector** inputVector,
vtkInformationVector* outputVector);
virtual int ComputeInputUpdateExtent(vtkInformation*,
vtkInformationVector**,
vtkInformationVector*);
virtual int RequestUpdateExtent(vtkInformation*,
vtkInformationVector**,
vtkInformationVector*);
virtual int FillInputPortInformation(int port, vtkInformation* info);
......
......@@ -20,7 +20,7 @@
#include "vtkPolyData.h"
#include "vtkStreamingDemandDrivenPipeline.h"
vtkCxxRevisionMacro(vtkPPolyDataNormals, "1.11");
vtkCxxRevisionMacro(vtkPPolyDataNormals, "1.12");
vtkStandardNewMacro(vtkPPolyDataNormals);
//----------------------------------------------------------------------------
......@@ -58,7 +58,7 @@ int vtkPPolyDataNormals::RequestData(
}
//--------------------------------------------------------------------------
int vtkPPolyDataNormals::ComputeInputUpdateExtent(
int vtkPPolyDataNormals::RequestUpdateExtent(
vtkInformation *vtkNotUsed(request),
vtkInformationVector **inputVector,
vtkInformationVector *outputVector)
......
......@@ -42,7 +42,7 @@ protected:
// Usual data generation method
virtual int RequestData(vtkInformation *, vtkInformationVector **, vtkInformationVector *);
virtual int ComputeInputUpdateExtent(vtkInformation *, vtkInformationVector **, vtkInformationVector *);
virtual int RequestUpdateExtent(vtkInformation *, vtkInformationVector **, vtkInformationVector *);
int PieceInvariant;
private:
......
......@@ -35,7 +35,7 @@
#include <math.h>
vtkCxxRevisionMacro(vtkKitwareContourFilter, "1.39");
vtkCxxRevisionMacro(vtkKitwareContourFilter, "1.40");
vtkStandardNewMacro(vtkKitwareContourFilter);
// Construct object with initial range (0,1) and single contour value
......@@ -49,7 +49,7 @@ vtkKitwareContourFilter::~vtkKitwareContourFilter()
{
}
int vtkKitwareContourFilter::ComputeInputUpdateExtent(
int vtkKitwareContourFilter::RequestUpdateExtent(
vtkInformation* request,
vtkInformationVector** inputVector,
vtkInformationVector* outputVector)
......@@ -161,9 +161,9 @@ int vtkKitwareContourFilter::ComputeInputUpdateExtent(
}
}
return this->Superclass::ComputeInputUpdateExtent(request,
inputVector,
outputVector);
return this->Superclass::RequestUpdateExtent(request,
inputVector,
outputVector);
}
//
......
......@@ -78,9 +78,9 @@ protected:
vtkKitwareContourFilter();
~vtkKitwareContourFilter();
virtual int ComputeInputUpdateExtent(vtkInformation* request,
vtkInformationVector** inputVector,
vtkInformationVector* outputVector);
virtual int RequestUpdateExtent(vtkInformation* request,
vtkInformationVector** inputVector,
vtkInformationVector* outputVector);
virtual int RequestData(vtkInformation* request,
vtkInformationVector** inputVector,
vtkInformationVector* outputVector);
......
......@@ -37,6 +37,11 @@ STRING (REGEX REPLACE
"int RequestInformation(vtkInformation *, vtkInformationVector **, vtkInformationVector *)"
H_CONTENTS "${H_CONTENTS}")
STRING (REGEX REPLACE
"void[ \t]+ComputeInputUpdateExtents[ \t]*\\([ \t]*[^)]*\\)"
"int RequestUpdateExtent(vtkInformation *, vtkInformationVector **, vtkInformationVector *)"
H_CONTENTS "${H_CONTENTS}")
FILE (WRITE ${H_FILE} "${H_CONTENTS}")
#================================================================
......@@ -53,6 +58,11 @@ STRING (REGEX REPLACE
"::RequestInformation(\n vtkInformation *vtkNotUsed(request),\n vtkInformationVector **inputVector,\n vtkInformationVector *outputVector)\n{\n // get the info objects\n vtkInformation *inInfo = inputVector[0]->GetInformationObject(0);\n vtkInformation *outInfo = outputVector->GetInformationObject(0);\n"
CXX_CONTENTS "${CXX_CONTENTS}")
STRING (REGEX REPLACE
"::ComputeInputUpdateExtents[ \t]*\\([^{]*{"
"::RequestUpdateExtent(\n vtkInformation *vtkNotUsed(request),\n vtkInformationVector **inputVector,\n vtkInformationVector *outputVector)\n{\n // get the info objects\n vtkInformation *inInfo = inputVector[0]->GetInformationObject(0);\n vtkInformation *outInfo = outputVector->GetInformationObject(0);\n"
CXX_CONTENTS "${CXX_CONTENTS}")
# add some useful include files if needed
IF ("${CXX_CONTENTS}" MATCHES ".*vtkInformation.*")
# do not do these replacements multiple times
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment