Commit fe18e42b authored by Robert Maynard's avatar Robert Maynard Committed by Kitware Robot

Merge topic 'add_override_to_all_of_common'

6b3ae23c VTK Common classes now all use VTK_OVERRIDE
Acked-by: Kitware Robot's avatarKitware Robot <kwrobot@kitware.com>
Merge-request: !1999
parents 3b13ad9f 6b3ae23c
Pipeline #27699 running with stage
in 0 seconds
...@@ -288,7 +288,7 @@ enum LUTMode { ...@@ -288,7 +288,7 @@ enum LUTMode {
protected: protected:
vtkColorSeries(); vtkColorSeries();
virtual ~vtkColorSeries(); ~vtkColorSeries() VTK_OVERRIDE;
// Description: // Description:
// If the current scheme is a predefined (read-only) scheme, // If the current scheme is a predefined (read-only) scheme,
......
...@@ -352,7 +352,7 @@ public: ...@@ -352,7 +352,7 @@ public:
protected: protected:
vtkNamedColors(); vtkNamedColors();
virtual ~vtkNamedColors(); ~vtkNamedColors() VTK_OVERRIDE;
private: private:
// Description: // Description:
......
...@@ -39,19 +39,19 @@ public: ...@@ -39,19 +39,19 @@ public:
// Description // Description
// Compute Cardinal Splines for each dependent variable // Compute Cardinal Splines for each dependent variable
void Compute (); void Compute () VTK_OVERRIDE;
// Description: // Description:
// Evaluate a 1D cardinal spline. // Evaluate a 1D cardinal spline.
virtual double Evaluate (double t); double Evaluate (double t) VTK_OVERRIDE;
// Description: // Description:
// Deep copy of cardinal spline data. // Deep copy of cardinal spline data.
virtual void DeepCopy(vtkSpline *s); void DeepCopy(vtkSpline *s) VTK_OVERRIDE;
protected: protected:
vtkCardinalSpline(); vtkCardinalSpline();
~vtkCardinalSpline() {} ~vtkCardinalSpline() VTK_OVERRIDE {}
void Fit1D (int n, double *x, double *y, double *w, double coefficients[][4], void Fit1D (int n, double *x, double *y, double *w, double coefficients[][4],
int leftConstraint, double leftValue, int rightConstraint, int leftConstraint, double leftValue, int rightConstraint,
......
...@@ -59,11 +59,11 @@ public: ...@@ -59,11 +59,11 @@ public:
// Description: // Description:
// Compute Kochanek Spline coefficients. // Compute Kochanek Spline coefficients.
void Compute (); void Compute () VTK_OVERRIDE;
// Description: // Description:
// Evaluate a 1D Kochanek spline. // Evaluate a 1D Kochanek spline.
double Evaluate (double t); double Evaluate (double t) VTK_OVERRIDE;
// Description: // Description:
// Set the bias for all points. Default is 0. // Set the bias for all points. Default is 0.
...@@ -82,11 +82,11 @@ public: ...@@ -82,11 +82,11 @@ public:
// Description: // Description:
// Deep copy of cardinal spline data. // Deep copy of cardinal spline data.
virtual void DeepCopy(vtkSpline *s); void DeepCopy(vtkSpline *s) VTK_OVERRIDE;
protected: protected:
vtkKochanekSpline(); vtkKochanekSpline();
~vtkKochanekSpline() {} ~vtkKochanekSpline() VTK_OVERRIDE {}
void Fit1D (int n, double *x, double *y, double tension, double bias, void Fit1D (int n, double *x, double *y, double tension, double bias,
double continuity, double coefficients[][4], int leftConstraint, double continuity, double coefficients[][4], int leftConstraint,
......
...@@ -56,7 +56,7 @@ public: ...@@ -56,7 +56,7 @@ public:
// Description // Description
// Return the parametric dimension of the class. // Return the parametric dimension of the class.
virtual int GetDimension() {return 2;} int GetDimension() VTK_OVERRIDE {return 2;}
// Description: // Description:
// BohemianDome surface. // BohemianDome surface.
...@@ -65,16 +65,16 @@ public: ...@@ -65,16 +65,16 @@ public:
// as Pt. It also returns the partial derivatives Du and Dv. // 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$ . // \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$ . // 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: // Description:
// Calculate a user defined scalar using one or all of uvw, Pt, Duvw. // Calculate a user defined scalar using one or all of uvw, Pt, Duvw.
// This method simply returns 0. // 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: protected:
vtkParametricBohemianDome(); vtkParametricBohemianDome();
~vtkParametricBohemianDome(); ~vtkParametricBohemianDome() VTK_OVERRIDE;
// Variables // Variables
double A; double A;
......
...@@ -45,7 +45,7 @@ public: ...@@ -45,7 +45,7 @@ public:
// Description // Description
// Return the parametric dimension of the class. // Return the parametric dimension of the class.
virtual int GetDimension() {return 2;} int GetDimension() VTK_OVERRIDE {return 2;}
// Description: // Description:
// Bour's minimal surface. // Bour's minimal surface.
...@@ -54,16 +54,16 @@ public: ...@@ -54,16 +54,16 @@ public:
// as Pt. It also returns the partial derivatives Du and Dv. // 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$ . // \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$ . // 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: // Description:
// Calculate a user defined scalar using one or all of uvw, Pt, Duvw. // Calculate a user defined scalar using one or all of uvw, Pt, Duvw.
// This method simply returns 0. // 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: protected:
vtkParametricBour(); vtkParametricBour();
~vtkParametricBour(); ~vtkParametricBour() VTK_OVERRIDE;
private: private:
vtkParametricBour(const vtkParametricBour&) VTK_DELETE_FUNCTION; vtkParametricBour(const vtkParametricBour&) VTK_DELETE_FUNCTION;
......
...@@ -52,7 +52,7 @@ public: ...@@ -52,7 +52,7 @@ public:
// Description // Description
// Return the parametric dimension of the class. // Return the parametric dimension of the class.
virtual int GetDimension() {return 2;} int GetDimension() VTK_OVERRIDE {return 2;}
// Description: // Description:
// Set/Get the scale factor for the z-coordinate. // Set/Get the scale factor for the z-coordinate.
...@@ -67,7 +67,7 @@ public: ...@@ -67,7 +67,7 @@ public:
// as Pt. It also returns the partial derivatives Du and Dv. // 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$ . // \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$ . // 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: // Description:
// Calculate a user defined scalar using one or all of uvw, Pt, Duvw. // Calculate a user defined scalar using one or all of uvw, Pt, Duvw.
...@@ -82,11 +82,11 @@ public: ...@@ -82,11 +82,11 @@ public:
// If the user does not need to calculate a scalar, then the // If the user does not need to calculate a scalar, then the
// instantiated function should return zero. // 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: protected:
vtkParametricBoy(); vtkParametricBoy();
~vtkParametricBoy(); ~vtkParametricBoy() VTK_OVERRIDE;
// Variables // Variables
double ZScale; double ZScale;
......
...@@ -46,7 +46,7 @@ public: ...@@ -46,7 +46,7 @@ public:
// Description // Description
// Return the parametric dimension of the class. // Return the parametric dimension of the class.
virtual int GetDimension() {return 2;} int GetDimension() VTK_OVERRIDE {return 2;}
// Description: // Description:
// Catalan's minimal surface. // Catalan's minimal surface.
...@@ -55,16 +55,16 @@ public: ...@@ -55,16 +55,16 @@ public:
// as Pt. It also returns the partial derivatives Du and Dv. // 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$ . // \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$ . // 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: // Description:
// Calculate a user defined scalar using one or all of uvw, Pt, Duvw. // Calculate a user defined scalar using one or all of uvw, Pt, Duvw.
// This method simply returns 0. // 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: protected:
vtkParametricCatalanMinimal(); vtkParametricCatalanMinimal();
~vtkParametricCatalanMinimal(); ~vtkParametricCatalanMinimal() VTK_OVERRIDE;
private: private:
vtkParametricCatalanMinimal(const vtkParametricCatalanMinimal&) VTK_DELETE_FUNCTION; vtkParametricCatalanMinimal(const vtkParametricCatalanMinimal&) VTK_DELETE_FUNCTION;
......
...@@ -50,7 +50,7 @@ public: ...@@ -50,7 +50,7 @@ public:
// Description // Description
// Return the parametric dimension of the class. // Return the parametric dimension of the class.
virtual int GetDimension() {return 2;} int GetDimension() VTK_OVERRIDE {return 2;}
// Description: // Description:
// Set/Get the scale factor. // Set/Get the scale factor.
...@@ -86,7 +86,7 @@ public: ...@@ -86,7 +86,7 @@ public:
// as Pt. It also returns the partial derivatives Du and Dv. // 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$ . // \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$ . // 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: // Description:
// Calculate a user defined scalar using one or all of uvw, Pt, Duvw. // Calculate a user defined scalar using one or all of uvw, Pt, Duvw.
...@@ -100,11 +100,11 @@ public: ...@@ -100,11 +100,11 @@ public:
// //
// If the user does not need to calculate a scalar, then the // If the user does not need to calculate a scalar, then the
// instantiated function should return zero. // 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: protected:
vtkParametricConicSpiral(); vtkParametricConicSpiral();
~vtkParametricConicSpiral(); ~vtkParametricConicSpiral() VTK_OVERRIDE;
// Variables // Variables
double A; double A;
......
...@@ -51,7 +51,7 @@ public: ...@@ -51,7 +51,7 @@ public:
// Description // Description
// Return the parametric dimension of the class. // Return the parametric dimension of the class.
virtual int GetDimension() {return 2;} int GetDimension() VTK_OVERRIDE {return 2;}
// Description: // Description:
// A cross-cap. // A cross-cap.
...@@ -60,7 +60,7 @@ public: ...@@ -60,7 +60,7 @@ public:
// as Pt. It also returns the partial derivatives Du and Dv. // 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$ . // \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$ . // 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: // Description:
// Calculate a user defined scalar using one or all of uvw, Pt, Duvw. // Calculate a user defined scalar using one or all of uvw, Pt, Duvw.
...@@ -75,11 +75,11 @@ public: ...@@ -75,11 +75,11 @@ public:
// If the user does not need to calculate a scalar, then the // If the user does not need to calculate a scalar, then the
// instantiated function should return zero. // 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: protected:
vtkParametricCrossCap(); vtkParametricCrossCap();
~vtkParametricCrossCap(); ~vtkParametricCrossCap() VTK_OVERRIDE;
private: private:
vtkParametricCrossCap(const vtkParametricCrossCap&) VTK_DELETE_FUNCTION; vtkParametricCrossCap(const vtkParametricCrossCap&) VTK_DELETE_FUNCTION;
......
...@@ -52,7 +52,7 @@ public: ...@@ -52,7 +52,7 @@ public:
// Description // Description
// Return the parametric dimension of the class. // Return the parametric dimension of the class.
virtual int GetDimension() {return 2;} int GetDimension() VTK_OVERRIDE {return 2;}
// Description: // Description:
// Set/Get the scale factor. // Set/Get the scale factor.
...@@ -75,7 +75,7 @@ public: ...@@ -75,7 +75,7 @@ public:
// as Pt. It also returns the partial derivatives Du and Dv. // 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$ . // \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$ . // 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: // Description:
// Calculate a user defined scalar using one or all of uvw, Pt, Duvw. // Calculate a user defined scalar using one or all of uvw, Pt, Duvw.
...@@ -90,11 +90,11 @@ public: ...@@ -90,11 +90,11 @@ public:
// If the user does not need to calculate a scalar, then the // If the user does not need to calculate a scalar, then the
// instantiated function should return zero. // 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: protected:
vtkParametricDini(); vtkParametricDini();
~vtkParametricDini(); ~vtkParametricDini() VTK_OVERRIDE;
// Variables // Variables
double A; double A;
......
...@@ -55,7 +55,7 @@ public: ...@@ -55,7 +55,7 @@ public:
// Description // Description
// Return the parametric dimension of the class. // Return the parametric dimension of the class.
virtual int GetDimension() {return 2;} int GetDimension() VTK_OVERRIDE {return 2;}
// Description: // Description:
// Set/Get the scaling factor for the x-axis. Default is 1. // Set/Get the scaling factor for the x-axis. Default is 1.
...@@ -79,7 +79,7 @@ public: ...@@ -79,7 +79,7 @@ public:
// as Pt. It also returns the partial derivatives Du and Dv. // 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$ . // \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$ . // 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: // Description:
// Calculate a user defined scalar using one or all of uvw, Pt, Duvw. // Calculate a user defined scalar using one or all of uvw, Pt, Duvw.
...@@ -94,11 +94,11 @@ public: ...@@ -94,11 +94,11 @@ public:
// If the user does not need to calculate a scalar, then the // If the user does not need to calculate a scalar, then the
// instantiated function should return zero. // 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: protected:
vtkParametricEllipsoid(); vtkParametricEllipsoid();
~vtkParametricEllipsoid(); ~vtkParametricEllipsoid() VTK_OVERRIDE;
// Variables // Variables
double XRadius; double XRadius;
......
...@@ -51,7 +51,7 @@ public: ...@@ -51,7 +51,7 @@ public:
// Description // Description
// Return the parametric dimension of the class. // Return the parametric dimension of the class.
virtual int GetDimension() {return 2;} int GetDimension() VTK_OVERRIDE {return 2;}
// Description: // Description:
// Enneper's surface. // Enneper's surface.
...@@ -60,7 +60,7 @@ public: ...@@ -60,7 +60,7 @@ public:
// as Pt. It also returns the partial derivatives Du and Dv. // 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$ . // \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$ . // 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: // Description:
// Calculate a user defined scalar using one or all of uvw, Pt, Duvw. // Calculate a user defined scalar using one or all of uvw, Pt, Duvw.
...@@ -75,11 +75,11 @@ public: ...@@ -75,11 +75,11 @@ public:
// If the user does not need to calculate a scalar, then the // If the user does not need to calculate a scalar, then the
// instantiated function should return zero. // 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: protected:
vtkParametricEnneper();