comicsansg/CubicSDR
comicsansg/CubicSDR
1
0
Fork 0
mirror of https://github.com/cjcliffe/CubicSDR.git synced 2025-08-03 14:12:25 -04:00
Code Issues Projects Releases Wiki Activity

Fix conflict with wx RGBColor struct

Browse Source
This commit is contained in:
Charles J. Cliffe 2015-06-21 10:51:13 -04:00
parent 4ee791ac0c
commit ab438738aa
8 changed files with 184 additions and 184 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/ui/GLPanel.h
View File

@ -53,7 +53,7 @@ private:
} }
public: public:
typedef enum GLPanelFillType { GLPANEL_FILL_NONE, GLPANEL_FILL_SOLID } GLPanelFillType; typedef enum GLPanelFillType { GLPANEL_FILL_NONE, GLPANEL_FILL_SOLID, GLPANEL_FILL_GRAD_X, GLPANEL_FILL_GRAD_Y, GLPANEL_FILL_GRAD_BAR_X, GLPANEL_FILL_GRAD_BAR_Y } GLPanelFillType;
typedef enum GLPanelCoordinateSystem { GLPANEL_Y_DOWN_ZERO_ONE, GLPANEL_Y_UP_ZERO_ONE, GLPANEL_Y_UP, GLPANEL_Y_DOWN } GLPanelCoordinateSystem; typedef enum GLPanelCoordinateSystem { GLPANEL_Y_DOWN_ZERO_ONE, GLPANEL_Y_UP_ZERO_ONE, GLPANEL_Y_UP, GLPANEL_Y_DOWN } GLPanelCoordinateSystem;
float pos[2]; float pos[2];
float size[2]; float size[2];

280
src/visual/ColorTheme.cpp
View File

