mirror
/
sdrangel
kopia lustrzana https://github.com/f4exb/sdrangel
1
0
Forkuj 0
Kod Zgłoszenia Projekty Wydania Wiki Aktywność

New value dial color schemes: new yellow color scheme for filters. Use it in LimeSDR plugins

pull/60/head
f4exb 2017-05-16 21:24:25 +02:00
rodzic 1bcb38038a
commit 396baa22c8
4 zmienionych plików z 22 dodań i 5 usunięć
Pokaż statystyki Ściągnij plik aktualizacji Ściągnij plik porównania Expand all files Collapse all files

4
plugins/samplesink/limesdroutput/limesdroutputgui.cpp
Wyświetl plik

@ -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));

4
plugins/samplesource/limesdrinput/limesdrinputgui.cpp
Wyświetl plik

@ -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));

16
sdrbase/gui/colormapper.cpp
Wyświetl plik

@ -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<float, QColor>(0.0, QColor(27, 27, 27))); // 59% darkness
m_dialBackgroundcolorMap.push_back(std::pair<float, QColor>(0.1, QColor(42, 42, 42))); // 37% darkness
m_dialBackgroundcolorMap.push_back(std::pair<float, QColor>(0.2, QColor(55, 55, 55))); // 18% darkness
m_dialBackgroundcolorMap.push_back(std::pair<float, QColor>(0.5, QColor(67, 67, 67))); // 0% darkness
m_dialBackgroundcolorMap.push_back(std::pair<float, QColor>(0.8, QColor(50, 50, 50))); // 25% darkness
m_dialBackgroundcolorMap.push_back(std::pair<float, QColor>(0.9, QColor(42, 42, 42))); // 37% darkness
m_dialBackgroundcolorMap.push_back(std::pair<float, QColor>(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<float, QColor>(0.0, QColor(0x40, 0x40, 0x40)));

3
sdrbase/gui/colormapper.h
Wyświetl plik

@ -24,7 +24,8 @@ public:
ReverseGreenApple,
ReverseGreenYellow,
GrayGreenYellow,
GrayGold
GrayGold,
GrayYellow
};
typedef std::vector<std::pair<float, QColor> > colormap;