From 14d5b5e9132c610d9a5b83748b7fffe5402686b3 Mon Sep 17 00:00:00 2001 From: f4exb Date: Sun, 26 Feb 2017 09:25:55 +0100 Subject: [PATCH] New scope: trace overlay implemented on all displays --- sdrbase/gui/glscopeng.cpp | 23 ++++++++++++++++++++++- 1 file changed, 22 insertions(+), 1 deletion(-) diff --git a/sdrbase/gui/glscopeng.cpp b/sdrbase/gui/glscopeng.cpp index c1854b6eb..a39c4fd77 100644 --- a/sdrbase/gui/glscopeng.cpp +++ b/sdrbase/gui/glscopeng.cpp @@ -346,7 +346,17 @@ void GLScopeNG::paintGL() mat.translate(-1.0f + 2.0f * rectX, 1.0f - 2.0f * rectY); mat.scale(2.0f * rectW, -2.0f * rectH); m_glShaderSimple.drawSegments(mat, color, q3, 2); - } // display trace + } // display trigger + + // Paint overlay if any + if ((m_focusedTraceIndex == 0) && (traceData.m_hasTextOverlay)) + { + drawChannelOverlay( + traceData.m_textOverlay, + traceData.m_traceColor, + m_channelOverlayPixmap1, + m_glScopeRect1); + } } // trace length > 0 } // Display X @@ -509,6 +519,17 @@ void GLScopeNG::paintGL() mat.scale(2.0f * rectW, -2.0f * rectH); m_glShaderSimple.drawSegments(mat, color, q3, 2); } + + // Paint overlay if any + if ((i == m_focusedTraceIndex) && (traceData.m_hasTextOverlay)) + { + drawChannelOverlay( + traceData.m_textOverlay, + traceData.m_traceColor, + m_channelOverlayPixmap2, + m_glScopeRect2); + } + } // one trace display } // trace length > 0 } // Display Y