From 396baa22c889bc0c5c5f4d481345aebabbbe9dde Mon Sep 17 00:00:00 2001 From: f4exb Date: Tue, 16 May 2017 21:24:25 +0200 Subject: [PATCH] New value dial color schemes: new yellow color scheme for filters. Use it in LimeSDR plugins --- .../limesdroutput/limesdroutputgui.cpp | 4 ++-- .../limesdrinput/limesdrinputgui.cpp | 4 ++-- sdrbase/gui/colormapper.cpp | 16 ++++++++++++++++ sdrbase/gui/colormapper.h | 3 ++- 4 files changed, 22 insertions(+), 5 deletions(-) diff --git a/plugins/samplesink/limesdroutput/limesdroutputgui.cpp b/plugins/samplesink/limesdroutput/limesdroutputgui.cpp index 5599cddc8..36dadee7e 100644 --- a/plugins/samplesink/limesdroutput/limesdroutputgui.cpp +++ b/plugins/samplesink/limesdroutput/limesdroutputgui.cpp @@ -54,10 +54,10 @@ LimeSDROutputGUI::LimeSDROutputGUI(DeviceSinkAPI *deviceAPI, QWidget* parent) : ui->sampleRate->setValueRange(8, (uint32_t) minF, (uint32_t) maxF); m_limeSDROutput->getLPRange(minF, maxF, stepF); - ui->lpf->setColorMapper(ColorMapper(ColorMapper::GrayGold)); + ui->lpf->setColorMapper(ColorMapper(ColorMapper::GrayYellow)); ui->lpf->setValueRange(6, (minF/1000)+1, maxF/1000); - ui->lpFIR->setColorMapper(ColorMapper(ColorMapper::GrayGold)); + ui->lpFIR->setColorMapper(ColorMapper(ColorMapper::GrayYellow)); ui->lpFIR->setValueRange(5, 1U, 56000U); ui->ncoFrequency->setColorMapper(ColorMapper(ColorMapper::GrayGold)); diff --git a/plugins/samplesource/limesdrinput/limesdrinputgui.cpp b/plugins/samplesource/limesdrinput/limesdrinputgui.cpp index a5d4f0e12..3d70e0981 100644 --- a/plugins/samplesource/limesdrinput/limesdrinputgui.cpp +++ b/plugins/samplesource/limesdrinput/limesdrinputgui.cpp @@ -55,10 +55,10 @@ LimeSDRInputGUI::LimeSDRInputGUI(DeviceSourceAPI *deviceAPI, QWidget* parent) : ui->sampleRate->setValueRange(8, (uint32_t) minF, (uint32_t) maxF); m_limeSDRInput->getLPRange(minF, maxF, stepF); - ui->lpf->setColorMapper(ColorMapper(ColorMapper::GrayGold)); + ui->lpf->setColorMapper(ColorMapper(ColorMapper::GrayYellow)); ui->lpf->setValueRange(6, (minF/1000)+1, maxF/1000); - ui->lpFIR->setColorMapper(ColorMapper(ColorMapper::GrayGold)); + ui->lpFIR->setColorMapper(ColorMapper(ColorMapper::GrayYellow)); ui->lpFIR->setValueRange(5, 1U, 56000U); ui->ncoFrequency->setColorMapper(ColorMapper(ColorMapper::GrayGold)); diff --git a/sdrbase/gui/colormapper.cpp b/sdrbase/gui/colormapper.cpp index 1affb8873..8fd20348f 100644 --- a/sdrbase/gui/colormapper.cpp +++ b/sdrbase/gui/colormapper.cpp @@ -149,6 +149,22 @@ ColorMapper::ColorMapper(Theme theme) : m_lightBorderColor = QColor(80, 80, 80); m_darkBorderColor = QColor(0, 0, 0); break; + case GrayYellow: // Base 50 degrees hue 255,213,0 - background 67, 67, 67 + m_dialBackgroundcolorMap.push_back(std::pair(0.0, QColor(27, 27, 27))); // 59% darkness + m_dialBackgroundcolorMap.push_back(std::pair(0.1, QColor(42, 42, 42))); // 37% darkness + m_dialBackgroundcolorMap.push_back(std::pair(0.2, QColor(55, 55, 55))); // 18% darkness + m_dialBackgroundcolorMap.push_back(std::pair(0.5, QColor(67, 67, 67))); // 0% darkness + m_dialBackgroundcolorMap.push_back(std::pair(0.8, QColor(50, 50, 50))); // 25% darkness + m_dialBackgroundcolorMap.push_back(std::pair(0.9, QColor(42, 42, 42))); // 37% darkness + m_dialBackgroundcolorMap.push_back(std::pair(1.0, QColor(27, 27, 27))); // 59% darkness + m_foregroundColor = QColor(128, 117, 64); // 50% saturation 50% brightbess - shadow face color + m_secondaryForegroundColor = QColor(255, 234, 128); // 50% saturation - front face color + m_highlightColor = QColor(255, 233, 64, 80); // 75% saturation - digit highlight overlay + m_boundaryColor = QColor(27, 27, 27); // background 60% darkness - inter wheel gap + m_boundaryAlphaColor = QColor(255, 213, 0, 32); // Base with alpha - wheel edges + m_lightBorderColor = QColor(80, 80, 80); + m_darkBorderColor = QColor(0, 0, 0); + break; case Normal: default: m_dialBackgroundcolorMap.push_back(std::pair(0.0, QColor(0x40, 0x40, 0x40))); diff --git a/sdrbase/gui/colormapper.h b/sdrbase/gui/colormapper.h index 60b85578d..5937f387d 100644 --- a/sdrbase/gui/colormapper.h +++ b/sdrbase/gui/colormapper.h @@ -24,7 +24,8 @@ public: ReverseGreenApple, ReverseGreenYellow, GrayGreenYellow, - GrayGold + GrayGold, + GrayYellow }; typedef std::vector > colormap;