VE7UWU/sdrangel
1
0
Fork 0
mirror of https://github.com/f4exb/sdrangel.git synced 2024-11-16 13:21:50 -05:00
Code Issues Projects Releases Wiki Activity

NFM Demod: use different color scheme for the signal meter bar

Browse Source
This commit is contained in:
f4exb 2016-12-05 18:42:24 +01:00
parent 0de8d916c0
commit e6667c88eb
3 changed files with 15 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
plugins/channelrx/demodnfm/nfmdemodgui.cpp
View File

@ -291,7 +291,7 @@ NFMDemodGUI::NFMDemodGUI(PluginAPI* pluginAPI, DeviceSourceAPI *deviceAPI, QWidg
} }
ui->deltaFrequency->setColorMapper(ColorMapper(ColorMapper::ReverseGold)); ui->deltaFrequency->setColorMapper(ColorMapper(ColorMapper::ReverseGold));
ui->channelPowerMeter->setColorTheme(LevelMeterSignalDB::ColorGreenYellow); ui->channelPowerMeter->setColorTheme(LevelMeterSignalDB::ColorGreenAndBlue);
m_channelizer = new DownChannelizer(m_nfmDemod); m_channelizer = new DownChannelizer(m_nfmDemod);
m_threadedChannelizer = new ThreadedBasebandSampleSink(m_channelizer, this); m_threadedChannelizer = new ThreadedBasebandSampleSink(m_channelizer, this);

15
sdrbase/gui/levelmeter.cpp
View File

@ -237,19 +237,22 @@ void LevelMeterVU::render(QPainter *painter)
// ==================================================================== // ====================================================================
const QColor LevelMeterSignalDB::m_avgColor[2] = { const QColor LevelMeterSignalDB::m_avgColor[3] = {
QColor(0xff, 0x8b, 0x00, 128), QColor(0xff, 0x8b, 0x00, 128),
QColor(0x8c, 0xff, 0x00, 128) QColor(0x8c, 0xff, 0x00, 128),
QColor(0x8c, 0xff, 0x00, 128)
}; };
const QColor LevelMeterSignalDB::m_decayedPeakColor[2] = { const QColor LevelMeterSignalDB::m_decayedPeakColor[3] = {
QColor(0x97, 0x54, 0x00, 128), QColor(0x97, 0x54, 0x00, 128),
QColor(0x53, 0x96, 0x00, 128) QColor(0x53, 0x96, 0x00, 128),
QColor(0x00, 0x96, 0x53, 128)
}; };
const QColor LevelMeterSignalDB::m_peakColor[2] = { const QColor LevelMeterSignalDB::m_peakColor[3] = {
Qt::red, Qt::red,
Qt::green Qt::green,
Qt::green
}; };
LevelMeterSignalDB::LevelMeterSignalDB(QWidget *parent) : LevelMeterSignalDB::LevelMeterSignalDB(QWidget *parent) :

9
sdrbase/gui/levelmeter.h
View File

@ -147,7 +147,8 @@ public:
typedef enum typedef enum
{ {
ColorGold, ColorGold,
ColorGreenYellow ColorGreenYellow,
ColorGreenAndBlue
} ColorTheme; } ColorTheme;
LevelMeterSignalDB(QWidget *parent = 0); LevelMeterSignalDB(QWidget *parent = 0);
@ -155,9 +156,9 @@ public:
void setColorTheme(ColorTheme colorTheme) { m_colorTheme = colorTheme; } void setColorTheme(ColorTheme colorTheme) { m_colorTheme = colorTheme; }
static const QColor m_avgColor[2]; static const QColor m_avgColor[3];
static const QColor m_decayedPeakColor[2]; static const QColor m_decayedPeakColor[3];
static const QColor m_peakColor[2]; static const QColor m_peakColor[3];
protected: protected:
virtual void render(QPainter *painter); virtual void render(QPainter *painter);