VE7UWU/sdrangel
1
0
Fork 0
mirror of https://github.com/f4exb/sdrangel.git synced 2024-11-26 17:58:43 -05:00
Code Issues Projects Releases Wiki Activity

OpenGL modernization: GLScope modernization #3

Browse Source
This commit is contained in:
f4exb 2016-03-06 00:45:10 +01:00
parent e55da665e9
commit 8d843939e2
1 changed files with 53 additions and 56 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

95
sdrbase/gui/glscope.cpp
View File

@ -502,6 +502,10 @@ void GLScope::paintGL()
|| (m_triggerChannel == ScopeVis::TriggerMagDb) || (m_triggerChannel == ScopeVis::TriggerMagDb)
) )
{ {
float posLimit = 1.0 / m_amp1;
float negLimit = -1.0 / m_amp1;
#ifdef GL_DEPRECATED
glPushMatrix(); glPushMatrix();
glTranslatef(m_glScopeRect1.x(), m_glScopeRect1.y() + m_glScopeRect1.height() / 2.0, 0); glTranslatef(m_glScopeRect1.x(), m_glScopeRect1.y() + m_glScopeRect1.height() / 2.0, 0);
glScalef(m_glScopeRect1.width(), -(m_glScopeRect1.height() / 2) * m_amp1, 1); glScalef(m_glScopeRect1.width(), -(m_glScopeRect1.height() / 2) * m_amp1, 1);
@ -510,10 +514,7 @@ void GLScope::paintGL()
//glEnable(GL_LINE_SMOOTH); //glEnable(GL_LINE_SMOOTH);
glLineWidth(1.0f); glLineWidth(1.0f);
glColor4f(0, 1, 0, 0.4); glColor4f(0, 1, 0, 0.4);
float posLimit = 1.0 / m_amp1;
float negLimit = -1.0 / m_amp1;
#ifdef GL_DEPRECATED
glBegin(GL_LINE_LOOP); glBegin(GL_LINE_LOOP);
if ((m_triggerChannel == ScopeVis::TriggerChannelI) if ((m_triggerChannel == ScopeVis::TriggerChannelI)
@ -528,53 +529,39 @@ void GLScope::paintGL()
} }
glEnd(); glEnd();
//glDisable(GL_LINE_SMOOTH);
glPopMatrix();
#else #else
if ((m_triggerChannel == ScopeVis::TriggerChannelI)
|| (m_triggerChannel == ScopeVis::TriggerMagLin)
|| (m_triggerChannel == ScopeVis::TriggerMagDb))
{
if ((m_triggerLevelDis1 > negLimit) && (m_triggerLevelDis1 < posLimit)) if ((m_triggerLevelDis1 > negLimit) && (m_triggerLevelDis1 < posLimit))
{ {
GLfloat q3[] { GLfloat q3[] {
0, m_triggerLevelDis1, 0, m_triggerLevelDis1,
1, m_triggerLevelDis1 1, m_triggerLevelDis1
}; };
#ifdef GL_ANDROID
glEnableVertexAttribArray(GL_VERTEX_ARRAY); float rectX = m_glScopeRect1.x();
glVertexAttribPointer(GL_VERTEX_ARRAY, 2, GL_FLOAT, GL_FALSE, 0, q3); float rectY = m_glScopeRect1.y() + m_glScopeRect1.height() / 2.0f;
glDrawArrays(GL_LINES, 0, 2); float rectW = m_glScopeRect1.width();
glDisableVertexAttribArray(GL_VERTEX_ARRAY); float rectH = -(m_glScopeRect1.height() / 2.0f) * m_amp1;
#else
glEnableClientState(GL_VERTEX_ARRAY); QVector4D color(0.0f, 1.0f, 0.0f, 0.4f);
glVertexPointer(2, GL_FLOAT, 0, q3); QMatrix4x4 mat;
glDrawArrays(GL_LINES, 0, 2); mat.setToIdentity();
glDisableClientState(GL_VERTEX_ARRAY); mat.translate(-1.0f + 2.0f * rectX, 1.0f - 2.0f * rectY);
#endif mat.scale(2.0f * rectW, -2.0f * rectH);
} m_glShaderSimple.drawSegments(mat, color, q3, 2);
// glPushMatrix();
// glTranslatef(m_glScopeRect1.x(), m_glScopeRect1.y() + m_glScopeRect1.height() / 2.0, 0);
// glScalef(m_glScopeRect1.width(), -(m_glScopeRect1.height() / 2) * m_amp1, 1);
} }
#endif #endif
//glDisable(GL_LINE_SMOOTH);
glPopMatrix();
} }
// paint trace #1 // paint trace #1
if(m_displayTrace->size() > 0) if(m_displayTrace->size() > 0)
{ {
glPushMatrix();
glTranslatef(m_glScopeRect1.x(), m_glScopeRect1.y() + m_glScopeRect1.height() / 2.0, 0);
glScalef(m_glScopeRect1.width() * (float)m_timeBase / (float)(m_displayTrace->size() - 1), -(m_glScopeRect1.height() / 2) * m_amp1, 1);
glEnable(GL_BLEND);
glBlendFunc(GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA);
//glEnable(GL_LINE_SMOOTH);
glLineWidth(1.0f);
glColor4f(1, 1, 0.25f, m_displayTraceIntensity / 100.0);
int start = (m_timeOfsProMill/1000.0) * m_displayTrace->size();
int end = std::min(start + m_displayTrace->size()/m_timeBase, m_displayTrace->size());
if(end - start < 2)
start--;
float posLimit = 1.0 / m_amp1;
float negLimit = -1.0 / m_amp1;
#ifdef GL_DEPRECATED #ifdef GL_DEPRECATED
glBegin(GL_LINE_STRIP); glBegin(GL_LINE_STRIP);
@ -611,6 +598,13 @@ void GLScope::paintGL()
glEnd(); glEnd();
#else #else
{ {
int start = (m_timeOfsProMill/1000.0) * m_displayTrace->size();
int end = std::min(start + m_displayTrace->size()/m_timeBase, m_displayTrace->size());
if(end - start < 2)
start--;
float posLimit = 1.0 / m_amp1;
float negLimit = -1.0 / m_amp1;
GLfloat q3[2*(end -start)]; GLfloat q3[2*(end -start)];
for (int i = start; i < end; i++) for (int i = start; i < end; i++)
@ -642,22 +636,25 @@ void GLScope::paintGL()
} }
} }
} }
#ifdef GL_ANDROID
glEnableVertexAttribArray(GL_VERTEX_ARRAY); float rectX = m_glScopeRect1.x();
glVertexAttribPointer(GL_VERTEX_ARRAY, 2, GL_FLOAT, GL_FALSE, 0, q3); float rectY = m_glScopeRect1.y() + m_glScopeRect1.height() / 2.0f;
glDrawArrays(GL_LINE_STRIP, 0, end - start); float rectW = m_glScopeRect1.width() * (float)m_timeBase / (float)(m_displayTrace->size() - 1);
glDisableVertexAttribArray(GL_VERTEX_ARRAY); float rectH = -(m_glScopeRect1.height() / 2.0f) * m_amp1;
#else
glEnableClientState(GL_VERTEX_ARRAY); QVector4D color(1.0f, 1.0f, 0.25f, 0.4f);
glVertexPointer(2, GL_FLOAT, 0, q3); QMatrix4x4 mat;
glDrawArrays(GL_LINE_STRIP, 0, end - start); mat.setToIdentity();
glDisableClientState(GL_VERTEX_ARRAY); mat.translate(-1.0f + 2.0f * rectX, 1.0f - 2.0f * rectY);
#endif mat.scale(2.0f * rectW, -2.0f * rectH);
m_glShaderSimple.drawPolyline(mat, color, q3, end -start);
// glPushMatrix();
// glTranslatef(m_glScopeRect1.x(), m_glScopeRect1.y() + m_glScopeRect1.height() / 2.0, 0);
// glScalef(m_glScopeRect1.width() * (float)m_timeBase / (float)(m_displayTrace->size() - 1), -(m_glScopeRect1.height() / 2) * m_amp1, 1);
m_nbPow = end - start; m_nbPow = end - start;
} }
#endif #endif
//glDisable(GL_LINE_SMOOTH);
glPopMatrix();
} }
// Paint powers overlays // Paint powers overlays