diff --git a/plugins/channeltx/modam/ammodgui.ui b/plugins/channeltx/modam/ammodgui.ui index 4c7c8ead7..baa8e302b 100644 --- a/plugins/channeltx/modam/ammodgui.ui +++ b/plugins/channeltx/modam/ammodgui.ui @@ -357,7 +357,7 @@ - + 0 @@ -662,7 +662,7 @@
gui/buttonswitch.h
- LevelMeter + LevelMeterVU QWidget
gui/levelmeter.h
1 diff --git a/plugins/channeltx/modnfm/nfmmodgui.ui b/plugins/channeltx/modnfm/nfmmodgui.ui index d819d29db..b5096a3d7 100644 --- a/plugins/channeltx/modnfm/nfmmodgui.ui +++ b/plugins/channeltx/modnfm/nfmmodgui.ui @@ -381,7 +381,7 @@
- + 0 @@ -686,7 +686,7 @@
gui/buttonswitch.h
- LevelMeter + LevelMeterVU QWidget
gui/levelmeter.h
1 diff --git a/sdrbase/gui/levelmeter.cpp b/sdrbase/gui/levelmeter.cpp index d529f23a4..181162ee3 100644 --- a/sdrbase/gui/levelmeter.cpp +++ b/sdrbase/gui/levelmeter.cpp @@ -132,7 +132,16 @@ void LevelMeter::paintEvent(QPaintEvent *event) render(&painter); } -void LevelMeter::render(QPainter *painter) +LevelMeterVU::LevelMeterVU(QWidget *parent) : + LevelMeter(parent) +{ +} + +LevelMeterVU::~LevelMeterVU() +{ +} + +void LevelMeterVU::render(QPainter *painter) { painter->fillRect(rect(), QColor(42, 42, 42, 255)); diff --git a/sdrbase/gui/levelmeter.h b/sdrbase/gui/levelmeter.h index 808990e8a..db61888b8 100644 --- a/sdrbase/gui/levelmeter.h +++ b/sdrbase/gui/levelmeter.h @@ -60,8 +60,8 @@ class LevelMeter : public QWidget Q_OBJECT public: - explicit LevelMeter(QWidget *parent = 0); - ~LevelMeter(); + LevelMeter(QWidget *parent = 0); + virtual ~LevelMeter(); void paintEvent(QPaintEvent *event); @@ -69,10 +69,10 @@ public slots: void reset(); void levelChanged(qreal rmsLevel, qreal peakLevel, int numSamples); -private slots: +protected slots: void redrawTimerExpired(); -private: +protected: /** * Height of RMS level bar. * Range 0.0 - 1.0. @@ -120,7 +120,17 @@ private: QColor m_peakColor; QColor m_decayedPeakColor; - void render(QPainter *painter); + virtual void render(QPainter *painter) = 0; }; +class LevelMeterVU : public LevelMeter +{ +public: + LevelMeterVU(QWidget *parent = 0); + virtual ~LevelMeterVU(); +protected: + virtual void render(QPainter *painter); +}; + + #endif /* SDRBASE_GUI_LEVELMETER_H_ */