Commit 0cc86887 authored by Robert Maynard's avatar Robert Maynard

Correct inconsistent-missing-override warnings in DataModel.

parent 7fe30aa1
......@@ -38,7 +38,7 @@ class VTKCOMMONDATAMODEL_EXPORT vtkAMRUtilities : public vtkObject
public:
// Standard Routines
vtkTypeMacro(vtkAMRUtilities,vtkObject);
void PrintSelf(ostream& os, vtkIndent indent );
void PrintSelf(ostream& os, vtkIndent indent) VTK_OVERRIDE;
// Description:
// This method detects and strips partially overlapping cells from a
......
......@@ -87,7 +87,7 @@ public:
// Description:
// Deep copies the data object into this.
virtual void DeepCopy(vtkDataObject *obj);
void DeepCopy(vtkDataObject *obj) VTK_OVERRIDE;
// Description:
// Get the padding between the molecule and the cube boundaries. This is
......
......@@ -87,13 +87,6 @@ public:
// after the locator is constructed.
vtkGetMacro(NumberOfBuckets,vtkIdType);
// Description:
// See vtkLocator interface documentation.
// These methods are not thread safe.
virtual void FreeSearchStructure() = 0;
virtual void BuildLocator() = 0;
virtual void GenerateRepresentation(int level, vtkPolyData *pd) = 0;
protected:
vtkAbstractPointLocator();
virtual ~vtkAbstractPointLocator();
......
......@@ -85,12 +85,11 @@ public:
// Description:
// Makes the state of the scene same as the given time.
void SetAnimationTime(double time);
vtkGetMacro(AnimationTime, double);
// Description:
// Overridden to allow change to Normalized mode only
// if none of the constituent cues is in Relative time mode.
virtual void SetTimeMode(int mode);
void SetTimeMode(int mode) VTK_OVERRIDE;
// Description:
// Returns if the animation is being played.
......@@ -109,9 +108,9 @@ protected:
// Description:
// Called on every valid tick.
// Calls ticks on all the contained cues.
virtual void TickInternal(double currenttime, double deltatime, double clocktime);
virtual void StartCueInternal();
virtual void EndCueInternal();
void TickInternal(double currenttime, double deltatime, double clocktime) VTK_OVERRIDE;
void StartCueInternal() VTK_OVERRIDE;
void EndCueInternal() VTK_OVERRIDE;
void InitializeChildren();
void FinalizeChildren();
......
......@@ -92,21 +92,21 @@ public:
// Description:
// Initialize the annotation to an empty state.
virtual void Initialize();
void Initialize() VTK_OVERRIDE;
// Description:
// Make this annotation have the same properties and have
// the same selection of another annotation.
virtual void ShallowCopy(vtkDataObject* other);
void ShallowCopy(vtkDataObject* other) VTK_OVERRIDE;
// Description:
// Make this annotation have the same properties and have
// a copy of the selection of another annotation.
virtual void DeepCopy(vtkDataObject* other);
void DeepCopy(vtkDataObject* other) VTK_OVERRIDE;
// Description:
// Get the modified time of this object.
virtual vtkMTimeType GetMTime() VTK_OVERRIDE;
vtkMTimeType GetMTime() VTK_OVERRIDE;
protected:
vtkAnnotation();
......
......@@ -72,17 +72,17 @@ public:
// Description:
// Initialize the data structure to an empty state.
virtual void Initialize();
void Initialize() VTK_OVERRIDE;
// Description:
// Copy data from another data object into this one
// which references the same member annotations.
virtual void ShallowCopy(vtkDataObject* other);
void ShallowCopy(vtkDataObject* other) VTK_OVERRIDE;
// Description:
// Copy data from another data object into this one,
// performing a deep copy of member annotations.
virtual void DeepCopy(vtkDataObject* other);
void DeepCopy(vtkDataObject* other) VTK_OVERRIDE;
// Description:
// Retrieve a vtkAnnotationLayers stored inside an information object.
......@@ -91,7 +91,7 @@ public:
// Description:
// The modified time for this object.
virtual vtkMTimeType GetMTime() VTK_OVERRIDE;
vtkMTimeType GetMTime() VTK_OVERRIDE;
protected:
vtkAnnotationLayers();
......
......@@ -48,7 +48,7 @@ class VTKCOMMONDATAMODEL_EXPORT vtkArrayData : public vtkDataObject
public:
static vtkArrayData* New();
vtkTypeMacro(vtkArrayData, vtkDataObject);
void PrintSelf(ostream &os, vtkIndent indent);
void PrintSelf(ostream &os, vtkIndent indent) VTK_OVERRIDE;
static vtkArrayData* GetData(vtkInformation* info);
static vtkArrayData* GetData(vtkInformationVector* v, int i = 0);
......@@ -75,10 +75,10 @@ public:
// Description:
// Return class name of data type (VTK_ARRAY_DATA).
virtual int GetDataObjectType() {return VTK_ARRAY_DATA;}
int GetDataObjectType() VTK_OVERRIDE {return VTK_ARRAY_DATA;}
virtual void ShallowCopy(vtkDataObject* other);
virtual void DeepCopy(vtkDataObject* other);
void ShallowCopy(vtkDataObject* other) VTK_OVERRIDE;
void DeepCopy(vtkDataObject* other) VTK_OVERRIDE;
protected:
vtkArrayData();
......
......@@ -98,7 +98,7 @@ public:
// \pre valid_size: sizeof(leftPoint)=sizeof(midPoint)=sizeof(rightPoint)
// =GetAttributeCollection()->GetNumberOfPointCenteredComponents()+6
int RequiresEdgeSubdivision(double *leftPoint, double *midPoint, double *rightPoint,
double alpha);
double alpha) VTK_OVERRIDE;
// Description:
// Return the error at the mid-point. The type of error depends on the state
......@@ -113,7 +113,7 @@ public:
// =GetAttributeCollection()->GetNumberOfPointCenteredComponents()+6
// \post positive_result: result>=0
double GetError(double *leftPoint, double *midPoint,
double *rightPoint, double alpha);
double *rightPoint, double alpha) VTK_OVERRIDE;
protected:
vtkAttributesErrorMetric();
......
......@@ -105,13 +105,13 @@ public:
// Description:
// Restore data object to initial state,
virtual void Initialize();
void Initialize() VTK_OVERRIDE;
// Description:
// Shallow copy. These copy the data, but not any of the
// pipeline connections.
virtual void ShallowCopy(vtkDataObject *src);
virtual void DeepCopy(vtkDataObject *src);
void ShallowCopy(vtkDataObject *src) VTK_OVERRIDE;
void DeepCopy(vtkDataObject *src) VTK_OVERRIDE;
protected:
......
......@@ -50,34 +50,34 @@ class VTKCOMMONDATAMODEL_EXPORT vtkBiQuadraticQuad : public vtkNonLinearCell
public:
static vtkBiQuadraticQuad *New ();
vtkTypeMacro(vtkBiQuadraticQuad,vtkNonLinearCell);
void PrintSelf (ostream & os, vtkIndent indent);
void PrintSelf (ostream & os, vtkIndent indent) VTK_OVERRIDE;
// Description:
// Implement the vtkCell API. See the vtkCell API for descriptions
// of these methods.
int GetCellType () { return VTK_BIQUADRATIC_QUAD; }
int GetCellDimension () { return 2; }
int GetNumberOfEdges () { return 4; }
int GetNumberOfFaces () { return 0; }
vtkCell *GetEdge (int);
vtkCell *GetFace (int) { return 0; }
int CellBoundary (int subId, double pcoords[3], vtkIdList * pts);
int GetCellType() VTK_OVERRIDE { return VTK_BIQUADRATIC_QUAD; }
int GetCellDimension() VTK_OVERRIDE { return 2; }
int GetNumberOfEdges() VTK_OVERRIDE { return 4; }
int GetNumberOfFaces() VTK_OVERRIDE { return 0; }
vtkCell *GetEdge (int) VTK_OVERRIDE;
vtkCell *GetFace (int) VTK_OVERRIDE { return 0; }
int CellBoundary (int subId, double pcoords[3], vtkIdList * pts) VTK_OVERRIDE;
int EvaluatePosition (double x[3], double *closestPoint,
int &subId, double pcoords[3],
double &dist2, double *weights);
double &dist2, double *weights) VTK_OVERRIDE;
void EvaluateLocation (int &subId, double pcoords[3], double x[3],
double *weights);
int Triangulate (int index, vtkIdList * ptIds, vtkPoints * pts);
double *weights) VTK_OVERRIDE;
int Triangulate (int index, vtkIdList * ptIds, vtkPoints * pts) VTK_OVERRIDE;
void Derivatives (int subId, double pcoords[3], double *values,
int dim, double *derivs);
virtual double *GetParametricCoords();
int dim, double *derivs) VTK_OVERRIDE;
double *GetParametricCoords() VTK_OVERRIDE;
void Contour (double value, vtkDataArray * cellScalars,
vtkIncrementalPointLocator * locator, vtkCellArray * verts,
vtkCellArray * lines, vtkCellArray * polys,
vtkPointData * inPd, vtkPointData * outPd, vtkCellData * inCd,
vtkIdType cellId, vtkCellData * outCd);
vtkIdType cellId, vtkCellData * outCd) VTK_OVERRIDE;
// Description:
// Clip this biquadratic quad using scalar value provided. Like contouring,
......@@ -86,17 +86,18 @@ public:
vtkIncrementalPointLocator * locator, vtkCellArray * polys,
vtkPointData * inPd, vtkPointData * outPd,
vtkCellData * inCd, vtkIdType cellId, vtkCellData * outCd,
int insideOut);
int insideOut) VTK_OVERRIDE;
// Description:
// Line-edge intersection. Intersection has to occur within [0,1] parametric
// coordinates and with specified tolerance.
int IntersectWithLine (double p1[3], double p2[3], double tol, double &t,
double x[3], double pcoords[3], int &subId);
double x[3], double pcoords[3],
int &subId) VTK_OVERRIDE;
// Description:
// Return the center of the pyramid in parametric coordinates.
int GetParametricCenter(double pcoords[3]);
int GetParametricCenter(double pcoords[3]) VTK_OVERRIDE;
// Description:
// @deprecated Replaced by vtkBiQuadraticQuad::InterpolateFunctions as of VTK 5.2
......@@ -107,11 +108,11 @@ public:
// Description:
// Compute the interpolation functions/derivatives
// (aka shape functions/derivatives)
virtual void InterpolateFunctions (double pcoords[3], double weights[9])
void InterpolateFunctions (double pcoords[3], double weights[9]) VTK_OVERRIDE
{
vtkBiQuadraticQuad::InterpolationFunctionsPrivate(pcoords,weights);
}
virtual void InterpolateDerivs (double pcoords[3], double derivs[18])
void InterpolateDerivs (double pcoords[3], double derivs[18]) VTK_OVERRIDE
{
vtkBiQuadraticQuad::InterpolationDerivsPrivate(pcoords,derivs);
}
......
......@@ -85,28 +85,28 @@ public:
// Description:
// Implement the vtkCell API. See the vtkCell API for descriptions
// of these methods.
int GetCellType() {return VTK_BIQUADRATIC_QUADRATIC_HEXAHEDRON;}
int GetCellDimension() {return 3;}
int GetNumberOfEdges() {return 12;}
int GetNumberOfFaces() {return 6;}
vtkCell *GetEdge(int);
vtkCell *GetFace(int);
int CellBoundary(int subId, double pcoords[3], vtkIdList *pts);
int GetCellType() VTK_OVERRIDE {return VTK_BIQUADRATIC_QUADRATIC_HEXAHEDRON;}
int GetCellDimension() VTK_OVERRIDE {return 3;}
int GetNumberOfEdges() VTK_OVERRIDE {return 12;}
int GetNumberOfFaces() VTK_OVERRIDE {return 6;}
vtkCell *GetEdge(int) VTK_OVERRIDE;
vtkCell *GetFace(int) VTK_OVERRIDE;
int CellBoundary(int subId, double pcoords[3], vtkIdList *pts) VTK_OVERRIDE;
void Contour(double value, vtkDataArray *cellScalars,
vtkIncrementalPointLocator *locator, vtkCellArray *verts,
vtkCellArray *lines, vtkCellArray *polys,
vtkPointData *inPd, vtkPointData *outPd,
vtkCellData *inCd, vtkIdType cellId, vtkCellData *outCd);
vtkCellData *inCd, vtkIdType cellId, vtkCellData *outCd) VTK_OVERRIDE;
int EvaluatePosition(double x[3], double* closestPoint,
int& subId, double pcoords[3],
double& dist2, double *weights);
double& dist2, double *weights) VTK_OVERRIDE;
void EvaluateLocation(int& subId, double pcoords[3], double x[3],
double *weights);
int Triangulate(int index, vtkIdList *ptIds, vtkPoints *pts);
double *weights) VTK_OVERRIDE;
int Triangulate(int index, vtkIdList *ptIds, vtkPoints *pts) VTK_OVERRIDE;
void Derivatives(int subId, double pcoords[3], double *values,
int dim, double *derivs);
virtual double *GetParametricCoords();
int dim, double *derivs) VTK_OVERRIDE;
double *GetParametricCoords() VTK_OVERRIDE;
// Description:
// Clip this biquadratic hexahedron using scalar value provided. Like
......@@ -116,13 +116,13 @@ public:
vtkIncrementalPointLocator *locator, vtkCellArray *tetras,
vtkPointData *inPd, vtkPointData *outPd,
vtkCellData *inCd, vtkIdType cellId, vtkCellData *outCd,
int insideOut);
int insideOut) VTK_OVERRIDE;
// Description:
// Line-edge intersection. Intersection has to occur within [0,1] parametric
// coordinates and with specified tolerance.
int IntersectWithLine(double p1[3], double p2[3], double tol, double& t,
double x[3], double pcoords[3], int& subId);
double x[3], double pcoords[3], int& subId) VTK_OVERRIDE;
// Description:
// @deprecated Replaced by vtkBiQuadraticQuadraticHexahedron::InterpolateFunctions as of VTK 5.2
......@@ -133,11 +133,11 @@ public:
// Description:
// Compute the interpolation functions/derivatives
// (aka shape functions/derivatives)
virtual void InterpolateFunctions(double pcoords[3], double weights[24])
void InterpolateFunctions(double pcoords[3], double weights[24]) VTK_OVERRIDE
{
vtkBiQuadraticQuadraticHexahedron::InterpolationFunctions(pcoords,weights);
}
virtual void InterpolateDerivs(double pcoords[3], double derivs[72])
void InterpolateDerivs(double pcoords[3], double derivs[72]) VTK_OVERRIDE
{
vtkBiQuadraticQuadraticHexahedron::InterpolationDerivs(pcoords,derivs);
}
......
......@@ -53,32 +53,33 @@ class VTKCOMMONDATAMODEL_EXPORT vtkBiQuadraticQuadraticWedge : public vtkNonLine
public:
static vtkBiQuadraticQuadraticWedge *New ();
vtkTypeMacro(vtkBiQuadraticQuadraticWedge,vtkNonLinearCell);
void PrintSelf (ostream & os, vtkIndent indent);
void PrintSelf (ostream & os, vtkIndent indent) VTK_OVERRIDE;
// Description:
// Implement the vtkCell API. See the vtkCell API for descriptions
// of these methods.
int GetCellType () { return VTK_BIQUADRATIC_QUADRATIC_WEDGE; }
int GetCellDimension () { return 3; }
int GetNumberOfEdges () { return 9; }
int GetNumberOfFaces () { return 5; }
vtkCell *GetEdge (int edgeId);
vtkCell *GetFace (int faceId);
int CellBoundary (int subId, double pcoords[3], vtkIdList * pts);
int GetCellType() VTK_OVERRIDE { return VTK_BIQUADRATIC_QUADRATIC_WEDGE; }
int GetCellDimension() VTK_OVERRIDE { return 3; }
int GetNumberOfEdges() VTK_OVERRIDE { return 9; }
int GetNumberOfFaces() VTK_OVERRIDE { return 5; }
vtkCell *GetEdge (int edgeId) VTK_OVERRIDE;
vtkCell *GetFace (int faceId) VTK_OVERRIDE;
int CellBoundary (int subId, double pcoords[3], vtkIdList * pts) VTK_OVERRIDE;
void Contour (double value, vtkDataArray * cellScalars,
vtkIncrementalPointLocator * locator, vtkCellArray * verts,
vtkCellArray * lines, vtkCellArray * polys,
vtkPointData * inPd, vtkPointData * outPd, vtkCellData * inCd,
vtkIdType cellId, vtkCellData * outCd);
vtkIdType cellId, vtkCellData * outCd) VTK_OVERRIDE;
int EvaluatePosition (double x[3], double *closestPoint,
int &subId, double pcoords[3], double &dist2, double *weights);
int &subId, double pcoords[3], double &dist2,
double *weights) VTK_OVERRIDE;
void EvaluateLocation (int &subId, double pcoords[3], double x[3],
double *weights);
int Triangulate (int index, vtkIdList * ptIds, vtkPoints * pts);
double *weights) VTK_OVERRIDE;
int Triangulate (int index, vtkIdList * ptIds, vtkPoints * pts) VTK_OVERRIDE;
void Derivatives (int subId, double pcoords[3], double *values, int dim,
double *derivs);
virtual double *GetParametricCoords ();
double *derivs) VTK_OVERRIDE;
double *GetParametricCoords () VTK_OVERRIDE;
// Description:
// Clip this quadratic Wedge using scalar value provided. Like
......@@ -88,18 +89,18 @@ public:
vtkIncrementalPointLocator * locator, vtkCellArray * tetras,
vtkPointData * inPd, vtkPointData * outPd,
vtkCellData * inCd, vtkIdType cellId, vtkCellData * outCd,
int insideOut);
int insideOut) VTK_OVERRIDE;
// Description:
// Line-edge intersection. Intersection has to occur within [0,1] parametric
// coordinates and with specified tolerance.
int IntersectWithLine (double p1[3], double p2[3], double tol, double &t,
double x[3], double pcoords[3], int &subId);
double x[3], double pcoords[3], int &subId) VTK_OVERRIDE;
// Description:
// Return the center of the quadratic wedge in parametric coordinates.
int GetParametricCenter (double pcoords[3]);
int GetParametricCenter (double pcoords[3]) VTK_OVERRIDE;
// Description:
// @deprecated Replaced by vtkBiQuadraticQuadraticWedge::InterpolateFunctions as of VTK 5.2
......@@ -110,11 +111,11 @@ public:
// Description:
// Compute the interpolation functions/derivatives
// (aka shape functions/derivatives)
virtual void InterpolateFunctions (double pcoords[3], double weights[15])
void InterpolateFunctions (double pcoords[3], double weights[15]) VTK_OVERRIDE
{
vtkBiQuadraticQuadraticWedge::InterpolationFunctions(pcoords,weights);
}
virtual void InterpolateDerivs (double pcoords[3], double derivs[45])
void InterpolateDerivs (double pcoords[3], double derivs[45]) VTK_OVERRIDE
{
vtkBiQuadraticQuadraticWedge::InterpolationDerivs(pcoords,derivs);
}
......
......@@ -52,28 +52,28 @@ public:
// Description:
// Implement the vtkCell API. See the vtkCell API for descriptions
// of these methods.
int GetCellType() {return VTK_BIQUADRATIC_TRIANGLE;};
int GetCellDimension() {return 2;}
int GetNumberOfEdges() {return 3;}
int GetNumberOfFaces() {return 0;}
vtkCell *GetEdge(int edgeId);
vtkCell *GetFace(int) {return 0;}
int CellBoundary(int subId, double pcoords[3], vtkIdList *pts);
int GetCellType() VTK_OVERRIDE {return VTK_BIQUADRATIC_TRIANGLE;};
int GetCellDimension() VTK_OVERRIDE {return 2;}
int GetNumberOfEdges() VTK_OVERRIDE {return 3;}
int GetNumberOfFaces() VTK_OVERRIDE {return 0;}
vtkCell *GetEdge(int edgeId) VTK_OVERRIDE;
vtkCell *GetFace(int) VTK_OVERRIDE {return 0;}
int CellBoundary(int subId, double pcoords[3], vtkIdList *pts) VTK_OVERRIDE;
void Contour(double value, vtkDataArray *cellScalars,
vtkIncrementalPointLocator *locator, vtkCellArray *verts,
vtkCellArray *lines, vtkCellArray *polys,
vtkPointData *inPd, vtkPointData *outPd,
vtkCellData *inCd, vtkIdType cellId, vtkCellData *outCd);
vtkCellData *inCd, vtkIdType cellId, vtkCellData *outCd) VTK_OVERRIDE;
int EvaluatePosition(double x[3], double* closestPoint,
int& subId, double pcoords[3],
double& dist2, double *weights);
double& dist2, double *weights) VTK_OVERRIDE;
void EvaluateLocation(int& subId, double pcoords[3], double x[3],
double *weights);
int Triangulate(int index, vtkIdList *ptIds, vtkPoints *pts);
double *weights) VTK_OVERRIDE;
int Triangulate(int index, vtkIdList *ptIds, vtkPoints *pts) VTK_OVERRIDE;
void Derivatives(int subId, double pcoords[3], double *values,
int dim, double *derivs);
virtual double *GetParametricCoords();
int dim, double *derivs) VTK_OVERRIDE;
double *GetParametricCoords() VTK_OVERRIDE;
// Description:
// Clip this quadratic triangle using scalar value provided. Like
......@@ -83,23 +83,23 @@ public:
vtkIncrementalPointLocator *locator, vtkCellArray *polys,
vtkPointData *inPd, vtkPointData *outPd,
vtkCellData *inCd, vtkIdType cellId, vtkCellData *outCd,
int insideOut);
int insideOut) VTK_OVERRIDE;
// Description:
// Line-edge intersection. Intersection has to occur within [0,1] parametric
// coordinates and with specified tolerance.
int IntersectWithLine(double p1[3], double p2[3], double tol, double& t,
double x[3], double pcoords[3], int& subId);
double x[3], double pcoords[3], int& subId) VTK_OVERRIDE;
// Description:
// Return the center of the quadratic triangle in parametric coordinates.
int GetParametricCenter(double pcoords[3]);
int GetParametricCenter(double pcoords[3]) VTK_OVERRIDE;
// Description:
// Return the distance of the parametric coordinate provided to the
// cell. If inside the cell, a distance of zero is returned.
double GetParametricDistance(double pcoords[3]);
double GetParametricDistance(double pcoords[3]) VTK_OVERRIDE;
// Description:
// @deprecated Replaced by vtkBiQuadraticTriangle::InterpolateFunctions as of VTK 5.2
......@@ -110,11 +110,11 @@ public:
// Description:
// Compute the interpolation functions/derivatives
// (aka shape functions/derivatives)
virtual void InterpolateFunctions(double pcoords[3], double weights[7])
void InterpolateFunctions(double pcoords[3], double weights[7]) VTK_OVERRIDE
{
vtkBiQuadraticTriangle::InterpolationFunctions(pcoords,weights);
}
virtual void InterpolateDerivs(double pcoords[3], double derivs[14])
void InterpolateDerivs(double pcoords[3], double derivs[14]) VTK_OVERRIDE
{
vtkBiQuadraticTriangle::InterpolationDerivs(pcoords,derivs);
}
......
......@@ -44,13 +44,13 @@ public:
// Description
// Evaluate box defined by the two points (pMin,pMax).
double EvaluateFunction(double x[3]);
double EvaluateFunction(double x[3]) VTK_OVERRIDE;
double EvaluateFunction(double x, double y, double z)
{return this->vtkImplicitFunction::EvaluateFunction(x, y, z); }
// Description
// Evaluate the gradient of the box.
void EvaluateGradient(double x[3], double n[3]);
void EvaluateGradient(double x[3], double n[3]) VTK_OVERRIDE;
// Description:
// Set / get the bounding box using various methods.
......
......@@ -54,11 +54,12 @@ public:
// 0<=faceId<this->GetNumberOfFaces().
virtual void GetFacePoints(int faceId, int* &pts) = 0;
virtual void Contour(double value, vtkDataArray *cellScalars,
void Contour(double value, vtkDataArray *cellScalars,
vtkIncrementalPointLocator *locator, vtkCellArray *verts,
vtkCellArray *lines, vtkCellArray *polys,
vtkPointData *inPd, vtkPointData *outPd,
vtkCellData *inCd, vtkIdType cellId, vtkCellData *outCd);
vtkCellData *inCd, vtkIdType cellId,
vtkCellData *outCd) VTK_OVERRIDE;
// Description:
// Cut (or clip) the cell based on the input cellScalars and the specified
......@@ -71,15 +72,15 @@ public:
// generated contouring primitives. (Note: the CopyAllocate() method must
// be invoked on both the output cell and point data. The cellId refers to
// the cell from which the cell data is copied.) (Satisfies vtkCell API.)
virtual void Clip(double value, vtkDataArray *cellScalars,
vtkIncrementalPointLocator *locator, vtkCellArray *connectivity,
vtkPointData *inPd, vtkPointData *outPd,
vtkCellData *inCd, vtkIdType cellId, vtkCellData *outCd,
int insideOut);
void Clip(double value, vtkDataArray *cellScalars,
vtkIncrementalPointLocator *locator, vtkCellArray *connectivity,
vtkPointData *inPd, vtkPointData *outPd,
vtkCellData *inCd, vtkIdType cellId, vtkCellData *outCd,
int insideOut) VTK_OVERRIDE;
// Description:
// The topological dimension of the cell. (Satisfies vtkCell API.)
virtual int GetCellDimension() {return 3;}
int GetCellDimension() VTK_OVERRIDE {return 3;}
// Description:
// Set the tolerance for merging clip intersection points that are near
......
......@@ -57,7 +57,7 @@ public:
// Description:
// Build the link list array. All subclasses of vtkAbstractCellLinks
// must support this method.
virtual void BuildLinks(vtkDataSet *data);
void BuildLinks(vtkDataSet *data) VTK_OVERRIDE;
// Description:
// Build the link list array with a provided connectivity array.
......
......@@ -68,10 +68,10 @@ public:
// Return intersection point (if any) AND the cell which was intersected by
// the finite line. The cell is returned as a cell id and as a generic cell.
// For other IntersectWithLine signatures, see vtkAbstractCellLocator
virtual int IntersectWithLine(double a0[3], double a1[3], double tol,
double& t, double x[3], double pcoords[3],
int &subId, vtkIdType &cellId,
vtkGenericCell *cell);
int IntersectWithLine(double a0[3], double a1[3], double tol,
double& t, double x[3], double pcoords[3],
int &subId, vtkIdType &cellId,
vtkGenericCell *cell) VTK_OVERRIDE;
// Description:
// Return the closest point and the cell which is closest to the point x.
......@@ -83,10 +83,10 @@ public:
// deallocation can be done only once outside the for loop. If a cell is
// found, "cell" contains the points and ptIds for the cell "cellId" upon
// exit.
virtual void FindClosestPoint(
void FindClosestPoint(
double x[3], double closestPoint[3],
vtkGenericCell *cell, vtkIdType &cellId,
int &subId, double& dist2);
int &subId, double& dist2) VTK_OVERRIDE;
// Description:
// Return the closest point within a specified radius and the cell which is
......@@ -104,10 +104,10 @@ public:
// inside returns the return value of the EvaluatePosition call to the
// closest cell; inside(=1) or outside(=0).
// For other FindClosestPointWithinRadius signatures, see vtkAbstractCellLocator
virtual vtkIdType FindClosestPointWithinRadius(
vtkIdType FindClosestPointWithinRadius(
double x[3], double radius, double closestPoint[3],
vtkGenericCell *cell, vtkIdType &cellId,
int &subId, double& dist2, int &inside);
int &subId, double& dist2, int &inside) VTK_OVERRIDE;
// Description:
// Get the cells in a particular bucket.
......@@ -122,15 +122,15 @@ public:
// Find the cell containing a given point. returns -1 if no cell found
// the cell parameters are copied into the supplied variables, a cell must
// be provided to store the information.
virtual vtkIdType FindCell(
vtkIdType FindCell(
double x[3], double tol2, vtkGenericCell *GenCell,
double pcoords[3], double *weights);
double pcoords[3], double *weights) VTK_OVERRIDE;
// Description:
// Return a list of unique cell ids inside of a given bounding box. The
// user must provide the vtkIdList to populate. This method returns data
// only after the locator has been built.
virtual void FindCellsWithinBounds(double *bbox, vtkIdList *cells);
void FindCellsWithinBounds(double *bbox, vtkIdList *cells) VTK_OVERRIDE;
// Description:
// Given a finite line defined by the two points (p1,p2), return the list
......@@ -138,17 +138,17 @@ public:
// that an empty cell list is returned. The user must provide the vtkIdList
// to populate. This method returns data only after the locator has been
// built.
virtual void FindCellsAlongLine(
double p1[3], double p2[3], double tolerance, vtkIdList *cells);
void FindCellsAlongLine(double p1[3], double p2[3],
double tolerance, vtkIdList *cells) VTK_OVERRIDE;
// Description:
// Satisfy vtkLocator abstract interface.