VE7UWU/sdrangel
1
0
Fork 0
mirror of https://github.com/f4exb/sdrangel.git synced 2025-06-25 13:35:23 -04:00
Code Issues Projects Releases Wiki Activity

Adapted GLScope to new trigger model

Browse Source
This commit is contained in:
f4exb 2015-07-14 01:24:59 +02:00
parent b7a7f898bc
commit 9d9e419fd4
2 changed files with 16 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
include-gpl/gui/glscope.h
View File

@ -103,8 +103,8 @@ private:
int m_timeBase; int m_timeBase;
int m_timeOfsProMill; int m_timeOfsProMill;
ScopeVis::TriggerChannel m_triggerChannel; ScopeVis::TriggerChannel m_triggerChannel;
Real m_triggerLevelHigh; Real m_triggerLevel;
Real m_triggerLevelLow; //Real m_triggerLevelLow;
// graphics stuff // graphics stuff
QRectF m_glScopeRect1; QRectF m_glScopeRect1;

26
sdrbase/gui/glscope.cpp
View File

@ -273,14 +273,15 @@ void GLScope::paintGL()
glLineWidth(1.0f); glLineWidth(1.0f);
glColor4f(0, 1, 0, 0.3f); glColor4f(0, 1, 0, 0.3f);
glBegin(GL_LINE_LOOP); glBegin(GL_LINE_LOOP);
glVertex2f(0, m_triggerLevelHigh); glVertex2f(0, m_triggerLevel);
glVertex2f(1, m_triggerLevelHigh); glVertex2f(1, m_triggerLevel);
glEnd(); glEnd();
/*
glColor4f(0, 0.8f, 0.0, 0.3f); glColor4f(0, 0.8f, 0.0, 0.3f);
glBegin(GL_LINE_LOOP); glBegin(GL_LINE_LOOP);
glVertex2f(0, m_triggerLevelLow); glVertex2f(0, m_triggerLevelLow);
glVertex2f(1, m_triggerLevelLow); glVertex2f(1, m_triggerLevelLow);
glEnd(); glEnd();*/
glDisable(GL_LINE_SMOOTH); glDisable(GL_LINE_SMOOTH);
glPopMatrix(); glPopMatrix();
} }
@ -410,14 +411,15 @@ void GLScope::paintGL()
glLineWidth(1.0f); glLineWidth(1.0f);
glColor4f(0, 1, 0, 0.3f); glColor4f(0, 1, 0, 0.3f);
glBegin(GL_LINE_LOOP); glBegin(GL_LINE_LOOP);
glVertex2f(0, m_triggerLevelHigh); glVertex2f(0, m_triggerLevel);
glVertex2f(1, m_triggerLevelHigh); glVertex2f(1, m_triggerLevel);
glEnd(); glEnd();
/*
glColor4f(0, 0.8f, 0.0, 0.3f); glColor4f(0, 0.8f, 0.0, 0.3f);
glBegin(GL_LINE_LOOP); glBegin(GL_LINE_LOOP);
glVertex2f(0, m_triggerLevelLow); glVertex2f(0, m_triggerLevelLow);
glVertex2f(1, m_triggerLevelLow); glVertex2f(1, m_triggerLevelLow);
glEnd(); glEnd();*/
glDisable(GL_LINE_SMOOTH); glDisable(GL_LINE_SMOOTH);
glPopMatrix(); glPopMatrix();
} }
@ -491,17 +493,17 @@ void GLScope::mousePressEvent(QMouseEvent* event)
if(m_dspEngine != NULL) { if(m_dspEngine != NULL) {
qDebug("amp %f", amplitude); qDebug("amp %f", amplitude);
m_triggerLevelHigh = amplitude + 0.01 / m_amp; m_triggerLevel = amplitude + 0.01 / m_amp;
m_triggerLevelLow = amplitude - 0.01 / m_amp; m_triggerLevelLow = amplitude - 0.01 / m_amp;
if(m_triggerLevelHigh > 1.0) if(m_triggerLevel > 1.0)
m_triggerLevelHigh = 1.0; m_triggerLevel = 1.0;
else if(m_triggerLevelHigh < -1.0) else if(m_triggerLevel < -1.0)
m_triggerLevelHigh = -1.0; m_triggerLevel = -1.0;
if(m_triggerLevelLow > 1.0) if(m_triggerLevelLow > 1.0)
m_triggerLevelLow = 1.0; m_triggerLevelLow = 1.0;
else if(m_triggerLevelLow < -1.0) else if(m_triggerLevelLow < -1.0)
m_triggerLevelLow = -1.0; m_triggerLevelLow = -1.0;
m_scopeVis->configure(m_dspEngine->getMessageQueue(), channel, m_triggerLevelHigh, m_triggerLevelLow); m_scopeVis->configure(m_dspEngine->getMessageQueue(), channel, m_triggerLevel, m_triggerLevelLow);
m_triggerChannel = channel; m_triggerChannel = channel;
m_changed = true; m_changed = true;
update(); update();