VE7UWU/sdrangel
1
0
Fork 0
mirror of https://github.com/f4exb/sdrangel.git synced 2025-08-05 23:32:28 -04:00
Code Issues Projects Releases Wiki Activity

Spectrum: enhanced (again) the histogram (phosphor) palette

Browse Source
This commit is contained in:
f4exb 2018-10-24 01:05:49 +02:00
parent faf428ed3d
commit 58b94c0366
1 changed files with 17 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
sdrgui/gui/glspectrum.cpp
View File

@ -90,16 +90,29 @@ GLSpectrum::GLSpectrum(QWidget* parent) :
for (int i = 1; i < 240; i++) for (int i = 1; i < 240; i++)
{ {
QColor c; QColor c;
int val = i < 60 ? 255 : 200; int val = i < 60 ? 128 + (60-i) : 128;
int sat = i < 60 ? 128 : i < 180 ? 255 : 180; int sat = i < 60 ? 140 + i : i < 180 ? 200 : 200 - (i-180);
c.setHsv(239 - i, sat, val); c.setHsl(239 - i, sat, val);
((quint8*)&m_histogramPalette[i])[0] = c.red(); ((quint8*)&m_histogramPalette[i])[0] = c.red();
((quint8*)&m_histogramPalette[i])[1] = c.green(); ((quint8*)&m_histogramPalette[i])[1] = c.green();
((quint8*)&m_histogramPalette[i])[2] = c.blue(); ((quint8*)&m_histogramPalette[i])[2] = c.blue();
((quint8*)&m_histogramPalette[i])[3] = c.alpha(); ((quint8*)&m_histogramPalette[i])[3] = c.alpha();
} }
// Original palette: // 4.2.3 palette
// for (int i = 1; i < 240; i++)
// {
// QColor c;
// int val = i < 60 ? 255 : 200;
// int sat = i < 60 ? 128 : i < 180 ? 255 : 180;
// c.setHsv(239 - i, sat, val);
// ((quint8*)&m_histogramPalette[i])[0] = c.red();
// ((quint8*)&m_histogramPalette[i])[1] = c.green();
// ((quint8*)&m_histogramPalette[i])[2] = c.blue();
// ((quint8*)&m_histogramPalette[i])[3] = c.alpha();
// }
// Original palette:
// for(int i = 16; i < 240; i++) { // for(int i = 16; i < 240; i++) {
// QColor c; // QColor c;
// c.setHsv(239 - i, 255 - ((i < 200) ? 0 : (i - 200) * 3), 150 + ((i < 100) ? i : 100)); // c.setHsv(239 - i, 255 - ((i < 200) ? 0 : (i - 200) * 3), 150 + ((i < 100) ? i : 100));