From 747f400a789a60cd128a4e5dadc01bb45e8fdb66 Mon Sep 17 00:00:00 2001 From: f4exb Date: Tue, 16 May 2017 16:21:59 +0200 Subject: [PATCH] New value dial color schemes. apply to File and AM demod plugins --- plugins/channeltx/modam/ammodgui.cpp | 2 +- plugins/samplesink/filesink/filesinkgui.cpp | 4 ++-- sdrbase/gui/colormapper.cpp | 24 ++++++++++----------- 3 files changed, 15 insertions(+), 15 deletions(-) diff --git a/plugins/channeltx/modam/ammodgui.cpp b/plugins/channeltx/modam/ammodgui.cpp index e6d0e2601..83d6309f3 100644 --- a/plugins/channeltx/modam/ammodgui.cpp +++ b/plugins/channeltx/modam/ammodgui.cpp @@ -361,7 +361,7 @@ AMModGUI::AMModGUI(PluginAPI* pluginAPI, DeviceSinkAPI *deviceAPI, QWidget* pare connect(&m_pluginAPI->getMainWindow()->getMasterTimer(), SIGNAL(timeout()), this, SLOT(tick())); - ui->deltaFrequency->setColorMapper(ColorMapper(ColorMapper::ReverseGold)); + ui->deltaFrequency->setColorMapper(ColorMapper(ColorMapper::GrayGold)); //m_channelMarker = new ChannelMarker(this); m_channelMarker.setColor(Qt::yellow); diff --git a/plugins/samplesink/filesink/filesinkgui.cpp b/plugins/samplesink/filesink/filesinkgui.cpp index efa0e5aa7..2484e5ef0 100644 --- a/plugins/samplesink/filesink/filesinkgui.cpp +++ b/plugins/samplesink/filesink/filesinkgui.cpp @@ -50,10 +50,10 @@ FileSinkGui::FileSinkGui(DeviceSinkAPI *deviceAPI, QWidget* parent) : { ui->setupUi(this); - ui->centerFrequency->setColorMapper(ColorMapper(ColorMapper::ReverseGold)); + ui->centerFrequency->setColorMapper(ColorMapper(ColorMapper::GrayGold)); ui->centerFrequency->setValueRange(7, 0, pow(10,7)); - ui->sampleRate->setColorMapper(ColorMapper(ColorMapper::ReverseGreenYellow)); + ui->sampleRate->setColorMapper(ColorMapper(ColorMapper::GrayGreenYellow)); ui->sampleRate->setValueRange(7, 32000U, 9000000U); ui->fileNameText->setText(m_fileName); diff --git a/sdrbase/gui/colormapper.cpp b/sdrbase/gui/colormapper.cpp index f796f731a..ee6448252 100644 --- a/sdrbase/gui/colormapper.cpp +++ b/sdrbase/gui/colormapper.cpp @@ -105,7 +105,7 @@ ColorMapper::ColorMapper(Theme theme) : m_boundaryColor = QColor(0x46, 0x66, 0x20); // 69% saturation 40% brightness m_boundaryAlphaColor = QColor(0x8c, 0xff, 0x00, 0x20); // Base with alpha break; - case GrayGreenYellow: + case GrayGreenYellow: // Base 87 (=120-33) degrees hue 140,255,0 m_dialBackgroundcolorMap.push_back(std::pair(0.0, QColor(33, 33, 33))); // 59% darkness m_dialBackgroundcolorMap.push_back(std::pair(0.1, QColor(50, 50, 50))); // 37% darkness m_dialBackgroundcolorMap.push_back(std::pair(0.2, QColor(67, 67, 67))); // 18% darkness @@ -113,13 +113,13 @@ ColorMapper::ColorMapper(Theme theme) : m_dialBackgroundcolorMap.push_back(std::pair(0.8, QColor(60, 60, 60))); // 25% darkness m_dialBackgroundcolorMap.push_back(std::pair(0.9, QColor(50, 50, 50))); // 37% darkness m_dialBackgroundcolorMap.push_back(std::pair(1.0, QColor(33, 33, 33))); // 59% darkness - m_foregroundColor = QColor(0x8c, 0xff, 0x00); // Base 87 (=120-33) degrees hue - m_secondaryForegroundColor = QColor(0xc6, 0xff, 0x80); // 50% saturation - m_highlightColor = QColor(0xa9, 0xff, 0x40, 0x80); // 75% saturation - m_boundaryColor = QColor(0x46, 0x66, 0x20); // 69% saturation 40% brightness - m_boundaryAlphaColor = QColor(0x8c, 0xff, 0x00, 0x20); // Base with alpha + m_foregroundColor = QColor(99, 128, 64); // 50% saturation 50% brightbess - shadow face color + m_secondaryForegroundColor = QColor(198, 255, 128); // 50% saturation - front face color + m_highlightColor = QColor(169, 255, 64, 128); // 75% saturation - digit highlight overlay + m_boundaryColor = QColor(79, 115, 34); // 70% saturation 45% brightness - inter wheel boundary + m_boundaryAlphaColor = QColor(140, 255, 0, 32); // Base with alpha break; - case GrayGold: + case GrayGold: // Base 33 degrees hue 255,139,0 m_dialBackgroundcolorMap.push_back(std::pair(0.0, QColor(33, 33, 33))); // 59% darkness m_dialBackgroundcolorMap.push_back(std::pair(0.1, QColor(50, 50, 50))); // 37% darkness m_dialBackgroundcolorMap.push_back(std::pair(0.2, QColor(67, 67, 67))); // 18% darkness @@ -127,11 +127,11 @@ ColorMapper::ColorMapper(Theme theme) : m_dialBackgroundcolorMap.push_back(std::pair(0.8, QColor(60, 60, 60))); // 25% darkness m_dialBackgroundcolorMap.push_back(std::pair(0.9, QColor(50, 50, 50))); // 37% darkness m_dialBackgroundcolorMap.push_back(std::pair(1.0, QColor(33, 33, 33))); // 59% darkness - m_foregroundColor = QColor(0xff, 0x8b, 0x00); // Base 33 degrees hue - m_secondaryForegroundColor = QColor(0xff, 0xc5, 0x80); // 50% saturation - m_highlightColor = QColor(0xbf, 0x69, 0x00, 0x80); // 75% saturation - m_boundaryColor = QColor(0x66, 0x38, 0x20); // 69% saturation 40% brightness - m_boundaryAlphaColor = QColor(0xff, 0x8b, 0x00, 0x20); // Base with alpha + m_foregroundColor = QColor(128, 98, 64); // 50% saturation 50% brightbess - shadow face color + m_secondaryForegroundColor = QColor(255, 197, 128); // 50% saturation - front face color + m_highlightColor = QColor(255, 169, 64, 128); // 75% saturation - digit highlight overlay + m_boundaryColor = QColor(115, 79, 34); // 70% saturation 45% brightness - inter wheel boundary + m_boundaryAlphaColor = QColor(255, 39, 0, 32); // Base with alpha break; case Normal: default: