Commit b88f647b authored by Chris Harris's avatar Chris Harris
Browse files

COMP: Rename vtkImageAlgorithm::ExecuteData(vtkDataObject, vtkInformation*)

Rename vtkImageAlgorithm::ExecuteData(vtkDataObject, vtkInformation*) to
vtkImageAlgorithm::ExecuteDataWithInformation(vtkDataObject, vtkInformation*)
to prevent hiding of overloaded version.

Change-Id: Iff5b37ecbb1f3be24e131b98cdd247fd0e0250e3
parent 0460b2ec
......@@ -160,7 +160,7 @@ int vtkMoleculeAlgorithm::RequestData(
vtkInformationVector* outputVector)
{
// the default implimentation is to do what the old pipeline did find what
// output is requesting the data, and pass that into ExecuteData
// output is requesting the data, and pass that into ExecuteDataWithInformation
// which output port did the request come from
int outputPort =
......@@ -177,15 +177,15 @@ int vtkMoleculeAlgorithm::RequestData(
vtkInformation *outInfo =
outputVector->GetInformationObject(outputPort);
// call ExecuteData
this->ExecuteData( outInfo->Get(vtkDataObject::DATA_OBJECT()), outInfo );
this->ExecuteDataWithInformation( outInfo->Get(vtkDataObject::DATA_OBJECT()), outInfo );
return 1;
}
//----------------------------------------------------------------------------
// Assume that any source that implements ExecuteData
// Assume that any source that implements ExecuteDataWithInformation
// can handle an empty extent.
void vtkMoleculeAlgorithm::ExecuteData(
void vtkMoleculeAlgorithm::ExecuteDataWithInformation(
vtkDataObject *output,
vtkInformation *outInfo)
{
......
......@@ -104,8 +104,8 @@ protected:
// Description:
// This method is the old style execute method
virtual void ExecuteData(vtkDataObject *output,
vtkInformation* outInfo);
virtual void ExecuteDataWithInformation(vtkDataObject *output,
vtkInformation* outInfo);
virtual void Execute();
// see algorithm for more info
......
......@@ -76,8 +76,8 @@ int vtkImageAlgorithm::RequestData(
this->SetErrorCode( vtkErrorCode::NoError );
if (outInfo)
{
this->ExecuteData( outInfo->Get(vtkDataObject::DATA_OBJECT()),
outInfo );
this->ExecuteDataWithInformation( outInfo->Get(vtkDataObject::DATA_OBJECT()),
outInfo );
}
else
{
......@@ -118,7 +118,7 @@ int vtkImageAlgorithm::ProcessRequest(vtkInformation* request,
return this->Superclass::ProcessRequest(request, inputVector, outputVector);
}
void vtkImageAlgorithm::ExecuteData(vtkDataObject *dobj, vtkInformation*)
void vtkImageAlgorithm::ExecuteDataWithInformation(vtkDataObject *dobj, vtkInformation*)
{
this->ExecuteData(dobj);
}
......
......@@ -95,8 +95,8 @@ protected:
vtkInformationVector* outputVector);
// Description:
virtual void ExecuteDataWithInformation(vtkDataObject *output, vtkInformation* outInfo);
// This method is the old style execute method
virtual void ExecuteData(vtkDataObject *output, vtkInformation* outInfo);
virtual void ExecuteData(vtkDataObject *output);
virtual void Execute();
......
......@@ -529,8 +529,8 @@ void vtkBMPReaderUpdate2(vtkBMPReader *self, vtkImageData *data, OT *outPtr)
//----------------------------------------------------------------------------
// This function reads a data from a file. The datas extent/axes
// are assumed to be the same as the file extent/order.
void vtkBMPReader::ExecuteData(vtkDataObject *output,
vtkInformation* outInfo)
void vtkBMPReader::ExecuteDataWithInformation(vtkDataObject *output,
vtkInformation* outInfo)
{
vtkImageData *data = this->AllocateOutputData(output, outInfo);
......
......@@ -100,7 +100,7 @@ protected:
virtual void ComputeDataIncrements();
virtual void ExecuteInformation();
virtual void ExecuteData(vtkDataObject *out, vtkInformation* outInfo);
virtual void ExecuteDataWithInformation(vtkDataObject *out, vtkInformation* outInfo);
private:
vtkBMPReader(const vtkBMPReader&); // Not implemented.
void operator=(const vtkBMPReader&); // Not implemented.
......
......@@ -247,8 +247,8 @@ void vtkDICOMImageReader::ExecuteInformation()
}
//----------------------------------------------------------------------------
void vtkDICOMImageReader::ExecuteData(vtkDataObject *output,
vtkInformation *outInfo)
void vtkDICOMImageReader::ExecuteDataWithInformation(vtkDataObject *output,
vtkInformation *outInfo)
{
vtkImageData *data = this->AllocateOutputData(output, outInfo);
......
......@@ -183,7 +183,7 @@ protected:
void SetupOutputInformation(int num_slices);
virtual void ExecuteInformation();
virtual void ExecuteData(vtkDataObject *out, vtkInformation *outInfo);
virtual void ExecuteDataWithInformation(vtkDataObject *out, vtkInformation *outInfo);
//
// Constructor
......
......@@ -721,8 +721,8 @@ void vtkGESignaReaderUpdate(vtkGESignaReader *self, vtkImageData *data,
//----------------------------------------------------------------------------
// This function reads a data from a file. The datas extent/axes
// are assumed to be the same as the file extent/order.
void vtkGESignaReader::ExecuteData(vtkDataObject *output,
vtkInformation *outInfo)
void vtkGESignaReader::ExecuteDataWithInformation(vtkDataObject *output,
vtkInformation *outInfo)
{
vtkImageData *data = this->AllocateOutputData(output, outInfo);
......
......@@ -61,7 +61,7 @@ protected:
~vtkGESignaReader() {};
virtual void ExecuteInformation();
virtual void ExecuteData(vtkDataObject *out, vtkInformation* outInfo);
virtual void ExecuteDataWithInformation(vtkDataObject *out, vtkInformation* outInfo);
private:
vtkGESignaReader(const vtkGESignaReader&); // Not implemented.
......
......@@ -415,8 +415,8 @@ void vtkImageReaderUpdate1(vtkImageReader *self, vtkImageData *data, T *inPtr)
//----------------------------------------------------------------------------
// This function reads a data from a file. The datas extent/axes
// are assumed to be the same as the file extent/order.
void vtkImageReader::ExecuteData(vtkDataObject *output,
vtkInformation *outInfo)
void vtkImageReader::ExecuteDataWithInformation(vtkDataObject *output,
vtkInformation *outInfo)
{
vtkImageData *data = this->AllocateOutputData(output, outInfo);
......
......@@ -97,7 +97,7 @@ protected:
vtkInformationVector** inputVector,
vtkInformationVector* outputVector);
void ExecuteData(vtkDataObject *data, vtkInformation *outInfo);
void ExecuteDataWithInformation(vtkDataObject *data, vtkInformation *outInfo);
private:
vtkImageReader(const vtkImageReader&); // Not implemented.
void operator=(const vtkImageReader&); // Not implemented.
......
......@@ -802,8 +802,8 @@ void vtkImageReader2Update(vtkImageReader2 *self, vtkImageData *data, OT *outPtr
//----------------------------------------------------------------------------
// This function reads a data from a file. The datas extent/axes
// are assumed to be the same as the file extent/order.
void vtkImageReader2::ExecuteData(vtkDataObject *output,
vtkInformation *outInfo)
void vtkImageReader2::ExecuteDataWithInformation(vtkDataObject *output,
vtkInformation *outInfo)
{
vtkImageData *data = this->AllocateOutputData(output, outInfo);
......
......@@ -259,7 +259,7 @@ protected:
vtkInformationVector** inputVector,
vtkInformationVector* outputVector);
virtual void ExecuteInformation();
virtual void ExecuteData(vtkDataObject *data, vtkInformation *outInfo);
virtual void ExecuteDataWithInformation(vtkDataObject *data, vtkInformation *outInfo);
virtual void ComputeDataIncrements();
private:
vtkImageReader2(const vtkImageReader2&); // Not implemented.
......
......@@ -268,8 +268,8 @@ void vtkJPEGReaderUpdate(vtkJPEGReader *self, vtkImageData *data, OT *outPtr)
//----------------------------------------------------------------------------
// This function reads a data from a file. The datas extent/axes
// are assumed to be the same as the file extent/order.
void vtkJPEGReader::ExecuteData(vtkDataObject *output,
vtkInformation *outInfo)
void vtkJPEGReader::ExecuteDataWithInformation(vtkDataObject *output,
vtkInformation *outInfo)
{
vtkImageData *data = this->AllocateOutputData(output, outInfo);
......
......@@ -56,7 +56,7 @@ protected:
~vtkJPEGReader() {};
virtual void ExecuteInformation();
virtual void ExecuteData(vtkDataObject *out, vtkInformation *outInfo);
virtual void ExecuteDataWithInformation(vtkDataObject *out, vtkInformation *outInfo);
private:
vtkJPEGReader(const vtkJPEGReader&); // Not implemented.
void operator=(const vtkJPEGReader&); // Not implemented.
......
......@@ -1128,8 +1128,8 @@ void vtkMINCImageReaderExecuteChunk(
case VTK_UNSIGNED_CHAR: { typedef unsigned char VTK_TT; call; }; break
//-------------------------------------------------------------------------
void vtkMINCImageReader::ExecuteData(vtkDataObject *output,
vtkInformation *outInfo)
void vtkMINCImageReader::ExecuteDataWithInformation(vtkDataObject *output,
vtkInformation *outInfo)
{
vtkImageData *data = this->AllocateOutputData(output, outInfo);
int scalarType = data->GetScalarType();
......
......@@ -178,7 +178,7 @@ protected:
static int ConvertMINCTypeToVTKType(int minctype, int mincsigned);
virtual void ExecuteInformation();
virtual void ExecuteData(vtkDataObject *out, vtkInformation *outInfo);
virtual void ExecuteDataWithInformation(vtkDataObject *out, vtkInformation *outInfo);
private:
vtkMINCImageReader(const vtkMINCImageReader&); // Not implemented
......
......@@ -204,8 +204,8 @@ void vtkMetaImageReader::ExecuteInformation()
}
void vtkMetaImageReader::ExecuteData(vtkDataObject * output,
vtkInformation *outInfo)
void vtkMetaImageReader::ExecuteDataWithInformation(vtkDataObject * output,
vtkInformation *outInfo)
{
vtkImageData * data = this->AllocateOutputData(output, outInfo);
......
......@@ -172,7 +172,7 @@ protected:
{ return vtkImageReader2::GetHeaderSize(); }*/
void ExecuteInformation();
void ExecuteData(vtkDataObject *out, vtkInformation *outInfo);
void ExecuteDataWithInformation(vtkDataObject *out, vtkInformation *outInfo);
virtual int RequestInformation(vtkInformation * request,
vtkInformationVector ** inputVector,
vtkInformationVector * outputVector);
......
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