Commit 6b3ae23c authored by Robert Maynard's avatar Robert Maynard

VTK Common classes now all use VTK_OVERRIDE

parent bace0bcf
......@@ -288,7 +288,7 @@ enum LUTMode {
protected:
vtkColorSeries();
virtual ~vtkColorSeries();
~vtkColorSeries() VTK_OVERRIDE;
// Description:
// If the current scheme is a predefined (read-only) scheme,
......
......@@ -352,7 +352,7 @@ public:
protected:
vtkNamedColors();
virtual ~vtkNamedColors();
~vtkNamedColors() VTK_OVERRIDE;
private:
// Description:
......
......@@ -39,19 +39,19 @@ public:
// Description
// Compute Cardinal Splines for each dependent variable
void Compute ();
void Compute () VTK_OVERRIDE;
// Description:
// Evaluate a 1D cardinal spline.
virtual double Evaluate (double t);
double Evaluate (double t) VTK_OVERRIDE;
// Description:
// Deep copy of cardinal spline data.
virtual void DeepCopy(vtkSpline *s);
void DeepCopy(vtkSpline *s) VTK_OVERRIDE;
protected:
vtkCardinalSpline();
~vtkCardinalSpline() {}
~vtkCardinalSpline() VTK_OVERRIDE {}
void Fit1D (int n, double *x, double *y, double *w, double coefficients[][4],
int leftConstraint, double leftValue, int rightConstraint,
......
......@@ -59,11 +59,11 @@ public:
// Description:
// Compute Kochanek Spline coefficients.
void Compute ();
void Compute () VTK_OVERRIDE;
// Description:
// Evaluate a 1D Kochanek spline.
double Evaluate (double t);
double Evaluate (double t) VTK_OVERRIDE;
// Description:
// Set the bias for all points. Default is 0.
......@@ -82,11 +82,11 @@ public:
// Description:
// Deep copy of cardinal spline data.
virtual void DeepCopy(vtkSpline *s);
void DeepCopy(vtkSpline *s) VTK_OVERRIDE;
protected:
vtkKochanekSpline();
~vtkKochanekSpline() {}
~vtkKochanekSpline() VTK_OVERRIDE {}
void Fit1D (int n, double *x, double *y, double tension, double bias,
double continuity, double coefficients[][4], int leftConstraint,
......
......@@ -56,7 +56,7 @@ public:
// Description
// Return the parametric dimension of the class.
virtual int GetDimension() {return 2;}
int GetDimension() VTK_OVERRIDE {return 2;}
// Description:
// BohemianDome surface.
......@@ -65,16 +65,16 @@ public:
// as Pt. It also returns the partial derivatives Du and Dv.
// \f$Pt = (x, y, z), D_u\vec{f} = (dx/du, dy/du, dz/du), D_v\vec{f} = (dx/dv, dy/dv, dz/dv)\f$ .
// Then the normal is \f$N = D_u\vec{f} \times D_v\vec{f}\f$ .
virtual void Evaluate(double uvw[3], double Pt[3], double Duvw[9]);
void Evaluate(double uvw[3], double Pt[3], double Duvw[9]) VTK_OVERRIDE;
// Description:
// Calculate a user defined scalar using one or all of uvw, Pt, Duvw.
// This method simply returns 0.
virtual double EvaluateScalar(double uvw[3], double Pt[3], double Duvw[9]);
double EvaluateScalar(double uvw[3], double Pt[3], double Duvw[9]) VTK_OVERRIDE;
protected:
vtkParametricBohemianDome();
~vtkParametricBohemianDome();
~vtkParametricBohemianDome() VTK_OVERRIDE;
// Variables
double A;
......
......@@ -45,7 +45,7 @@ public:
// Description
// Return the parametric dimension of the class.
virtual int GetDimension() {return 2;}
int GetDimension() VTK_OVERRIDE {return 2;}
// Description:
// Bour's minimal surface.
......@@ -54,16 +54,16 @@ public:
// as Pt. It also returns the partial derivatives Du and Dv.
// \f$Pt = (x, y, z), D_u\vec{f} = (dx/du, dy/du, dz/du), D_v\vec{f} = (dx/dv, dy/dv, dz/dv)\f$ .
// Then the normal is \f$N = D_u\vec{f} \times D_v\vec{f}\f$ .
virtual void Evaluate(double uvw[3], double Pt[3], double Duvw[9]);
void Evaluate(double uvw[3], double Pt[3], double Duvw[9]) VTK_OVERRIDE;
// Description:
// Calculate a user defined scalar using one or all of uvw, Pt, Duvw.
// This method simply returns 0.
virtual double EvaluateScalar(double uvw[3], double Pt[3], double Duvw[9]);
double EvaluateScalar(double uvw[3], double Pt[3], double Duvw[9]) VTK_OVERRIDE;
protected:
vtkParametricBour();
~vtkParametricBour();
~vtkParametricBour() VTK_OVERRIDE;
private:
vtkParametricBour(const vtkParametricBour&) VTK_DELETE_FUNCTION;
......
......@@ -52,7 +52,7 @@ public:
// Description
// Return the parametric dimension of the class.
virtual int GetDimension() {return 2;}
int GetDimension() VTK_OVERRIDE {return 2;}
// Description:
// Set/Get the scale factor for the z-coordinate.
......@@ -67,7 +67,7 @@ public:
// as Pt. It also returns the partial derivatives Du and Dv.
// \f$Pt = (x, y, z), Du = (dx/du, dy/du, dz/du), Dv = (dx/dv, dy/dv, dz/dv)\f$ .
// Then the normal is \f$N = Du X Dv\f$ .
virtual void Evaluate(double uvw[3], double Pt[3], double Duvw[9]);
void Evaluate(double uvw[3], double Pt[3], double Duvw[9]) VTK_OVERRIDE;
// Description:
// Calculate a user defined scalar using one or all of uvw, Pt, Duvw.
......@@ -82,11 +82,11 @@ public:
// If the user does not need to calculate a scalar, then the
// instantiated function should return zero.
//
virtual double EvaluateScalar(double uvw[3], double Pt[3], double Duvw[9]);
double EvaluateScalar(double uvw[3], double Pt[3], double Duvw[9]) VTK_OVERRIDE;
protected:
vtkParametricBoy();
~vtkParametricBoy();
~vtkParametricBoy() VTK_OVERRIDE;
// Variables
double ZScale;
......
......@@ -46,7 +46,7 @@ public:
// Description
// Return the parametric dimension of the class.
virtual int GetDimension() {return 2;}
int GetDimension() VTK_OVERRIDE {return 2;}
// Description:
// Catalan's minimal surface.
......@@ -55,16 +55,16 @@ public:
// as Pt. It also returns the partial derivatives Du and Dv.
// \f$Pt = (x, y, z), D_u\vec{f} = (dx/du, dy/du, dz/du), D_v\vec{f} = (dx/dv, dy/dv, dz/dv)\f$ .
// Then the normal is \f$N = D_u\vec{f} \times D_v\vec{f}\f$ .
virtual void Evaluate(double uvw[3], double Pt[3], double Duvw[9]);
void Evaluate(double uvw[3], double Pt[3], double Duvw[9]) VTK_OVERRIDE;
// Description:
// Calculate a user defined scalar using one or all of uvw, Pt, Duvw.
// This method simply returns 0.
virtual double EvaluateScalar(double uvw[3], double Pt[3], double Duvw[9]);
double EvaluateScalar(double uvw[3], double Pt[3], double Duvw[9]) VTK_OVERRIDE;
protected:
vtkParametricCatalanMinimal();
~vtkParametricCatalanMinimal();
~vtkParametricCatalanMinimal() VTK_OVERRIDE;
private:
vtkParametricCatalanMinimal(const vtkParametricCatalanMinimal&) VTK_DELETE_FUNCTION;
......
......@@ -50,7 +50,7 @@ public:
// Description
// Return the parametric dimension of the class.
virtual int GetDimension() {return 2;}
int GetDimension() VTK_OVERRIDE {return 2;}
// Description:
// Set/Get the scale factor.
......@@ -86,7 +86,7 @@ public:
// as Pt. It also returns the partial derivatives Du and Dv.
// \f$Pt = (x, y, z), Du = (dx/du, dy/du, dz/du), Dv = (dx/dv, dy/dv, dz/dv)\f$ .
// Then the normal is \f$N = Du X Dv\f$ .
virtual void Evaluate(double uvw[3], double Pt[3], double Duvw[9]);
void Evaluate(double uvw[3], double Pt[3], double Duvw[9]) VTK_OVERRIDE;
// Description:
// Calculate a user defined scalar using one or all of uvw, Pt, Duvw.
......@@ -100,11 +100,11 @@ public:
//
// If the user does not need to calculate a scalar, then the
// instantiated function should return zero.
virtual double EvaluateScalar(double uvw[3], double Pt[3], double Duvw[9]);
double EvaluateScalar(double uvw[3], double Pt[3], double Duvw[9]) VTK_OVERRIDE;
protected:
vtkParametricConicSpiral();
~vtkParametricConicSpiral();
~vtkParametricConicSpiral() VTK_OVERRIDE;
// Variables
double A;
......
......@@ -51,7 +51,7 @@ public:
// Description
// Return the parametric dimension of the class.
virtual int GetDimension() {return 2;}
int GetDimension() VTK_OVERRIDE {return 2;}
// Description:
// A cross-cap.
......@@ -60,7 +60,7 @@ public:
// as Pt. It also returns the partial derivatives Du and Dv.
// \f$Pt = (x, y, z), Du = (dx/du, dy/du, dz/du), Dv = (dx/dv, dy/dv, dz/dv)\f$ .
// Then the normal is \f$N = Du X Dv\f$ .
virtual void Evaluate(double uvw[3], double Pt[3], double Duvw[9]);
void Evaluate(double uvw[3], double Pt[3], double Duvw[9]) VTK_OVERRIDE;
// Description:
// Calculate a user defined scalar using one or all of uvw, Pt, Duvw.
......@@ -75,11 +75,11 @@ public:
// If the user does not need to calculate a scalar, then the
// instantiated function should return zero.
//
virtual double EvaluateScalar(double uvw[3], double Pt[3], double Duvw[9]);
double EvaluateScalar(double uvw[3], double Pt[3], double Duvw[9]) VTK_OVERRIDE;
protected:
vtkParametricCrossCap();
~vtkParametricCrossCap();
~vtkParametricCrossCap() VTK_OVERRIDE;
private:
vtkParametricCrossCap(const vtkParametricCrossCap&) VTK_DELETE_FUNCTION;
......
......@@ -52,7 +52,7 @@ public:
// Description
// Return the parametric dimension of the class.
virtual int GetDimension() {return 2;}
int GetDimension() VTK_OVERRIDE {return 2;}
// Description:
// Set/Get the scale factor.
......@@ -75,7 +75,7 @@ public:
// as Pt. It also returns the partial derivatives Du and Dv.
// \f$Pt = (x, y, z), Du = (dx/du, dy/du, dz/du), Dv = (dx/dv, dy/dv, dz/dv)\f$ .
// Then the normal is \f$N = Du X Dv\f$ .
virtual void Evaluate(double uvw[3], double Pt[3], double Duvw[9]);
void Evaluate(double uvw[3], double Pt[3], double Duvw[9]) VTK_OVERRIDE;
// Description:
// Calculate a user defined scalar using one or all of uvw, Pt, Duvw.
......@@ -90,11 +90,11 @@ public:
// If the user does not need to calculate a scalar, then the
// instantiated function should return zero.
//
virtual double EvaluateScalar(double uvw[3], double Pt[3], double Duvw[9]);
double EvaluateScalar(double uvw[3], double Pt[3], double Duvw[9]) VTK_OVERRIDE;
protected:
vtkParametricDini();
~vtkParametricDini();
~vtkParametricDini() VTK_OVERRIDE;
// Variables
double A;
......
......@@ -55,7 +55,7 @@ public:
// Description
// Return the parametric dimension of the class.
virtual int GetDimension() {return 2;}
int GetDimension() VTK_OVERRIDE {return 2;}
// Description:
// Set/Get the scaling factor for the x-axis. Default is 1.
......@@ -79,7 +79,7 @@ public:
// as Pt. It also returns the partial derivatives Du and Dv.
// \f$Pt = (x, y, z), Du = (dx/du, dy/du, dz/du), Dv = (dx/dv, dy/dv, dz/dv)\f$ .
// Then the normal is \f$N = Du X Dv\f$ .
virtual void Evaluate(double uvw[3], double Pt[3], double Duvw[9]);
void Evaluate(double uvw[3], double Pt[3], double Duvw[9]) VTK_OVERRIDE;
// Description:
// Calculate a user defined scalar using one or all of uvw, Pt, Duvw.
......@@ -94,11 +94,11 @@ public:
// If the user does not need to calculate a scalar, then the
// instantiated function should return zero.
//
virtual double EvaluateScalar(double uvw[3], double Pt[3], double Duvw[9]);
double EvaluateScalar(double uvw[3], double Pt[3], double Duvw[9]) VTK_OVERRIDE;
protected:
vtkParametricEllipsoid();
~vtkParametricEllipsoid();
~vtkParametricEllipsoid() VTK_OVERRIDE;
// Variables
double XRadius;
......
......@@ -51,7 +51,7 @@ public:
// Description
// Return the parametric dimension of the class.
virtual int GetDimension() {return 2;}
int GetDimension() VTK_OVERRIDE {return 2;}
// Description:
// Enneper's surface.
......@@ -60,7 +60,7 @@ public:
// as Pt. It also returns the partial derivatives Du and Dv.
// \f$Pt = (x, y, z), Du = (dx/du, dy/du, dz/du), Dv = (dx/dv, dy/dv, dz/dv)\f$ .
// Then the normal is \f$N = Du X Dv\f$ .
virtual void Evaluate(double uvw[3], double Pt[3], double Duvw[9]);
void Evaluate(double uvw[3], double Pt[3], double Duvw[9]) VTK_OVERRIDE;
// Description:
// Calculate a user defined scalar using one or all of uvw, Pt, Duvw.
......@@ -75,11 +75,11 @@ public:
// If the user does not need to calculate a scalar, then the
// instantiated function should return zero.
//
virtual double EvaluateScalar(double uvw[3], double Pt[3], double Duvw[9]);
double EvaluateScalar(double uvw[3], double Pt[3], double Duvw[9]) VTK_OVERRIDE;
protected:
vtkParametricEnneper();
~vtkParametricEnneper();
~vtkParametricEnneper() VTK_OVERRIDE;
private:
vtkParametricEnneper(const vtkParametricEnneper&) VTK_DELETE_FUNCTION;
......
......@@ -63,7 +63,7 @@ public:
// Description
// Return the parametric dimension of the class.
virtual int GetDimension() {return 2;}
int GetDimension() VTK_OVERRIDE {return 2;}
// Description:
// A Figure-8 Klein bottle.
......@@ -72,7 +72,7 @@ public:
// as Pt. It also returns the partial derivatives Du and Dv.
// \f$Pt = (x, y, z), Du = (dx/du, dy/du, dz/du), Dv = (dx/dv, dy/dv, dz/dv)\f$ .
// Then the normal is \f$N = Du X Dv\f$ .
virtual void Evaluate(double uvw[3], double Pt[3], double Duvw[9]);
void Evaluate(double uvw[3], double Pt[3], double Duvw[9]) VTK_OVERRIDE;
// Description:
// Calculate a user defined scalar using one or all of uvw, Pt, Duvw.
......@@ -87,11 +87,11 @@ public:
// If the user does not need to calculate a scalar, then the
// instantiated function should return zero.
//
virtual double EvaluateScalar(double uvw[3], double Pt[3], double Duvw[9]);
double EvaluateScalar(double uvw[3], double Pt[3], double Duvw[9]) VTK_OVERRIDE;
protected:
vtkParametricFigure8Klein();
~vtkParametricFigure8Klein();
~vtkParametricFigure8Klein() VTK_OVERRIDE;
// Variables
double Radius;
......
......@@ -188,7 +188,7 @@ public:
protected:
vtkParametricFunction();
virtual ~vtkParametricFunction();
~vtkParametricFunction() VTK_OVERRIDE;
// Variables
double MinimumU;
......
......@@ -45,7 +45,7 @@ public:
// Description
// Return the parametric dimension of the class.
virtual int GetDimension() {return 2;}
int GetDimension() VTK_OVERRIDE {return 2;}
// Description:
// Henneberg's minimal surface.
......@@ -54,16 +54,16 @@ public:
// as Pt. It also returns the partial derivatives Du and Dv.
// \f$Pt = (x, y, z), D_u\vec{f} = (dx/du, dy/du, dz/du), D_v\vec{f} = (dx/dv, dy/dv, dz/dv)\f$ .
// Then the normal is \f$N = D_u\vec{f} \times D_v\vec{f}\f$ .
virtual void Evaluate(double uvw[3], double Pt[3], double Duvw[9]);
void Evaluate(double uvw[3], double Pt[3], double Duvw[9]) VTK_OVERRIDE;
// Description:
// Calculate a user defined scalar using one or all of uvw, Pt, Duvw.
// This method simply returns 0.
virtual double EvaluateScalar(double uvw[3], double Pt[3], double Duvw[9]);
double EvaluateScalar(double uvw[3], double Pt[3], double Duvw[9]) VTK_OVERRIDE;
protected:
vtkParametricHenneberg();
~vtkParametricHenneberg();
~vtkParametricHenneberg() VTK_OVERRIDE;
private:
vtkParametricHenneberg(const vtkParametricHenneberg&) VTK_DELETE_FUNCTION;
......
......@@ -57,7 +57,7 @@ public:
// Description
// Return the parametric dimension of the class.
virtual int GetDimension() {return 2;}
int GetDimension() VTK_OVERRIDE {return 2;}
// Description:
// A Klein bottle.
......@@ -66,7 +66,7 @@ public:
// as Pt. It also returns the partial derivatives Du and Dv.
// \f$Pt = (x, y, z), Du = (dx/du, dy/du, dz/du), Dv = (dx/dv, dy/dv, dz/dv)\f$ .
// Then the normal is \f$N = Du X Dv\f$ .
virtual void Evaluate(double uvw[3], double Pt[3], double Duvw[9]);
void Evaluate(double uvw[3], double Pt[3], double Duvw[9]) VTK_OVERRIDE;
// Description:
// Calculate a user defined scalar using one or all of uvw, Pt, Duvw.
......@@ -81,11 +81,11 @@ public:
// If the user does not need to calculate a scalar, then the
// instantiated function should return zero.
//
virtual double EvaluateScalar(double uvw[3], double Pt[3], double Duvw[9]);
double EvaluateScalar(double uvw[3], double Pt[3], double Duvw[9]) VTK_OVERRIDE;
protected:
vtkParametricKlein();
~vtkParametricKlein();
~vtkParametricKlein() VTK_OVERRIDE;
private:
vtkParametricKlein(const vtkParametricKlein&) VTK_DELETE_FUNCTION;
......
......@@ -46,7 +46,7 @@ public:
// Description
// Return the parametric dimension of the class.
virtual int GetDimension() {return 2;}
int GetDimension() VTK_OVERRIDE {return 2;}
// Description:
// Kuen's surface.
......@@ -55,16 +55,16 @@ public:
// as Pt. It also returns the partial derivatives Du and Dv.
// \f$Pt = (x, y, z), D_u\vec{f} = (dx/du, dy/du, dz/du), D_v\vec{f} = (dx/dv, dy/dv, dz/dv)\f$ .
// Then the normal is \f$N = D_u\vec{f} \times D_v\vec{f}\f$ .
virtual void Evaluate(double uvw[3], double Pt[3], double Duvw[9]);
void Evaluate(double uvw[3], double Pt[3], double Duvw[9]) VTK_OVERRIDE;
// Description:
// Calculate a user defined scalar using one or all of uvw, Pt, Duvw.
// This method simply returns 0.
virtual double EvaluateScalar(double uvw[3], double Pt[3], double Duvw[9]);
double EvaluateScalar(double uvw[3], double Pt[3], double Duvw[9]) VTK_OVERRIDE;
protected:
vtkParametricKuen();
~vtkParametricKuen();
~vtkParametricKuen() VTK_OVERRIDE;
private:
vtkParametricKuen(const vtkParametricKuen&) VTK_DELETE_FUNCTION;
......
......@@ -54,7 +54,7 @@ public:
// Description
// Return the parametric dimension of the class.
virtual int GetDimension() {return 2;}
int GetDimension() VTK_OVERRIDE {return 2;}
// Description:
// The Mobius strip.
......@@ -63,7 +63,7 @@ public:
// as Pt. It also returns the partial derivatives Du and Dv.
// \f$Pt = (x, y, z), Du = (dx/du, dy/du, dz/du), Dv = (dx/dv, dy/dv, dz/dv)\f$ .
// Then the normal is \f$N = Du X Dv\f$ .
virtual void Evaluate(double uvw[3], double Pt[3], double Duvw[9]);
void Evaluate(double uvw[3], double Pt[3], double Duvw[9]) VTK_OVERRIDE;
// Description:
// Calculate a user defined scalar using one or all of uvw, Pt, Duvw.
......@@ -78,11 +78,11 @@ public:
// If the user does not need to calculate a scalar, then the
// instantiated function should return zero.
//