diff options
| author | Marcus Müller <mmueller@gnuradio.org> | 2021-06-17 00:37:10 +0200 |
|---|---|---|
| committer | mormj <34754695+mormj@users.noreply.github.com> | 2021-06-19 19:40:27 -0400 |
| commit | e1b633a95047fce266e575cbc66a314d31c24491 (patch) | |
| tree | da8e5790f1c6b0361480159f7095ca0ef404d253 | |
| parent | 29ebb4085e689043e14b95e1b8d16b517cc52000 (diff) | |
qtgui: only one definition of (internal) TimePrecisionClass
Signed-off-by: Marcus Müller <mmueller@gnuradio.org>
| -rw-r--r-- | gr-qtgui/lib/EyeDisplayPlot.cc | 18 | ||||
| -rw-r--r-- | gr-qtgui/lib/HistogramDisplayPlot.cc | 20 | ||||
| -rw-r--r-- | gr-qtgui/lib/TimeDomainDisplayPlot.cc | 20 | ||||
| -rw-r--r-- | gr-qtgui/lib/TimePrecisionClass.h | 23 | ||||
| -rw-r--r-- | gr-qtgui/lib/TimeRasterDisplayPlot.cc | 19 |
5 files changed, 27 insertions, 73 deletions
diff --git a/gr-qtgui/lib/EyeDisplayPlot.cc b/gr-qtgui/lib/EyeDisplayPlot.cc index ca0ffa4978..d947da2423 100644 --- a/gr-qtgui/lib/EyeDisplayPlot.cc +++ b/gr-qtgui/lib/EyeDisplayPlot.cc @@ -10,6 +10,7 @@ #ifndef EYE_DISPLAY_PLOT_C #define EYE_DISPLAY_PLOT_C +#include "TimePrecisionClass.h" #include <gnuradio/qtgui/EyeDisplayPlot.h> #include <qwt_legend.h> @@ -17,23 +18,6 @@ #include <QColor> #include <cmath> -class TimePrecisionClass -{ -public: - TimePrecisionClass(const int timePrecision) { d_timePrecision = timePrecision; } - - virtual ~TimePrecisionClass() {} - - virtual unsigned int getTimePrecision() const { return d_timePrecision; } - - virtual void setTimePrecision(const unsigned int newPrecision) - { - d_timePrecision = newPrecision; - } - -protected: - unsigned int d_timePrecision; -}; class EyeDisplayZoomer : public QwtPlotZoomer, public TimePrecisionClass { diff --git a/gr-qtgui/lib/HistogramDisplayPlot.cc b/gr-qtgui/lib/HistogramDisplayPlot.cc index 9c49759cd7..82936356ea 100644 --- a/gr-qtgui/lib/HistogramDisplayPlot.cc +++ b/gr-qtgui/lib/HistogramDisplayPlot.cc @@ -11,6 +11,7 @@ #ifndef HISTOGRAM_DISPLAY_PLOT_C #define HISTOGRAM_DISPLAY_PLOT_C +#include "TimePrecisionClass.h" #include <gnuradio/qtgui/HistogramDisplayPlot.h> #include <gnuradio/math.h> @@ -24,25 +25,6 @@ #define copysign _copysign #endif -class TimePrecisionClass -{ -public: - TimePrecisionClass(const int timeprecision) { d_time_precision = timeprecision; } - - virtual ~TimePrecisionClass() {} - - virtual unsigned int getTimePrecision() const { return d_time_precision; } - - virtual void setTimePrecision(const unsigned int newprecision) - { - d_time_precision = newprecision; - } - -protected: - unsigned int d_time_precision; -}; - - class HistogramDisplayZoomer : public QwtPlotZoomer, public TimePrecisionClass { public: diff --git a/gr-qtgui/lib/TimeDomainDisplayPlot.cc b/gr-qtgui/lib/TimeDomainDisplayPlot.cc index 77f8fe14bb..b6dc166a95 100644 --- a/gr-qtgui/lib/TimeDomainDisplayPlot.cc +++ b/gr-qtgui/lib/TimeDomainDisplayPlot.cc @@ -11,6 +11,7 @@ #ifndef TIME_DOMAIN_DISPLAY_PLOT_C #define TIME_DOMAIN_DISPLAY_PLOT_C +#include "TimePrecisionClass.h" #include <gnuradio/qtgui/TimeDomainDisplayPlot.h> #include <qwt_legend.h> @@ -18,25 +19,6 @@ #include <QColor> #include <cmath> -class TimePrecisionClass -{ -public: - TimePrecisionClass(const int timePrecision) { d_timePrecision = timePrecision; } - - virtual ~TimePrecisionClass() {} - - virtual unsigned int getTimePrecision() const { return d_timePrecision; } - - virtual void setTimePrecision(const unsigned int newPrecision) - { - d_timePrecision = newPrecision; - } - -protected: - unsigned int d_timePrecision; -}; - - class TimeDomainDisplayZoomer : public QwtPlotZoomer, public TimePrecisionClass { public: diff --git a/gr-qtgui/lib/TimePrecisionClass.h b/gr-qtgui/lib/TimePrecisionClass.h new file mode 100644 index 0000000000..ed619545f9 --- /dev/null +++ b/gr-qtgui/lib/TimePrecisionClass.h @@ -0,0 +1,23 @@ +/* -*- c++ -*- */ +/* + * Copyright 2020 Free Software Foundation, Inc. + * + * This file is part of GNU Radio + * + * SPDX-License-Identifier: GPL-3.0-or-later + */ + +class TimePrecisionClass +{ +public: + TimePrecisionClass(const int timePrecision) { d_timePrecision = timePrecision; } + virtual ~TimePrecisionClass() = default; + virtual unsigned int getTimePrecision() const { return d_timePrecision; } + virtual void setTimePrecision(const unsigned int newPrecision) + { + d_timePrecision = newPrecision; + } + +protected: + unsigned int d_timePrecision; +}; diff --git a/gr-qtgui/lib/TimeRasterDisplayPlot.cc b/gr-qtgui/lib/TimeRasterDisplayPlot.cc index 7f093f9926..d24dabf6a6 100644 --- a/gr-qtgui/lib/TimeRasterDisplayPlot.cc +++ b/gr-qtgui/lib/TimeRasterDisplayPlot.cc @@ -11,6 +11,7 @@ #ifndef TIMERASTER_DISPLAY_PLOT_C #define TIMERASTER_DISPLAY_PLOT_C +#include "TimePrecisionClass.h" #include <gnuradio/qtgui/TimeRasterDisplayPlot.h> #include <gnuradio/qtgui/qtgui_types.h> @@ -235,24 +236,6 @@ private: std::string d_units; }; -class TimePrecisionClass -{ -public: - TimePrecisionClass(const int timePrecision) { d_timePrecision = timePrecision; } - - virtual ~TimePrecisionClass() {} - - virtual unsigned int getTimePrecision() const { return d_timePrecision; } - - virtual void setTimePrecision(const unsigned int newPrecision) - { - d_timePrecision = newPrecision; - } - -protected: - unsigned int d_timePrecision; -}; - /*********************************************************************** * Widget to provide mouse pointer coordinate text **********************************************************************/ |