comicsansg/CubicSDR
1
0
Fork 0
mirror of https://github.com/cjcliffe/CubicSDR.git synced 2026-06-03 06:24:49 -04:00
Code Issues Projects Releases Wiki Activity

Cleanup MSVC warnings and deprecated C++ exception stuff

Browse Source
This commit is contained in:
Charles J. Cliffe
2016-06-01 19:42:34 -04:00
parent c1863d9319
commit 688181e566
26 changed files with 267 additions and 267 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/visual/ColorTheme.cpp
+129 -129
View File
@@ -39,226 +39,226 @@ DefaultColorTheme::DefaultColorTheme() {
waterfallGradient.addColor(GradientColor(0, 0, 1.0));
waterfallGradient.addColor(GradientColor(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.2f, 0.0));
waterfallGradient.generate(256);
waterfallHighlight = RGBA4f(1, 1, 1);
waterfallNew = RGBA4f(0, 1, 0);
waterfallHover = RGBA4f(1, 1, 0);
waterfallDestroy = RGBA4f(1, 0, 0);
fftLine = RGBA4f(0.9, 0.9, 0.9);
fftLine = RGBA4f(0.9f, 0.9f, 0.9f);
fftHighlight = RGBA4f(1, 1, 1);
scopeLine = RGBA4f(0.9, 0.9, 0.9);
tuningBarLight = RGBA4f(0.2, 0.2, 0.9);
tuningBarDark = RGBA4f(0.0, 0.0, 0.35);
tuningBarUp = RGBA4f(1.0, 139.0/255.0, 96.0/255.0);
tuningBarDown = RGBA4f(148.0/255.0, 148.0/255.0, 1.0);
meterLevel = RGBA4f(0.1, 0.75, 0.1);
meterValue = RGBA4f(0.75, 0.1, 0.1);
scopeLine = RGBA4f(0.9f, 0.9f, 0.9f);
tuningBarLight = RGBA4f(0.2f, 0.2f, 0.9f);
tuningBarDark = RGBA4f(0.0f, 0.0f, 0.35f);
tuningBarUp = RGBA4f(1.0f, 139.0f/255.0f, 96.0f/255.0f);
tuningBarDown = RGBA4f(148.0f/255.0f, 148.0f/255.0f, 1.0f);
meterLevel = RGBA4f(0.1f, 0.75f, 0.1f);
meterValue = RGBA4f(0.75f, 0.1f, 0.1f);
text = RGBA4f(1, 1, 1);
freqLine = RGBA4f(1, 1, 1);
button = RGBA4f(0.65, 0.65, 0.65);
button = RGBA4f(0.65f, 0.65f, 0.65f);
buttonHighlight = RGBA4f(1, 1, 0);
scopeBackground = RGBA4f(0.1, 0.1, 0.1);
fftBackground = RGBA4f(0.1, 0.1, 0.1);
generalBackground = RGBA4f(0.1, 0.1, 0.1);
scopeBackground = RGBA4f(0.1f, 0.1f, 0.1f);
fftBackground = RGBA4f(0.1f, 0.1f, 0.1f);
generalBackground = RGBA4f(0.1f, 0.1f, 0.1f);
}
RadarColorTheme::RadarColorTheme() {
name = "Rad";
waterfallGradient.addColor(GradientColor(5.0 / 255.0, 45.0 / 255.0, 10.0 / 255.0));
waterfallGradient.addColor(GradientColor(30.0 / 255.0, 150.0 / 255.0, 40.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(5.0f / 255.0f, 45.0f / 255.0f, 10.0f / 255.0f));
waterfallGradient.addColor(GradientColor(30.0f / 255.0f, 150.0f / 255.0f, 40.0f / 255.0f));
waterfallGradient.addColor(GradientColor(40.0f / 255.0f, 240.0f / 255.0f, 60.0f / 255.0f));
waterfallGradient.addColor(GradientColor(250.0f / 255.0f, 250.0f / 255.0f, 250.0f / 255.0f));
waterfallGradient.generate(256);
waterfallHighlight = RGBA4f(1, 1, 1);
waterfallNew = RGBA4f(0, 1, 0);
waterfallHover = RGBA4f(1, 1, 0);
waterfallDestroy = RGBA4f(1, 0, 0);
fftLine = RGBA4f(0.8, 1.0, 0.8);
fftLine = RGBA4f(0.8f, 1.0f, 0.8f);
fftHighlight = RGBA4f(1, 1, 1);
scopeLine = RGBA4f(0.8, 1.0, 0.8);
tuningBarLight = RGBA4f(0.0, 0.45, 0.0);
tuningBarDark = RGBA4f(0.0, 0.1, 0.0);
tuningBarUp = RGBA4f(1.0, 139.0/255.0, 96.0/255.0);
tuningBarDown = RGBA4f(148.0/255.0, 0.0, 0.0);
meterLevel = RGBA4f(0, 0.5, 0);
meterValue = RGBA4f(0, 0.5, 0);
text = RGBA4f(0.8, 1.0, 0.8);
scopeLine = RGBA4f(0.8f, 1.0f, 0.8f);
tuningBarLight = RGBA4f(0.0, 0.45f, 0.0);
tuningBarDark = RGBA4f(0.0, 0.1f, 0.0);
tuningBarUp = RGBA4f(1.0f, 139.0f/255.0f, 96.0f/255.0f);
tuningBarDown = RGBA4f(148.0f/255.0f, 0.0, 0.0);
meterLevel = RGBA4f(0, 0.5f, 0);
meterValue = RGBA4f(0, 0.5f, 0);
text = RGBA4f(0.8f, 1.0, 0.8f);
freqLine = RGBA4f(1, 1, 1);
button = RGBA4f(0.65, 0.75, 0.65);
buttonHighlight = RGBA4f(0.65, 1.0, 0.65);
button = RGBA4f(0.65f, 0.75f, 0.65f);
buttonHighlight = RGBA4f(0.65f, 1.0f, 0.65f);
scopeBackground = RGBA4f(0.05, 0.1, 0.05);
fftBackground = RGBA4f(0.05, 0.1, 0.05);
generalBackground = RGBA4f(0.05, 0.1, 0.05);
scopeBackground = RGBA4f(0.05f, 0.1f, 0.05f);
fftBackground = RGBA4f(0.05f, 0.1f, 0.05f);
generalBackground = RGBA4f(0.05f, 0.1f, 0.05f);
}
BlackAndWhiteColorTheme::BlackAndWhiteColorTheme() {
name = "Black & White";
waterfallGradient.addColor(GradientColor(0, 0, 0));
waterfallGradient.addColor(GradientColor(0.75, 0.75, 0.75));
waterfallGradient.addColor(GradientColor(1.0, 1.0, 1.0));
waterfallGradient.addColor(GradientColor(0.75f, 0.75f, 0.75f));
waterfallGradient.addColor(GradientColor(1.0f, 1.0f, 1.0f));
waterfallGradient.generate(256);
waterfallHighlight = RGBA4f(1, 1, 0.9);
waterfallHighlight = RGBA4f(1, 1, 0.9f);
waterfallNew = RGBA4f(0, 1, 0);
waterfallHover = RGBA4f(1, 1, 0);
waterfallDestroy = RGBA4f(1, 0, 0);
fftLine = RGBA4f(0.9, 0.9, 0.9);
fftHighlight = RGBA4f(1, 1, 0.9);
scopeLine = RGBA4f(0.9, 0.9, 0.9);
tuningBarLight = RGBA4f(0.4, 0.4, 0.4);
tuningBarDark = RGBA4f(0.1, 0.1, 0.1);
tuningBarUp = RGBA4f(0.8, 0.8, 0.8);
tuningBarDown = RGBA4f(0.4, 0.4, 0.4);
meterLevel = RGBA4f(0.5, 0.5, 0.5);
meterValue = RGBA4f(0.5, 0.5, 0.5);
fftLine = RGBA4f(0.9f, 0.9f, 0.9f);
fftHighlight = RGBA4f(1, 1, 0.9f);
scopeLine = RGBA4f(0.9f, 0.9f, 0.9f);
tuningBarLight = RGBA4f(0.4f, 0.4f, 0.4f);
tuningBarDark = RGBA4f(0.1f, 0.1f, 0.1f);
tuningBarUp = RGBA4f(0.8f, 0.8f, 0.8f);
tuningBarDown = RGBA4f(0.4f, 0.4f, 0.4f);
meterLevel = RGBA4f(0.5f, 0.5f, 0.5f);
meterValue = RGBA4f(0.5f, 0.5f, 0.5f);
text = RGBA4f(1, 1, 1);
freqLine = RGBA4f(1, 1, 1);
button = RGBA4f(0.65, 0.65, 0.65);
button = RGBA4f(0.65f, 0.65f, 0.65f);
buttonHighlight = RGBA4f(1, 1, 1);
scopeBackground = RGBA4f(0.1, 0.1, 0.1);
fftBackground = RGBA4f(0.1, 0.1, 0.1);
generalBackground = RGBA4f(0.1, 0.1, 0.1);
scopeBackground = RGBA4f(0.1f, 0.1f, 0.1f);
fftBackground = RGBA4f(0.1f, 0.1f, 0.1f);
generalBackground = RGBA4f(0.1f, 0.1f, 0.1f);
}
SharpColorTheme::SharpColorTheme() {
name = "Sharp";
waterfallGradient.addColor(GradientColor(0, 0, 0));
waterfallGradient.addColor(GradientColor(0.0, 0, 0.5));
waterfallGradient.addColor(GradientColor(0.0, 0.0, 1.0));
waterfallGradient.addColor(GradientColor(65.0 / 255.0, 161.0 / 255.0, 1.0));
waterfallGradient.addColor(GradientColor(1.0, 1.0, 1.0));
waterfallGradient.addColor(GradientColor(1.0, 1.0, 1.0));
waterfallGradient.addColor(GradientColor(1.0, 1.0, 0.5));
waterfallGradient.addColor(GradientColor(1.0, 1.0, 0.0));
waterfallGradient.addColor(GradientColor(1.0, 0.5, 0.0));
waterfallGradient.addColor(GradientColor(1.0, 0.25, 0.0));
waterfallGradient.addColor(GradientColor(0.5, 0.1, 0.0));
waterfallGradient.addColor(GradientColor(0.0, 0, 0.5f));
waterfallGradient.addColor(GradientColor(0.0, 0.0, 1.0f));
waterfallGradient.addColor(GradientColor(65.0f / 255.0f, 161.0f / 255.0f, 1.0f));
waterfallGradient.addColor(GradientColor(1.0f, 1.0f, 1.0f));
waterfallGradient.addColor(GradientColor(1.0f, 1.0f, 1.0f));
waterfallGradient.addColor(GradientColor(1.0f, 1.0f, 0.5f));
waterfallGradient.addColor(GradientColor(1.0f, 1.0f, 0.0f));
waterfallGradient.addColor(GradientColor(1.0f, 0.5f, 0.0f));
waterfallGradient.addColor(GradientColor(1.0f, 0.25f, 0.0f));
waterfallGradient.addColor(GradientColor(0.5f, 0.1f, 0.0f));
waterfallGradient.generate(256);
waterfallHighlight = RGBA4f(0.9, 0.9, 1.0);
waterfallHighlight = RGBA4f(0.9f, 0.9f, 1.0f);
waterfallNew = RGBA4f(0, 1, 0);
waterfallHover = RGBA4f(1, 1, 0);
waterfallDestroy = RGBA4f(1, 0, 0);
fftLine = RGBA4f(0.9, 0.9, 1.0);
fftHighlight = RGBA4f(0.9, 0.9, 1.0);
scopeLine = RGBA4f(0.85, 0.85, 1.0);
tuningBarLight = RGBA4f(28.0 / 255.0, 106.0 / 255.0, 179.0 / 255.0);
tuningBarDark = RGBA4f(14.0 / 255.0, 53.0 / 255.0, 89.5 / 255.0);
tuningBarUp = RGBA4f(0.7, 0.7, 0.7);
tuningBarDown = RGBA4f(1.0, 0.0, 0.0);
meterLevel = RGBA4f(28.0 / 255.0, 106.0 / 255.0, 179.0 / 255.0);
meterValue = RGBA4f(190.0 / 255.0, 190.0 / 255.0, 60.0 / 255.0);
text = RGBA4f(0.9, 0.9, 1);
freqLine = RGBA4f(0.85, 0.85, 1.0);
button = RGBA4f(217.0 / 255.0, 218.0 / 255.0, 228.0 / 255.0);
buttonHighlight = RGBA4f(208.0 / 255.0, 249.0 / 255.0, 255.0 / 255.0);
fftLine = RGBA4f(0.9f, 0.9f, 1.0);
fftHighlight = RGBA4f(0.9f, 0.9f, 1.0);
scopeLine = RGBA4f(0.85f, 0.85f, 1.0);
tuningBarLight = RGBA4f(28.0f / 255.0f, 106.0f / 255.0f, 179.0f / 255.0f);
tuningBarDark = RGBA4f(14.0f / 255.0f, 53.0f / 255.0f, 89.5f / 255.0f);
tuningBarUp = RGBA4f(0.7f, 0.7f, 0.7f);
tuningBarDown = RGBA4f(1.0f, 0.0, 0.0);
meterLevel = RGBA4f(28.0f / 255.0f, 106.0f / 255.0f, 179.0f / 255.0f);
meterValue = RGBA4f(190.0f / 255.0f, 190.0f / 255.0f, 60.0f / 255.0f);
text = RGBA4f(0.9f, 0.9f, 1);
freqLine = RGBA4f(0.85f, 0.85f, 1.0f);
button = RGBA4f(217.0f / 255.0f, 218.0f / 255.0f, 228.0f / 255.0f);
buttonHighlight = RGBA4f(208.0f / 255.0f, 249.0f / 255.0f, 255.0f / 255.0f);
scopeBackground = RGBA4f(0.05, 0.05, 0.15);
fftBackground = RGBA4f(0.05, 0.05, 0.15);
generalBackground = RGBA4f(0.05, 0.05, 0.15);
scopeBackground = RGBA4f(0.05f, 0.05f, 0.15f);
fftBackground = RGBA4f(0.05f, 0.05f, 0.15f);
generalBackground = RGBA4f(0.05f, 0.05f, 0.15f);
}
RadColorTheme::RadColorTheme() {
name = "Rad";
waterfallGradient.addColor(GradientColor(0, 0, 0.5));
waterfallGradient.addColor(GradientColor(25.0 / 255.0, 154.0 / 255.0, 0.0));
waterfallGradient.addColor(GradientColor(201.0 / 255.0, 115.0 / 255.0, 0.0));
waterfallGradient.addColor(GradientColor(1.0, 40.0 / 255.0, 40.0 / 255.0));
waterfallGradient.addColor(GradientColor(0, 0, 0.5f));
waterfallGradient.addColor(GradientColor(25.0f / 255.0f, 154.0f / 255.0f, 0.0));
waterfallGradient.addColor(GradientColor(201.0f / 255.0f, 115.0f / 255.0f, 0.0));
waterfallGradient.addColor(GradientColor(1.0, 40.0f / 255.0f, 40.0f / 255.0f));
waterfallGradient.addColor(GradientColor(1.0, 1.0, 1.0));
waterfallGradient.generate(256);
waterfallHighlight = RGBA4f(1, 1, 1);
waterfallNew = RGBA4f(0, 1, 0);
waterfallHover = RGBA4f(1, 1, 0);
waterfallDestroy = RGBA4f(1, 0, 0);
fftLine = RGBA4f(1.0, 0.9, 0.9);
fftLine = RGBA4f(1.0, 0.9f, 0.9f);
fftHighlight = RGBA4f(1, 1, 1);
scopeLine = RGBA4f(1.0, 0.9, 0.9);
tuningBarLight = RGBA4f(0.0, 0.45, 0.0);
tuningBarDark = RGBA4f(0.0, 0.1, 0.0);
scopeLine = RGBA4f(1.0, 0.9f, 0.9f);
tuningBarLight = RGBA4f(0.0, 0.45f, 0.0);
tuningBarDark = RGBA4f(0.0, 0.1f, 0.0);
tuningBarUp = RGBA4f(1.0, 0.0, 0.0);
tuningBarDown = RGBA4f(0.0, 0.5, 1.0);
meterLevel = RGBA4f(0, 0.5, 0);
meterValue = RGBA4f(0.5, 0, 0);
tuningBarDown = RGBA4f(0.0, 0.5f, 1.0);
meterLevel = RGBA4f(0, 0.5f, 0);
meterValue = RGBA4f(0.5f, 0, 0);
text = RGBA4f(1, 1, 1);
freqLine = RGBA4f(1, 1, 1);
button = RGBA4f(0.65, 0.65, 0.65);
buttonHighlight = RGBA4f(0.76, 0.65, 0);
button = RGBA4f(0.65f, 0.65f, 0.65f);
buttonHighlight = RGBA4f(0.76f, 0.65f, 0);
scopeBackground = RGBA4f(13.0 / 255.0, 47.0 / 255.0, 9.0 / 255.0);
fftBackground = RGBA4f(0, 0, 50.0 / 255.0);
generalBackground = RGBA4f(13.0 / 255.0, 47.0 / 255.0, 9.0 / 255.0);
scopeBackground = RGBA4f(13.0f / 255.0f, 47.0f / 255.0f, 9.0f / 255.0f);
fftBackground = RGBA4f(0, 0, 50.0f / 255.0f);
generalBackground = RGBA4f(13.0f / 255.0f, 47.0f / 255.0f, 9.0f / 255.0f);
}
TouchColorTheme::TouchColorTheme() {
name = "Touch";
waterfallGradient.addColor(GradientColor(0, 0, 0));
waterfallGradient.addColor(GradientColor(55.0 / 255.0, 40.0 / 255.0, 55.0 / 255.0));
waterfallGradient.addColor(GradientColor(61.0 / 255.0, 57.0 / 255.0, 88.0 / 255.0));
waterfallGradient.addColor(GradientColor(0.0 / 255.0, 255.0 / 255.0, 255.0 / 255.0));
waterfallGradient.addColor(GradientColor(10.0 / 255.0, 255.0 / 255.0, 85.0 / 255.0));
waterfallGradient.addColor(GradientColor(255.0 / 255.0, 255.0 / 255.0, 75.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(55.0f / 255.0f, 40.0f / 255.0f, 55.0f / 255.0f));
waterfallGradient.addColor(GradientColor(61.0f / 255.0f, 57.0f / 255.0f, 88.0f / 255.0f));
waterfallGradient.addColor(GradientColor(0.0f / 255.0f, 255.0f / 255.0f, 255.0f / 255.0f));
waterfallGradient.addColor(GradientColor(10.0f / 255.0f, 255.0f / 255.0f, 85.0f / 255.0f));
waterfallGradient.addColor(GradientColor(255.0f / 255.0f, 255.0f / 255.0f, 75.0f / 255.0f));
waterfallGradient.addColor(GradientColor(255.0f / 255.0f, 0.0f / 255.0f, 0.0f / 255.0f));
waterfallGradient.addColor(GradientColor(255.0f / 255.0f, 255.0f / 255.0f, 255.0f / 255.0f));
waterfallGradient.generate(256);
waterfallHighlight = RGBA4f(1, 1, 1);
waterfallNew = RGBA4f(0, 1, 0);
waterfallHover = RGBA4f(1, 1, 0);
waterfallDestroy = RGBA4f(1, 0, 0);
fftLine = RGBA4f(234.0 / 255.0, 232.0 / 255.0, 247.0 / 255.0);
fftHighlight = RGBA4f(1.0, 1.0, 1.0);
scopeLine = RGBA4f(234.0 / 255.0, 232.0 / 255.0, 247.0 / 255.0);
tuningBarLight = RGBA4f(0.2, 0.2, 0.7);
tuningBarDark = RGBA4f(0.1, 0.1, 0.45);
tuningBarUp = RGBA4f(0.5, 139.0/255.0, 96.0/255.0);
tuningBarDown = RGBA4f(0.6, 108.0/255.0, 1.0);
meterLevel = RGBA4f(61.0 / 255.0, 57.0 / 255.0, 88.0 / 255.0);
meterValue = RGBA4f(61.0 / 255.0, 57.0 / 255.0, 88.0 / 255.0);
fftLine = RGBA4f(234.0f / 255.0f, 232.0f / 255.0f, 247.0f / 255.0f);
fftHighlight = RGBA4f(1.0f, 1.0f, 1.0f);
scopeLine = RGBA4f(234.0f / 255.0f, 232.0f / 255.0f, 247.0f / 255.0f);
tuningBarLight = RGBA4f(0.2f, 0.2f, 0.7f);
tuningBarDark = RGBA4f(0.1f, 0.1f, 0.45f);
tuningBarUp = RGBA4f(0.5f, 139.0f/255.0f, 96.0f/255.0f);
tuningBarDown = RGBA4f(0.6f, 108.0f/255.0f, 1.0f);
meterLevel = RGBA4f(61.0f / 255.0f, 57.0f / 255.0f, 88.0f / 255.0f);
meterValue = RGBA4f(61.0f / 255.0f, 57.0f / 255.0f, 88.0f / 255.0f);
text = RGBA4f(1, 1, 1);
freqLine = RGBA4f(1, 1, 1);
button = RGBA4f(1.0, 1.0, 1.0);
buttonHighlight = RGBA4f(208.0 / 255.0, 202.0 / 255.0, 247.0 / 255.0);
button = RGBA4f(1.0f, 1.0f, 1.0f);
buttonHighlight = RGBA4f(208.0f / 255.0f, 202.0f / 255.0f, 247.0f / 255.0f);
scopeBackground = RGBA4f(39.0 / 255.0, 36.0 / 255.0, 56.0 / 255.0);
fftBackground = RGBA4f(39.0 / 255.0, 36.0 / 255.0, 56.0 / 255.0);
generalBackground = RGBA4f(61.0 / 255.0, 57.0 / 255.0, 88.0 / 255.0);
scopeBackground = RGBA4f(39.0f / 255.0f, 36.0f / 255.0f, 56.0f / 255.0f);
fftBackground = RGBA4f(39.0f / 255.0f, 36.0f / 255.0f, 56.0f / 255.0f);
generalBackground = RGBA4f(61.0f / 255.0f, 57.0f / 255.0f, 88.0f / 255.0f);
}
HDColorTheme::HDColorTheme() {
name = "HD";
waterfallGradient.addColor(GradientColor(5.0 / 255.0, 5.0 / 255.0, 60.0 / 255.0));
waterfallGradient.addColor(GradientColor(5.0 / 255.0, 20.0 / 255.0, 120.0 / 255.0));
waterfallGradient.addColor(GradientColor(50.0 / 255.0, 100.0 / 255.0, 200.0 / 255.0));
waterfallGradient.addColor(GradientColor(75.0 / 255.0, 190.0 / 255.0, 100.0 / 255.0));
waterfallGradient.addColor(GradientColor(240.0 / 255.0, 55.0 / 255.0, 5.0 / 255.0));
waterfallGradient.addColor(GradientColor(255.0 / 255.0, 55.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(5.0f / 255.0f, 5.0f / 255.0f, 60.0f / 255.0f));
waterfallGradient.addColor(GradientColor(5.0f / 255.0f, 20.0f / 255.0f, 120.0f / 255.0f));
waterfallGradient.addColor(GradientColor(50.0f / 255.0f, 100.0f / 255.0f, 200.0f / 255.0f));
waterfallGradient.addColor(GradientColor(75.0f / 255.0f, 190.0f / 255.0f, 100.0f / 255.0f));
waterfallGradient.addColor(GradientColor(240.0f / 255.0f, 55.0f / 255.0f, 5.0f / 255.0f));
waterfallGradient.addColor(GradientColor(255.0f / 255.0f, 55.0f / 255.0f, 100.0f / 255.0f));
waterfallGradient.addColor(GradientColor(255.0f / 255.0f, 235.0f / 255.0f, 100.0f / 255.0f));
waterfallGradient.addColor(GradientColor(250.0f / 255.0f, 250.0f / 255.0f, 250.0f / 255.0f));
waterfallGradient.generate(256);
waterfallHighlight = RGBA4f(1, 1, 1);
waterfallNew = RGBA4f(0, 1, 0);
waterfallHover = RGBA4f(1, 1, 0);
waterfallDestroy = RGBA4f(1, 0, 0);
fftLine = RGBA4f(0.9, 0.9, 0.9);
fftLine = RGBA4f(0.9f, 0.9f, 0.9f);
fftHighlight = RGBA4f(1, 1, 1);
scopeLine = RGBA4f(0.9, 0.9, 0.9);
tuningBarLight = RGBA4f(0.4, 0.4, 1.0);
tuningBarDark = RGBA4f(0.1, 0.1, 0.45);
tuningBarUp = RGBA4f(1.0, 139.0/255.0, 96.0/255.0);
tuningBarDown = RGBA4f(148.0/255.0, 148.0/255.0, 1.0);
meterLevel = RGBA4f(0, 0.5, 0);
scopeLine = RGBA4f(0.9f, 0.9f, 0.9f);
tuningBarLight = RGBA4f(0.4f, 0.4f, 1.0);
tuningBarDark = RGBA4f(0.1f, 0.1f, 0.45f);
tuningBarUp = RGBA4f(1.0, 139.0f/255.0f, 96.0f/255.0f);
tuningBarDown = RGBA4f(148.0f/255.0f, 148.0f/255.0f, 1.0f);
meterLevel = RGBA4f(0, 0.5f, 0);
meterValue = RGBA4f(0.0, 0.0, 1.0);
text = RGBA4f(1, 1, 1);
freqLine = RGBA4f(1, 1, 1);
button = RGBA4f(0, 0.7, 0.7);
button = RGBA4f(0, 0.7f, 0.7f);
buttonHighlight = RGBA4f(1, 1, 1);
scopeBackground = RGBA4f(0.0, 0.0, 48.0 / 255.0);
fftBackground = RGBA4f(0.0, 0.0, 48.0 / 255.0);
scopeBackground = RGBA4f(0.0, 0.0, 48.0f / 255.0f);
fftBackground = RGBA4f(0.0, 0.0, 48.0f / 255.0f);
generalBackground = RGBA4f(0.0, 0.0, 0.0);
}
src/visual/GainCanvas.cpp
+7 -7
View File
@@ -36,7 +36,7 @@ GainCanvas::GainCanvas(wxWindow *parent, int *dispAttrs) :
spacing = 2.0/numGains;
barWidth = (1.0/numGains)*0.8;
startPos = spacing/2.0;
barHeight = 0.8;
barHeight = 0.8f;
refreshCounter = 0;
}
@@ -226,7 +226,7 @@ void GainCanvas::updateGainUI() {
spacing = 2.0/numGains;
barWidth = (1.0/numGains)*0.7;
startPos = spacing/2.0;
barHeight = 0.8;
barHeight = 0.8f;
RGBA4f c1, c2;
@@ -260,7 +260,7 @@ void GainCanvas::updateGainUI() {
gInfo->levelPanel.setBorderPx(0);
gInfo->levelPanel.setMarginPx(1);
gInfo->levelPanel.setSize(1.0,0.8);
gInfo->levelPanel.setSize(1.0,0.8f);
float levelVal = float(gInfo->current-gInfo->low)/float(gInfo->high-gInfo->low);
gInfo->levelPanel.setSize(1.0, levelVal);
gInfo->levelPanel.setPosition(0.0, (-1.0+(levelVal)));
@@ -271,8 +271,8 @@ void GainCanvas::updateGainUI() {
gInfo->highlightPanel.setBorderPx(0);
gInfo->highlightPanel.setMarginPx(1);
gInfo->highlightPanel.setSize(1.0,0.8);
gInfo->highlightPanel.setPosition(0.0,-0.2);
gInfo->highlightPanel.setSize(1.0,0.8f);
gInfo->highlightPanel.setPosition(0.0,-0.2f);
gInfo->highlightPanel.setFill(GLPanel::GLPANEL_FILL_GRAD_BAR_X);
gInfo->highlightPanel.setBlend(GL_ONE, GL_ONE);
gInfo->highlightPanel.visible = false;
@@ -326,8 +326,8 @@ void GainCanvas::setThemeColors() {
c2.a = 1.0;
gInfo->levelPanel.setFillColor(c1, c2);
c1 = RGBA4f(0.3,0.3,0.3,1.0);
c2 = RGBA4f(0.65,0.65,0.65,1.0);;
c1 = RGBA4f(0.3f,0.3f,0.3f,1.0f);
c2 = RGBA4f(0.65f,0.65f,0.65f,1.0f);;
gInfo->highlightPanel.setFillColor(c1, c2);
}
Refresh();
src/visual/MeterCanvas.cpp
+1 -1
View File
@@ -91,7 +91,7 @@ void MeterCanvas::OnPaint(wxPaintEvent& WXUNUSED(event)) {
glContext->Draw(ThemeMgr::mgr.currentTheme->generalBackground.r, ThemeMgr::mgr.currentTheme->generalBackground.g, ThemeMgr::mgr.currentTheme->generalBackground.b, 0.5, 1.0);
if (mouseTracker.mouseInView()) {
glContext->Draw(0.4, 0.4, 0.4, 0.5, mouseTracker.getMouseY());
glContext->Draw(0.4f, 0.4f, 0.4f, 0.5f, mouseTracker.getMouseY());
}
glContext->Draw(ThemeMgr::mgr.currentTheme->meterLevel.r, ThemeMgr::mgr.currentTheme->meterLevel.g, ThemeMgr::mgr.currentTheme->meterLevel.b, 0.5, (level-level_min) / (level_max-level_min));
if (showUserInput) {
src/visual/PrimaryGLContext.cpp
+15 -15
View File
@@ -90,7 +90,7 @@ void PrimaryGLContext::DrawDemodInfo(DemodulatorInstance *demod, RGBA4f color, l
glEnable(GL_BLEND);
glBlendFunc(GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA);
glColor4f(color.r, color.g, color.b, 0.6);
glColor4f(color.r, color.g, color.b, 0.6f);
float ofs = ((float) demod->getBandwidth()) / (float) srate;
float ofsLeft = (demod->getDemodulatorType()!="USB")?ofs:0, ofsRight = (demod->getDemodulatorType()!="LSB")?ofs:0;
@@ -104,13 +104,13 @@ void PrimaryGLContext::DrawDemodInfo(DemodulatorInstance *demod, RGBA4f color, l
bool isSolo = soloMode && demod == wxGetApp().getDemodMgr().getLastActiveDemodulator();
if (isSolo) {
glColor4f(0.8, 0.8, 0, 0.35);
glColor4f(0.8f, 0.8f, 0, 0.35f);
} else if (demod->isMuted()) {
glColor4f(0.8, 0, 0, 0.35);
glColor4f(0.8f, 0, 0, 0.35f);
} else if (soloMode) {
glColor4f(0.2, 0, 0, 0.35);
glColor4f(0.2f, 0, 0, 0.35f);
} else {
glColor4f(0, 0, 0, 0.35);
glColor4f(0, 0, 0, 0.35f);
}
glBegin(GL_QUADS);
@@ -123,7 +123,7 @@ void PrimaryGLContext::DrawDemodInfo(DemodulatorInstance *demod, RGBA4f color, l
glBlendFunc(GL_SRC_ALPHA, GL_ONE);
glColor4f(color.r, color.g, color.b, 0.2);
glColor4f(color.r, color.g, color.b, 0.2f);
glBegin(GL_QUADS);
glVertex3f(uxPos - ofsLeft, 1.0, 0.0);
glVertex3f(uxPos - ofsLeft, -1.0, 0.0);
@@ -133,7 +133,7 @@ void PrimaryGLContext::DrawDemodInfo(DemodulatorInstance *demod, RGBA4f color, l
glEnd();
if (ofs * 2.0 < 16.0 / viewWidth) {
glColor4f(color.r, color.g, color.b, 0.2);
glColor4f(color.r, color.g, color.b, 0.2f);
glBegin(GL_QUADS);
glVertex3f(uxPos - ofsLeft, hPos + labelHeight, 0.0);
glVertex3f(uxPos - ofsLeft, -1.0, 0.0);
@@ -151,7 +151,7 @@ void PrimaryGLContext::DrawDemodInfo(DemodulatorInstance *demod, RGBA4f color, l
glEnd();
}
glColor4f(1.0, 1.0, 1.0, 0.8);
glColor4f(1.0, 1.0, 1.0, 0.8f);
std::string demodLabel = demod->getLabel();
@@ -207,7 +207,7 @@ void PrimaryGLContext::DrawFreqBwInfo(long long freq, int bw, RGBA4f color, long
glEnable(GL_BLEND);
glBlendFunc(GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA);
glColor4f(0, 0, 0, 0.35);
glColor4f(0, 0, 0, 0.35f);
glBegin(GL_QUADS);
glVertex3f(uxPos - ofsLeft, hPos + labelHeight, 0.0);
@@ -219,7 +219,7 @@ void PrimaryGLContext::DrawFreqBwInfo(long long freq, int bw, RGBA4f color, long
glBlendFunc(GL_SRC_ALPHA, GL_ONE);
glColor4f(color.r, color.g, color.b, 0.1);
glColor4f(color.r, color.g, color.b, 0.1f);
glBegin(GL_QUADS);
glVertex3f(uxPos - ofsLeft, 1.0, 0.0);
glVertex3f(uxPos - ofsLeft, -1.0, 0.0);
@@ -229,7 +229,7 @@ void PrimaryGLContext::DrawFreqBwInfo(long long freq, int bw, RGBA4f color, long
glEnd();
if (ofs * 2.0 < 16.0 / viewWidth) {
glColor4f(color.r, color.g, color.b, 0.1);
glColor4f(color.r, color.g, color.b, 0.1f);
glBegin(GL_QUADS);
glVertex3f(uxPos - ofsLeft, hPos + labelHeight, 0.0);
glVertex3f(uxPos - ofsLeft, -1.0, 0.0);
@@ -247,7 +247,7 @@ void PrimaryGLContext::DrawFreqBwInfo(long long freq, int bw, RGBA4f color, long
glEnd();
}
glColor4f(1.0, 1.0, 1.0, 0.8);
glColor4f(1.0, 1.0, 1.0, 0.8f);
std::string demodLabel = std::to_string((double)freq/1000000.0);
@@ -306,7 +306,7 @@ void PrimaryGLContext::DrawDemod(DemodulatorInstance *demod, RGBA4f color, long
glEnable(GL_BLEND);
glBlendFunc(GL_SRC_ALPHA, GL_ONE);
glColor4f(color.r, color.g, color.b, 0.6);
glColor4f(color.r, color.g, color.b, 0.6f);
float ofs = ((float) demod->getBandwidth()) / (float) srate;
float ofsLeft = (demod->getDemodulatorType()!="USB")?ofs:0, ofsRight = (demod->getDemodulatorType()!="LSB")?ofs:0;
@@ -410,7 +410,7 @@ void PrimaryGLContext::DrawFreqSelector(float uxPos, RGBA4f color, float w, long
glEnable(GL_BLEND);
glBlendFunc(GL_SRC_ALPHA, GL_ONE);
glColor4f(color.r, color.g, color.b, 0.6);
glColor4f(color.r, color.g, color.b, 0.6f);
glBegin(GL_LINES);
@@ -453,7 +453,7 @@ void PrimaryGLContext::DrawRangeSelector(float uxPos1, float uxPos2, RGBA4f colo
glEnable(GL_BLEND);
glBlendFunc(GL_SRC_ALPHA, GL_ONE);
glColor4f(color.r, color.g, color.b, 0.6);
glColor4f(color.r, color.g, color.b, 0.6f);
glLineWidth((last_type == "USB")?2.0:1.0);
src/visual/ScopeCanvas.cpp
+4 -4
View File
@@ -33,9 +33,9 @@ ScopeCanvas::ScopeCanvas(wxWindow *parent, int *dispAttrs) : InteractiveCanvas(p
glContext = new ScopeContext(this, &wxGetApp().GetContext(this));
inputData.set_max_num_items(2);
bgPanel.setFill(GLPanel::GLPANEL_FILL_GRAD_Y);
bgPanel.setSize(1.0, 0.5);
bgPanel.setPosition(0.0, -0.5);
panelSpacing = 0.4;
bgPanel.setSize(1.0, 0.5f);
bgPanel.setPosition(0.0, -0.5f);
panelSpacing = 0.4f;
parentPanel.addChild(&scopePanel);
parentPanel.addChild(&spectrumPanel);
@@ -147,7 +147,7 @@ void ScopeCanvas::OnPaint(wxPaintEvent& WXUNUSED(event)) {
glMatrixMode(GL_MODELVIEW);
glLoadIdentity();
CubicVR::mat4 modelView = CubicVR::mat4::lookat(0, 0, -1.205, 0, 0, 0, 0, -1, 0);
CubicVR::mat4 modelView = CubicVR::mat4::lookat(0, 0, -1.205f, 0, 0, 0, 0, -1, 0);
float panelWidth = 1.0;
float panelInterval = (panelWidth * 2.0 + panelSpacing);
src/visual/ScopeContext.cpp
+4 -4
View File
@@ -33,11 +33,11 @@ void ScopeContext::DrawTunerTitles(bool ppmMode) {
float viewHeight = (float) vp[3];
float hPos = (float) (13) / viewHeight;
glColor3f(0.65, 0.65, 0.65);
glColor3f(0.65f, 0.65f, 0.65f);
GLFont::getFont(GLFont::GLFONT_SIZE12).drawString(ppmMode?"Device PPM":"Frequency", -0.66, -1.0+hPos, 12, GLFont::GLFONT_ALIGN_CENTER, GLFont::GLFONT_ALIGN_CENTER, 0, 0, true);
GLFont::getFont(GLFont::GLFONT_SIZE12).drawString(ppmMode?"Device PPM":"Frequency", -0.66f, -1.0+hPos, 12, GLFont::GLFONT_ALIGN_CENTER, GLFont::GLFONT_ALIGN_CENTER, 0, 0, true);
GLFont::getFont(GLFont::GLFONT_SIZE12).drawString("Bandwidth", 0.0, -1.0+hPos, 12, GLFont::GLFONT_ALIGN_CENTER, GLFont::GLFONT_ALIGN_CENTER, 0, 0, true);
GLFont::getFont(GLFont::GLFONT_SIZE12).drawString("Center Frequency", 0.66, -1.0+hPos, 12, GLFont::GLFONT_ALIGN_CENTER, GLFont::GLFONT_ALIGN_CENTER, 0, 0, true);
GLFont::getFont(GLFont::GLFONT_SIZE12).drawString("Center Frequency", 0.66f, -1.0+hPos, 12, GLFont::GLFONT_ALIGN_CENTER, GLFont::GLFONT_ALIGN_CENTER, 0, 0, true);
}
void ScopeContext::DrawDeviceName(std::string deviceName) {
@@ -46,7 +46,7 @@ void ScopeContext::DrawDeviceName(std::string deviceName) {
float viewHeight = (float) vp[3];
float hPos = (float) (viewHeight - 20) / viewHeight;
glColor3f(0.65, 0.65, 0.65);
glColor3f(0.65f, 0.65f, 0.65f);
GLFont::getFont(GLFont::GLFONT_SIZE12).drawString(deviceName.c_str(), 1.0, hPos, 12, GLFont::GLFONT_ALIGN_RIGHT, GLFont::GLFONT_ALIGN_CENTER, 0, 0, true);
}
src/visual/TuningCanvas.cpp
+3 -3
View File
@@ -42,13 +42,13 @@ TuningCanvas::TuningCanvas(wxWindow *parent, int *dispAttrs) :
dragging = false;
freqDP = -1.0;
freqW = (1.0 / 3.0) * 2.0;
freqW = (1.0f / 3.0f) * 2.0f;
bwDP = -1.0 + (2.25 / 3.0);
bwW = (1.0 / 4.0) * 2.0;
centerDP = -1.0 + (2.0 / 3.0) * 2.0;
centerW = (1.0 / 3.0) * 2.0;
centerDP = -1.0f + (2.0f / 3.0f) * 2.0f;
centerW = (1.0f / 3.0f) * 2.0f;
currentPPM = lastPPM = 0;
}
src/visual/TuningContext.cpp
+5 -5
View File
@@ -98,7 +98,7 @@ void TuningContext::DrawTuner(long long freq, int count, float displayPos, float
GLFont::getFont(fontSize).drawString(freqStr.str().substr(i - ofs, 1), xpos, 0, fontHeight, GLFont::GLFONT_ALIGN_CENTER, GLFont::GLFONT_ALIGN_CENTER);
}
glColor4f(0.65, 0.65, 0.65, 0.25);
glColor4f(0.65f, 0.65f, 0.65f, 0.25f);
glEnable(GL_BLEND);
glBlendFunc(GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA);
glBegin(GL_LINES);
@@ -158,7 +158,7 @@ bool bottom) {
float p2 = displayPos + ofs * (float) (count - start + 1);
float p1 = displayPos + ofs * (float) (count - end);
float r = color.r, g = color.g, b = color.b, a = 0.6;
float r = color.r, g = color.g, b = color.b, a = 0.6f;
glEnable(GL_BLEND);
glBlendFunc(GL_ONE, GL_ONE);
@@ -184,8 +184,8 @@ bool bottom) {
}
void TuningContext::DrawDemodFreqBw(long long freq, unsigned int bw, long long center) {
DrawTuner(freq, 11, -1.0, (1.0 / 3.0) * 2.0);
DrawTuner(bw, 7, -1.0 + (2.25 / 3.0), (1.0 / 4.0) * 2.0);
DrawTuner(center, 11, -1.0 + (2.0 / 3.0) * 2.0, (1.0 / 3.0) * 2.0);
DrawTuner(freq, 11, -1.0, (1.0f / 3.0f) * 2.0f);
DrawTuner(bw, 7, -1.0 + (2.25f / 3.0f), (1.0f / 4.0f) * 2.0f);
DrawTuner(center, 11, -1.0 + (2.0f / 3.0f) * 2.0, (1.0f / 3.0f) * 2.0f);
}
src/visual/WaterfallCanvas.cpp
+4 -4
View File
@@ -355,7 +355,7 @@ void WaterfallCanvas::OnKeyUp(wxKeyEvent& event) {
scaleMove = 0.0;
zoom = 1.0;
if (mouseZoom != 1.0) {
mouseZoom = 0.95;
mouseZoom = 0.95f;
}
break;
case WXK_DOWN:
@@ -363,7 +363,7 @@ void WaterfallCanvas::OnKeyUp(wxKeyEvent& event) {
scaleMove = 0.0;
zoom = 1.0;
if (mouseZoom != 1.0) {
mouseZoom = 1.05;
mouseZoom = 1.05f;
}
break;
case WXK_LEFT:
@@ -388,7 +388,7 @@ void WaterfallCanvas::OnKeyDown(wxKeyEvent& event) {
case WXK_NUMPAD_UP:
if (!shiftDown) {
mouseZoom = 1.0;
zoom = 0.95;
zoom = 0.95f;
} else {
scaleMove = 1.0;
}
@@ -397,7 +397,7 @@ void WaterfallCanvas::OnKeyDown(wxKeyEvent& event) {
case WXK_NUMPAD_DOWN:
if (!shiftDown) {
mouseZoom = 1.0;
zoom = 1.05;
zoom = 1.05f;
} else {
scaleMove = -1.0;
}