VE7UWU/sdrangel
1
0
Fork 0
mirror of https://github.com/f4exb/sdrangel.git synced 2024-12-18 07:35:47 -05:00
Code Issues Projects Releases Wiki Activity

New scope: trace overlay implemented on all displays

Browse Source
This commit is contained in:
f4exb 2017-02-26 09:25:55 +01:00
parent 82d55764a9
commit 14d5b5e913
1 changed files with 22 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
sdrbase/gui/glscopeng.cpp
View File

@ -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