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

Transform error for scope divider / center line

Browse Source
This commit is contained in:
Charles J. Cliffe 2015-08-09 13:23:58 -04:00
parent db8e7a68d0
commit c970f8d5db
2 changed files with 2 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/panel/ScopePanel.cpp
View File

@ -29,7 +29,7 @@ void ScopePanel::drawPanelContents() {
bgPanel.calcTransform(transform); bgPanel.calcTransform(transform);
bgPanel.draw(); bgPanel.draw();
glLoadIdentity(); glLoadMatrixf(transform);
glColor3f(ThemeMgr::mgr.currentTheme->scopeLine.r * 0.35, ThemeMgr::mgr.currentTheme->scopeLine.g * 0.35, glColor3f(ThemeMgr::mgr.currentTheme->scopeLine.r * 0.35, ThemeMgr::mgr.currentTheme->scopeLine.g * 0.35,
ThemeMgr::mgr.currentTheme->scopeLine.b * 0.35); ThemeMgr::mgr.currentTheme->scopeLine.b * 0.35);
glBegin (GL_LINES); glBegin (GL_LINES);
@ -45,7 +45,7 @@ void ScopePanel::drawPanelContents() {
bgPanelStereo[1].calcTransform(transform); bgPanelStereo[1].calcTransform(transform);
bgPanelStereo[1].draw(); bgPanelStereo[1].draw();
glLoadIdentity(); glLoadMatrixf(transform);
glColor3f(ThemeMgr::mgr.currentTheme->scopeLine.r, ThemeMgr::mgr.currentTheme->scopeLine.g, ThemeMgr::mgr.currentTheme->scopeLine.b); glColor3f(ThemeMgr::mgr.currentTheme->scopeLine.r, ThemeMgr::mgr.currentTheme->scopeLine.g, ThemeMgr::mgr.currentTheme->scopeLine.b);
glBegin (GL_LINES); glBegin (GL_LINES);
glVertex2f(-1.0, 0.0); glVertex2f(-1.0, 0.0);

1
src/visual/ScopeCanvas.cpp
View File

@ -69,7 +69,6 @@ void ScopeCanvas::OnPaint(wxPaintEvent& WXUNUSED(event)) {
} }
scopePanel.setPoints(avData->waveform_points); scopePanel.setPoints(avData->waveform_points);
// waveform_points.assign(avData->waveform_points.begin(),avData->waveform_points.end());
setStereo(avData->channels == 2); setStereo(avData->channels == 2);
avData->decRefCount(); avData->decRefCount();