@ -41,27 +41,27 @@ DefaultColorTheme::DefaultColorTheme() {
waterfallGradient.addColor(GradientColor(1.0, 1.0, 0)); waterfallGradient.addColor(GradientColor(1.0, 1.0, 0));
waterfallGradient.addColor(GradientColor(1.0, 0.2, 0.0)); waterfallGradient.addColor(GradientColor(1.0, 0.2, 0.0));
waterfallGradient.generate(256); waterfallGradient.generate(256);
waterfallHighlight = RGBColor(1, 1, 1); waterfallHighlight = RGB(1, 1, 1);
waterfallNew = RGBColor(0, 1, 0); waterfallNew = RGB(0, 1, 0);
waterfallHover = RGBColor(1, 1, 0); waterfallHover = RGB(1, 1, 0);
waterfallDestroy = RGBColor(1, 0, 0); waterfallDestroy = RGB(1, 0, 0);
fftLine = RGBColor(0.9, 0.9, 0.9); fftLine = RGB(0.9, 0.9, 0.9);
fftHighlight = RGBColor(1, 1, 1); fftHighlight = RGB(1, 1, 1);
scopeLine = RGBColor(0.9, 0.9, 0.9); scopeLine = RGB(0.9, 0.9, 0.9);
tuningBarLight = RGBColor(0.2, 0.2, 0.9); tuningBarLight = RGB(0.2, 0.2, 0.9);
tuningBarDark = RGBColor(0.0, 0.0, 0.35); tuningBarDark = RGB(0.0, 0.0, 0.35);
tuningBarUp = RGBColor(1.0, 139.0/255.0, 96.0/255.0); tuningBarUp = RGB(1.0, 139.0/255.0, 96.0/255.0);
tuningBarDown = RGBColor(148.0/255.0, 148.0/255.0, 1.0); tuningBarDown = RGB(148.0/255.0, 148.0/255.0, 1.0);
meterLevel = RGBColor(0.1, 0.75, 0.1); meterLevel = RGB(0.1, 0.75, 0.1);
meterValue = RGBColor(0.75, 0.1, 0.1); meterValue = RGB(0.75, 0.1, 0.1);
text = RGBColor(1, 1, 1); text = RGB(1, 1, 1);
freqLine = RGBColor(1, 1, 1); freqLine = RGB(1, 1, 1);
button = RGBColor(0.65, 0.65, 0.65); button = RGB(0.65, 0.65, 0.65);
buttonHighlight = RGBColor(1, 1, 0); buttonHighlight = RGB(1, 1, 0);
scopeBackground = RGBColor(0.1, 0.1, 0.1); scopeBackground = RGB(0.1, 0.1, 0.1);
fftBackground = RGBColor(0.1, 0.1, 0.1); fftBackground = RGB(0.1, 0.1, 0.1);
generalBackground = RGBColor(0.1, 0.1, 0.1); generalBackground = RGB(0.1, 0.1, 0.1);
} }
@ -72,27 +72,27 @@ RadarColorTheme::RadarColorTheme() {
waterfallGradient.addColor(GradientColor(40.0 / 255.0, 240.0 / 255.0, 60.0 / 255.0)); waterfallGradient.addColor(GradientColor(40.0 / 255.0, 240.0 / 255.0, 60.0 / 255.0));
waterfallGradient.addColor(GradientColor(250.0 / 255.0, 250.0 / 255.0, 250.0 / 255.0)); waterfallGradient.addColor(GradientColor(250.0 / 255.0, 250.0 / 255.0, 250.0 / 255.0));
waterfallGradient.generate(256); waterfallGradient.generate(256);
waterfallHighlight = RGBColor(1, 1, 1); waterfallHighlight = RGB(1, 1, 1);
waterfallNew = RGBColor(0, 1, 0); waterfallNew = RGB(0, 1, 0);
waterfallHover = RGBColor(1, 1, 0); waterfallHover = RGB(1, 1, 0);
waterfallDestroy = RGBColor(1, 0, 0); waterfallDestroy = RGB(1, 0, 0);
fftLine = RGBColor(0.8, 1.0, 0.8); fftLine = RGB(0.8, 1.0, 0.8);
fftHighlight = RGBColor(1, 1, 1); fftHighlight = RGB(1, 1, 1);
scopeLine = RGBColor(0.8, 1.0, 0.8); scopeLine = RGB(0.8, 1.0, 0.8);
tuningBarLight = RGBColor(0.0, 0.45, 0.0); tuningBarLight = RGB(0.0, 0.45, 0.0);
tuningBarDark = RGBColor(0.0, 0.1, 0.0); tuningBarDark = RGB(0.0, 0.1, 0.0);
tuningBarUp = RGBColor(1.0, 139.0/255.0, 96.0/255.0); tuningBarUp = RGB(1.0, 139.0/255.0, 96.0/255.0);
tuningBarDown = RGBColor(148.0/255.0, 0.0, 0.0); tuningBarDown = RGB(148.0/255.0, 0.0, 0.0);
meterLevel = RGBColor(0, 0.5, 0); meterLevel = RGB(0, 0.5, 0);
meterValue = RGBColor(0, 0.5, 0); meterValue = RGB(0, 0.5, 0);
text = RGBColor(0.8, 1.0, 0.8); text = RGB(0.8, 1.0, 0.8);
freqLine = RGBColor(1, 1, 1); freqLine = RGB(1, 1, 1);
button = RGBColor(0.65, 0.75, 0.65); button = RGB(0.65, 0.75, 0.65);
buttonHighlight = RGBColor(0.65, 1.0, 0.65); buttonHighlight = RGB(0.65, 1.0, 0.65);
scopeBackground = RGBColor(0.05, 0.1, 0.05); scopeBackground = RGB(0.05, 0.1, 0.05);
fftBackground = RGBColor(0.05, 0.1, 0.05); fftBackground = RGB(0.05, 0.1, 0.05);
generalBackground = RGBColor(0.05, 0.1, 0.05); generalBackground = RGB(0.05, 0.1, 0.05);
} }
BlackAndWhiteColorTheme::BlackAndWhiteColorTheme() { BlackAndWhiteColorTheme::BlackAndWhiteColorTheme() {
@ -101,27 +101,27 @@ BlackAndWhiteColorTheme::BlackAndWhiteColorTheme() {
waterfallGradient.addColor(GradientColor(0.75, 0.75, 0.75)); waterfallGradient.addColor(GradientColor(0.75, 0.75, 0.75));
waterfallGradient.addColor(GradientColor(1.0, 1.0, 1.0)); waterfallGradient.addColor(GradientColor(1.0, 1.0, 1.0));
waterfallGradient.generate(256); waterfallGradient.generate(256);
waterfallHighlight = RGBColor(1, 1, 0.9); waterfallHighlight = RGB(1, 1, 0.9);
waterfallNew = RGBColor(0, 1, 0); waterfallNew = RGB(0, 1, 0);
waterfallHover = RGBColor(1, 1, 0); waterfallHover = RGB(1, 1, 0);
waterfallDestroy = RGBColor(1, 0, 0); waterfallDestroy = RGB(1, 0, 0);
fftLine = RGBColor(0.9, 0.9, 0.9); fftLine = RGB(0.9, 0.9, 0.9);
fftHighlight = RGBColor(1, 1, 0.9); fftHighlight = RGB(1, 1, 0.9);
scopeLine = RGBColor(0.9, 0.9, 0.9); scopeLine = RGB(0.9, 0.9, 0.9);
tuningBarLight = RGBColor(0.4, 0.4, 0.4); tuningBarLight = RGB(0.4, 0.4, 0.4);
tuningBarDark = RGBColor(0.1, 0.1, 0.1); tuningBarDark = RGB(0.1, 0.1, 0.1);
tuningBarUp = RGBColor(0.8, 0.8, 0.8); tuningBarUp = RGB(0.8, 0.8, 0.8);
tuningBarDown = RGBColor(0.4, 0.4, 0.4); tuningBarDown = RGB(0.4, 0.4, 0.4);
meterLevel = RGBColor(0.5, 0.5, 0.5); meterLevel = RGB(0.5, 0.5, 0.5);
meterValue = RGBColor(0.5, 0.5, 0.5); meterValue = RGB(0.5, 0.5, 0.5);
text = RGBColor(1, 1, 1); text = RGB(1, 1, 1);
freqLine = RGBColor(1, 1, 1); freqLine = RGB(1, 1, 1);
button = RGBColor(0.65, 0.65, 0.65); button = RGB(0.65, 0.65, 0.65);
buttonHighlight = RGBColor(1, 1, 1); buttonHighlight = RGB(1, 1, 1);
scopeBackground = RGBColor(0.1, 0.1, 0.1); scopeBackground = RGB(0.1, 0.1, 0.1);
fftBackground = RGBColor(0.1, 0.1, 0.1); fftBackground = RGB(0.1, 0.1, 0.1);
generalBackground = RGBColor(0.1, 0.1, 0.1); generalBackground = RGB(0.1, 0.1, 0.1);
} }
@ -139,27 +139,27 @@ SharpColorTheme::SharpColorTheme() {
waterfallGradient.addColor(GradientColor(1.0, 0.25, 0.0)); waterfallGradient.addColor(GradientColor(1.0, 0.25, 0.0));
waterfallGradient.addColor(GradientColor(0.5, 0.1, 0.0)); waterfallGradient.addColor(GradientColor(0.5, 0.1, 0.0));
waterfallGradient.generate(256); waterfallGradient.generate(256);
waterfallHighlight = RGBColor(0.9, 0.9, 1.0); waterfallHighlight = RGB(0.9, 0.9, 1.0);
waterfallNew = RGBColor(0, 1, 0); waterfallNew = RGB(0, 1, 0);
waterfallHover = RGBColor(1, 1, 0); waterfallHover = RGB(1, 1, 0);
waterfallDestroy = RGBColor(1, 0, 0); waterfallDestroy = RGB(1, 0, 0);
fftLine = RGBColor(0.9, 0.9, 1.0); fftLine = RGB(0.9, 0.9, 1.0);
fftHighlight = RGBColor(0.9, 0.9, 1.0); fftHighlight = RGB(0.9, 0.9, 1.0);
scopeLine = RGBColor(0.85, 0.85, 1.0); scopeLine = RGB(0.85, 0.85, 1.0);
tuningBarLight = RGBColor(28.0 / 255.0, 106.0 / 255.0, 179.0 / 255.0); tuningBarLight = RGB(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); tuningBarDark = RGB(14.0 / 255.0, 53.0 / 255.0, 89.5 / 255.0);
tuningBarUp = RGBColor(0.7, 0.7, 0.7); tuningBarUp = RGB(0.7, 0.7, 0.7);
tuningBarDown = RGBColor(1.0, 0.0, 0.0); tuningBarDown = RGB(1.0, 0.0, 0.0);
meterLevel = RGBColor(28.0 / 255.0, 106.0 / 255.0, 179.0 / 255.0); meterLevel = RGB(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); meterValue = RGB(190.0 / 255.0, 190.0 / 255.0, 60.0 / 255.0);
text = RGBColor(0.9, 0.9, 1); text = RGB(0.9, 0.9, 1);
freqLine = RGBColor(0.85, 0.85, 1.0); freqLine = RGB(0.85, 0.85, 1.0);
button = RGBColor(217.0 / 255.0, 218.0 / 255.0, 228.0 / 255.0); button = RGB(217.0 / 255.0, 218.0 / 255.0, 228.0 / 255.0);
buttonHighlight = RGBColor(208.0 / 255.0, 249.0 / 255.0, 255.0 / 255.0); buttonHighlight = RGB(208.0 / 255.0, 249.0 / 255.0, 255.0 / 255.0);
scopeBackground = RGBColor(0.05, 0.05, 0.15); scopeBackground = RGB(0.05, 0.05, 0.15);
fftBackground = RGBColor(0.05, 0.05, 0.15); fftBackground = RGB(0.05, 0.05, 0.15);
generalBackground = RGBColor(0.05, 0.05, 0.15); generalBackground = RGB(0.05, 0.05, 0.15);
} }
RadColorTheme::RadColorTheme() { RadColorTheme::RadColorTheme() {
@ -170,27 +170,27 @@ RadColorTheme::RadColorTheme() {
waterfallGradient.addColor(GradientColor(1.0, 40.0 / 255.0, 40.0 / 255.0)); waterfallGradient.addColor(GradientColor(1.0, 40.0 / 255.0, 40.0 / 255.0));
waterfallGradient.addColor(GradientColor(1.0, 1.0, 1.0)); waterfallGradient.addColor(GradientColor(1.0, 1.0, 1.0));
waterfallGradient.generate(256); waterfallGradient.generate(256);
waterfallHighlight = RGBColor(1, 1, 1); waterfallHighlight = RGB(1, 1, 1);
waterfallNew = RGBColor(0, 1, 0); waterfallNew = RGB(0, 1, 0);
waterfallHover = RGBColor(1, 1, 0); waterfallHover = RGB(1, 1, 0);
waterfallDestroy = RGBColor(1, 0, 0); waterfallDestroy = RGB(1, 0, 0);
fftLine = RGBColor(1.0, 0.9, 0.9); fftLine = RGB(1.0, 0.9, 0.9);
fftHighlight = RGBColor(1, 1, 1); fftHighlight = RGB(1, 1, 1);
scopeLine = RGBColor(1.0, 0.9, 0.9); scopeLine = RGB(1.0, 0.9, 0.9);
tuningBarLight = RGBColor(0.0, 0.45, 0.0); tuningBarLight = RGB(0.0, 0.45, 0.0);
tuningBarDark = RGBColor(0.0, 0.1, 0.0); tuningBarDark = RGB(0.0, 0.1, 0.0);
tuningBarUp = RGBColor(1.0, 0.0, 0.0); tuningBarUp = RGB(1.0, 0.0, 0.0);
tuningBarDown = RGBColor(0.0, 0.5, 1.0); tuningBarDown = RGB(0.0, 0.5, 1.0);
meterLevel = RGBColor(0, 0.5, 0); meterLevel = RGB(0, 0.5, 0);
meterValue = RGBColor(0.5, 0, 0); meterValue = RGB(0.5, 0, 0);
text = RGBColor(1, 1, 1); text = RGB(1, 1, 1);
freqLine = RGBColor(1, 1, 1); freqLine = RGB(1, 1, 1);
button = RGBColor(0.65, 0.65, 0.65); button = RGB(0.65, 0.65, 0.65);
buttonHighlight = RGBColor(0.76, 0.65, 0); buttonHighlight = RGB(0.76, 0.65, 0);
scopeBackground = RGBColor(13.0 / 255.0, 47.0 / 255.0, 9.0 / 255.0); scopeBackground = RGB(13.0 / 255.0, 47.0 / 255.0, 9.0 / 255.0);
fftBackground = RGBColor(0, 0, 50.0 / 255.0); fftBackground = RGB(0, 0, 50.0 / 255.0);
generalBackground = RGBColor(13.0 / 255.0, 47.0 / 255.0, 9.0 / 255.0); generalBackground = RGB(13.0 / 255.0, 47.0 / 255.0, 9.0 / 255.0);
} }
TouchColorTheme::TouchColorTheme() { TouchColorTheme::TouchColorTheme() {
@ -204,27 +204,27 @@ TouchColorTheme::TouchColorTheme() {
waterfallGradient.addColor(GradientColor(255.0 / 255.0, 0.0 / 255.0, 0.0 / 255.0)); waterfallGradient.addColor(GradientColor(255.0 / 255.0, 0.0 / 255.0, 0.0 / 255.0));
waterfallGradient.addColor(GradientColor(255.0 / 255.0, 255.0 / 255.0, 255.0 / 255.0)); waterfallGradient.addColor(GradientColor(255.0 / 255.0, 255.0 / 255.0, 255.0 / 255.0));
waterfallGradient.generate(256); waterfallGradient.generate(256);
waterfallHighlight = RGBColor(1, 1, 1); waterfallHighlight = RGB(1, 1, 1);
waterfallNew = RGBColor(0, 1, 0); waterfallNew = RGB(0, 1, 0);
waterfallHover = RGBColor(1, 1, 0); waterfallHover = RGB(1, 1, 0);
waterfallDestroy = RGBColor(1, 0, 0); waterfallDestroy = RGB(1, 0, 0);
fftLine = RGBColor(234.0 / 255.0, 232.0 / 255.0, 247.0 / 255.0); fftLine = RGB(234.0 / 255.0, 232.0 / 255.0, 247.0 / 255.0);
fftHighlight = RGBColor(1.0, 1.0, 1.0); fftHighlight = RGB(1.0, 1.0, 1.0);
scopeLine = RGBColor(234.0 / 255.0, 232.0 / 255.0, 247.0 / 255.0); scopeLine = RGB(234.0 / 255.0, 232.0 / 255.0, 247.0 / 255.0);
tuningBarLight = RGBColor(0.2, 0.2, 0.7); tuningBarLight = RGB(0.2, 0.2, 0.7);
tuningBarDark = RGBColor(0.1, 0.1, 0.45); tuningBarDark = RGB(0.1, 0.1, 0.45);
tuningBarUp = RGBColor(0.5, 139.0/255.0, 96.0/255.0); tuningBarUp = RGB(0.5, 139.0/255.0, 96.0/255.0);
tuningBarDown = RGBColor(0.6, 108.0/255.0, 1.0); tuningBarDown = RGB(0.6, 108.0/255.0, 1.0);
meterLevel = RGBColor(61.0 / 255.0, 57.0 / 255.0, 88.0 / 255.0); meterLevel = RGB(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); meterValue = RGB(61.0 / 255.0, 57.0 / 255.0, 88.0 / 255.0);
text = RGBColor(1, 1, 1); text = RGB(1, 1, 1);
freqLine = RGBColor(1, 1, 1); freqLine = RGB(1, 1, 1);
button = RGBColor(1.0, 1.0, 1.0); button = RGB(1.0, 1.0, 1.0);
buttonHighlight = RGBColor(208.0 / 255.0, 202.0 / 255.0, 247.0 / 255.0); buttonHighlight = RGB(208.0 / 255.0, 202.0 / 255.0, 247.0 / 255.0);
scopeBackground = RGBColor(39.0 / 255.0, 36.0 / 255.0, 56.0 / 255.0); scopeBackground = RGB(39.0 / 255.0, 36.0 / 255.0, 56.0 / 255.0);
fftBackground = RGBColor(39.0 / 255.0, 36.0 / 255.0, 56.0 / 255.0); fftBackground = RGB(39.0 / 255.0, 36.0 / 255.0, 56.0 / 255.0);
generalBackground = RGBColor(61.0 / 255.0, 57.0 / 255.0, 88.0 / 255.0); generalBackground = RGB(61.0 / 255.0, 57.0 / 255.0, 88.0 / 255.0);
} }
@ -239,27 +239,27 @@ HDColorTheme::HDColorTheme() {
waterfallGradient.addColor(GradientColor(255.0 / 255.0, 235.0 / 255.0, 100.0 / 255.0)); waterfallGradient.addColor(GradientColor(255.0 / 255.0, 235.0 / 255.0, 100.0 / 255.0));
waterfallGradient.addColor(GradientColor(250.0 / 255.0, 250.0 / 255.0, 250.0 / 255.0)); waterfallGradient.addColor(GradientColor(250.0 / 255.0, 250.0 / 255.0, 250.0 / 255.0));
waterfallGradient.generate(256); waterfallGradient.generate(256);
waterfallHighlight = RGBColor(1, 1, 1); waterfallHighlight = RGB(1, 1, 1);
waterfallNew = RGBColor(0, 1, 0); waterfallNew = RGB(0, 1, 0);
waterfallHover = RGBColor(1, 1, 0); waterfallHover = RGB(1, 1, 0);
waterfallDestroy = RGBColor(1, 0, 0); waterfallDestroy = RGB(1, 0, 0);
fftLine = RGBColor(0.9, 0.9, 0.9); fftLine = RGB(0.9, 0.9, 0.9);
fftHighlight = RGBColor(1, 1, 1); fftHighlight = RGB(1, 1, 1);
scopeLine = RGBColor(0.9, 0.9, 0.9); scopeLine = RGB(0.9, 0.9, 0.9);
tuningBarLight = RGBColor(0.4, 0.4, 1.0); tuningBarLight = RGB(0.4, 0.4, 1.0);
tuningBarDark = RGBColor(0.1, 0.1, 0.45); tuningBarDark = RGB(0.1, 0.1, 0.45);
tuningBarUp = RGBColor(1.0, 139.0/255.0, 96.0/255.0); tuningBarUp = RGB(1.0, 139.0/255.0, 96.0/255.0);
tuningBarDown = RGBColor(148.0/255.0, 148.0/255.0, 1.0); tuningBarDown = RGB(148.0/255.0, 148.0/255.0, 1.0);
meterLevel = RGBColor(0, 0.5, 0); meterLevel = RGB(0, 0.5, 0);
meterValue = RGBColor(0.0, 0.0, 1.0); meterValue = RGB(0.0, 0.0, 1.0);
text = RGBColor(1, 1, 1); text = RGB(1, 1, 1);
freqLine = RGBColor(1, 1, 1); freqLine = RGB(1, 1, 1);
button = RGBColor(0, 0.7, 0.7); button = RGB(0, 0.7, 0.7);
buttonHighlight = RGBColor(1, 1, 1); buttonHighlight = RGB(1, 1, 1);
scopeBackground = RGBColor(0.0, 0.0, 48.0 / 255.0); scopeBackground = RGB(0.0, 0.0, 48.0 / 255.0);
fftBackground = RGBColor(0.0, 0.0, 48.0 / 255.0); fftBackground = RGB(0.0, 0.0, 48.0 / 255.0);
generalBackground = RGBColor(0.0, 0.0, 0.0); generalBackground = RGB(0.0, 0.0, 0.0);
} }

54
src/visual/ColorTheme.h
View File

@ -15,21 +15,21 @@
#define COLOR_THEME_RADAR 6 #define COLOR_THEME_RADAR 6
#define COLOR_THEME_MAX 7 #define COLOR_THEME_MAX 7
class RGBColor { class RGB {
public: public:
float r, g, b; float r, g, b;
RGBColor(float r, float g, float b) : RGB(float r, float g, float b) :
r(r), g(g), b(b) { r(r), g(g), b(b) {
} }
RGBColor() : RGB() :
RGBColor(0, 0, 0) { RGB(0, 0, 0) {
} }
~RGBColor() { ~RGB() {
} }
RGBColor & operator=(const RGBColor &other) { RGB & operator=(const RGB &other) {
r = other.r; r = other.r;
g = other.g; g = other.g;
b = other.b; b = other.b;
@ -39,28 +39,28 @@ public:
class ColorTheme { class ColorTheme {
public: public:
RGBColor waterfallHighlight; RGB waterfallHighlight;
RGBColor waterfallNew; RGB waterfallNew;
RGBColor wfHighlight; RGB wfHighlight;
RGBColor waterfallHover; RGB waterfallHover;
RGBColor waterfallDestroy; RGB waterfallDestroy;
RGBColor fftLine; RGB fftLine;
RGBColor fftHighlight; RGB fftHighlight;
RGBColor scopeLine; RGB scopeLine;
RGBColor tuningBarLight; RGB tuningBarLight;
RGBColor tuningBarDark; RGB tuningBarDark;
RGBColor tuningBarUp; RGB tuningBarUp;
RGBColor tuningBarDown; RGB tuningBarDown;
RGBColor meterLevel; RGB meterLevel;
RGBColor meterValue; RGB meterValue;
RGBColor text; RGB text;
RGBColor freqLine; RGB freqLine;
RGBColor button; RGB button;
RGBColor buttonHighlight; RGB buttonHighlight;
RGBColor scopeBackground; RGB scopeBackground;
RGBColor fftBackground; RGB fftBackground;
RGBColor generalBackground; RGB generalBackground;
Gradient waterfallGradient; Gradient waterfallGradient;

8
src/visual/PrimaryGLContext.cpp
View File

@ -95,7 +95,7 @@ GLFont &PrimaryGLContext::getFont(GLFontSize esize) {
return fonts[esize]; return fonts[esize];
} }
void PrimaryGLContext::DrawDemodInfo(DemodulatorInstance *demod, RGBColor color, long long center_freq, long long srate) { void PrimaryGLContext::DrawDemodInfo(DemodulatorInstance *demod, RGB color, long long center_freq, long long srate) {
if (!demod) { if (!demod) {
return; return;
} }
@ -176,7 +176,7 @@ void PrimaryGLContext::DrawDemodInfo(DemodulatorInstance *demod, RGBColor color,
} }
void PrimaryGLContext::DrawDemod(DemodulatorInstance *demod, RGBColor color, long long center_freq, long long srate) { void PrimaryGLContext::DrawDemod(DemodulatorInstance *demod, RGB color, long long center_freq, long long srate) {
if (!demod) { if (!demod) {
return; return;
} }
@ -273,7 +273,7 @@ void PrimaryGLContext::DrawDemod(DemodulatorInstance *demod, RGBColor color, lon
} }
void PrimaryGLContext::DrawFreqSelector(float uxPos, RGBColor color, float w, long long center_freq, long long srate) { void PrimaryGLContext::DrawFreqSelector(float uxPos, RGB color, float w, long long center_freq, long long srate) {
DemodulatorInstance *demod = wxGetApp().getDemodMgr().getLastActiveDemodulator(); DemodulatorInstance *demod = wxGetApp().getDemodMgr().getLastActiveDemodulator();
long long bw = 0; long long bw = 0;
@ -324,7 +324,7 @@ void PrimaryGLContext::DrawFreqSelector(float uxPos, RGBColor color, float w, lo
} }
void PrimaryGLContext::DrawRangeSelector(float uxPos1, float uxPos2, RGBColor color) { void PrimaryGLContext::DrawRangeSelector(float uxPos1, float uxPos2, RGB color) {
if (uxPos2 < uxPos1) { if (uxPos2 < uxPos1) {
float temp = uxPos2; float temp = uxPos2;
uxPos2=uxPos1; uxPos2=uxPos1;

8
src/visual/PrimaryGLContext.h
View File

@ -24,10 +24,10 @@ public:
void BeginDraw(float r, float g, float b); void BeginDraw(float r, float g, float b);
void EndDraw(); void EndDraw();
void DrawFreqSelector(float uxPos, RGBColor color, float w = 0, long long center_freq = -1, long long srate = 0); void DrawFreqSelector(float uxPos, RGB color, float w = 0, long long center_freq = -1, long long srate = 0);
void DrawRangeSelector(float uxPos1, float uxPos2, RGBColor color); void DrawRangeSelector(float uxPos1, float uxPos2, RGB color);
void DrawDemod(DemodulatorInstance *demod, RGBColor color, long long center_freq = -1, long long srate = 0); void DrawDemod(DemodulatorInstance *demod, RGB color, long long center_freq = -1, long long srate = 0);
void DrawDemodInfo(DemodulatorInstance *demod, RGBColor color, long long center_freq = -1, long long srate = 0); void DrawDemodInfo(DemodulatorInstance *demod, RGB color, long long center_freq = -1, long long srate = 0);
static GLFont &getFont(GLFontSize esize); static GLFont &getFont(GLFontSize esize);

8
src/visual/TuningCanvas.cpp
View File

@ -84,10 +84,10 @@ void TuningCanvas::OnPaint(wxPaintEvent& WXUNUSED(event)) {
0.75, mouseTracker.getOriginMouseX(), mouseTracker.getMouseX()); 0.75, mouseTracker.getOriginMouseX(), mouseTracker.getMouseX());
} }
RGBColor clr = top ? ThemeMgr::mgr.currentTheme->tuningBarUp : ThemeMgr::mgr.currentTheme->tuningBarDown; RGB clr = top ? ThemeMgr::mgr.currentTheme->tuningBarUp : ThemeMgr::mgr.currentTheme->tuningBarDown;
RGBColor clrDark = ThemeMgr::mgr.currentTheme->tuningBarDark; RGB clrDark = ThemeMgr::mgr.currentTheme->tuningBarDark;
RGBColor clrMid = ThemeMgr::mgr.currentTheme->tuningBarLight; RGB clrMid = ThemeMgr::mgr.currentTheme->tuningBarLight;
glContext->DrawTunerBarIndexed(1, 3, 11, freqDP, freqW, clrMid, 0.25, true, true); // freq 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); glContext->DrawTunerBarIndexed(4, 6, 11, freqDP, freqW, clrDark, 0.25, true, true);
@ -129,7 +129,7 @@ void TuningCanvas::OnPaint(wxPaintEvent& WXUNUSED(event)) {
glContext->DrawTuner(freq, 11, freqDP, freqW); glContext->DrawTuner(freq, 11, freqDP, freqW);
int snap = wxGetApp().getFrequencySnap(); int snap = wxGetApp().getFrequencySnap();
if (snap != 1) { if (snap != 1) {
glContext->DrawTunerDigitBox((int)log10(snap), 11, freqDP, freqW, RGBColor(1.0,0.0,0.0)); glContext->DrawTunerDigitBox((int)log10(snap), 11, freqDP, freqW, RGB(1.0,0.0,0.0));
} }
} }
glContext->DrawTuner(bw, 7, bwDP, bwW); glContext->DrawTuner(bw, 7, bwDP, bwW);

4
src/visual/TuningContext.cpp
View File

@ -112,7 +112,7 @@ void TuningContext::DrawTuner(long long freq, int count, float displayPos, float
} }
void TuningContext::DrawTunerDigitBox(int index, int count, float displayPos, float displayWidth, RGBColor c) { void TuningContext::DrawTunerDigitBox(int index, int count, float displayPos, float displayWidth, RGB c) {
GLint vp[4]; GLint vp[4];
glGetIntegerv( GL_VIEWPORT, vp); glGetIntegerv( GL_VIEWPORT, vp);
@ -152,7 +152,7 @@ int TuningContext::GetTunerDigitIndex(float mPos, int count, float displayPos, f
return count - index; return count - index;
} }
void TuningContext::DrawTunerBarIndexed(int start, int end, int count, float displayPos, float displayWidth, RGBColor color, float alpha, bool top, void TuningContext::DrawTunerBarIndexed(int start, int end, int count, float displayPos, float displayWidth, RGB color, float alpha, bool top,
bool bottom) { bool bottom) {
float ofs = (displayWidth / (float) count); float ofs = (displayWidth / (float) count);
float p2 = displayPos + ofs * (float) (count - start + 1); float p2 = displayPos + ofs * (float) (count - start + 1);

4
src/visual/TuningContext.h
View File

@ -14,9 +14,9 @@ public:
void DrawBegin(); void DrawBegin();
void Draw(float r, float g, float b, float a, float p1, float p2); void Draw(float r, float g, float b, float a, float p1, float p2);
void DrawTuner(long long freq, int count, float displayPos, float displayWidth); void DrawTuner(long long freq, int count, float displayPos, float displayWidth);
void DrawTunerDigitBox(int index, int count, float displayPos, float displayWidth, RGBColor c); void DrawTunerDigitBox(int index, int count, float displayPos, float displayWidth, RGB c);
int GetTunerDigitIndex(float mPos, int count, float displayPos, float displayWidth); int GetTunerDigitIndex(float mPos, int count, float displayPos, float displayWidth);
void DrawTunerBarIndexed(int start, int end, int count, float displayPos, float displayWidth, RGBColor color, float alpha, bool top, bool bottom); void DrawTunerBarIndexed(int start, int end, int count, float displayPos, float displayWidth, RGB color, float alpha, bool top, bool bottom);
void DrawDemodFreqBw(long long freq, unsigned int bw, long long center); void DrawDemodFreqBw(long long freq, unsigned int bw, long long center);
void DrawEnd(); void DrawEnd();