diff options
| author | Bastian Bloessl <mail@bastibl.net> | 2019-08-27 18:23:58 +0200 |
|---|---|---|
| committer | Marcus Müller <marcus@hostalia.de> | 2019-09-05 13:14:21 +0200 |
| commit | cdb0535e7dea1d856cca4ec18b724fe9326e1ccf (patch) | |
| tree | 03fe9f186941e83ec873614957cb0d218132fee9 | |
| parent | 747196f3ba052c35eefd8d2407621eeb7f528f3f (diff) | |
qtgui: do not override parent function
| -rw-r--r-- | gr-qtgui/include/gnuradio/qtgui/plot_raster.h | 5 | ||||
| -rw-r--r-- | gr-qtgui/include/gnuradio/qtgui/plot_waterfall.h | 5 | ||||
| -rw-r--r-- | gr-qtgui/lib/plot_raster.cc | 19 | ||||
| -rw-r--r-- | gr-qtgui/lib/plot_waterfall.cc | 19 |
4 files changed, 0 insertions, 48 deletions
diff --git a/gr-qtgui/include/gnuradio/qtgui/plot_raster.h b/gr-qtgui/include/gnuradio/qtgui/plot_raster.h index 83165619b8..c9718db5ae 100644 --- a/gr-qtgui/include/gnuradio/qtgui/plot_raster.h +++ b/gr-qtgui/include/gnuradio/qtgui/plot_raster.h @@ -69,11 +69,6 @@ public: virtual int rtti() const; - virtual void draw(QPainter* p, - const QwtScaleMap& xMap, - const QwtScaleMap& yMap, - const QRect& rect) const; - protected: #if QWT_VERSION < 0x060000 QImage renderImage(const QwtScaleMap& xMap, diff --git a/gr-qtgui/include/gnuradio/qtgui/plot_waterfall.h b/gr-qtgui/include/gnuradio/qtgui/plot_waterfall.h index 22cd708353..df6dfe773f 100644 --- a/gr-qtgui/include/gnuradio/qtgui/plot_waterfall.h +++ b/gr-qtgui/include/gnuradio/qtgui/plot_waterfall.h @@ -64,11 +64,6 @@ public: virtual int rtti() const; - virtual void draw(QPainter* p, - const QwtScaleMap& xMap, - const QwtScaleMap& yMap, - const QRect& rect) const; - protected: #if QWT_VERSION < 0x060000 QImage renderImage(const QwtScaleMap& xMap, diff --git a/gr-qtgui/lib/plot_raster.cc b/gr-qtgui/lib/plot_raster.cc index 46095ecbdf..312d344fb8 100644 --- a/gr-qtgui/lib/plot_raster.cc +++ b/gr-qtgui/lib/plot_raster.cc @@ -299,22 +299,3 @@ QwtInterval PlotTimeRaster::interval(Qt::Axis ax) const } #endif -/*! - \brief Draw the raster - - \param painter Painter - \param xMap Maps x-values into pixel coordinates. - \param yMap Maps y-values into pixel coordinates. - \param canvasRect Contents rect of the canvas in painter coordinates - - \sa setDisplayMode, renderImage, - QwtPlotRasterItem::draw, drawContourLines -*/ - -void PlotTimeRaster::draw(QPainter* painter, - const QwtScaleMap& xMap, - const QwtScaleMap& yMap, - const QRect& canvasRect) const -{ - QwtPlotRasterItem::draw(painter, xMap, yMap, canvasRect); -} diff --git a/gr-qtgui/lib/plot_waterfall.cc b/gr-qtgui/lib/plot_waterfall.cc index e39b8345c6..6c18544315 100644 --- a/gr-qtgui/lib/plot_waterfall.cc +++ b/gr-qtgui/lib/plot_waterfall.cc @@ -280,22 +280,3 @@ QImage PlotWaterfall::renderImage(const QwtScaleMap& xMap, return std::move(image); } -/*! - \brief Draw the spectrogram - - \param painter Painter - \param xMap Maps x-values into pixel coordinates. - \param yMap Maps y-values into pixel coordinates. - \param canvasRect Contents rect of the canvas in painter coordinates - - \sa setDisplayMode, renderImage, - QwtPlotRasterItem::draw, drawContourLines -*/ - -void PlotWaterfall::draw(QPainter* painter, - const QwtScaleMap& xMap, - const QwtScaleMap& yMap, - const QRect& canvasRect) const -{ - QwtPlotRasterItem::draw(painter, xMap, yMap, canvasRect); -} |