diff options
author | Marcus Müller <mmueller@gnuradio.org> | 2020-10-30 18:22:33 +0100 |
---|---|---|
committer | mormj <34754695+mormj@users.noreply.github.com> | 2020-11-03 14:07:23 -0500 |
commit | 0ddc7dbc95ca6fb4c4a62a3c027104d6dd71fc3b (patch) | |
tree | b454053fdc123711f3011b8a703de38e1d783ba3 /gr-qtgui | |
parent | 1cfd6287635e339b313e1826fdfda23f474c91c8 (diff) |
modernization: `override` instead of virtual in all compilation units
Diffstat (limited to 'gr-qtgui')
59 files changed, 805 insertions, 803 deletions
diff --git a/gr-qtgui/examples/c++/display_qt.h b/gr-qtgui/examples/c++/display_qt.h index 9f140e7db5..696a4cb495 100644 --- a/gr-qtgui/examples/c++/display_qt.h +++ b/gr-qtgui/examples/c++/display_qt.h @@ -58,7 +58,7 @@ public slots: public: mywindow(); - virtual ~mywindow(); + ~mywindow() override; // call start() on the topblock void start(); diff --git a/gr-qtgui/include/gnuradio/qtgui/ConstellationDisplayPlot.h b/gr-qtgui/include/gnuradio/qtgui/ConstellationDisplayPlot.h index 2e54a8194e..4a04f5eb94 100644 --- a/gr-qtgui/include/gnuradio/qtgui/ConstellationDisplayPlot.h +++ b/gr-qtgui/include/gnuradio/qtgui/ConstellationDisplayPlot.h @@ -26,7 +26,7 @@ class ConstellationDisplayPlot : public DisplayPlot public: ConstellationDisplayPlot(int nplots, QWidget*); - virtual ~ConstellationDisplayPlot(); + ~ConstellationDisplayPlot() override; void plotNewData(const std::vector<double*> realDataPoints, const std::vector<double*> imagDataPoints, @@ -39,7 +39,7 @@ public: const int64_t numDataPoints, const double timeInterval); - void replot(); + void replot() override; void set_xaxis(double min, double max); void set_yaxis(double min, double max); diff --git a/gr-qtgui/include/gnuradio/qtgui/DisplayPlot.h b/gr-qtgui/include/gnuradio/qtgui/DisplayPlot.h index 9e2fabf501..da14dd31eb 100644 --- a/gr-qtgui/include/gnuradio/qtgui/DisplayPlot.h +++ b/gr-qtgui/include/gnuradio/qtgui/DisplayPlot.h @@ -114,9 +114,9 @@ class DisplayPlot : public QwtPlot public: DisplayPlot(int nplots, QWidget*); - virtual ~DisplayPlot(); + ~DisplayPlot() override; - virtual void replot() = 0; + void replot() override = 0; const QColor getLineColor1() const; const QColor getLineColor2() const; diff --git a/gr-qtgui/include/gnuradio/qtgui/EyeDisplayPlot.h b/gr-qtgui/include/gnuradio/qtgui/EyeDisplayPlot.h index ef11fc3f4f..db239aaeb8 100644 --- a/gr-qtgui/include/gnuradio/qtgui/EyeDisplayPlot.h +++ b/gr-qtgui/include/gnuradio/qtgui/EyeDisplayPlot.h @@ -32,7 +32,7 @@ class EyeDisplayPlot : public DisplayPlot public: EyeDisplayPlot(unsigned int nplots, unsigned int curve_index, QWidget* parent); - virtual ~EyeDisplayPlot(); + ~EyeDisplayPlot() override; void plotNewData(const std::vector<double*> dataPoints, const int64_t numDataPoints, @@ -41,7 +41,7 @@ public: const std::vector<std::vector<gr::tag_t>>& tags = std::vector<std::vector<gr::tag_t>>()); - void replot(); + void replot() override; void stemPlot(bool en); @@ -50,11 +50,11 @@ public: const QColor getTagTextColor(); const QColor getTagBackgroundColor(); const Qt::BrushStyle getTagBackgroundStyle(); - void setLineColor(unsigned int which, QColor color); - void setLineWidth(unsigned int which, int width); - void setLineMarker(unsigned int which, QwtSymbol::Style marker); - void setLineStyle(unsigned int which, Qt::PenStyle style); - void setMarkerAlpha(unsigned int which, int alpha); + void setLineColor(unsigned int which, QColor color) override; + void setLineWidth(unsigned int which, int width) override; + void setLineMarker(unsigned int which, QwtSymbol::Style marker) override; + void setLineStyle(unsigned int which, Qt::PenStyle style) override; + void setMarkerAlpha(unsigned int which, int alpha) override; public slots: void setSampleRate(double sr, double units, const std::string& strunits); @@ -62,8 +62,8 @@ public slots: void setAutoScale(bool state); void setAutoScaleShot(); - void legendEntryChecked(QwtPlotItem* plotItem, bool on); - void legendEntryChecked(const QVariant& plotItem, bool on, int index); + void legendEntryChecked(QwtPlotItem* plotItem, bool on) override; + void legendEntryChecked(const QVariant& plotItem, bool on, int index) override; void enableTagMarker(unsigned int which, bool en); @@ -76,7 +76,7 @@ public slots: void setTagBackgroundColor(QColor c); void setTagBackgroundStyle(Qt::BrushStyle b); - void setLineLabel(unsigned int which, QString label); + void setLineLabel(unsigned int which, QString label) override; private: void _resetXAxisPoints(); diff --git a/gr-qtgui/include/gnuradio/qtgui/FrequencyDisplayPlot.h b/gr-qtgui/include/gnuradio/qtgui/FrequencyDisplayPlot.h index e62d8bfe5c..1d88cdee27 100644 --- a/gr-qtgui/include/gnuradio/qtgui/FrequencyDisplayPlot.h +++ b/gr-qtgui/include/gnuradio/qtgui/FrequencyDisplayPlot.h @@ -48,7 +48,7 @@ class FrequencyDisplayPlot : public DisplayPlot public: FrequencyDisplayPlot(int nplots, QWidget*); - virtual ~FrequencyDisplayPlot(); + ~FrequencyDisplayPlot() override; void setFrequencyRange(const double, const double, @@ -72,9 +72,9 @@ public: const double peakAmplitude, const double timeInterval); - void replot(); + void replot() override; - void setYaxis(double min, double max); + void setYaxis(double min, double max) override; double getYMin() const; double getYMax() const; diff --git a/gr-qtgui/include/gnuradio/qtgui/HistogramDisplayPlot.h b/gr-qtgui/include/gnuradio/qtgui/HistogramDisplayPlot.h index f7ed687269..624c8fa52d 100644 --- a/gr-qtgui/include/gnuradio/qtgui/HistogramDisplayPlot.h +++ b/gr-qtgui/include/gnuradio/qtgui/HistogramDisplayPlot.h @@ -26,13 +26,13 @@ class HistogramDisplayPlot : public DisplayPlot public: HistogramDisplayPlot(unsigned int nplots, QWidget*); - virtual ~HistogramDisplayPlot(); + ~HistogramDisplayPlot() override; void plotNewData(const std::vector<double*> dataPoints, const uint64_t numDataPoints, const double timeInterval); - void replot(); + void replot() override; public slots: void setAutoScale(bool state); @@ -42,12 +42,12 @@ public slots: void setAccumulate(bool en); bool getAccumulate() const; - void setMarkerAlpha(unsigned int which, int alpha); - int getMarkerAlpha(unsigned int which) const; - void setLineColor(unsigned int which, QColor color); + void setMarkerAlpha(unsigned int which, int alpha) override; + int getMarkerAlpha(unsigned int which) const override; + void setLineColor(unsigned int which, QColor color) override; void setNumBins(unsigned int bins); - void setXaxis(double min, double max); + void setXaxis(double min, double max) override; void clear(); diff --git a/gr-qtgui/include/gnuradio/qtgui/TimeDomainDisplayPlot.h b/gr-qtgui/include/gnuradio/qtgui/TimeDomainDisplayPlot.h index 3dce1a9ac5..fb9bafb684 100644 --- a/gr-qtgui/include/gnuradio/qtgui/TimeDomainDisplayPlot.h +++ b/gr-qtgui/include/gnuradio/qtgui/TimeDomainDisplayPlot.h @@ -33,7 +33,7 @@ class TimeDomainDisplayPlot : public DisplayPlot public: TimeDomainDisplayPlot(int nplots, QWidget*); - virtual ~TimeDomainDisplayPlot(); + ~TimeDomainDisplayPlot() override; void plotNewData(const std::vector<double*> dataPoints, const int64_t numDataPoints, @@ -41,7 +41,7 @@ public: const std::vector<std::vector<gr::tag_t>>& tags = std::vector<std::vector<gr::tag_t>>()); - void replot(); + void replot() override; void stemPlot(bool en); @@ -59,8 +59,8 @@ public slots: void setSemilogx(bool en); void setSemilogy(bool en); - void legendEntryChecked(QwtPlotItem* plotItem, bool on); - void legendEntryChecked(const QVariant& plotItem, bool on, int index); + void legendEntryChecked(QwtPlotItem* plotItem, bool on) override; + void legendEntryChecked(const QVariant& plotItem, bool on, int index) override; void enableTagMarker(unsigned int which, bool en); diff --git a/gr-qtgui/include/gnuradio/qtgui/TimeRasterDisplayPlot.h b/gr-qtgui/include/gnuradio/qtgui/TimeRasterDisplayPlot.h index 01a601c5f3..d855a74b1b 100644 --- a/gr-qtgui/include/gnuradio/qtgui/TimeRasterDisplayPlot.h +++ b/gr-qtgui/include/gnuradio/qtgui/TimeRasterDisplayPlot.h @@ -42,7 +42,7 @@ class TimeRasterDisplayPlot : public DisplayPlot public: TimeRasterDisplayPlot( int nplots, double samp_rate, double rows, double cols, QWidget*); - virtual ~TimeRasterDisplayPlot(); + ~TimeRasterDisplayPlot() override; void reset(); @@ -67,7 +67,7 @@ public: void setIntensityRange(const double minIntensity, const double maxIntensity); - void replot(void); + void replot(void) override; int getIntensityColorMapType(unsigned int) const; int getIntensityColorMapType1() const; diff --git a/gr-qtgui/include/gnuradio/qtgui/VectorDisplayPlot.h b/gr-qtgui/include/gnuradio/qtgui/VectorDisplayPlot.h index 43dbcec0de..ea3d152d53 100644 --- a/gr-qtgui/include/gnuradio/qtgui/VectorDisplayPlot.h +++ b/gr-qtgui/include/gnuradio/qtgui/VectorDisplayPlot.h @@ -43,7 +43,7 @@ class VectorDisplayPlot : public DisplayPlot public: VectorDisplayPlot(int nplots, QWidget*); - virtual ~VectorDisplayPlot(); + ~VectorDisplayPlot() override; void setXAxisValues(const double start, const double step = 1.0); @@ -55,9 +55,9 @@ public: void clearMaxData(); void clearMinData(); - void replot(); + void replot() override; - void setYaxis(double min, double max); + void setYaxis(double min, double max) override; double getYMin() const; double getYMax() const; diff --git a/gr-qtgui/include/gnuradio/qtgui/WaterfallDisplayPlot.h b/gr-qtgui/include/gnuradio/qtgui/WaterfallDisplayPlot.h index 822eb13a76..14290c8f70 100644 --- a/gr-qtgui/include/gnuradio/qtgui/WaterfallDisplayPlot.h +++ b/gr-qtgui/include/gnuradio/qtgui/WaterfallDisplayPlot.h @@ -45,7 +45,7 @@ class WaterfallDisplayPlot : public DisplayPlot public: WaterfallDisplayPlot(int nplots, QWidget*); - virtual ~WaterfallDisplayPlot(); + ~WaterfallDisplayPlot() override; void resetAxis(); @@ -73,7 +73,7 @@ public: double getMinIntensity(unsigned int which) const; double getMaxIntensity(unsigned int which) const; - void replot(void); + void replot(void) override; void clearData(); int getIntensityColorMapType(unsigned int) const; @@ -95,7 +95,7 @@ public slots: void setUserDefinedLowIntensityColor(QColor); void setUserDefinedHighIntensityColor(QColor); void setPlotPosHalf(bool half); - void disableLegend(); + void disableLegend() override; void enableLegend(); void enableLegend(bool en); void setNumRows(int nrows); diff --git a/gr-qtgui/include/gnuradio/qtgui/constellationdisplayform.h b/gr-qtgui/include/gnuradio/qtgui/constellationdisplayform.h index 9cd9332c6f..de3f431466 100644 --- a/gr-qtgui/include/gnuradio/qtgui/constellationdisplayform.h +++ b/gr-qtgui/include/gnuradio/qtgui/constellationdisplayform.h @@ -29,9 +29,9 @@ class QTGUI_API ConstellationDisplayForm : public DisplayForm public: ConstellationDisplayForm(int nplots = 1, QWidget* parent = 0); - ~ConstellationDisplayForm(); + ~ConstellationDisplayForm() override; - ConstellationDisplayPlot* getPlot(); + ConstellationDisplayPlot* getPlot() override; int getNPoints() const; gr::qtgui::trigger_mode getTriggerMode() const; @@ -41,13 +41,13 @@ public: std::string getTriggerTagKey() const; public slots: - void customEvent(QEvent* e); + void customEvent(QEvent* e) override; void setNPoints(const int); - void setSampleRate(const QString& samprate); + void setSampleRate(const QString& samprate) override; void setYaxis(double min, double max); void setXaxis(double min, double max); - void autoScale(bool en); + void autoScale(bool en) override; void updateTrigger(gr::qtgui::trigger_mode mode); void setTriggerMode(gr::qtgui::trigger_mode mode); @@ -59,7 +59,7 @@ public slots: void setTriggerTagKey(const std::string& s); private slots: - void newData(const QEvent*); + void newData(const QEvent*) override; private: QIntValidator* d_int_validator; diff --git a/gr-qtgui/include/gnuradio/qtgui/displayform.h b/gr-qtgui/include/gnuradio/qtgui/displayform.h index 47492b4871..31671e1cae 100644 --- a/gr-qtgui/include/gnuradio/qtgui/displayform.h +++ b/gr-qtgui/include/gnuradio/qtgui/displayform.h @@ -32,7 +32,7 @@ class QTGUI_API DisplayForm : public QWidget public: DisplayForm(int nplots = 1, QWidget* parent = 0); - ~DisplayForm(); + ~DisplayForm() override; virtual DisplayPlot* getPlot() = 0; void Reset(); @@ -41,11 +41,11 @@ public: void enableMenu(bool en = true); public slots: - void resizeEvent(QResizeEvent* e); - void mousePressEvent(QMouseEvent* e); - virtual void customEvent(QEvent* e) = 0; + void resizeEvent(QResizeEvent* e) override; + void mousePressEvent(QMouseEvent* e) override; + void customEvent(QEvent* e) override = 0; - void closeEvent(QCloseEvent* e); + void closeEvent(QCloseEvent* e) override; void setUpdateTime(double t); diff --git a/gr-qtgui/include/gnuradio/qtgui/eyecontrolpanel.h b/gr-qtgui/include/gnuradio/qtgui/eyecontrolpanel.h index 810efdc3de..8bc4f841ac 100644 --- a/gr-qtgui/include/gnuradio/qtgui/eyecontrolpanel.h +++ b/gr-qtgui/include/gnuradio/qtgui/eyecontrolpanel.h @@ -27,7 +27,7 @@ class EyeControlPanel : public QVBoxLayout public: EyeControlPanel(EyeDisplayForm* form); - ~EyeControlPanel(); + ~EyeControlPanel() override; public slots: void toggleAutoScale(bool en); diff --git a/gr-qtgui/include/gnuradio/qtgui/eyedisplayform.h b/gr-qtgui/include/gnuradio/qtgui/eyedisplayform.h index d4987d264e..77a5ed208e 100644 --- a/gr-qtgui/include/gnuradio/qtgui/eyedisplayform.h +++ b/gr-qtgui/include/gnuradio/qtgui/eyedisplayform.h @@ -28,7 +28,7 @@ class EyeDisplayForm : public EyeDisplaysForm public: EyeDisplayForm(int nplots = 1, bool cmplx = false, QWidget* parent = 0); - ~EyeDisplayForm(); + ~EyeDisplayForm() override; EyeDisplayPlot* getPlot(); EyeDisplayPlot* getSinglePlot(unsigned int); @@ -45,14 +45,14 @@ public: void setAxisLabels(bool en); public slots: - void customEvent(QEvent* e); + void customEvent(QEvent* e) override; void setSampleRate(const double samprate); - void setSampleRate(const QString& samprate); + void setSampleRate(const QString& samprate) override; void setYaxis(double min, double max); void setYLabel(const std::string& label, const std::string& unit = ""); void setNPoints(const int); - void autoScale(bool en); + void autoScale(bool en) override; void autoScaleShot(); void tagMenuSlot(bool en); void setTagMenu(unsigned int which, bool en); @@ -73,7 +73,7 @@ public slots: void teardownControlPanel(); private slots: - void newData(const QEvent*); + void newData(const QEvent*) override; void notifyYAxisPlus(); void notifyYAxisMinus(); void notifyYRangePlus(); diff --git a/gr-qtgui/include/gnuradio/qtgui/eyedisplaysform.h b/gr-qtgui/include/gnuradio/qtgui/eyedisplaysform.h index 0e9fcf2fb8..a75db83089 100644 --- a/gr-qtgui/include/gnuradio/qtgui/eyedisplaysform.h +++ b/gr-qtgui/include/gnuradio/qtgui/eyedisplaysform.h @@ -31,7 +31,7 @@ class QTGUI_API EyeDisplaysForm : public QWidget public: EyeDisplaysForm(int nplots = 1, QWidget* parent = 0); - ~EyeDisplaysForm(); + ~EyeDisplaysForm() override; void Reset(); bool isClosed() const; @@ -39,11 +39,11 @@ public: void enableMenu(bool en = true); public slots: - void resizeEvent(QResizeEvent* e); - void mousePressEvent(QMouseEvent* e); - virtual void customEvent(QEvent* e) = 0; + void resizeEvent(QResizeEvent* e) override; + void mousePressEvent(QMouseEvent* e) override; + void customEvent(QEvent* e) override = 0; - void closeEvent(QCloseEvent* e); + void closeEvent(QCloseEvent* e) override; void setUpdateTime(double t); void setSamplesPerSymbol(int64_t sps); diff --git a/gr-qtgui/include/gnuradio/qtgui/form_menus.h b/gr-qtgui/include/gnuradio/qtgui/form_menus.h index 633c316e42..bc3be36c27 100644 --- a/gr-qtgui/include/gnuradio/qtgui/form_menus.h +++ b/gr-qtgui/include/gnuradio/qtgui/form_menus.h @@ -71,7 +71,7 @@ public: } } - ~LineColorMenu() {} + ~LineColorMenu() override {} int getNumActions() const { return d_act.size(); } @@ -151,7 +151,7 @@ public: } } - ~LineWidthMenu() {} + ~LineWidthMenu() override {} int getNumActions() const { return d_act.size(); } @@ -221,7 +221,7 @@ public: } } - ~LineStyleMenu() {} + ~LineStyleMenu() override {} int getNumActions() const { return d_act.size(); } @@ -305,7 +305,7 @@ public: } } - ~LineMarkerMenu() {} + ~LineMarkerMenu() override {} int getNumActions() const { return d_act.size(); } @@ -378,7 +378,7 @@ public: } } - ~MarkerAlphaMenu() {} + ~MarkerAlphaMenu() override {} int getNumActions() const { return d_act.size(); } @@ -437,7 +437,7 @@ public: connect(this, SIGNAL(triggered()), this, SLOT(getTextDiag())); } - ~LineTitleAction() {} + ~LineTitleAction() override {} signals: void whichTrigger(unsigned int which, const QString& text); @@ -490,7 +490,7 @@ public: connect(this, SIGNAL(triggered()), this, SLOT(getTextDiag())); } - ~OtherAction() {} + ~OtherAction() override {} void setValidator(QValidator* v) { d_text->setValidator(v); } @@ -553,7 +553,7 @@ public: connect(this, SIGNAL(triggered()), this, SLOT(getTextDiag())); } - ~OtherDualAction() {} + ~OtherDualAction() override {} signals: void whichTrigger(const QString& text0, const QString& text1); @@ -634,7 +634,7 @@ public: } } - ~FFTSizeMenu() {} + ~FFTSizeMenu() override {} int getNumActions() const { return d_act.size(); } @@ -742,7 +742,7 @@ public: } } - ~AverageMenu() {} + ~AverageMenu() override {} int getNumActions() const { return d_act.size(); } @@ -808,7 +808,7 @@ public: // nop } - ~FFTAverageMenu() {} + ~FFTAverageMenu() override {} }; /********************************************************************/ @@ -852,7 +852,7 @@ public: } } - ~FFTWindowMenu() {} + ~FFTWindowMenu() override {} int getNumActions() const { return d_act.size(); } @@ -945,7 +945,7 @@ public: connect(this, SIGNAL(triggered()), this, SLOT(getTextDiag())); } - ~NPointsMenu() {} + ~NPointsMenu() override {} signals: void whichTrigger(const int npts); @@ -1011,7 +1011,7 @@ public: d_min_value = QColor("white"); } - ~ColorMapMenu() {} + ~ColorMapMenu() override {} int getNumActions() const { return d_act.size(); } @@ -1109,7 +1109,7 @@ public: } } - ~TriggerModeMenu() {} + ~TriggerModeMenu() override {} int getNumActions() const { return d_act.size(); } @@ -1182,7 +1182,7 @@ public: } } - ~TriggerSlopeMenu() {} + ~TriggerSlopeMenu() override {} int getNumActions() const { return d_act.size(); } @@ -1243,7 +1243,7 @@ public: } } - ~TriggerChannelMenu() {} + ~TriggerChannelMenu() override {} int getNumActions() const { return d_act.size(); } @@ -1302,7 +1302,7 @@ public: } } - ~NumberLayoutMenu() {} + ~NumberLayoutMenu() override {} int getNumActions() const { return d_act.size(); } @@ -1384,7 +1384,7 @@ public: d_min_value = QColor("black"); } - ~NumberColorMapMenu() {} + ~NumberColorMapMenu() override {} int getNumActions() const { return d_act.size(); } @@ -1457,7 +1457,7 @@ public: connect(this, SIGNAL(triggered()), this, SLOT(getTextDiag())); } - ~PopupMenu() {} + ~PopupMenu() override {} void setText(QString s) { d_text->setText(s); } @@ -1511,7 +1511,7 @@ public: connect(this, SIGNAL(triggered()), this, SLOT(getTextDiag())); } - ~ItemFloatAct() {} + ~ItemFloatAct() override {} void setText(float f) { d_text->setText(QString("%1").arg(f)); } diff --git a/gr-qtgui/include/gnuradio/qtgui/freqcontrolpanel.h b/gr-qtgui/include/gnuradio/qtgui/freqcontrolpanel.h index e509734a01..ff03fbc3e9 100644 --- a/gr-qtgui/include/gnuradio/qtgui/freqcontrolpanel.h +++ b/gr-qtgui/include/gnuradio/qtgui/freqcontrolpanel.h @@ -29,7 +29,7 @@ class FreqControlPanel : public QVBoxLayout public: FreqControlPanel(FreqDisplayForm* form); - ~FreqControlPanel(); + ~FreqControlPanel() override; public slots: void notifyAvgSlider(int val); diff --git a/gr-qtgui/include/gnuradio/qtgui/freqdisplayform.h b/gr-qtgui/include/gnuradio/qtgui/freqdisplayform.h index 673749e627..35763be156 100644 --- a/gr-qtgui/include/gnuradio/qtgui/freqdisplayform.h +++ b/gr-qtgui/include/gnuradio/qtgui/freqdisplayform.h @@ -31,9 +31,9 @@ class FreqDisplayForm : public DisplayForm public: FreqDisplayForm(int nplots = 1, QWidget* parent = 0); - ~FreqDisplayForm(); + ~FreqDisplayForm() override; - FrequencyDisplayPlot* getPlot(); + FrequencyDisplayPlot* getPlot() override; int getFFTSize() const; float getFFTAverage() const; @@ -53,9 +53,9 @@ public: bool checkClicked(); public slots: - void customEvent(QEvent* e); + void customEvent(QEvent* e) override; - void setSampleRate(const QString& samprate); + void setSampleRate(const QString& samprate) override; void setFFTSize(const int); void setFFTAverage(const float); void setFFTWindowType(const gr::fft::window::win_type); @@ -65,7 +65,7 @@ public slots: void setYLabel(const std::string& label, const std::string& unit = ""); void setYMax(const QString& m); void setYMin(const QString& m); - void autoScale(bool en); + void autoScale(bool en) override; void autoScaleShot(); void setPlotPosHalf(bool half); void clearMaxHold(); @@ -109,8 +109,8 @@ signals: private slots: - void newData(const QEvent* updateEvent); - void onPlotPointSelected(const QPointF p); + void newData(const QEvent* updateEvent) override; + void onPlotPointSelected(const QPointF p) override; private: uint64_t d_num_real_data_points; diff --git a/gr-qtgui/include/gnuradio/qtgui/histogramdisplayform.h b/gr-qtgui/include/gnuradio/qtgui/histogramdisplayform.h index 0bd8b95e4f..638dc9ba35 100644 --- a/gr-qtgui/include/gnuradio/qtgui/histogramdisplayform.h +++ b/gr-qtgui/include/gnuradio/qtgui/histogramdisplayform.h @@ -28,19 +28,19 @@ class HistogramDisplayForm : public DisplayForm public: HistogramDisplayForm(int nplots = 1, QWidget* parent = 0); - ~HistogramDisplayForm(); + ~HistogramDisplayForm() override; - HistogramDisplayPlot* getPlot(); + HistogramDisplayPlot* getPlot() override; int getNPoints() const; public slots: - void customEvent(QEvent* e); + void customEvent(QEvent* e) override; void setYaxis(double min, double max); void setXaxis(double min, double max); void setNPoints(const int); - void autoScale(bool en); + void autoScale(bool en) override; void setSemilogx(bool en); void setSemilogy(bool en); @@ -50,7 +50,7 @@ public slots: void autoScaleX(); private slots: - void newData(const QEvent*); + void newData(const QEvent*) override; private: QIntValidator* d_int_validator; diff --git a/gr-qtgui/include/gnuradio/qtgui/numberdisplayform.h b/gr-qtgui/include/gnuradio/qtgui/numberdisplayform.h index 423ecaade3..0411c967ad 100644 --- a/gr-qtgui/include/gnuradio/qtgui/numberdisplayform.h +++ b/gr-qtgui/include/gnuradio/qtgui/numberdisplayform.h @@ -29,7 +29,7 @@ public: NumberDisplayForm(int nplots = 1, gr::qtgui::graph_t type = gr::qtgui::NUM_GRAPH_HORIZ, QWidget* parent = 0); - ~NumberDisplayForm(); + ~NumberDisplayForm() override; gr::qtgui::graph_t graphType() const; QColor colorMin(unsigned int which) const; @@ -44,8 +44,8 @@ public: float factor(unsigned int which) const; public slots: - void mousePressEvent(QMouseEvent* e); - void customEvent(QEvent* e); + void mousePressEvent(QMouseEvent* e) override; + void customEvent(QEvent* e) override; void setStop(bool on); void setStop(); void setGraphType(const gr::qtgui::graph_t type); diff --git a/gr-qtgui/include/gnuradio/qtgui/plot_raster.h b/gr-qtgui/include/gnuradio/qtgui/plot_raster.h index 429ea3d76e..b6710ade57 100644 --- a/gr-qtgui/include/gnuradio/qtgui/plot_raster.h +++ b/gr-qtgui/include/gnuradio/qtgui/plot_raster.h @@ -37,7 +37,7 @@ class PlotTimeRaster : public QwtPlotRasterItem { public: explicit PlotTimeRaster(const QString& title = QString()); - virtual ~PlotTimeRaster(); + ~PlotTimeRaster() override; const TimeRasterData* data() const; @@ -52,10 +52,10 @@ public: virtual QSize rasterHint(const QwtDoubleRect&) const; virtual QwtDoubleInterval interval(Qt::Axis ax) const; #else - virtual QwtInterval interval(Qt::Axis ax) const; + QwtInterval interval(Qt::Axis ax) const override; #endif - virtual int rtti() const; + int rtti() const override; protected: #if QWT_VERSION < 0x060000 @@ -66,7 +66,7 @@ protected: QImage renderImage(const QwtScaleMap& xMap, const QwtScaleMap& yMap, const QRectF& rect, - const QSize& size = QSize(0, 0)) const; + const QSize& size = QSize(0, 0)) const override; #endif private: diff --git a/gr-qtgui/include/gnuradio/qtgui/plot_waterfall.h b/gr-qtgui/include/gnuradio/qtgui/plot_waterfall.h index 9a4cdd3f4d..51c08f87ea 100644 --- a/gr-qtgui/include/gnuradio/qtgui/plot_waterfall.h +++ b/gr-qtgui/include/gnuradio/qtgui/plot_waterfall.h @@ -37,7 +37,7 @@ class PlotWaterfall : public QwtPlotRasterItem { public: explicit PlotWaterfall(WaterfallData* data, const QString& title = QString()); - virtual ~PlotWaterfall(); + ~PlotWaterfall() override; const WaterfallData* data() const; @@ -50,7 +50,7 @@ public: virtual QSize rasterHint(const QwtDoubleRect&) const; #endif - virtual int rtti() const; + int rtti() const override; protected: #if QWT_VERSION < 0x060000 @@ -61,7 +61,7 @@ protected: QImage renderImage(const QwtScaleMap& xMap, const QwtScaleMap& yMap, const QRectF& rect, - const QSize& size = QSize(0, 0)) const; + const QSize& size = QSize(0, 0)) const override; #endif private: diff --git a/gr-qtgui/include/gnuradio/qtgui/qtgui_types.h b/gr-qtgui/include/gnuradio/qtgui/qtgui_types.h index a0ed7339a3..e2735cf945 100644 --- a/gr-qtgui/include/gnuradio/qtgui/qtgui_types.h +++ b/gr-qtgui/include/gnuradio/qtgui/qtgui_types.h @@ -101,7 +101,7 @@ public: { } - virtual QwtText label(double value) const + QwtText label(double value) const override { return QString("%1").arg(value, 0, 'f', getFrequencyPrecision()); } diff --git a/gr-qtgui/include/gnuradio/qtgui/spectrumUpdateEvents.h b/gr-qtgui/include/gnuradio/qtgui/spectrumUpdateEvents.h index 4c0d182ca8..1bc1097b44 100644 --- a/gr-qtgui/include/gnuradio/qtgui/spectrumUpdateEvents.h +++ b/gr-qtgui/include/gnuradio/qtgui/spectrumUpdateEvents.h @@ -40,7 +40,7 @@ public: const gr::high_res_timer_type generatedTimestamp, const int droppedFFTFrames); - ~SpectrumUpdateEvent(); + ~SpectrumUpdateEvent() override; const float* getFFTPoints() const; const double* getRealTimeDomainPoints() const; @@ -71,7 +71,7 @@ class SpectrumWindowCaptionEvent : public QEvent { public: SpectrumWindowCaptionEvent(const QString&); - ~SpectrumWindowCaptionEvent(); + ~SpectrumWindowCaptionEvent() override; QString getLabel(); protected: @@ -83,7 +83,7 @@ class SpectrumWindowResetEvent : public QEvent { public: SpectrumWindowResetEvent(); - ~SpectrumWindowResetEvent(); + ~SpectrumWindowResetEvent() override; protected: private: @@ -93,7 +93,7 @@ class SpectrumFrequencyRangeEvent : public QEvent { public: SpectrumFrequencyRangeEvent(const double, const double, const double); - ~SpectrumFrequencyRangeEvent(); + ~SpectrumFrequencyRangeEvent() override; double GetCenterFrequency() const; double GetStartFrequency() const; double GetStopFrequency() const; @@ -113,7 +113,7 @@ public: const uint64_t numTimeDomainDataPoints, const std::vector<std::vector<gr::tag_t>> tags); - ~TimeUpdateEvent(); + ~TimeUpdateEvent() override; int which() const; const std::vector<double*> getTimeDomainPoints() const; @@ -141,7 +141,7 @@ class FreqUpdateEvent : public QEvent public: FreqUpdateEvent(const std::vector<double*> dataPoints, const uint64_t numDataPoints); - ~FreqUpdateEvent(); + ~FreqUpdateEvent() override; int which() const; const std::vector<double*> getPoints() const; @@ -162,7 +162,7 @@ class SetFreqEvent : public QEvent { public: SetFreqEvent(const double, const double); - ~SetFreqEvent(); + ~SetFreqEvent() override; double getCenterFrequency() const; double getBandwidth() const; @@ -182,7 +182,7 @@ public: const std::vector<double*> imagDataPoints, const uint64_t numDataPoints); - ~ConstUpdateEvent(); + ~ConstUpdateEvent() override; int which() const; const std::vector<double*> getRealPoints() const; @@ -211,7 +211,7 @@ public: const uint64_t numDataPoints, const gr::high_res_timer_type dataTimestamp); - ~WaterfallUpdateEvent(); + ~WaterfallUpdateEvent() override; int which() const; const std::vector<double*> getPoints() const; @@ -240,7 +240,7 @@ class TimeRasterUpdateEvent : public QEvent public: TimeRasterUpdateEvent(const std::vector<double*> dataPoints, const uint64_t numDataPoints); - ~TimeRasterUpdateEvent(); + ~TimeRasterUpdateEvent() override; int which() const; const std::vector<double*> getPoints() const; @@ -261,7 +261,7 @@ class TimeRasterSetSize : public QEvent { public: TimeRasterSetSize(const double nrows, const double ncols); - ~TimeRasterSetSize(); + ~TimeRasterSetSize() override; double nRows() const; double nCols() const; @@ -282,7 +282,7 @@ class HistogramUpdateEvent : public QEvent public: HistogramUpdateEvent(const std::vector<double*> points, const uint64_t npoints); - ~HistogramUpdateEvent(); + ~HistogramUpdateEvent() override; int which() const; const std::vector<double*> getDataPoints() const; @@ -303,7 +303,7 @@ class HistogramSetAccumulator : public QEvent { public: HistogramSetAccumulator(const bool en); - ~HistogramSetAccumulator(); + ~HistogramSetAccumulator() override; bool getAccumulator() const; @@ -318,7 +318,7 @@ class HistogramClearEvent : public QEvent public: HistogramClearEvent() : QEvent(QEvent::Type(SpectrumUpdateEventType + 2)) {} - ~HistogramClearEvent() {} + ~HistogramClearEvent() override {} static QEvent::Type Type() { return QEvent::Type(SpectrumUpdateEventType + 2); } }; @@ -331,7 +331,7 @@ class NumberUpdateEvent : public QEvent { public: NumberUpdateEvent(const std::vector<float> samples); - ~NumberUpdateEvent(); + ~NumberUpdateEvent() override; int which() const; const std::vector<float> getSamples() const; diff --git a/gr-qtgui/include/gnuradio/qtgui/spectrumdisplayform.h b/gr-qtgui/include/gnuradio/qtgui/spectrumdisplayform.h index 06b3b45a8e..31724a16e8 100644 --- a/gr-qtgui/include/gnuradio/qtgui/spectrumdisplayform.h +++ b/gr-qtgui/include/gnuradio/qtgui/spectrumdisplayform.h @@ -31,7 +31,7 @@ class SpectrumDisplayForm : public QWidget, public Ui::SpectrumDisplayForm public: SpectrumDisplayForm(QWidget* parent = 0); - ~SpectrumDisplayForm(); + ~SpectrumDisplayForm() override; void setSystem(SpectrumGUIClass* newSystem, const uint64_t numFFTDataPoints, @@ -51,8 +51,8 @@ public: bool checkClicked(); public slots: - void resizeEvent(QResizeEvent* e); - void customEvent(QEvent* e); + void resizeEvent(QResizeEvent* e) override; + void customEvent(QEvent* e) override; void avgLineEdit_valueChanged(int valueString); void maxHoldCheckBox_toggled(bool newState); void minHoldCheckBox_toggled(bool newState); @@ -63,7 +63,7 @@ public slots: void setFrequencyRange(const double newCenterFrequency, const double newStartFrequency, const double newStopFrequency); - void closeEvent(QCloseEvent* e); + void closeEvent(QCloseEvent* e) override; void windowTypeChanged(int newItem); void useRFFrequenciesCB(bool useRFFlag); void toggleRFFrequencies(bool en); diff --git a/gr-qtgui/include/gnuradio/qtgui/timeRasterGlobalData.h b/gr-qtgui/include/gnuradio/qtgui/timeRasterGlobalData.h index 0dd37cd0ba..6bd53f142c 100644 --- a/gr-qtgui/include/gnuradio/qtgui/timeRasterGlobalData.h +++ b/gr-qtgui/include/gnuradio/qtgui/timeRasterGlobalData.h @@ -23,7 +23,7 @@ class TimeRasterData : public QwtRasterData { public: TimeRasterData(const double rows, const double cols); - virtual ~TimeRasterData(); + ~TimeRasterData() override; virtual void reset(); virtual void copy(const TimeRasterData*); @@ -37,7 +37,7 @@ public: virtual void setRange(const QwtDoubleInterval&); #endif - virtual double value(double x, double y) const; + double value(double x, double y) const override; virtual double getNumCols() const; virtual double getNumRows() const; diff --git a/gr-qtgui/include/gnuradio/qtgui/timecontrolpanel.h b/gr-qtgui/include/gnuradio/qtgui/timecontrolpanel.h index 2aa88d06fd..e9590b8b2f 100644 --- a/gr-qtgui/include/gnuradio/qtgui/timecontrolpanel.h +++ b/gr-qtgui/include/gnuradio/qtgui/timecontrolpanel.h @@ -28,7 +28,7 @@ class TimeControlPanel : public QVBoxLayout public: TimeControlPanel(TimeDisplayForm* form); - ~TimeControlPanel(); + ~TimeControlPanel() override; public slots: void toggleAutoScale(bool en); diff --git a/gr-qtgui/include/gnuradio/qtgui/timedisplayform.h b/gr-qtgui/include/gnuradio/qtgui/timedisplayform.h index 5f9d2461ae..1901100f0c 100644 --- a/gr-qtgui/include/gnuradio/qtgui/timedisplayform.h +++ b/gr-qtgui/include/gnuradio/qtgui/timedisplayform.h @@ -29,9 +29,9 @@ class TimeDisplayForm : public DisplayForm public: TimeDisplayForm(int nplots = 1, QWidget* parent = 0); - ~TimeDisplayForm(); + ~TimeDisplayForm() override; - TimeDomainDisplayPlot* getPlot(); + TimeDomainDisplayPlot* getPlot() override; int getNPoints() const; gr::qtgui::trigger_mode getTriggerMode() const; @@ -42,15 +42,15 @@ public: std::string getTriggerTagKey() const; public slots: - void customEvent(QEvent* e); + void customEvent(QEvent* e) override; void setSampleRate(const double samprate); - void setSampleRate(const QString& samprate); + void setSampleRate(const QString& samprate) override; void setYaxis(double min, double max); void setYLabel(const std::string& label, const std::string& unit = ""); void setNPoints(const int); void setStem(bool en); - void autoScale(bool en); + void autoScale(bool en) override; void autoScaleShot(); void setSemilogx(bool en); void setSemilogy(bool en); @@ -73,7 +73,7 @@ public slots: void teardownControlPanel(); private slots: - void newData(const QEvent*); + void newData(const QEvent*) override; void notifyYAxisPlus(); void notifyYAxisMinus(); void notifyYRangePlus(); diff --git a/gr-qtgui/include/gnuradio/qtgui/timerasterdisplayform.h b/gr-qtgui/include/gnuradio/qtgui/timerasterdisplayform.h index 4732eff13a..497d81afaf 100644 --- a/gr-qtgui/include/gnuradio/qtgui/timerasterdisplayform.h +++ b/gr-qtgui/include/gnuradio/qtgui/timerasterdisplayform.h @@ -34,9 +34,9 @@ public: double cols = 1, double zmax = 1, QWidget* parent = 0); - ~TimeRasterDisplayForm(); + ~TimeRasterDisplayForm() override; - TimeRasterDisplayPlot* getPlot(); + TimeRasterDisplayPlot* getPlot() override; double numRows(); double numCols(); @@ -47,7 +47,7 @@ public: double getMaxIntensity(unsigned int which); public slots: - void customEvent(QEvent* e); + void customEvent(QEvent* e) override; void setNumRows(double rows); void setNumCols(double cols); @@ -56,7 +56,7 @@ public slots: void setNumCols(QString cols); void setSampleRate(const double samprate); - void setSampleRate(const QString& rate); + void setSampleRate(const QString& rate) override; void setIntensityRange(const double minIntensity, const double maxIntensity); void setMaxIntensity(const QString& m); @@ -69,10 +69,10 @@ public slots: void setAlpha(unsigned int which, unsigned int alpha); - void autoScale(bool en = false); + void autoScale(bool en = false) override; private slots: - void newData(const QEvent* updateEvent); + void newData(const QEvent* updateEvent) override; private: double d_min_val, d_cur_min_val; diff --git a/gr-qtgui/include/gnuradio/qtgui/utils.h b/gr-qtgui/include/gnuradio/qtgui/utils.h index e9adaf3013..4e5b2ca02d 100644 --- a/gr-qtgui/include/gnuradio/qtgui/utils.h +++ b/gr-qtgui/include/gnuradio/qtgui/utils.h @@ -35,7 +35,7 @@ public: QwtDblClickPlotPicker(QWidget*); #endif /* QWT_VERSION < 0x060100 */ - ~QwtDblClickPlotPicker(); + ~QwtDblClickPlotPicker() override; virtual QwtPickerMachine* stateMachine(int) const; }; @@ -44,14 +44,14 @@ class QTGUI_API QwtPickerDblClickPointMachine : public QwtPickerMachine { public: QwtPickerDblClickPointMachine(); - ~QwtPickerDblClickPointMachine(); + ~QwtPickerDblClickPointMachine() override; #if QWT_VERSION < 0x060000 virtual CommandList #else - virtual QList<QwtPickerMachine::Command> + QList<QwtPickerMachine::Command> #endif - transition(const QwtEventPattern& eventPattern, const QEvent* e); + transition(const QwtEventPattern& eventPattern, const QEvent* e) override; }; void check_set_qss(QApplication* app); diff --git a/gr-qtgui/include/gnuradio/qtgui/vectordisplayform.h b/gr-qtgui/include/gnuradio/qtgui/vectordisplayform.h index aaa2c1b3ff..a6bfceb042 100644 --- a/gr-qtgui/include/gnuradio/qtgui/vectordisplayform.h +++ b/gr-qtgui/include/gnuradio/qtgui/vectordisplayform.h @@ -28,9 +28,9 @@ class VectorDisplayForm : public DisplayForm public: VectorDisplayForm(int nplots = 1, QWidget* parent = 0); - ~VectorDisplayForm(); + ~VectorDisplayForm() override; - VectorDisplayPlot* getPlot(); + VectorDisplayPlot* getPlot() override; int getVecSize() const; float getVecAverage() const; @@ -46,7 +46,7 @@ public: bool checkClicked(); public slots: - void customEvent(QEvent* e); + void customEvent(QEvent* e) override; void setVecSize(const int); void setVecAverage(const float); @@ -55,13 +55,13 @@ public slots: void setYaxis(double min, double max); void setYMax(const QString& m); void setYMin(const QString& m); - void autoScale(bool en); + void autoScale(bool en) override; void clearMaxHold(); void clearMinHold(); private slots: - void newData(const QEvent* updateEvent); - void onPlotPointSelected(const QPointF p); + void newData(const QEvent* updateEvent) override; + void onPlotPointSelected(const QPointF p) override; private: uint64_t d_num_real_data_points; diff --git a/gr-qtgui/include/gnuradio/qtgui/waterfallGlobalData.h b/gr-qtgui/include/gnuradio/qtgui/waterfallGlobalData.h index 1aff339a06..a244de7eb7 100644 --- a/gr-qtgui/include/gnuradio/qtgui/waterfallGlobalData.h +++ b/gr-qtgui/include/gnuradio/qtgui/waterfallGlobalData.h @@ -23,7 +23,7 @@ class WaterfallData : public QwtRasterData { public: WaterfallData(const double, const double, const uint64_t, const unsigned int); - virtual ~WaterfallData(); + ~WaterfallData() override; virtual void reset(); virtual void copy(const WaterfallData*); @@ -38,7 +38,7 @@ public: virtual void setRange(const QwtDoubleInterval&); #endif - virtual double value(double x, double y) const; + double value(double x, double y) const override; virtual uint64_t getNumFFTPoints() const; virtual void addFFTData(const double*, const uint64_t, const int); diff --git a/gr-qtgui/include/gnuradio/qtgui/waterfalldisplayform.h b/gr-qtgui/include/gnuradio/qtgui/waterfalldisplayform.h index 7aea4a98a7..9f86ba79f5 100644 --- a/gr-qtgui/include/gnuradio/qtgui/waterfalldisplayform.h +++ b/gr-qtgui/include/gnuradio/qtgui/waterfalldisplayform.h @@ -29,9 +29,9 @@ class WaterfallDisplayForm : public DisplayForm public: WaterfallDisplayForm(int nplots = 1, QWidget* parent = 0); - ~WaterfallDisplayForm(); + ~WaterfallDisplayForm() override; - WaterfallDisplayPlot* getPlot(); + WaterfallDisplayPlot* getPlot() override; int getFFTSize() const; double getTimePerFFT(); @@ -52,9 +52,9 @@ public: bool checkClicked(); public slots: - void customEvent(QEvent* e); + void customEvent(QEvent* e) override; void setTimeTitle(const std::string); - void setSampleRate(const QString& samprate); + void setSampleRate(const QString& samprate) override; void setFFTSize(const int); void setFFTAverage(const float); void setFFTWindowType(const gr::fft::window::win_type); @@ -72,14 +72,14 @@ public slots: const QColor lowColor = QColor("white"), const QColor highColor = QColor("white")); - void autoScale(bool en = false); + void autoScale(bool en = false) override; void setPlotPosHalf(bool half); void setTimePerFFT(double t); void setUpdateTime(double t); private slots: - void newData(const QEvent* updateEvent); - void onPlotPointSelected(const QPointF p); + void newData(const QEvent* updateEvent) override; + void onPlotPointSelected(const QPointF p) override; private: QIntValidator* d_int_validator; diff --git a/gr-qtgui/lib/ConstellationDisplayPlot.cc b/gr-qtgui/lib/ConstellationDisplayPlot.cc index 960800ddfe..6187d02fe1 100644 --- a/gr-qtgui/lib/ConstellationDisplayPlot.cc +++ b/gr-qtgui/lib/ConstellationDisplayPlot.cc @@ -31,13 +31,13 @@ public: setTrackerMode(QwtPicker::AlwaysOn); } - virtual ~ConstellationDisplayZoomer() {} + ~ConstellationDisplayZoomer() override {} virtual void updateTrackerText() { updateDisplay(); } protected: using QwtPlotZoomer::trackerText; - virtual QwtText trackerText(const QPoint& p) const + QwtText trackerText(const QPoint& p) const override { QwtDoublePoint dp = QwtPlotZoomer::invTransform(p); QwtText t(QString("(%1, %2)").arg(dp.x(), 0, 'f', 4).arg(dp.y(), 0, 'f', 4)); diff --git a/gr-qtgui/lib/EyeDisplayPlot.cc b/gr-qtgui/lib/EyeDisplayPlot.cc index 44260faa30..cd54e06600 100644 --- a/gr-qtgui/lib/EyeDisplayPlot.cc +++ b/gr-qtgui/lib/EyeDisplayPlot.cc @@ -50,7 +50,7 @@ public: setTrackerMode(QwtPicker::AlwaysOn); } - virtual ~EyeDisplayZoomer() {} + ~EyeDisplayZoomer() override {} virtual void updateTrackerText() { updateDisplay(); } @@ -62,7 +62,7 @@ public: protected: using QwtPlotZoomer::trackerText; - virtual QwtText trackerText(const QPoint& p) const + QwtText trackerText(const QPoint& p) const override { QwtText t; QwtDoublePoint dp = QwtPlotZoomer::invTransform(p); diff --git a/gr-qtgui/lib/FrequencyDisplayPlot.cc b/gr-qtgui/lib/FrequencyDisplayPlot.cc index f9a4084c9e..1e208e8b0c 100644 --- a/gr-qtgui/lib/FrequencyDisplayPlot.cc +++ b/gr-qtgui/lib/FrequencyDisplayPlot.cc @@ -43,7 +43,7 @@ public: protected: using QwtPlotZoomer::trackerText; - virtual QwtText trackerText(QPoint const& p) const + QwtText trackerText(QPoint const& p) const override { QwtDoublePoint dp = QwtPlotZoomer::invTransform(p); QwtText t(QString("%1 %2, %3 %4") diff --git a/gr-qtgui/lib/HistogramDisplayPlot.cc b/gr-qtgui/lib/HistogramDisplayPlot.cc index 1aaf034f25..a918e0a301 100644 --- a/gr-qtgui/lib/HistogramDisplayPlot.cc +++ b/gr-qtgui/lib/HistogramDisplayPlot.cc @@ -58,7 +58,7 @@ public: setTrackerMode(QwtPicker::AlwaysOn); } - virtual ~HistogramDisplayZoomer() {} + ~HistogramDisplayZoomer() override {} virtual void updateTrackerText() { updateDisplay(); } @@ -66,7 +66,7 @@ public: protected: using QwtPlotZoomer::trackerText; - virtual QwtText trackerText(const QPoint& p) const + QwtText trackerText(const QPoint& p) const override { QwtText t; QwtDoublePoint dp = QwtPlotZoomer::invTransform(p); diff --git a/gr-qtgui/lib/TimeDomainDisplayPlot.cc b/gr-qtgui/lib/TimeDomainDisplayPlot.cc index 80f5921b3a..6bb97dcd43 100644 --- a/gr-qtgui/lib/TimeDomainDisplayPlot.cc +++ b/gr-qtgui/lib/TimeDomainDisplayPlot.cc @@ -52,7 +52,7 @@ public: setTrackerMode(QwtPicker::AlwaysOn); } - virtual ~TimeDomainDisplayZoomer() {} + ~TimeDomainDisplayZoomer() override {} virtual void updateTrackerText() { updateDisplay(); } @@ -64,7 +64,7 @@ public: protected: using QwtPlotZoomer::trackerText; - virtual QwtText trackerText(const QPoint& p) const + QwtText trackerText(const QPoint& p) const override { QwtText t; QwtDoublePoint dp = QwtPlotZoomer::invTransform(p); diff --git a/gr-qtgui/lib/TimeRasterDisplayPlot.cc b/gr-qtgui/lib/TimeRasterDisplayPlot.cc index 27bc1f5c89..8c2edf111e 100644 --- a/gr-qtgui/lib/TimeRasterDisplayPlot.cc +++ b/gr-qtgui/lib/TimeRasterDisplayPlot.cc @@ -41,9 +41,9 @@ class QwtXScaleDraw : public QwtScaleDraw, public TimeScaleData public: QwtXScaleDraw() : QwtScaleDraw(), TimeScaleData() {} - virtual ~QwtXScaleDraw() {} + ~QwtXScaleDraw() override {} - virtual QwtText label(double value) const + QwtText label(double value) const override { double secs = double(value * getSecondsPerLine()); return QwtText(QString::number(secs, 'f', 2)); @@ -65,9 +65,9 @@ class QwtYScaleDraw : public QwtScaleDraw public: QwtYScaleDraw() : QwtScaleDraw(), d_rows(0) {} - virtual ~QwtYScaleDraw() {} + ~QwtYScaleDraw() override {} - virtual QwtText label(double value) const + QwtText label(double value) const override { if (d_rows > 0) value = d_rows - value; @@ -133,7 +133,7 @@ public: setTrackerMode(QwtPicker::AlwaysOn); } - virtual ~TimeRasterZoomer() {} + ~TimeRasterZoomer() override {} virtual void updateTrackerText() { updateDisplay(); } @@ -145,7 +145,7 @@ public: protected: using QwtPlotZoomer::trackerText; - virtual QwtText trackerText(QPoint const& p) const + QwtText trackerText(QPoint const& p) const override { QwtDoublePoint dp = QwtPlotZoomer::invTransform(p); double x = dp.x() * getSecondsPerLine(); diff --git a/gr-qtgui/lib/VectorDisplayPlot.cc b/gr-qtgui/lib/VectorDisplayPlot.cc index 8e17605f37..a395e64776 100644 --- a/gr-qtgui/lib/VectorDisplayPlot.cc +++ b/gr-qtgui/lib/VectorDisplayPlot.cc @@ -50,7 +50,7 @@ public: protected: using QwtPlotZoomer::trackerText; - virtual QwtText trackerText(QPoint const& p) const + QwtText trackerText(QPoint const& p) const override { QwtDoublePoint dp = QwtPlotZoomer::invTransform(p); QwtText t(QString("%1 %2, %3 %4") diff --git a/gr-qtgui/lib/WaterfallDisplayPlot.cc b/gr-qtgui/lib/WaterfallDisplayPlot.cc index f2068621dd..a03a8c017d 100644 --- a/gr-qtgui/lib/WaterfallDisplayPlot.cc +++ b/gr-qtgui/lib/WaterfallDisplayPlot.cc @@ -41,9 +41,9 @@ class QwtTimeScaleDraw : public QwtScaleDraw, public TimeScaleData public: QwtTimeScaleDraw() : QwtScaleDraw(), TimeScaleData() {} - virtual ~QwtTimeScaleDraw() {} + ~QwtTimeScaleDraw() override {} - virtual QwtText label(double value) const + QwtText label(double value) const override { double secs = double(value * getSecondsPerLine()); return QwtText(QString::number(secs, 'e', 2)); @@ -80,7 +80,7 @@ public: setTrackerMode(QwtPicker::AlwaysOn); } - virtual ~WaterfallZoomer() {} + ~WaterfallZoomer() override {} virtual void updateTrackerText() { updateDisplay(); } @@ -88,7 +88,7 @@ public: protected: using QwtPlotZoomer::trackerText; - virtual QwtText trackerText(QPoint const& p) const + QwtText trackerText(QPoint const& p) const override { QwtDoublePoint dp = QwtPlotZoomer::invTransform(p); double secs = double(dp.y() * getSecondsPerLine()); diff --git a/gr-qtgui/lib/ber_sink_b_impl.h b/gr-qtgui/lib/ber_sink_b_impl.h index aeeefe5e72..195bad4586 100644 --- a/gr-qtgui/lib/ber_sink_b_impl.h +++ b/gr-qtgui/lib/ber_sink_b_impl.h @@ -47,45 +47,45 @@ public: float ber_limit = -7.0, std::vector<std::string> curvenames = std::vector<std::string>(), QWidget* parent = NULL); - ~ber_sink_b_impl(); + ~ber_sink_b_impl() override; bool check_topology(int ninputs, int noutputs) override; - void exec_(); + void exec_() override; QWidget* qwidget(); #ifdef ENABLE_PYTHON - PyObject* pyqwidget(); + PyObject* pyqwidget() override; #else void* pyqwidget(); #endif - void set_y_axis(double min, double max); - void set_x_axis(double min, double max); + void set_y_axis(double min, double max) override; + void set_x_axis(double min, double max) override; - void set_update_time(double t); - void set_title(const std::string& title); - void set_line_label(unsigned int which, const std::string& label); - void set_line_color(unsigned int which, const std::string& color); - void set_line_width(unsigned int which, int width); - void set_line_style(unsigned int which, int style); - void set_line_marker(unsigned int which, int marker); + void set_update_time(double t) override; + void set_title(const std::string& title) override; + void set_line_label(unsigned int which, const std::string& label) override; + void set_line_color(unsigned int which, const std::string& color) override; + void set_line_width(unsigned int which, int width) override; + void set_line_style(unsigned int which, int style) override; + void set_line_marker(unsigned int which, int marker) override; - void set_line_alpha(unsigned int which, double alpha); + void set_line_alpha(unsigned int which, double alpha) override; - std::string title(); - std::string line_label(unsigned int which); - std::string line_color(unsigned int which); - int line_width(unsigned int which); - int line_style(unsigned int which); - int line_marker(unsigned int which); - double line_alpha(unsigned int which); + std::string title() override; + std::string line_label(unsigned int which) override; + std::string line_color(unsigned int which) override; + int line_width(unsigned int which) override; + int line_style(unsigned int which) override; + int line_marker(unsigned int which) override; + double line_alpha(unsigned int which) override; - void set_size(int width, int height); + void set_size(int width, int height) override; - int nsamps() const; - void enable_menu(bool en); - void enable_autoscale(bool en); + int nsamps() const override; + void enable_menu(bool en) override; + void enable_autoscale(bool en) override; int general_work(int noutput_items, gr_vector_int& ninput_items, diff --git a/gr-qtgui/lib/const_sink_c_impl.h b/gr-qtgui/lib/const_sink_c_impl.h index 1038b6558d..17f9e97e2e 100644 --- a/gr-qtgui/lib/const_sink_c_impl.h +++ b/gr-qtgui/lib/const_sink_c_impl.h @@ -64,54 +64,54 @@ public: const std::string& name, int nconnections, QWidget* parent = NULL); - ~const_sink_c_impl(); + ~const_sink_c_impl() override; bool check_topology(int ninputs, int noutputs) override; - void exec_(); - QWidget* qwidget(); + void exec_() override; + QWidget* qwidget() override; #ifdef ENABLE_PYTHON - PyObject* pyqwidget(); + PyObject* pyqwidget() override; #else void* pyqwidget(); #endif - void set_y_axis(double min, double max); - void set_x_axis(double min, double max); - - void set_update_time(double t); - void set_title(const std::string& title); - void set_line_label(unsigned int which, const std::string& label); - void set_line_color(unsigned int which, const std::string& color); - void set_line_width(unsigned int which, int width); - void set_line_style(unsigned int which, int style); - void set_line_marker(unsigned int which, int marker); - void set_nsamps(const int size); - void set_line_alpha(unsigned int which, double alpha); + void set_y_axis(double min, double max) override; + void set_x_axis(double min, double max) override; + + void set_update_time(double t) override; + void set_title(const std::string& title) override; + void set_line_label(unsigned int which, const std::string& label) override; + void set_line_color(unsigned int which, const std::string& color) override; + void set_line_width(unsigned int which, int width) override; + void set_line_style(unsigned int which, int style) override; + void set_line_marker(unsigned int which, int marker) override; + void set_nsamps(const int size) override; + void set_line_alpha(unsigned int which, double alpha) override; void set_trigger_mode(trigger_mode mode, trigger_slope slope, float level, int channel, - const std::string& tag_key = ""); - - std::string title(); - std::string line_label(unsigned int which); - std::string line_color(unsigned int which); - int line_width(unsigned int which); - int line_style(unsigned int which); - int line_marker(unsigned int which); - double line_alpha(unsigned int which); - - void set_size(int width, int height); - - int nsamps() const; - void enable_menu(bool en); - void enable_autoscale(bool en); - void enable_grid(bool en); - void enable_axis_labels(bool en); - void disable_legend(); - void reset(); + const std::string& tag_key = "") override; + + std::string title() override; + std::string line_label(unsigned int which) override; + std::string line_color(unsigned int which) override; + int line_width(unsigned int which) override; + int line_style(unsigned int which) override; + int line_marker(unsigned int which) override; + double line_alpha(unsigned int which) override; + + void set_size(int width, int height) override; + + int nsamps() const override; + void enable_menu(bool en) override; + void enable_autoscale(bool en) override; + void enable_grid(bool en) override; + void enable_axis_labels(bool en) override; + void disable_legend() override; + void reset() override; int work(int noutput_items, gr_vector_const_void_star& input_items, diff --git a/gr-qtgui/lib/edit_box_msg_impl.h b/gr-qtgui/lib/edit_box_msg_impl.h index fa565a5e7f..f56eaeaef4 100644 --- a/gr-qtgui/lib/edit_box_msg_impl.h +++ b/gr-qtgui/lib/edit_box_msg_impl.h @@ -53,17 +53,17 @@ public: bool is_static = true, const std::string& key = "", QWidget* parent = 0); - ~edit_box_msg_impl(); + ~edit_box_msg_impl() override; // Overload the start method of gr::block to emit a message if a // default value is provided. - bool start(); + bool start() override; - void exec_(); - QWidget* qwidget(); + void exec_() override; + QWidget* qwidget() override; #ifdef ENABLE_PYTHON - PyObject* pyqwidget(); + PyObject* pyqwidget() override; #else void* pyqwidget(); #endif diff --git a/gr-qtgui/lib/eye_sink_c_impl.h b/gr-qtgui/lib/eye_sink_c_impl.h index a1f4c98b44..7283a023d8 100644 --- a/gr-qtgui/lib/eye_sink_c_impl.h +++ b/gr-qtgui/lib/eye_sink_c_impl.h @@ -68,63 +68,63 @@ public: double samp_rate, unsigned int nconnections, QWidget* parent = NULL); - ~eye_sink_c_impl(); + ~eye_sink_c_impl() override; bool check_topology(int ninputs, int noutputs) override; - void exec_(); - QWidget* qwidget(); + void exec_() override; + QWidget* qwidget() override; #ifdef ENABLE_PYTHON - PyObject* pyqwidget(); + PyObject* pyqwidget() override; #else void* pyqwidget(); #endif - void set_y_axis(double min, double max); - void set_y_label(const std::string& label, const std::string& unit = ""); - void set_update_time(double t); - void set_samp_per_symbol(unsigned int sps); - void set_line_label(unsigned int which, const std::string& label); - void set_line_color(unsigned int which, const std::string& color); - void set_line_width(unsigned int which, int width); - void set_line_style(unsigned int which, int style); - void set_line_marker(unsigned int which, int marker); - void set_nsamps(const int size); - void set_samp_rate(const double samp_rate); - void set_line_alpha(unsigned int which, double alpha); + void set_y_axis(double min, double max) override; + void set_y_label(const std::string& label, const std::string& unit = "") override; + void set_update_time(double t) override; + void set_samp_per_symbol(unsigned int sps) override; + void set_line_label(unsigned int which, const std::string& label) override; + void set_line_color(unsigned int which, const std::string& color) override; + void set_line_width(unsigned int which, int width) override; + void set_line_style(unsigned int which, int style) override; + void set_line_marker(unsigned int which, int marker) override; + void set_nsamps(const int size) override; + void set_samp_rate(const double samp_rate) override; + void set_line_alpha(unsigned int which, double alpha) override; void set_trigger_mode(gr::qtgui::trigger_mode mode, gr::qtgui::trigger_slope slope, float level, float delay, int channel, - const std::string& tag_key = ""); - - std::string title(); - std::string line_label(unsigned int which); - std::string line_color(unsigned int which); - int line_width(unsigned int which); - int line_style(unsigned int which); - int line_marker(unsigned int which); - double line_alpha(unsigned int which); - - void set_size(int width, int height); - - int nsamps() const; - - void enable_menu(bool en); - void enable_grid(bool en); - void enable_autoscale(bool en); - void enable_stem_plot(bool en); // Used by parent class, do not remove - void enable_semilogx(bool en); // Used by parent class, do not remove - void enable_semilogy(bool en); // Used by parent class, do not remove - void enable_control_panel(bool en); - void enable_tags(unsigned int which, bool en); - void enable_tags(bool en); - void enable_axis_labels(bool en); - void disable_legend(); - - void reset(); + const std::string& tag_key = "") override; + + std::string title() override; + std::string line_label(unsigned int which) override; + std::string line_color(unsigned int which) override; + int line_width(unsigned int which) override; + int line_style(unsigned int which) override; + int line_marker(unsigned int which) override; + double line_alpha(unsigned int which) override; + + void set_size(int width, int height) override; + + int nsamps() const override; + + void enable_menu(bool en) override; + void enable_grid(bool en) override; + void enable_autoscale(bool en) override; + void enable_stem_plot(bool en) override; // Used by parent class, do not remove + void enable_semilogx(bool en) override; // Used by parent class, do not remove + void enable_semilogy(bool en) override; // Used by parent class, do not remove + void enable_control_panel(bool en) override; + void enable_tags(unsigned int which, bool en) override; + void enable_tags(bool en) override; + void enable_axis_labels(bool en) override; + void disable_legend() override; + + void reset() override; int work(int noutput_items, gr_vector_const_void_star& input_items, diff --git a/gr-qtgui/lib/eye_sink_f_impl.h b/gr-qtgui/lib/eye_sink_f_impl.h index f03b1661bd..5711c8a322 100644 --- a/gr-qtgui/lib/eye_sink_f_impl.h +++ b/gr-qtgui/lib/eye_sink_f_impl.h @@ -65,63 +65,63 @@ public: double samp_rate, unsigned int nconnections, QWidget* parent = NULL); - ~eye_sink_f_impl(); + ~eye_sink_f_impl() override; bool check_topology(int ninputs, int noutputs) override; - void exec_(); - QWidget* qwidget(); + void exec_() override; + QWidget* qwidget() override; #ifdef ENABLE_PYTHON - PyObject* pyqwidget(); + PyObject* pyqwidget() override; #else void* pyqwidget(); #endif - void set_y_axis(double min, double max); - void set_y_label(const std::string& label, const std::string& unit = ""); - void set_update_time(double t); - void set_samp_per_symbol(unsigned int sps); - void set_line_label(unsigned int which, const std::string& label); - void set_line_color(unsigned int which, const std::string& color); - void set_line_width(unsigned int which, int width); - void set_line_style(unsigned int which, int style); - void set_line_marker(unsigned int which, int marker); - void set_nsamps(const int size); - void set_samp_rate(const double samp_rate); - void set_line_alpha(unsigned int which, double alpha); + void set_y_axis(double min, double max) override; + void set_y_label(const std::string& label, const std::string& unit = "") override; + void set_update_time(double t) override; + void set_samp_per_symbol(unsigned int sps) override; + void set_line_label(unsigned int which, const std::string& label) override; + void set_line_color(unsigned int which, const std::string& color) override; + void set_line_width(unsigned int which, int width) override; + void set_line_style(unsigned int which, int style) override; + void set_line_marker(unsigned int which, int marker) override; + void set_nsamps(const int size) override; + void set_samp_rate(const double samp_rate) override; + void set_line_alpha(unsigned int which, double alpha) override; void set_trigger_mode(gr::qtgui::trigger_mode mode, gr::qtgui::trigger_slope slope, float level, float delay, int channel, - const std::string& tag_key = ""); - - std::string title(); - std::string line_label(unsigned int which); - std::string line_color(unsigned int which); - int line_width(unsigned int which); - int line_style(unsigned int which); - int line_marker(unsigned int which); - double line_alpha(unsigned int which); - - void set_size(int width, int height); - - int nsamps() const; - - void enable_menu(bool en); - void enable_grid(bool en); - void enable_autoscale(bool en); - void enable_stem_plot(bool en); // Used by parent class, do not remove - void enable_semilogx(bool en); // Used by parent class, do not remove - void enable_semilogy(bool en); // Used by parent class, do not remove - void enable_control_panel(bool en); - void enable_tags(unsigned int which, bool en); - void enable_tags(bool en); - void enable_axis_labels(bool en); - void disable_legend(); - - void reset(); + const std::string& tag_key = "") override; + + std::string title() override; + std::string line_label(unsigned int which) override; + std::string line_color(unsigned int which) override; + int line_width(unsigned int which) override; + int line_style(unsigned int which) override; + int line_marker(unsigned int which) override; + double line_alpha(unsigned int which) override; + + void set_size(int width, int height) override; + + int nsamps() const override; + + void enable_menu(bool en) override; + void enable_grid(bool en) override; + void enable_autoscale(bool en) override; + void enable_stem_plot(bool en) override; // Used by parent class, do not remove + void enable_semilogx(bool en) override; // Used by parent class, do not remove + void enable_semilogy(bool en) override; // Used by parent class, do not remove + void enable_control_panel(bool en) override; + void enable_tags(unsigned int which, bool en) override; + void enable_tags(bool en) override; + void enable_axis_labels(bool en) override; + void disable_legend() override; + + void reset() override; int work(int noutput_items, gr_vector_const_void_star& input_items, diff --git a/gr-qtgui/lib/freq_sink_c_impl.h b/gr-qtgui/lib/freq_sink_c_impl.h index bae0ecb1da..975b42e8ec 100644 --- a/gr-qtgui/lib/freq_sink_c_impl.h +++ b/gr-qtgui/lib/freq_sink_c_impl.h @@ -96,66 +96,66 @@ public: const std::string& name, int nconnections, QWidget* parent = NULL); - ~freq_sink_c_impl(); + ~freq_sink_c_impl() override; bool check_topology(int ninputs, int noutputs) override; - void exec_(); - QWidget* qwidget(); + void exec_() override; + QWidget* qwidget() override; #ifdef ENABLE_PYTHON - PyObject* pyqwidget(); + PyObject* pyqwidget() override; #else void* pyqwidget(); #endif - void set_fft_size(const int fftsize); - int fft_size() const; - void set_fft_average(const float fftavg); - float fft_average() const; - void set_fft_window(const fft::window::win_type win); - fft::window::win_type fft_window(); - void set_fft_window_normalized(const bool enable); - - void set_frequency_range(const double centerfreq, const double bandwidth); - void set_y_axis(double min, double max); - - void set_update_time(double t); - - void set_title(const std::string& title); - void set_y_label(const std::string& label, const std::string& unit); - void set_line_label(unsigned int which, const std::string& label); - void set_line_color(unsigned int which, const std::string& color); - void set_line_width(unsigned int which, int width); - void set_line_style(unsigned int which, int style); - void set_line_marker(unsigned int which, int marker); - void set_line_alpha(unsigned int which, double alpha); + void set_fft_size(const int fftsize) override; + int fft_size() const override; + void set_fft_average(const float fftavg) override; + float fft_average() const override; + void set_fft_window(const fft::window::win_type win) override; + fft::window::win_type fft_window() override; + void set_fft_window_normalized(const bool enable) override; + + void set_frequency_range(const double centerfreq, const double bandwidth) override; + void set_y_axis(double min, double max) override; + + void set_update_time(double t) override; + + void set_title(const std::string& title) override; + void set_y_label(const std::string& label, const std::string& unit) override; + void set_line_label(unsigned int which, const std::string& label) override; + void set_line_color(unsigned int which, const std::string& color) override; + void set_line_width(unsigned int which, int width) override; + void set_line_style(unsigned int which, int style) override; + void set_line_marker(unsigned int which, int marker) override; + void set_line_alpha(unsigned int which, double alpha) override; void set_trigger_mode(trigger_mode mode, float level, int channel, - const std::string& tag_key = ""); - - std::string title(); - std::string line_label(unsigned int which); - std::string line_color(unsigned int which); - int line_width(unsigned int which); - int line_style(unsigned int which); - int line_marker(unsigned int which); - double line_alpha(unsigned int which); - - void set_size(int width, int height); - - void enable_menu(bool en); - void enable_grid(bool en); - void enable_autoscale(bool en); - void enable_control_panel(bool en); - void enable_max_hold(bool en); - void enable_min_hold(bool en); - void clear_max_hold(); - void clear_min_hold(); - void disable_legend(); - void reset(); - void enable_axis_labels(bool en); + const std::string& tag_key = "") override; + + std::string title() override; + std::string line_label(unsigned int which) override; + std::string line_color(unsigned int which) override; + int line_width(unsigned int which) override; + int line_style(unsigned int which) override; + int line_marker(unsigned int which) override; + double line_alpha(unsigned int which) override; + + void set_size(int width, int height) override; + + void enable_menu(bool en) override; + void enable_grid(bool en) override; + void enable_autoscale(bool en) override; + void enable_control_panel(bool en) override; + void enable_max_hold(bool en) override; + void enable_min_hold(bool en) override; + void clear_max_hold() override; + void clear_min_hold() override; + void disable_legend() override; + void reset() override; + void enable_axis_labels(bool en) override; int work(int noutput_items, gr_vector_const_void_star& input_items, diff --git a/gr-qtgui/lib/freq_sink_f_impl.h b/gr-qtgui/lib/freq_sink_f_impl.h index 3e41b8abb3..a5c3f7615f 100644 --- a/gr-qtgui/lib/freq_sink_f_impl.h +++ b/gr-qtgui/lib/freq_sink_f_impl.h @@ -96,66 +96,66 @@ public: const std::string& name, int nconnections, QWidget* parent = NULL); - ~freq_sink_f_impl(); + ~freq_sink_f_impl() override; bool check_topology(int ninputs, int noutputs) override; - void exec_(); - QWidget* qwidget(); + void exec_() override; + QWidget* qwidget() override; #ifdef ENABLE_PYTHON - PyObject* pyqwidget(); + PyObject* pyqwidget() override; #else void* pyqwidget(); #endif - void set_fft_size(const int fftsize); - int fft_size() const; - void set_fft_average(const float fftavg); - float fft_average() const; - void set_fft_window(const fft::window::win_type win); - fft::window::win_type fft_window(); - void set_fft_window_normalized(const bool enable); - - void set_frequency_range(const double centerfreq, const double bandwidth); - void set_y_axis(double min, double max); - - void set_update_time(double t); - void set_title(const std::string& title); - void set_y_label(const std::string& label, const std::string& unit); - void set_line_label(unsigned int which, const std::string& label); - void set_line_color(unsigned int which, const std::string& color); - void set_line_width(unsigned int which, int width); - void set_line_style(unsigned int which, int style); - void set_line_marker(unsigned int which, int marker); - void set_line_alpha(unsigned int which, double alpha); - void set_plot_pos_half(bool half); + void set_fft_size(const int fftsize) override; + int fft_size() const override; + void set_fft_average(const float fftavg) override; + float fft_average() const override; + void set_fft_window(const fft::window::win_type win) override; + fft::window::win_type fft_window() override; + void set_fft_window_normalized(const bool enable) override; + + void set_frequency_range(const double centerfreq, const double bandwidth) override; + void set_y_axis(double min, double max) override; + + void set_update_time(double t) override; + void set_title(const std::string& title) override; + void set_y_label(const std::string& label, const std::string& unit) override; + void set_line_label(unsigned int which, const std::string& label) override; + void set_line_color(unsigned int which, const std::string& color) override; + void set_line_width(unsigned int which, int width) override; + void set_line_style(unsigned int which, int style) override; + void set_line_marker(unsigned int which, int marker) override; + void set_line_alpha(unsigned int which, double alpha) override; + void set_plot_pos_half(bool half) override; void set_trigger_mode(trigger_mode mode, float level, int channel, - const std::string& tag_key = ""); - - std::string title(); - std::string line_label(unsigned int which); - std::string line_color(unsigned int which); - int line_width(unsigned int which); - int line_style(unsigned int which); - int line_marker(unsigned int which); - double line_alpha(unsigned int which); - - void set_size(int width, int height); - - void enable_menu(bool en); - void enable_grid(bool en); - void enable_autoscale(bool en); - void enable_control_panel(bool en); - void enable_max_hold(bool en); - void enable_min_hold(bool en); - void clear_max_hold(); - void clear_min_hold(); - void disable_legend(); - void reset(); - void enable_axis_labels(bool en); + const std::string& tag_key = "") override; + + std::string title() override; + std::string line_label(unsigned int which) override; + std::string line_color(unsigned int which) override; + int line_width(unsigned int which) override; + int line_style(unsigned int which) override; + int line_marker(unsigned int which) override; + double line_alpha(unsigned int which) override; + + void set_size(int width, int height) override; + + void enable_menu(bool en) override; + void enable_grid(bool en) override; + void enable_autoscale(bool en) override; + void enable_control_panel(bool en) override; + void enable_max_hold(bool en) override; + void enable_min_hold(bool en) override; + void clear_max_hold() override; + void clear_min_hold() override; + void disable_legend() override; + void reset() override; + void enable_axis_labels(bool en) override; int work(int noutput_items, gr_vector_const_void_star& input_items, diff --git a/gr-qtgui/lib/histogram_sink_f_impl.h b/gr-qtgui/lib/histogram_sink_f_impl.h index 754c262a71..f181654108 100644 --- a/gr-qtgui/lib/histogram_sink_f_impl.h +++ b/gr-qtgui/lib/histogram_sink_f_impl.h @@ -54,54 +54,54 @@ public: const std::string& name, int nconnections, QWidget* parent = NULL); - ~histogram_sink_f_impl(); + ~histogram_sink_f_impl() override; bool check_topology(int ninputs, int noutputs) override; - void exec_(); - QWidget* qwidget(); + void exec_() override; + QWidget* qwidget() override; #ifdef ENABLE_PYTHON - PyObject* pyqwidget(); + PyObject* pyqwidget() override; #else void* pyqwidget(); #endif - void set_y_axis(double min, double max); - void set_x_axis(double min, double max); - void set_update_time(double t); - void set_title(const std::string& title); - void set_line_label(unsigned int which, const std::string& label); - void set_line_color(unsigned int which, const std::string& color); - void set_line_width(unsigned int which, int width); - void set_line_style(unsigned int which, int style); - void set_line_marker(unsigned int which, int marker); - void set_line_alpha(unsigned int which, double alpha); - void set_nsamps(const int newsize); - void set_bins(const int bins); - void enable_axis_labels(bool en); - - std::string title(); - std::string line_label(unsigned int which); - std::string line_color(unsigned int which); - int line_width(unsigned int which); - int line_style(unsigned int which); - int line_marker(unsigned int which); - double line_alpha(unsigned int which); - - void set_size(int width, int height); - - void enable_menu(bool en); - void enable_grid(bool en); - void enable_autoscale(bool en); - void enable_semilogx(bool en); - void enable_semilogy(bool en); - void enable_accumulate(bool en); - void disable_legend(); - void autoscalex(); - int nsamps() const; - int bins() const; - void reset(); + void set_y_axis(double min, double max) override; + void set_x_axis(double min, double max) override; + void set_update_time(double t) override; + void set_title(const std::string& title) override; + void set_line_label(unsigned int which, const std::string& label) override; + void set_line_color(unsigned int which, const std::string& color) override; + void set_line_width(unsigned int which, int width) override; + void set_line_style(unsigned int which, int style) override; + void set_line_marker(unsigned int which, int marker) override; + void set_line_alpha(unsigned int which, double alpha) override; + void set_nsamps(const int newsize) override; + void set_bins(const int bins) override; + void enable_axis_labels(bool en) override; + + std::string title() override; + std::string line_label(unsigned int which) override; + std::string line_color(unsigned int which) override; + int line_width(unsigned int which) override; + int line_style(unsigned int which) override; + int line_marker(unsigned int which) override; + double line_alpha(unsigned int which) override; + + void set_size(int width, int height) override; + + void enable_menu(bool en) override; + void enable_grid(bool en) override; + void enable_autoscale(bool en) override; + void enable_semilogx(bool en) override; + void enable_semilogy(bool en) override; + void enable_accumulate(bool en) override; + void disable_legend() override; + void autoscalex() override; + int nsamps() const override; + int bins() const override; + void reset() override; int work(int noutput_items, gr_vector_const_void_star& input_items, diff --git a/gr-qtgui/lib/number_sink_impl.h b/gr-qtgui/lib/number_sink_impl.h index 7bc7228330..05d78aaa3c 100644 --- a/gr-qtgui/lib/number_sink_impl.h +++ b/gr-qtgui/lib/number_sink_impl.h @@ -57,46 +57,48 @@ public: graph_t graph_type = NUM_GRAPH_HORIZ, int nconnections = 1, QWidget* parent = NULL); - ~number_sink_impl(); + ~number_sink_impl() override; bool check_topology(int ninputs, int noutputs) override; - void exec_(); - QWidget* qwidget(); + void exec_() override; + QWidget* qwidget() override; #ifdef ENABLE_PYTHON - PyObject* pyqwidget(); + PyObject* pyqwidget() override; #else void* pyqwidget(); #endif - void set_update_time(double t); - void set_average(const float avg); - void set_graph_type(const graph_t type); - void set_color(unsigned int which, const std::string& min, const std::string& max); - void set_color(unsigned int which, int min, int max); - void set_label(unsigned int which, const std::string& label); - void set_min(unsigned int which, float min); - void set_max(unsigned int which, float max); - void set_title(const std::string& title); - void set_unit(unsigned int which, const std::string& unit); - void set_factor(unsigned int which, float factor); - - float average() const; - graph_t graph_type() const; - std::string color_min(unsigned int which) const; - std::string color_max(unsigned int which) const; - std::string label(unsigned int which) const; - float min(unsigned int which) const; - float max(unsigned int which) const; - std::string title() const; - std::string unit(unsigned int which) const; - float factor(unsigned int which) const; - - void enable_menu(bool en); - void enable_autoscale(bool en = true); - - void reset(); + void set_update_time(double t) override; + void set_average(const float avg) override; + void set_graph_type(const graph_t type) override; + void set_color(unsigned int which, + const std::string& min, + const std::string& max) override; + void set_color(unsigned int which, int min, int max) override; + void set_label(unsigned int which, const std::string& label) override; + void set_min(unsigned int which, float min) override; + void set_max(unsigned int which, float max) override; + void set_title(const std::string& title) override; + void set_unit(unsigned int which, const std::string& unit) override; + void set_factor(unsigned int which, float factor) override; + + float average() const override; + graph_t graph_type() const override; + std::string color_min(unsigned int which) const override; + std::string color_max(unsigned int which) const override; + std::string label(unsigned int which) const override; + float min(unsigned int which) const override; + float max(unsigned int which) const override; + std::string title() const override; + std::string unit(unsigned int which) const override; + float factor(unsigned int which) const override; + + void enable_menu(bool en) override; + void enable_autoscale(bool en = true) override; + + void reset() override; int work(int noutput_items, gr_vector_const_void_star& input_items, diff --git a/gr-qtgui/lib/sink_c_impl.h b/gr-qtgui/lib/sink_c_impl.h index db1c2f4884..466fcfd384 100644 --- a/gr-qtgui/lib/sink_c_impl.h +++ b/gr-qtgui/lib/sink_c_impl.h @@ -76,32 +76,32 @@ public: bool plottime, bool plotconst, QWidget* parent); - ~sink_c_impl(); + ~sink_c_impl() override; bool check_topology(int ninputs, int noutputs) override; - void exec_(); - QWidget* qwidget(); + void exec_() override; + QWidget* qwidget() override; #ifdef ENABLE_PYTHON - PyObject* pyqwidget(); + PyObject* pyqwidget() override; #else void* pyqwidget(); #endif - void set_fft_size(const int fftsize); - int fft_size() const; + void set_fft_size(const int fftsize) override; + int fft_size() const override; - void set_frequency_range(const double centerfreq, const double bandwidth); - void set_fft_power_db(double min, double max); - void enable_rf_freq(bool en); + void set_frequency_range(const double centerfreq, const double bandwidth) override; + void set_fft_power_db(double min, double max) override; + void enable_rf_freq(bool en) override; // void set_time_domain_axis(double min, double max); // void set_constellation_axis(double xmin, double xmax, // double ymin, double ymax); // void set_constellation_pen_size(int size); - void set_update_time(double t); + void set_update_time(double t) override; int general_work(int noutput_items, gr_vector_int& ninput_items, diff --git a/gr-qtgui/lib/sink_f_impl.h b/gr-qtgui/lib/sink_f_impl.h index a994f91c37..fb954b6875 100644 --- a/gr-qtgui/lib/sink_f_impl.h +++ b/gr-qtgui/lib/sink_f_impl.h @@ -74,32 +74,32 @@ public: bool plottime, bool plotconst, QWidget* parent); - ~sink_f_impl(); + ~sink_f_impl() override; bool check_topology(int ninputs, int noutputs) override; - void exec_(); - QWidget* qwidget(); + void exec_() override; + QWidget* qwidget() override; #ifdef ENABLE_PYTHON - PyObject* pyqwidget(); + PyObject* pyqwidget() override; #else void* pyqwidget(); #endif - void set_fft_size(const int fftsize); - int fft_size() const; + void set_fft_size(const int fftsize) override; + int fft_size() const override; - void set_frequency_range(const double centerfreq, const double bandwidth); - void set_fft_power_db(double min, double max); - void enable_rf_freq(bool en); + void set_frequency_range(const double centerfreq, const double bandwidth) override; + void set_fft_power_db(double min, double max) override; + void enable_rf_freq(bool en) override; // void set_time_domain_axis(double min, double max); // void set_constellation_axis(double xmin, double xmax, // double ymin, double ymax); // void set_constellation_pen_size(int size); - void set_update_time(double t); + void set_update_time(double t) override; int general_work(int noutput_items, gr_vector_int& ninput_items, diff --git a/gr-qtgui/lib/time_raster_sink_b_impl.h b/gr-qtgui/lib/time_raster_sink_b_impl.h index d507420266..4ffff9b8f6 100644 --- a/gr-qtgui/lib/time_raster_sink_b_impl.h +++ b/gr-qtgui/lib/time_raster_sink_b_impl.h @@ -63,57 +63,57 @@ public: const std::string& name, int nconnections, QWidget* parent = NULL); - ~time_raster_sink_b_impl(); + ~time_raster_sink_b_impl() override; bool check_topology(int ninputs, int noutputs) override; - void exec_(); - QWidget* qwidget(); + void exec_() override; + QWidget* qwidget() override; #ifdef ENABLE_PYTHON - PyObject* pyqwidget(); + PyObject* pyqwidget() override; #else void* pyqwidget(); #endif - void set_update_time(double t); - void set_title(const std::string& title); - void set_line_label(unsigned int which, const std::string& label); - void set_line_color(unsigned int which, const std::string& color); - void set_line_width(unsigned int which, int width); - void set_line_style(unsigned int which, Qt::PenStyle style); - void set_line_marker(unsigned int which, QwtSymbol::Style marker); - void set_line_alpha(unsigned int which, double alpha); - void set_color_map(unsigned int which, const int color); - - std::string title(); - std::string line_label(unsigned int which); - std::string line_color(unsigned int which); - int line_width(unsigned int which); - int line_style(unsigned int which); - int line_marker(unsigned int which); - double line_alpha(unsigned int which); - int color_map(unsigned int which); - - void set_size(int width, int height); - - void set_samp_rate(const double samp_rate); - void set_num_rows(double rows); - void set_num_cols(double cols); - - double num_rows(); - double num_cols(); - - void set_multiplier(const std::vector<float>& mult); - void set_offset(const std::vector<float>& offset); - - void set_intensity_range(float min, float max); - - void enable_menu(bool en); - void enable_grid(bool en); - void enable_autoscale(bool en); - void enable_axis_labels(bool en); - void reset(); + void set_update_time(double t) override; + void set_title(const std::string& title) override; + void set_line_label(unsigned int which, const std::string& label) override; + void set_line_color(unsigned int which, const std::string& color) override; + void set_line_width(unsigned int which, int width) override; + void set_line_style(unsigned int which, Qt::PenStyle style) override; + void set_line_marker(unsigned int which, QwtSymbol::Style marker) override; + void set_line_alpha(unsigned int which, double alpha) override; + void set_color_map(unsigned int which, const int color) override; + + std::string title() override; + std::string line_label(unsigned int which) override; + std::string line_color(unsigned int which) override; + int line_width(unsigned int which) override; + int line_style(unsigned int which) override; + int line_marker(unsigned int which) override; + double line_alpha(unsigned int which) override; + int color_map(unsigned int which) override; + + void set_size(int width, int height) override; + + void set_samp_rate(const double samp_rate) override; + void set_num_rows(double rows) override; + void set_num_cols(double cols) override; + + double num_rows() override; + double num_cols() override; + + void set_multiplier(const std::vector<float>& mult) override; + void set_offset(const std::vector<float>& offset) override; + + void set_intensity_range(float min, float max) override; + + void enable_menu(bool en) override; + void enable_grid(bool en) override; + void enable_autoscale(bool en) override; + void enable_axis_labels(bool en) override; + void reset() override; int work(int noutput_items, gr_vector_const_void_star& input_items, diff --git a/gr-qtgui/lib/time_raster_sink_f_impl.h b/gr-qtgui/lib/time_raster_sink_f_impl.h index 173d83314a..b85128dad7 100644 --- a/gr-qtgui/lib/time_raster_sink_f_impl.h +++ b/gr-qtgui/lib/time_raster_sink_f_impl.h @@ -62,57 +62,57 @@ public: const std::string& name, int nconnections, QWidget* parent = NULL); - ~time_raster_sink_f_impl(); + ~time_raster_sink_f_impl() override; bool check_topology(int ninputs, int noutputs) override; - void exec_(); - QWidget* qwidget(); + void exec_() override; + QWidget* qwidget() override; #ifdef ENABLE_PYTHON - PyObject* pyqwidget(); + PyObject* pyqwidget() override; #else void* pyqwidget(); #endif - void set_update_time(double t); - void set_title(const std::string& title); - void set_line_label(unsigned int which, const std::string& label); - void set_line_color(unsigned int which, const std::string& color); - void set_line_width(unsigned int which, int width); - void set_line_style(unsigned int which, Qt::PenStyle style); - void set_line_marker(unsigned int which, QwtSymbol::Style marker); - void set_line_alpha(unsigned int which, double alpha); - void set_color_map(unsigned int which, const int color); - - std::string title(); - std::string line_label(unsigned int which); - std::string line_color(unsigned int which); - int line_width(unsigned int which); - int line_style(unsigned int which); - int line_marker(unsigned int which); - double line_alpha(unsigned int which); - int color_map(unsigned int which); - - void set_size(int width, int height); - - void set_samp_rate(const double samp_rate); - void set_num_rows(double rows); - void set_num_cols(double cols); - - double num_rows(); - double num_cols(); - - void set_multiplier(const std::vector<float>& mult); - void set_offset(const std::vector<float>& offset); - - void set_intensity_range(float min, float max); - - void enable_menu(bool en); - void enable_grid(bool en); - void enable_autoscale(bool en); - void enable_axis_labels(bool en); - void reset(); + void set_update_time(double t) override; + void set_title(const std::string& title) override; + void set_line_label(unsigned int which, const std::string& label) override; + void set_line_color(unsigned int which, const std::string& color) override; + void set_line_width(unsigned int which, int width) override; + void set_line_style(unsigned int which, Qt::PenStyle style) override; + void set_line_marker(unsigned int which, QwtSymbol::Style marker) override; + void set_line_alpha(unsigned int which, double alpha) override; + void set_color_map(unsigned int which, const int color) override; + + std::string title() override; + std::string line_label(unsigned int which) override; + std::string line_color(unsigned int which) override; + int line_width(unsigned int which) override; + int line_style(unsigned int which) override; + int line_marker(unsigned int which) override; + double line_alpha(unsigned int which) override; + int color_map(unsigned int which) override; + + void set_size(int width, int height) override; + + void set_samp_rate(const double samp_rate) override; + void set_num_rows(double rows) override; + void set_num_cols(double cols) override; + + double num_rows() override; + double num_cols() override; + + void set_multiplier(const std::vector<float>& mult) override; + void set_offset(const std::vector<float>& offset) override; + + void set_intensity_range(float min, float max) override; + + void enable_menu(bool en) override; + void enable_grid(bool en) override; + void enable_autoscale(bool en) override; + void enable_axis_labels(bool en) override; + void reset() override; int work(int noutput_items, gr_vector_const_void_star& input_items, diff --git a/gr-qtgui/lib/time_sink_c_impl.h b/gr-qtgui/lib/time_sink_c_impl.h index 7dfcab501f..903734d53f 100644 --- a/gr-qtgui/lib/time_sink_c_impl.h +++ b/gr-qtgui/lib/time_sink_c_impl.h @@ -71,63 +71,63 @@ public: const std::string& name, unsigned int nconnections, QWidget* parent = NULL); - ~time_sink_c_impl(); + ~time_sink_c_impl() override; bool check_topology(int ninputs, int noutputs) override; - void exec_(); - QWidget* qwidget(); + void exec_() override; + QWidget* qwidget() override; #ifdef ENABLE_PYTHON - PyObject* pyqwidget(); + PyObject* pyqwidget() override; #else void* pyqwidget(); #endif - void set_y_axis(double min, double max); - void set_y_label(const std::string& label, const std::string& unit = ""); - void set_update_time(double t); - void set_title(const std::string& title); - void set_line_label(unsigned int which, const std::string& label); - void set_line_color(unsigned int which, const std::string& color); - void set_line_width(unsigned int which, int width); - void set_line_style(unsigned int which, int style); - void set_line_marker(unsigned int which, int marker); - void set_nsamps(const int size); - void set_samp_rate(const double samp_rate); - void set_line_alpha(unsigned int which, double alpha); + void set_y_axis(double min, double max) override; + void set_y_label(const std::string& label, const std::string& unit = "") override; + void set_update_time(double t) override; + void set_title(const std::string& title) override; + void set_line_label(unsigned int which, const std::string& label) override; + void set_line_color(unsigned int which, const std::string& color) override; + void set_line_width(unsigned int which, int width) override; + void set_line_style(unsigned int which, int style) override; + void set_line_marker(unsigned int which, int marker) override; + void set_nsamps(const int size) override; + void set_samp_rate(const double samp_rate) override; + void set_line_alpha(unsigned int which, double alpha) override; void set_trigger_mode(trigger_mode mode, trigger_slope slope, float level, float delay, int channel, - const std::string& tag_key = ""); - - std::string title(); - std::string line_label(unsigned int which); - std::string line_color(unsigned int which); - int line_width(unsigned int which); - int line_style(unsigned int which); - int line_marker(unsigned int which); - double line_alpha(unsigned int which); - - void set_size(int width, int height); - - int nsamps() const; - - void enable_menu(bool en); - void enable_grid(bool en); - void enable_autoscale(bool en); - void enable_stem_plot(bool en); - void enable_semilogx(bool en); - void enable_semilogy(bool en); - void enable_control_panel(bool en); - void enable_tags(unsigned int which, bool en); - void enable_tags(bool en); - void enable_axis_labels(bool en); - void disable_legend(); - - void reset(); + const std::string& tag_key = "") override; + + std::string title() override; + std::string line_label(unsigned int which) override; + std::string line_color(unsigned int which) override; + int line_width(unsigned int which) override; + int line_style(unsigned int which) override; + int line_marker(unsigned int which) override; + double line_alpha(unsigned int which) override; + + void set_size(int width, int height) override; + + int nsamps() const override; + + void enable_menu(bool en) override; + void enable_grid(bool en) override; + void enable_autoscale(bool en) override; + void enable_stem_plot(bool en) override; + void enable_semilogx(bool en) override; + void enable_semilogy(bool en) override; + void enable_control_panel(bool en) override; + void enable_tags(unsigned int which, bool en) override; + void enable_tags(bool en) override; + void enable_axis_labels(bool en) override; + void disable_legend() override; + + void reset() override; int work(int noutput_items, gr_vector_const_void_star& input_items, diff --git a/gr-qtgui/lib/time_sink_f_impl.h b/gr-qtgui/lib/time_sink_f_impl.h index 7a22ec8612..d011b2681e 100644 --- a/gr-qtgui/lib/time_sink_f_impl.h +++ b/gr-qtgui/lib/time_sink_f_impl.h @@ -70,63 +70,63 @@ public: const std::string& name, unsigned int nconnections, QWidget* parent = NULL); - ~time_sink_f_impl(); + ~time_sink_f_impl() override; bool check_topology(int ninputs, int noutputs) override; - void exec_(); - QWidget* qwidget(); + void exec_() override; + QWidget* qwidget() override; #ifdef ENABLE_PYTHON - PyObject* pyqwidget(); + PyObject* pyqwidget() override; #else void* pyqwidget(); #endif - void set_y_axis(double min, double max); - void set_y_label(const std::string& label, const std::string& unit = ""); - void set_update_time(double t); - void set_title(const std::string& title); - void set_line_label(unsigned int which, const std::string& label); - void set_line_color(unsigned int which, const std::string& color); - void set_line_width(unsigned int which, int width); - void set_line_style(unsigned int which, int style); - void set_line_marker(unsigned int which, int marker); - void set_nsamps(const int size); - void set_samp_rate(const double samp_rate); - void set_line_alpha(unsigned int which, double alpha); + void set_y_axis(double min, double max) override; + void set_y_label(const std::string& label, const std::string& unit = "") override; + void set_update_time(double t) override; + void set_title(const std::string& title) override; + void set_line_label(unsigned int which, const std::string& label) override; + void set_line_color(unsigned int which, const std::string& color) override; + void set_line_width(unsigned int which, int width) override; + void set_line_style(unsigned int which, int style) override; + void set_line_marker(unsigned int which, int marker) override; + void set_nsamps(const int size) override; + void set_samp_rate(const double samp_rate) override; + void set_line_alpha(unsigned int which, double alpha) override; void set_trigger_mode(trigger_mode mode, trigger_slope slope, float level, float delay, int channel, - const std::string& tag_key = ""); - - std::string title(); - std::string line_label(unsigned int which); - std::string line_color(unsigned int which); - int line_width(unsigned int which); - int line_style(unsigned int which); - int line_marker(unsigned int which); - double line_alpha(unsigned int which); - - void set_size(int width, int height); - - int nsamps() const; - - void enable_menu(bool en); - void enable_grid(bool en); - void enable_autoscale(bool en); - void enable_stem_plot(bool en); - void enable_semilogx(bool en); - void enable_semilogy(bool en); - void enable_control_panel(bool en); - void enable_tags(unsigned int which, bool en); - void enable_tags(bool en); - void enable_axis_labels(bool en); - void disable_legend(); - - void reset(); + const std::string& tag_key = "") override; + + std::string title() override; + std::string line_label(unsigned int which) override; + std::string line_color(unsigned int which) override; + int line_width(unsigned int which) override; + int line_style(unsigned int which) override; + int line_marker(unsigned int which) override; + double line_alpha(unsigned int which) override; + + void set_size(int width, int height) override; + + int nsamps() const override; + + void enable_menu(bool en) override; + void enable_grid(bool en) override; + void enable_autoscale(bool en) override; + void enable_stem_plot(bool en) override; + void enable_semilogx(bool en) override; + void enable_semilogy(bool en) override; + void enable_control_panel(bool en) override; + void enable_tags(unsigned int which, bool en) override; + void enable_tags(bool en) override; + void enable_axis_labels(bool en) override; + void disable_legend() override; + + void reset() override; int work(int noutput_items, gr_vector_const_void_star& input_items, diff --git a/gr-qtgui/lib/vector_sink_f_impl.h b/gr-qtgui/lib/vector_sink_f_impl.h index 0535bfc7d9..527a2ea39d 100644 --- a/gr-qtgui/lib/vector_sink_f_impl.h +++ b/gr-qtgui/lib/vector_sink_f_impl.h @@ -64,59 +64,59 @@ public: const std::string& name, int nconnections, QWidget* parent = NULL); - ~vector_sink_f_impl(); + ~vector_sink_f_impl() override; bool check_topology(int ninputs, int noutputs) override; - void exec_(); - QWidget* qwidget(); + void exec_() override; + QWidget* qwidget() override; #ifdef ENABLE_PYTHON - PyObject* pyqwidget(); + PyObject* pyqwidget() override; #else void* pyqwidget(); #endif - unsigned int vlen() const; - void set_vec_average(const float avg); - float vec_average() const; + unsigned int vlen() const override; + void set_vec_average(const float avg) override; + float vec_average() const override; void set_frequency_range(const double centerfreq, const double bandwidth); - void set_x_axis(const double start, const double step); - void set_y_axis(double min, double max); - void set_ref_level(double ref_level); - - void set_x_axis_label(const std::string& label); - void set_y_axis_label(const std::string& label); - - void set_x_axis_units(const std::string& units); - void set_y_axis_units(const std::string& units); - - void set_update_time(double t); - void set_title(const std::string& title); - void set_line_label(unsigned int which, const std::string& label); - void set_line_color(unsigned int which, const std::string& color); - void set_line_width(unsigned int which, int width); - void set_line_style(unsigned int which, int style); - void set_line_marker(unsigned int which, int marker); - void set_line_alpha(unsigned int which, double alpha); - - std::string title(); - std::string line_label(unsigned int which); - std::string line_color(unsigned int which); - int line_width(unsigned int which); - int line_style(unsigned int which); - int line_marker(unsigned int which); - double line_alpha(unsigned int which); - - void set_size(int width, int height); - - void enable_menu(bool en); - void enable_grid(bool en); - void enable_autoscale(bool en); - void clear_max_hold(); - void clear_min_hold(); - void reset(); + void set_x_axis(const double start, const double step) override; + void set_y_axis(double min, double max) override; + void set_ref_level(double ref_level) override; + + void set_x_axis_label(const std::string& label) override; + void set_y_axis_label(const std::string& label) override; + + void set_x_axis_units(const std::string& units) override; + void set_y_axis_units(const std::string& units) override; + + void set_update_time(double t) override; + void set_title(const std::string& title) override; + void set_line_label(unsigned int which, const std::string& label) override; + void set_line_color(unsigned int which, const std::string& color) override; + void set_line_width(unsigned int which, int width) override; + void set_line_style(unsigned int which, int style) override; + void set_line_marker(unsigned int which, int marker) override; + void set_line_alpha(unsigned int which, double alpha) override; + + std::string title() override; + std::string line_label(unsigned int which) override; + std::string line_color(unsigned int which) override; + int line_width(unsigned int which) override; + int line_style(unsigned int which) override; + int line_marker(unsigned int which) override; + double line_alpha(unsigned int which) override; + + void set_size(int width, int height) override; + + void enable_menu(bool en) override; + void enable_grid(bool en) override; + void enable_autoscale(bool en) override; + void clear_max_hold() override; + void clear_min_hold() override; + void reset() override; int work(int noutput_items, gr_vector_const_void_star& input_items, diff --git a/gr-qtgui/lib/waterfall_sink_c_impl.h b/gr-qtgui/lib/waterfall_sink_c_impl.h index a4dc0d8642..b5d2514964 100644 --- a/gr-qtgui/lib/waterfall_sink_c_impl.h +++ b/gr-qtgui/lib/waterfall_sink_c_impl.h @@ -85,54 +85,54 @@ public: const std::string& name, int nconnections, QWidget* parent = NULL); - ~waterfall_sink_c_impl(); + ~waterfall_sink_c_impl() override; bool check_topology(int ninputs, int noutputs) override; - void exec_(); - QWidget* qwidget(); + void exec_() override; + QWidget* qwidget() override; #ifdef ENABLE_PYTHON - PyObject* pyqwidget(); + PyObject* pyqwidget() override; #else void* pyqwidget(); #endif - void clear_data(); - - void set_fft_size(const int fftsize); - int fft_size() const; - void set_fft_average(const float fftavg); - float fft_average() const; - void set_fft_window(const gr::fft::window::win_type win); - gr::fft::window::win_type fft_window(); - - void set_frequency_range(const double centerfreq, const double bandwidth); - void set_intensity_range(const double min, const double max); - - void set_update_time(double t); - void set_time_per_fft(double t); - void set_title(const std::string& title); - void set_time_title(const std::string& title); - void set_line_label(unsigned int which, const std::string& label); - void set_line_alpha(unsigned int which, double alpha); - void set_color_map(unsigned int which, const int color); - - std::string title(); - std::string line_label(unsigned int which); - double line_alpha(unsigned int which); - int color_map(unsigned int which); - - void set_size(int width, int height); - - void auto_scale(); - double min_intensity(unsigned int which); - double max_intensity(unsigned int which); - - void enable_menu(bool en); - void enable_grid(bool en); - void disable_legend(); - void enable_axis_labels(bool en); + void clear_data() override; + + void set_fft_size(const int fftsize) override; + int fft_size() const override; + void set_fft_average(const float fftavg) override; + float fft_average() const override; + void set_fft_window(const gr::fft::window::win_type win) override; + gr::fft::window::win_type fft_window() override; + + void set_frequency_range(const double centerfreq, const double bandwidth) override; + void set_intensity_range(const double min, const double max) override; + + void set_update_time(double t) override; + void set_time_per_fft(double t) override; + void set_title(const std::string& title) override; + void set_time_title(const std::string& title) override; + void set_line_label(unsigned int which, const std::string& label) override; + void set_line_alpha(unsigned int which, double alpha) override; + void set_color_map(unsigned int which, const int color) override; + + std::string title() override; + std::string line_label(unsigned int which) override; + double line_alpha(unsigned int which) override; + int color_map(unsigned int which) override; + + void set_size(int width, int height) override; + + void auto_scale() override; + double min_intensity(unsigned int which) override; + double max_intensity(unsigned int which) override; + + void enable_menu(bool en) override; + void enable_grid(bool en) override; + void disable_legend() override; + void enable_axis_labels(bool en) override; int work(int noutput_items, gr_vector_const_void_star& input_items, diff --git a/gr-qtgui/lib/waterfall_sink_f_impl.h b/gr-qtgui/lib/waterfall_sink_f_impl.h index d721cc0416..d2bb016659 100644 --- a/gr-qtgui/lib/waterfall_sink_f_impl.h +++ b/gr-qtgui/lib/waterfall_sink_f_impl.h @@ -85,55 +85,55 @@ public: const std::string& name, int nconnections, QWidget* parent = NULL); - ~waterfall_sink_f_impl(); + ~waterfall_sink_f_impl() override; bool check_topology(int ninputs, int noutputs) override; - void exec_(); - QWidget* qwidget(); + void exec_() override; + QWidget* qwidget() override; #ifdef ENABLE_PYTHON - PyObject* pyqwidget(); + PyObject* pyqwidget() override; #else void* pyqwidget(); #endif - void clear_data(); - - void set_fft_size(const int fftsize); - int fft_size() const; - void set_fft_average(const float fftavg); - float fft_average() const; - void set_fft_window(const gr::fft::window::win_type win); - gr::fft::window::win_type fft_window(); - - void set_frequency_range(const double centerfreq, const double bandwidth); - void set_intensity_range(const double min, const double max); - - void set_update_time(double t); - void set_time_per_fft(double t); - void set_title(const std::string& title); - void set_time_title(const std::string& title); - void set_line_label(unsigned int which, const std::string& label); - void set_line_alpha(unsigned int which, double alpha); - void set_color_map(unsigned int which, const int color); - void set_plot_pos_half(bool half); - - std::string title(); - std::string line_label(unsigned int which); - double line_alpha(unsigned int which); - int color_map(unsigned int which); - - void set_size(int width, int height); - - void auto_scale(); - double min_intensity(unsigned int which); - double max_intensity(unsigned int which); - - void enable_menu(bool en); - void enable_grid(bool en); - void disable_legend(); - void enable_axis_labels(bool en); + void clear_data() override; + + void set_fft_size(const int fftsize) override; + int fft_size() const override; + void set_fft_average(const float fftavg) override; + float fft_average() const override; + void set_fft_window(const gr::fft::window::win_type win) override; + gr::fft::window::win_type fft_window() override; + + void set_frequency_range(const double centerfreq, const double bandwidth) override; + void set_intensity_range(const double min, const double max) override; + + void set_update_time(double t) override; + void set_time_per_fft(double t) override; + void set_title(const std::string& title) override; + void set_time_title(const std::string& title) override; + void set_line_label(unsigned int which, const std::string& label) override; + void set_line_alpha(unsigned int which, double alpha) override; + void set_color_map(unsigned int which, const int color) override; + void set_plot_pos_half(bool half) override; + + std::string title() override; + std::string line_label(unsigned int which) override; + double line_alpha(unsigned int which) override; + int color_map(unsigned int which) override; + + void set_size(int width, int height) override; + + void auto_scale() override; + double min_intensity(unsigned int which) override; + double max_intensity(unsigned int which) override; + + void enable_menu(bool en) override; + void enable_grid(bool en) override; + void disable_legend() override; + void enable_axis_labels(bool en) override; int work(int noutput_items, gr_vector_const_void_star& input_items, |