From 5b61e526d90cfecdbb649749b37f1f01d42a9e67 Mon Sep 17 00:00:00 2001 From: f4exb Date: Mon, 13 Feb 2017 08:41:53 +0100 Subject: [PATCH] New scope: fixed Y display only scale display --- sdrbase/gui/glscopeng.cpp | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/sdrbase/gui/glscopeng.cpp b/sdrbase/gui/glscopeng.cpp index 66be14569..ad58faa56 100644 --- a/sdrbase/gui/glscopeng.cpp +++ b/sdrbase/gui/glscopeng.cpp @@ -421,7 +421,7 @@ void GLScopeNG::paintGL() m_glShaderSimple.drawSegments(m_glScopeMatrix1, color, q3, 2*effectiveTicks); } - // paint left #1 scale + // paint left #2 scale { GLfloat vtx1[] = { 0, 1, @@ -435,7 +435,7 @@ void GLScopeNG::paintGL() 1, 0, 0, 0 }; - m_glShaderLeft1Scale.drawSurface(m_glLeft1ScaleMatrix, tex1, vtx1, 4); + m_glShaderLeft2Scale.drawSurface(m_glLeft1ScaleMatrix, tex1, vtx1, 4); } // paint bottom #1 scale @@ -594,7 +594,7 @@ void GLScopeNG::applyConfig() } else { - setYScale(m_y1Scale, 0); // Default to the X trace (trace #0) - If there is only one trace it should not get there (Y displays disabled in the UI) + setYScale(m_y2Scale, 0); // Default to the X trace (trace #0) - If there is only one trace it should not get there (Y displays disabled in the UI) } if ((m_displayMode == DisplayX) || (m_displayMode == DisplayY)) // unique display