Commit 3f7a2769 authored by Robert Maynard's avatar Robert Maynard
Browse files

Convert vtk over to using VTK_OVERRIDE

parent a182b3a6
......@@ -25,11 +25,11 @@ public:
static @vtk-module@ObjectFactory * New();
vtkTypeMacro(@vtk-module@ObjectFactory, vtkObjectFactory)
const char * GetDescription() { return "@vtk-module@ factory overrides."; }
const char * GetDescription() VTK_OVERRIDE { return "@vtk-module@ factory overrides."; }
const char * GetVTKSourceVersion();
const char * GetVTKSourceVersion() VTK_OVERRIDE;
void PrintSelf(ostream &os, vtkIndent indent);
void PrintSelf(ostream &os, vtkIndent indent) VTK_OVERRIDE;
protected:
@vtk-module@ObjectFactory();
......
......@@ -69,7 +69,7 @@ class VTKCHARTSCORE_EXPORT vtkAxis : public vtkContextItem
{
public:
vtkTypeMacro(vtkAxis, vtkContextItem);
virtual void PrintSelf(ostream &os, vtkIndent indent);
void PrintSelf(ostream &os, vtkIndent indent) VTK_OVERRIDE;
/**
* Enumeration of the axis locations in a conventional XY chart. Other
......@@ -499,12 +499,12 @@ public:
* Update the geometry of the axis. Takes care of setting up the tick mark
* locations etc. Should be called by the scene before rendering.
*/
virtual void Update();
void Update() VTK_OVERRIDE;
/**
* Paint event for the axis, called whenever the axis needs to be drawn.
*/
virtual bool Paint(vtkContext2D *painter);
bool Paint(vtkContext2D *painter) VTK_OVERRIDE;
/**
* Use this function to autoscale the axes after setting the minimum and
......@@ -577,7 +577,7 @@ public:
protected:
vtkAxis();
~vtkAxis();
~vtkAxis() VTK_OVERRIDE;
/**
* Update whether log scaling will be used for layout and rendering.
......
......@@ -118,7 +118,7 @@ public:
protected:
vtkAxisExtended();
~vtkAxisExtended();
~vtkAxisExtended() VTK_OVERRIDE;
/**
* This method implements an exhaustive search of the legibilty parameters.
......
......@@ -55,13 +55,13 @@ public:
/**
* Paint the legend into a rectangle defined by the bounds.
*/
virtual bool Paint(vtkContext2D *painter);
bool Paint(vtkContext2D *painter) VTK_OVERRIDE;
/**
* Compute and return the lower left corner of this legend, along
* with its width and height.
*/
virtual vtkRectf GetBoundingRect(vtkContext2D* painter);
vtkRectf GetBoundingRect(vtkContext2D* painter) VTK_OVERRIDE;
//@{
/**
......@@ -102,7 +102,7 @@ public:
protected:
vtkCategoryLegend();
virtual ~vtkCategoryLegend();
~vtkCategoryLegend() VTK_OVERRIDE;
bool HasOutliers;
float TitleWidthOffset;
......
......@@ -45,7 +45,7 @@ class VTKCHARTSCORE_EXPORT vtkChart : public vtkContextItem
{
public:
vtkTypeMacro(vtkChart, vtkContextItem);
virtual void PrintSelf(ostream &os, vtkIndent indent);
void PrintSelf(ostream &os, vtkIndent indent) VTK_OVERRIDE;
/**
* Enum of the available chart types
......@@ -90,7 +90,7 @@ public:
/**
* Paint event for the chart, called whenever the chart needs to be drawn
*/
virtual bool Paint(vtkContext2D *painter) = 0;
bool Paint(vtkContext2D *painter) VTK_OVERRIDE = 0;
/**
* Add a plot to the chart, defaults to using the name of the y column
......@@ -365,7 +365,7 @@ public:
protected:
vtkChart();
~vtkChart();
~vtkChart() VTK_OVERRIDE;
/**
* Given the x and y vtkAxis, and a transform, calculate the transform that
......
......@@ -37,7 +37,7 @@ class VTKCHARTSCORE_EXPORT vtkChartBox : public vtkChart
{
public:
vtkTypeMacro(vtkChartBox, vtkChart);
virtual void PrintSelf(ostream &os, vtkIndent indent);
void PrintSelf(ostream &os, vtkIndent indent) VTK_OVERRIDE;
/**
* Creates a box chart
......@@ -49,12 +49,12 @@ public:
* The scene should take care of calling this on all items before their
* Paint function is invoked.
*/
virtual void Update();
void Update() VTK_OVERRIDE;
/**
* Paint event for the chart, called whenever the chart needs to be drawn
*/
virtual bool Paint(vtkContext2D *painter);
bool Paint(vtkContext2D *painter) VTK_OVERRIDE;
//@{
/**
......@@ -97,12 +97,12 @@ public:
/**
* Get the plot at the specified index, returns null if the index is invalid.
*/
virtual vtkPlot* GetPlot(vtkIdType index);
vtkPlot* GetPlot(vtkIdType index) VTK_OVERRIDE;
/**
* Get the number of plots the chart contains.
*/
virtual vtkIdType GetNumberOfPlots();
vtkIdType GetNumberOfPlots() VTK_OVERRIDE;
/**
* Get the chart Y axis
......@@ -128,22 +128,22 @@ public:
/**
* Return true if the supplied x, y coordinate is inside the item.
*/
virtual bool Hit(const vtkContextMouseEvent &mouse);
bool Hit(const vtkContextMouseEvent &mouse) VTK_OVERRIDE;
/**
* Mouse move event.
*/
virtual bool MouseMoveEvent(const vtkContextMouseEvent &mouse);
bool MouseMoveEvent(const vtkContextMouseEvent &mouse) VTK_OVERRIDE;
/**
* Mouse button down event
*/
virtual bool MouseButtonPressEvent(const vtkContextMouseEvent &mouse);
bool MouseButtonPressEvent(const vtkContextMouseEvent &mouse) VTK_OVERRIDE;
/**
* Mouse button release event.
*/
virtual bool MouseButtonReleaseEvent(const vtkContextMouseEvent &mouse);
bool MouseButtonReleaseEvent(const vtkContextMouseEvent &mouse) VTK_OVERRIDE;
/**
* Set the vtkTooltipItem object that will be displayed by the chart.
......@@ -165,7 +165,7 @@ public:
protected:
vtkChartBox();
~vtkChartBox();
~vtkChartBox() VTK_OVERRIDE;
//@{
/**
......
......@@ -37,7 +37,7 @@ class VTKCHARTSCORE_EXPORT vtkChartHistogram2D : public vtkChartXY
{
public:
vtkTypeMacro(vtkChartHistogram2D, vtkChartXY);
virtual void PrintSelf(ostream &os, vtkIndent indent);
void PrintSelf(ostream &os, vtkIndent indent) VTK_OVERRIDE;
/**
* Creates a 2D histogram chart
......@@ -49,7 +49,7 @@ public:
* The scene should take care of calling this on all items before their
* Paint function is invoked.
*/
virtual void Update();
void Update() VTK_OVERRIDE;
virtual void SetInputData(vtkImageData *data, vtkIdType z = 0);
virtual void SetTransferFunction(vtkScalarsToColors *function);
......@@ -57,16 +57,16 @@ public:
/**
* Return true if the supplied x, y coordinate is inside the item.
*/
virtual bool Hit(const vtkContextMouseEvent &mouse);
bool Hit(const vtkContextMouseEvent &mouse) VTK_OVERRIDE;
/**
* Get the plot at the specified index, returns null if the index is invalid.
*/
virtual vtkPlot* GetPlot(vtkIdType index);
vtkPlot* GetPlot(vtkIdType index) VTK_OVERRIDE;
protected:
vtkChartHistogram2D();
~vtkChartHistogram2D();
~vtkChartHistogram2D() VTK_OVERRIDE;
vtkSmartPointer<vtkPlotHistogram2D> Histogram;
......@@ -78,7 +78,7 @@ protected:
class Private;
Private* Storage;
virtual bool UpdateLayout(vtkContext2D *painter);
bool UpdateLayout(vtkContext2D *painter) VTK_OVERRIDE;
private:
vtkChartHistogram2D(const vtkChartHistogram2D &) VTK_DELETE_FUNCTION;
......
......@@ -40,7 +40,7 @@ class VTKCHARTSCORE_EXPORT vtkChartLegend : public vtkContextItem
{
public:
vtkTypeMacro(vtkChartLegend, vtkContextItem);
virtual void PrintSelf(ostream &os, vtkIndent indent);
void PrintSelf(ostream &os, vtkIndent indent) VTK_OVERRIDE;
/**
* Creates a 2D Chart object.
......@@ -183,12 +183,12 @@ public:
* Update the geometry of the axis. Takes care of setting up the tick mark
* locations etc. Should be called by the scene before rendering.
*/
virtual void Update();
void Update() VTK_OVERRIDE;
/**
* Paint event for the axis, called whenever the axis needs to be drawn.
*/
virtual bool Paint(vtkContext2D *painter);
bool Paint(vtkContext2D *painter) VTK_OVERRIDE;
/**
* Request the space the legend requires to be drawn. This is returned as a
......@@ -230,26 +230,26 @@ public:
/**
* Return true if the supplied x, y coordinate is inside the item.
*/
virtual bool Hit(const vtkContextMouseEvent &mouse);
bool Hit(const vtkContextMouseEvent &mouse) VTK_OVERRIDE;
/**
* Mouse move event.
*/
virtual bool MouseMoveEvent(const vtkContextMouseEvent &mouse);
bool MouseMoveEvent(const vtkContextMouseEvent &mouse) VTK_OVERRIDE;
/**
* Mouse button down event
*/
virtual bool MouseButtonPressEvent(const vtkContextMouseEvent &mouse);
bool MouseButtonPressEvent(const vtkContextMouseEvent &mouse) VTK_OVERRIDE;
/**
* Mouse button release event.
*/
virtual bool MouseButtonReleaseEvent(const vtkContextMouseEvent &mouse);
bool MouseButtonReleaseEvent(const vtkContextMouseEvent &mouse) VTK_OVERRIDE;
protected:
vtkChartLegend();
~vtkChartLegend();
~vtkChartLegend() VTK_OVERRIDE;
float* Point; // The point the legend is anchored to.
int HorizontalAlignment; // Alignment of the legend to the point it is anchored to.
......
......@@ -39,7 +39,7 @@ class VTKCHARTSCORE_EXPORT vtkChartMatrix : public vtkAbstractContextItem
{
public:
vtkTypeMacro(vtkChartMatrix, vtkAbstractContextItem);
virtual void PrintSelf(ostream &os, vtkIndent indent);
void PrintSelf(ostream &os, vtkIndent indent) VTK_OVERRIDE;
/**
* Creates a new object.
......@@ -49,12 +49,12 @@ public:
/**
* Perform any updates to the item that may be necessary before rendering.
*/
virtual void Update();
void Update() VTK_OVERRIDE;
/**
* Paint event for the chart matrix.
*/
virtual bool Paint(vtkContext2D *painter);
bool Paint(vtkContext2D *painter) VTK_OVERRIDE;
/**
* Set the width and height of the chart matrix. This will cause an immediate
......@@ -149,7 +149,7 @@ public:
protected:
vtkChartMatrix();
~vtkChartMatrix();
~vtkChartMatrix() VTK_OVERRIDE;
class PIMPL;
PIMPL *Private;
......
......@@ -36,7 +36,7 @@ class VTKCHARTSCORE_EXPORT vtkChartParallelCoordinates : public vtkChart
{
public:
vtkTypeMacro(vtkChartParallelCoordinates, vtkChart);
virtual void PrintSelf(ostream &os, vtkIndent indent);
void PrintSelf(ostream &os, vtkIndent indent) VTK_OVERRIDE;
/**
* Creates a parallel coordinates chart
......@@ -48,12 +48,12 @@ public:
* The scene should take care of calling this on all items before their
* Paint function is invoked.
*/
virtual void Update();
void Update() VTK_OVERRIDE;
/**
* Paint event for the chart, called whenever the chart needs to be drawn
*/
virtual bool Paint(vtkContext2D *painter);
bool Paint(vtkContext2D *painter) VTK_OVERRIDE;
/**
* Set the visibility of the specified column.
......@@ -81,28 +81,28 @@ public:
/**
* Get the plot at the specified index, returns null if the index is invalid.
*/
virtual vtkPlot* GetPlot(vtkIdType index);
vtkPlot* GetPlot(vtkIdType index) VTK_OVERRIDE;
/**
* Get the number of plots the chart contains.
*/
virtual vtkIdType GetNumberOfPlots();
vtkIdType GetNumberOfPlots() VTK_OVERRIDE;
/**
* Get the axis specified by axisIndex.
*/
virtual vtkAxis* GetAxis(int axisIndex);
vtkAxis* GetAxis(int axisIndex) VTK_OVERRIDE;
/**
* Get the number of axes in the current chart.
*/
virtual vtkIdType GetNumberOfAxes();
vtkIdType GetNumberOfAxes() VTK_OVERRIDE;
/**
* Request that the chart recalculates the range of its axes. Especially
* useful in applications after the parameters of plots have been modified.
*/
virtual void RecalculateBounds();
void RecalculateBounds() VTK_OVERRIDE;
/**
* Set plot to use for the chart. Since this type of chart can
......@@ -113,41 +113,41 @@ public:
/**
* Return true if the supplied x, y coordinate is inside the item.
*/
virtual bool Hit(const vtkContextMouseEvent &mouse);
bool Hit(const vtkContextMouseEvent &mouse) VTK_OVERRIDE;
/**
* Mouse enter event.
*/
virtual bool MouseEnterEvent(const vtkContextMouseEvent &mouse);
bool MouseEnterEvent(const vtkContextMouseEvent &mouse) VTK_OVERRIDE;
/**
* Mouse move event.
*/
virtual bool MouseMoveEvent(const vtkContextMouseEvent &mouse);
bool MouseMoveEvent(const vtkContextMouseEvent &mouse) VTK_OVERRIDE;
/**
* Mouse leave event.
*/
virtual bool MouseLeaveEvent(const vtkContextMouseEvent &mouse);
bool MouseLeaveEvent(const vtkContextMouseEvent &mouse) VTK_OVERRIDE;
/**
* Mouse button down event
*/
virtual bool MouseButtonPressEvent(const vtkContextMouseEvent &mouse);
bool MouseButtonPressEvent(const vtkContextMouseEvent &mouse) VTK_OVERRIDE;
/**
* Mouse button release event.
*/
virtual bool MouseButtonReleaseEvent(const vtkContextMouseEvent &mouse);
bool MouseButtonReleaseEvent(const vtkContextMouseEvent &mouse) VTK_OVERRIDE;
/**
* Mouse wheel event, positive delta indicates forward movement of the wheel.
*/
virtual bool MouseWheelEvent(const vtkContextMouseEvent &mouse, int delta);
bool MouseWheelEvent(const vtkContextMouseEvent &mouse, int delta) VTK_OVERRIDE;
protected:
vtkChartParallelCoordinates();
~vtkChartParallelCoordinates();
~vtkChartParallelCoordinates() VTK_OVERRIDE;
//@{
/**
......
......@@ -35,7 +35,7 @@ class VTKCHARTSCORE_EXPORT vtkChartPie : public vtkChart
{
public:
vtkTypeMacro(vtkChartPie, vtkChart);
virtual void PrintSelf(ostream &os, vtkIndent indent);
void PrintSelf(ostream &os, vtkIndent indent) VTK_OVERRIDE;
/**
* Creates a 2D Chart object.
......@@ -47,88 +47,88 @@ public:
* The scene should take care of calling this on all items before their
* Paint function is invoked.
*/
virtual void Update();
void Update() VTK_OVERRIDE;
/**
* Paint event for the chart, called whenever the chart needs to be drawn
*/
virtual bool Paint(vtkContext2D *painter);
bool Paint(vtkContext2D *painter) VTK_OVERRIDE;
/**
* Add a plot to the chart.
*/
virtual vtkPlot * AddPlot(int type);
vtkPlot * AddPlot(int type) VTK_OVERRIDE;
/**
* Add a plot to the chart. Return the index of the plot, -1 if it failed.
*/
virtual vtkIdType AddPlot(vtkPlot* plot)
vtkIdType AddPlot(vtkPlot* plot) VTK_OVERRIDE
{ return Superclass::AddPlot(plot); }
/**
* Get the plot at the specified index, returns null if the index is invalid.
*/
virtual vtkPlot* GetPlot(vtkIdType index);
vtkPlot* GetPlot(vtkIdType index) VTK_OVERRIDE;
/**
* Get the number of plots the chart contains.
*/
virtual vtkIdType GetNumberOfPlots();
vtkIdType GetNumberOfPlots() VTK_OVERRIDE;
/**
* Set whether the chart should draw a legend.
*/
virtual void SetShowLegend(bool visible);
void SetShowLegend(bool visible) VTK_OVERRIDE;
/**
* Get the legend for the chart, if available. Can return NULL if there is no
* legend.
*/
virtual vtkChartLegend * GetLegend();
vtkChartLegend * GetLegend() VTK_OVERRIDE;
/**
* Set the vtkContextScene for the item, always set for an item in a scene.
*/
virtual void SetScene(vtkContextScene *scene);
void SetScene(vtkContextScene *scene) VTK_OVERRIDE;
/**
* Return true if the supplied x, y coordinate is inside the item.
*/
virtual bool Hit(const vtkContextMouseEvent &mouse);
bool Hit(const vtkContextMouseEvent &mouse) VTK_OVERRIDE;
/**
* Mouse enter event.
*/
virtual bool MouseEnterEvent(const vtkContextMouseEvent &mouse);
bool MouseEnterEvent(const vtkContextMouseEvent &mouse) VTK_OVERRIDE;
/**
* Mouse move event.
*/
virtual bool MouseMoveEvent(const vtkContextMouseEvent &mouse);
bool MouseMoveEvent(const vtkContextMouseEvent &mouse) VTK_OVERRIDE;
/**
* Mouse leave event.
*/
virtual bool MouseLeaveEvent(const vtkContextMouseEvent &mouse);
bool MouseLeaveEvent(const vtkContextMouseEvent &mouse) VTK_OVERRIDE;
/**
* Mouse button down event
*/
virtual bool MouseButtonPressEvent(const vtkContextMouseEvent &mouse);
bool MouseButtonPressEvent(const vtkContextMouseEvent &mouse) VTK_OVERRIDE;
/**
* Mouse button release event.
*/
virtual bool MouseButtonReleaseEvent(const vtkContextMouseEvent &mouse);
bool MouseButtonReleaseEvent(const vtkContextMouseEvent &mouse) VTK_OVERRIDE;
/**
* Mouse wheel event, positive delta indicates forward movement of the wheel.
*/
virtual bool MouseWheelEvent(const vtkContextMouseEvent &mouse, int delta);
bool MouseWheelEvent(const vtkContextMouseEvent &mouse, int delta) VTK_OVERRIDE;
protected:
vtkChartPie();
~vtkChartPie();
~vtkChartPie() VTK_OVERRIDE;
/**
* Recalculate the necessary transforms.
......
......@@ -44,7 +44,7 @@ class VTKCHARTSCORE_EXPORT vtkChartXY : public vtkChart
{
public:
vtkTypeMacro(vtkChartXY, vtkChart);
virtual void PrintSelf(ostream& os, vtkIndent indent);
void PrintSelf(ostream& os, vtkIndent indent) VTK_OVERRIDE;
/**
* Creates a 2D Chart object.
......@@ -56,38 +56,38 @@ public:
* The scene should take care of calling this on all items before their
* Paint function is invoked.
*/
virtual void Update();
void Update() VTK_OVERRIDE;
/**
* Paint event for the chart, called whenever the chart needs to be drawn
*/
virtual bool Paint(vtkContext2D* painter);
bool Paint(vtkContext2D* painter) VTK_OVERRIDE;
/**
* Add a plot to the chart, defaults to using the name of the y column
*/
virtual vtkPlot* AddPlot(int type);
vtkPlot* AddPlot(int type) VTK_OVERRIDE;
/**
* Adds a plot to the chart
*/
virtual vtkIdType AddPlot(vtkPlot* plot);
vtkIdType AddPlot(vtkPlot* plot) VTK_OVERRIDE;
/**
* Remove the plot at the specified index, returns true if successful,
* false if the index was invalid.
*/
virtual bool RemovePlot(vtkIdType index);
bool RemovePlot(vtkIdType index) VTK_OVERRIDE;
/**
* Remove all plots from the chart.
*/
virtual void ClearPlots();
void ClearPlots() VTK_OVERRIDE;
/**
* Get the plot at the specified index, returns null if the index is invalid.
*/
virtual vtkPlot* GetPlot(vtkIdType index);
vtkPlot* GetPlot(vtkIdType index) VTK_OVERRIDE;
/**
* Get the index of the specified plot, returns -1 if the plot does not
......@@ -128,7 +128,7 @@ public:
/**
* Get the number of plots the chart contains.
*/
virtual vtkIdType GetNumberOfPlots();
vtkIdType GetNumberOfPlots() VTK_OVERRIDE;
/**
* Figure out which quadrant the plot is in.
......@@ -145,17 +145,17 @@ public:
* position enum, valid values are vtkAxis::LEFT, vtkAxis::BOTTOM,
* vtkAxis::RIGHT and vtkAxis::TOP.
*/
virtual vtkAxis* GetAxis(int axisIndex);
vtkAxis* GetAxis(int axisIndex) VTK_OVERRIDE;
/**
* Set whether the chart should draw a legend.
*/
virtual void SetShowLegend(bool visible);
void SetShowLegend(bool visible) VTK_OVERRIDE;
/**
* Get the vtkChartLegend object that will be displayed by the chart.
*/
virtual vtkChartLegend* GetLegend();
vtkChartLegend* GetLegend() VTK_OVERRIDE;
/**
* Set the vtkTooltipItem object that will be displayed by the chart.
......@@ -170,13 +170,13 @@ public:
/**
* Get the number of axes in the current chart.
*/