From c970f8d5db0668174d270b2409bb5dbd4f519842 Mon Sep 17 00:00:00 2001 From: "Charles J. Cliffe" Date: Sun, 9 Aug 2015 13:23:58 -0400 Subject: [PATCH] Transform error for scope divider / center line --- src/panel/ScopePanel.cpp | 4 ++-- src/visual/ScopeCanvas.cpp | 1 - 2 files changed, 2 insertions(+), 3 deletions(-) diff --git a/src/panel/ScopePanel.cpp b/src/panel/ScopePanel.cpp index 7f60597..c50fa08 100644 --- a/src/panel/ScopePanel.cpp +++ b/src/panel/ScopePanel.cpp @@ -29,7 +29,7 @@ void ScopePanel::drawPanelContents() { bgPanel.calcTransform(transform); bgPanel.draw(); - glLoadIdentity(); + glLoadMatrixf(transform); glColor3f(ThemeMgr::mgr.currentTheme->scopeLine.r * 0.35, ThemeMgr::mgr.currentTheme->scopeLine.g * 0.35, ThemeMgr::mgr.currentTheme->scopeLine.b * 0.35); glBegin (GL_LINES); @@ -45,7 +45,7 @@ void ScopePanel::drawPanelContents() { bgPanelStereo[1].calcTransform(transform); bgPanelStereo[1].draw(); - glLoadIdentity(); + glLoadMatrixf(transform); glColor3f(ThemeMgr::mgr.currentTheme->scopeLine.r, ThemeMgr::mgr.currentTheme->scopeLine.g, ThemeMgr::mgr.currentTheme->scopeLine.b); glBegin (GL_LINES); glVertex2f(-1.0, 0.0); diff --git a/src/visual/ScopeCanvas.cpp b/src/visual/ScopeCanvas.cpp index febc3b5..f27d355 100644 --- a/src/visual/ScopeCanvas.cpp +++ b/src/visual/ScopeCanvas.cpp @@ -69,7 +69,6 @@ void ScopeCanvas::OnPaint(wxPaintEvent& WXUNUSED(event)) { } scopePanel.setPoints(avData->waveform_points); -// waveform_points.assign(avData->waveform_points.begin(),avData->waveform_points.end()); setStereo(avData->channels == 2); avData->decRefCount();