Skip to content

Commit

Permalink
re #7324 reverse previous change as it did not work.
Browse files Browse the repository at this point in the history
Now trying to perform overriding of both overloaded virtual methods to see if that fixes the warning.
  • Loading branch information
NickDraper committed Jun 21, 2013
1 parent c3871a1 commit b432547
Show file tree
Hide file tree
Showing 2 changed files with 12 additions and 1 deletion.
10 changes: 10 additions & 0 deletions Code/Mantid/MantidPlot/src/ScreenPickerTool.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -103,6 +103,16 @@ bool ScreenPickerTool::eventFilter(QObject *obj, QEvent *event)
}
return QwtPlotPicker::eventFilter(obj, event);
}
/**
* This overrides the base class trackerText() function so that we can
* adjust the text returned.
*
* @param pos The current mouse location.
*/
QwtText ScreenPickerTool::trackerText( const QPoint & pos ) const
{
return QwtPlotPicker::trackerText(pos);
}

/**
* This overrides the base class trackerText() function so that we can
Expand Down
3 changes: 2 additions & 1 deletion Code/Mantid/MantidPlot/src/ScreenPickerTool.h
Original file line number Diff line number Diff line change
Expand Up @@ -61,7 +61,8 @@ class ScreenPickerTool : public QwtPlotPicker, public PlotToolInterface
protected:
virtual bool eventFilter(QObject *obj, QEvent *event);
virtual void append(const QPoint &point);
QwtText trackerText(const QwtDoublePoint &) const;
virtual QwtText trackerText(const QPoint &) const;
virtual QwtText trackerText(const QwtDoublePoint &) const;
QwtPlotMarker d_selection_marker;
};

Expand Down

0 comments on commit b432547

Please sign in to comment.