comicsansg/CubicSDR
comicsansg/CubicSDR
1
0
Fork 0
mirror of https://github.com/cjcliffe/CubicSDR.git synced 2024-11-26 21:58:37 -05:00
Code Issues Projects Releases Wiki Activity

better color theme values for new frequency tuning bar

Browse Source
This commit is contained in:
Charles J. Cliffe 2015-04-02 20:52:33 -04:00
parent 9b283fbcef
commit 72edba4880
3 changed files with 29 additions and 29 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

39
src/visual/ColorTheme.cpp
View File

@ -48,7 +48,8 @@ DefaultColorTheme::DefaultColorTheme() {
fftLine = RGBColor(0.9, 0.9, 0.9);
fftHighlight = RGBColor(1, 1, 1);
scopeLine = RGBColor(0.9, 0.9, 0.9);
tuningBar = RGBColor(0.2, 0.2, 0.9);
tuningBarLight = RGBColor(0.2, 0.2, 0.9);
tuningBarDark = RGBColor(0.0, 0.0, 0.35);
tuningBarUp = RGBColor(1.0, 139.0/255.0, 96.0/255.0);
tuningBarDown = RGBColor(148.0/255.0, 148.0/255.0, 1.0);
meterLevel = RGBColor(0.1, 0.75, 0.1);
@ -78,9 +79,10 @@ RadarColorTheme::RadarColorTheme() {
fftLine = RGBColor(0.8, 1.0, 0.8);
fftHighlight = RGBColor(1, 1, 1);
scopeLine = RGBColor(0.8, 1.0, 0.8);
tuningBar = RGBColor(0.2, 0.9, 0.2);
tuningBarLight = RGBColor(0.0, 0.45, 0.0);
tuningBarDark = RGBColor(0.0, 0.1, 0.0);
tuningBarUp = RGBColor(1.0, 139.0/255.0, 96.0/255.0);
tuningBarDown = RGBColor(148.0/255.0, 148.0/255.0, 1.0);
tuningBarDown = RGBColor(148.0/255.0, 0.0, 0.0);
meterLevel = RGBColor(0, 0.5, 0);
meterValue = RGBColor(0, 0.5, 0);
text = RGBColor(0.8, 1.0, 0.8);
@ -106,9 +108,10 @@ BlackAndWhiteColorTheme::BlackAndWhiteColorTheme() {
fftLine = RGBColor(0.9, 0.9, 0.9);
fftHighlight = RGBColor(1, 1, 0.9);
scopeLine = RGBColor(0.9, 0.9, 0.9);
tuningBar = RGBColor(0.4, 0.4, 0.4);
tuningBarUp = RGBColor(1.0, 139.0/255.0, 96.0/255.0);
tuningBarDown = RGBColor(148.0/255.0, 148.0/255.0, 1.0);
tuningBarLight = RGBColor(0.4, 0.4, 0.4);
tuningBarDark = RGBColor(0.1, 0.1, 0.1);
tuningBarUp = RGBColor(0.8, 0.8, 0.8);
tuningBarDown = RGBColor(0.4, 0.4, 0.4);
meterLevel = RGBColor(0.5, 0.5, 0.5);
meterValue = RGBColor(0.5, 0.5, 0.5);
text = RGBColor(1, 1, 1);
@ -143,9 +146,10 @@ SharpColorTheme::SharpColorTheme() {
fftLine = RGBColor(0.9, 0.9, 1.0);
fftHighlight = RGBColor(0.9, 0.9, 1.0);
scopeLine = RGBColor(0.85, 0.85, 1.0);
tuningBar = RGBColor(0.2, 0.2, 0.9);
tuningBarUp = RGBColor(1.0, 139.0/255.0, 96.0/255.0);
tuningBarDown = RGBColor(148.0/255.0, 148.0/255.0, 1.0);
tuningBarLight = RGBColor(28.0 / 255.0, 106.0 / 255.0, 179.0 / 255.0);
tuningBarDark = RGBColor(14.0 / 255.0, 53.0 / 255.0, 89.5 / 255.0);
tuningBarUp = RGBColor(0.7, 0.7, 0.7);
tuningBarDown = RGBColor(1.0, 0.0, 0.0);
meterLevel = RGBColor(28.0 / 255.0, 106.0 / 255.0, 179.0 / 255.0);
meterValue = RGBColor(190.0 / 255.0, 190.0 / 255.0, 60.0 / 255.0);
text = RGBColor(0.9, 0.9, 1);
@ -173,9 +177,10 @@ RadColorTheme::RadColorTheme() {
fftLine = RGBColor(1.0, 0.9, 0.9);
fftHighlight = RGBColor(1, 1, 1);
scopeLine = RGBColor(1.0, 0.9, 0.9);
tuningBar = RGBColor(0.2, 0.2, 0.9);
tuningBarUp = RGBColor(1.0, 139.0/255.0, 96.0/255.0);
tuningBarDown = RGBColor(148.0/255.0, 148.0/255.0, 1.0);
tuningBarLight = RGBColor(0.0, 0.45, 0.0);
tuningBarDark = RGBColor(0.0, 0.1, 0.0);
tuningBarUp = RGBColor(1.0, 0.0, 0.0);
tuningBarDown = RGBColor(0.0, 0.5, 1.0);
meterLevel = RGBColor(0, 0.5, 0);
meterValue = RGBColor(0.5, 0, 0);
text = RGBColor(1, 1, 1);
@ -206,9 +211,10 @@ TouchColorTheme::TouchColorTheme() {
fftLine = RGBColor(234.0 / 255.0, 232.0 / 255.0, 247.0 / 255.0);
fftHighlight = RGBColor(1.0, 1.0, 1.0);
scopeLine = RGBColor(234.0 / 255.0, 232.0 / 255.0, 247.0 / 255.0);
tuningBar = RGBColor(61.0 / 255.0, 57.0 / 255.0, 88.0 / 255.0);
tuningBarUp = RGBColor(1.0, 139.0/255.0, 96.0/255.0);
tuningBarDown = RGBColor(148.0/255.0, 148.0/255.0, 1.0);
tuningBarLight = RGBColor(0.2, 0.2, 0.7);
tuningBarDark = RGBColor(0.1, 0.1, 0.45);
tuningBarUp = RGBColor(0.5, 139.0/255.0, 96.0/255.0);
tuningBarDown = RGBColor(0.6, 108.0/255.0, 1.0);
meterLevel = RGBColor(61.0 / 255.0, 57.0 / 255.0, 88.0 / 255.0);
meterValue = RGBColor(61.0 / 255.0, 57.0 / 255.0, 88.0 / 255.0);
text = RGBColor(1, 1, 1);
@ -240,7 +246,8 @@ HDColorTheme::HDColorTheme() {
fftLine = RGBColor(0.9, 0.9, 0.9);
fftHighlight = RGBColor(1, 1, 1);
scopeLine = RGBColor(0.9, 0.9, 0.9);
tuningBar = RGBColor(0, 0.7, 0.7);
tuningBarLight = RGBColor(0.4, 0.4, 1.0);
tuningBarDark = RGBColor(0.1, 0.1, 0.45);
tuningBarUp = RGBColor(1.0, 139.0/255.0, 96.0/255.0);
tuningBarDown = RGBColor(148.0/255.0, 148.0/255.0, 1.0);
meterLevel = RGBColor(0, 0.5, 0);

3
src/visual/ColorTheme.h
View File

@ -47,7 +47,8 @@ public:
RGBColor fftLine;
RGBColor fftHighlight;
RGBColor scopeLine;
RGBColor tuningBar;
RGBColor tuningBarLight;
RGBColor tuningBarDark;
RGBColor tuningBarUp;
RGBColor tuningBarDown;
RGBColor meterLevel;

16
src/visual/TuningCanvas.cpp
View File

@ -72,22 +72,14 @@ void TuningCanvas::OnPaint(wxPaintEvent& WXUNUSED(event)) {
long long center = wxGetApp().getFrequency();
if (mouseTracker.mouseDown()) {
glContext->Draw(ThemeMgr::mgr.currentTheme->tuningBar.r, ThemeMgr::mgr.currentTheme->tuningBar.g, ThemeMgr::mgr.currentTheme->tuningBar.b,
0.6, mouseTracker.getOriginMouseX(), mouseTracker.getMouseX());
glContext->Draw(ThemeMgr::mgr.currentTheme->tuningBarDark.r, ThemeMgr::mgr.currentTheme->tuningBarDark.g, ThemeMgr::mgr.currentTheme->tuningBarDark.b,
0.75, mouseTracker.getOriginMouseX(), mouseTracker.getMouseX());
}
RGBColor clr = top ? ThemeMgr::mgr.currentTheme->tuningBarUp : ThemeMgr::mgr.currentTheme->tuningBarDown;
RGBColor clrDark = ThemeMgr::mgr.currentTheme->tuningBar;
RGBColor clrMid = ThemeMgr::mgr.currentTheme->tuningBar;
RGBColor clrLight = ThemeMgr::mgr.currentTheme->tuningBar;
clrDark.r *= 0.5;
clrDark.g *= 0.5;
clrDark.b *= 0.5;
clrLight.r *= 2.0;
clrLight.g *= 2.0;
clrLight.b *= 2.0;
RGBColor clrDark = ThemeMgr::mgr.currentTheme->tuningBarDark;
RGBColor clrMid = ThemeMgr::mgr.currentTheme->tuningBarLight;
glContext->DrawTunerBarIndexed(1, 3, 11, freqDP, freqW, clrMid, 0.25, true, true); // freq
glContext->DrawTunerBarIndexed(4, 6, 11, freqDP, freqW, clrDark, 0.25, true, true);