comicsansg/CubicSDR
1
0
Fork 0
mirror of https://github.com/cjcliffe/CubicSDR.git synced 2026-08-14 15:33:41 -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/panel/ScopePanel.cpp
+2 -2
View File
@@ -65,8 +65,8 @@ void ScopePanel::drawPanelContents() {
} else if (scopeMode == SCOPE_MODE_XY) {
RGBA4f bg1(ThemeMgr::mgr.currentTheme->scopeBackground), bg2(ThemeMgr::mgr.currentTheme->scopeBackground * 2.0);
bg1.a = 0.05;
bg2.a = 0.05;
bg1.a = 0.05f;
bg2.a = 0.05f;
bgPanel.setFillColor(bg1, bg2);
bgPanel.calcTransform(transform);
bgPanel.draw();
src/panel/SpectrumPanel.cpp
+3 -3
View File
@@ -19,11 +19,11 @@ SpectrumPanel::SpectrumPanel() {
dbPanelCeil.setMarginPx(0);
dbPanelCeil.setFill(GLPanel::GLPANEL_FILL_GRAD_X);
dbPanelCeil.setFillColor(RGBA4f(0.2,0.2,0.2,5.0), RGBA4f(0.2,0.2,0.2,0.0));
dbPanelCeil.setFillColor(RGBA4f(0.2f,0.2f,0.2f,5.0f), RGBA4f(0.2f,0.2f,0.2f,0.0f));
dbPanelFloor.setMarginPx(0);
dbPanelFloor.setFill(GLPanel::GLPANEL_FILL_GRAD_X);
dbPanelFloor.setFillColor(RGBA4f(0.2,0.2,0.2,5.), RGBA4f(0.2,0.2,0.2,0.0));
dbPanelFloor.setFillColor(RGBA4f(0.2f,0.2f,0.2f,5.0f), RGBA4f(0.2f,0.2f,0.2f,0.0f));
}
@@ -124,7 +124,7 @@ void SpectrumPanel::drawPanelContents() {
a *= (rangeTrans-(range-(rangeMax-rangeTrans)))/rangeTrans;
}
glColor4f(0.12, 0.12, 0.12, a);
glColor4f(0.12f, 0.12f, 0.12f, a);
glBegin(GL_LINES);
for (double l = floorValue; l<=ceilValue+rangeStep; l+=rangeStep) {
p += rangeStep/range;