Commit 7a31d165 authored by Will Schroeder's avatar Will Schroeder

Renamed filter for consistency

parent bf20a5aa
......@@ -61,7 +61,7 @@ set(Module_SRCS
vtkRecursiveDividingCubes.cxx
vtkReflectionFilter.cxx
vtkRotationFilter.cxx
vtkSampleDataSet.cxx
vtkSampleImplicitFunctionFilter.cxx
vtkShrinkFilter.cxx
vtkShrinkPolyData.cxx
vtkSpatialRepresentationFilter.cxx
......
......@@ -10,7 +10,7 @@ vtk_add_test_python(
TestGraphLayoutFilter.py
TestMultiBlockStreamer.py
TestRectilinearGridToTetrahedra.py
TestSampleDataSet.py
TestSampleImplicitFunctionFilter.py
TestSplineFilter.py
WarpToImage.py
blankGrid.py
......
......@@ -20,7 +20,7 @@ cyl.SetCenter(0,0,0)
cyl.SetRadius(0.1)
# Generate scalars and vector
sample = vtk.vtkSampleDataSet()
sample = vtk.vtkSampleImplicitFunctionFilter()
sample.SetInputConnection(points.GetOutputPort())
sample.SetImplicitFunction(cyl)
sample.Update()
......
/*=========================================================================
Program: Visualization Toolkit
Module: vtkSampleDataSet.cxx
Module: vtkSampleImplicitFunctionFilter.cxx
Copyright (c) Ken Martin, Will Schroeder, Bill Lorensen
All rights reserved.
......@@ -12,7 +12,7 @@
PURPOSE. See the above copyright notice for more information.
=========================================================================*/
#include "vtkSampleDataSet.h"
#include "vtkSampleImplicitFunctionFilter.h"
#include "vtkFloatArray.h"
#include "vtkGarbageCollector.h"
......@@ -27,8 +27,8 @@
#include "vtkPointData.h"
#include "vtkSMPTools.h"
vtkStandardNewMacro(vtkSampleDataSet);
vtkCxxSetObjectMacro(vtkSampleDataSet,ImplicitFunction,vtkImplicitFunction);
vtkStandardNewMacro(vtkSampleImplicitFunctionFilter);
vtkCxxSetObjectMacro(vtkSampleImplicitFunctionFilter,ImplicitFunction,vtkImplicitFunction);
// Interface between vtkSMPTools and the VTK pipeline
namespace {
......@@ -92,7 +92,7 @@ struct SampleDataSetWithGradients
//----------------------------------------------------------------------------
// Okay define the VTK class proper
vtkSampleDataSet::vtkSampleDataSet()
vtkSampleImplicitFunctionFilter::vtkSampleImplicitFunctionFilter()
{
this->ImplicitFunction = NULL;
......@@ -106,7 +106,7 @@ vtkSampleDataSet::vtkSampleDataSet()
}
//----------------------------------------------------------------------------
vtkSampleDataSet::~vtkSampleDataSet()
vtkSampleImplicitFunctionFilter::~vtkSampleImplicitFunctionFilter()
{
this->SetImplicitFunction(NULL);
this->SetScalarArrayName(NULL);
......@@ -115,7 +115,7 @@ vtkSampleDataSet::~vtkSampleDataSet()
//----------------------------------------------------------------------------
// Produce the output data
int vtkSampleDataSet::RequestData(
int vtkSampleImplicitFunctionFilter::RequestData(
vtkInformation *vtkNotUsed(request),
vtkInformationVector **inputVector,
vtkInformationVector *outputVector)
......@@ -204,7 +204,7 @@ int vtkSampleDataSet::RequestData(
}
//----------------------------------------------------------------------------
int vtkSampleDataSet::
int vtkSampleImplicitFunctionFilter::
FillInputPortInformation(int, vtkInformation *info)
{
info->Set(vtkAlgorithm::INPUT_REQUIRED_DATA_TYPE(), "vtkDataSet");
......@@ -212,7 +212,7 @@ FillInputPortInformation(int, vtkInformation *info)
}
//----------------------------------------------------------------------------
unsigned long vtkSampleDataSet::GetMTime()
unsigned long vtkSampleImplicitFunctionFilter::GetMTime()
{
unsigned long mTime=this->Superclass::GetMTime();
unsigned long impFuncMTime;
......@@ -227,7 +227,8 @@ unsigned long vtkSampleDataSet::GetMTime()
}
//----------------------------------------------------------------------------
void vtkSampleDataSet::ReportReferences(vtkGarbageCollector* collector)
void vtkSampleImplicitFunctionFilter::
ReportReferences(vtkGarbageCollector* collector)
{
this->Superclass::ReportReferences(collector);
vtkGarbageCollectorReport(collector, this->ImplicitFunction,
......@@ -235,7 +236,7 @@ void vtkSampleDataSet::ReportReferences(vtkGarbageCollector* collector)
}
//----------------------------------------------------------------------------
void vtkSampleDataSet::PrintSelf(ostream& os, vtkIndent indent)
void vtkSampleImplicitFunctionFilter::PrintSelf(ostream& os, vtkIndent indent)
{
this->Superclass::PrintSelf(os,indent);
......
/*=========================================================================
Program: Visualization Toolkit
Module: vtkSampleDataSet.h
Module: vtkSampleImplicitFunctionFilter.h
Copyright (c) Ken Martin, Will Schroeder, Bill Lorensen
All rights reserved.
......@@ -12,11 +12,11 @@
PURPOSE. See the above copyright notice for more information.
=========================================================================*/
// .NAME vtkSampleDataSet - sample an implicit function over a dataset,
// .NAME vtkSampleImplicitFunctionFilter - sample an implicit function over a dataset,
// generating scalar values and optional gradient vectors
// .SECTION Description
// vtkSampleDataSet is a filter that evaluates an implicit function and
// vtkSampleImplicitFunctionFilter is a filter that evaluates an implicit function and
// (optional) gradients at each point in an input vtkDataSet. The output
// of the filter are new scalar values (the function values) and the
// optional vector (function gradient) array.
......@@ -29,8 +29,8 @@
// .SECTION See Also
// vtkSampleFunction vtkImplicitModeller
#ifndef vtkSampleDataSet_h
#define vtkSampleDataSet_h
#ifndef vtkSampleImplicitFunctionFilter_h
#define vtkSampleImplicitFunctionFilter_h
#include "vtkFiltersGeneralModule.h" // For export macro
#include "vtkDataSetAlgorithm.h"
......@@ -38,13 +38,13 @@
class vtkImplicitFunction;
class vtkDataArray;
class VTKFILTERSGENERAL_EXPORT vtkSampleDataSet : public vtkDataSetAlgorithm
class VTKFILTERSGENERAL_EXPORT vtkSampleImplicitFunctionFilter : public vtkDataSetAlgorithm
{
public:
// Description:
// Standard instantiation, type information, and print methods.
static vtkSampleDataSet *New();
vtkTypeMacro(vtkSampleDataSet,vtkDataSetAlgorithm);
static vtkSampleImplicitFunctionFilter *New();
vtkTypeMacro(vtkSampleImplicitFunctionFilter,vtkDataSetAlgorithm);
void PrintSelf(ostream& os, vtkIndent indent);
// Description:
......@@ -75,8 +75,8 @@ public:
unsigned long GetMTime();
protected:
vtkSampleDataSet();
~vtkSampleDataSet();
vtkSampleImplicitFunctionFilter();
~vtkSampleImplicitFunctionFilter();
vtkImplicitFunction *ImplicitFunction;
int ComputeGradients;
......@@ -91,8 +91,8 @@ protected:
private:
vtkSampleDataSet(const vtkSampleDataSet&); // Not implemented.
void operator=(const vtkSampleDataSet&); // Not implemented.
vtkSampleImplicitFunctionFilter(const vtkSampleImplicitFunctionFilter&); // Not implemented.
void operator=(const vtkSampleImplicitFunctionFilter&); // Not implemented.
};
#endif
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