VE7UWU/sdrangel
1
0
Fork 0
mirror of https://github.com/f4exb/sdrangel.git synced 2025-08-03 14:32:25 -04:00
Code Issues Projects Releases Wiki Activity

Display pre-trigger time line on scope

Browse Source
This commit is contained in:
f4exb 2015-07-27 02:12:37 +02:00
parent ab80992890
commit 1e61a5dc29
3 changed files with 76 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -63,6 +63,7 @@ public:
void setDisplayTraceIntensity(int intensity); void setDisplayTraceIntensity(int intensity);
void setTriggerChannel(ScopeVis::TriggerChannel triggerChannel); void setTriggerChannel(ScopeVis::TriggerChannel triggerChannel);
void setTriggerLevel(Real triggerLevel); void setTriggerLevel(Real triggerLevel);
void setTriggerPre(Real triggerPre);
void newTrace(const std::vector<Complex>& trace, int sampleRate); void newTrace(const std::vector<Complex>& trace, int sampleRate);
int getTraceSize() const { return m_rawTrace.size(); } int getTraceSize() const { return m_rawTrace.size(); }
@ -107,7 +108,7 @@ private:
int m_timeOfsProMill; int m_timeOfsProMill;
ScopeVis::TriggerChannel m_triggerChannel; ScopeVis::TriggerChannel m_triggerChannel;
Real m_triggerLevel; Real m_triggerLevel;
//Real m_triggerLevelLow; Real m_triggerPre;
// graphics stuff // graphics stuff
QRectF m_glScopeRect1; QRectF m_glScopeRect1;

74
sdrbase/gui/glscope.cpp
View File

@ -35,6 +35,7 @@ GLScope::GLScope(QWidget* parent) :
m_timeOfsProMill(0), m_timeOfsProMill(0),
m_triggerChannel(ScopeVis::TriggerFreeRun), m_triggerChannel(ScopeVis::TriggerFreeRun),
m_triggerLevel(0.0), m_triggerLevel(0.0),
m_triggerPre(0.0),
m_displayGridIntensity(5), m_displayGridIntensity(5),
m_displayTraceIntensity(50), m_displayTraceIntensity(50),
m_left1ScaleTextureAllocated(false), m_left1ScaleTextureAllocated(false),
@ -393,6 +394,40 @@ void GLScope::paintGL()
glDisable(GL_LINE_SMOOTH); glDisable(GL_LINE_SMOOTH);
glPopMatrix(); glPopMatrix();
} }
// paint trigger time line if pretriggered
if ((m_triggerPre > 0.0) &&
((m_triggerChannel == ScopeVis::TriggerChannelI)
|| (m_triggerChannel == ScopeVis::TriggerMagLin)
|| (m_triggerChannel == ScopeVis::TriggerMagDb)))
{
float x = (m_triggerPre - (m_timeOfsProMill/1000.0)) * m_displayTrace->size();
//std::cerr << "x=" << x << " w=" << (float) m_displayTrace->size() / (float) m_timeBase << std::endl;
if ((x >= 0.0) && (x <= (float) m_displayTrace->size() / (float) m_timeBase))
{
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(0, 1, 0, 0.5f);
glBegin(GL_LINE_LOOP);
float posLimit = 1.0 / m_amp1;
float negLimit = -1.0 / m_amp1;
glVertex2f(x, posLimit);
glVertex2f(x, negLimit);
glEnd();
glDisable(GL_LINE_SMOOTH);
glPopMatrix();
}
}
} // Both displays or primary only } // Both displays or primary only
// Q - secondary display // Q - secondary display
@ -513,7 +548,7 @@ void GLScope::paintGL()
glPopMatrix(); glPopMatrix();
// paint trigger level // paint trigger level
if((m_triggerChannel == ScopeVis::TriggerPhase) || (m_triggerChannel == ScopeVis::TriggerChannelQ)) if ((m_triggerChannel == ScopeVis::TriggerPhase) || (m_triggerChannel == ScopeVis::TriggerChannelQ))
{ {
glPushMatrix(); glPushMatrix();
glTranslatef(m_glScopeRect2.x(), m_glScopeRect2.y() + m_glScopeRect2.height() / 2.0, 0); glTranslatef(m_glScopeRect2.x(), m_glScopeRect2.y() + m_glScopeRect2.height() / 2.0, 0);
@ -566,6 +601,38 @@ void GLScope::paintGL()
glDisable(GL_LINE_SMOOTH); glDisable(GL_LINE_SMOOTH);
glPopMatrix(); glPopMatrix();
} }
// paint trigger time line if pretriggered
if ((m_triggerPre > 0.0) &&
((m_triggerChannel == ScopeVis::TriggerPhase)
|| (m_triggerChannel == ScopeVis::TriggerChannelQ)))
{
float x = (m_triggerPre - (m_timeOfsProMill/1000.0)) * m_displayTrace->size();
if ((x >= 0.0) && (x <= (float) m_displayTrace->size() / (float) m_timeBase))
{
glPushMatrix();
glTranslatef(m_glScopeRect2.x(), m_glScopeRect2.y() + m_glScopeRect2.height() / 2.0, 0);
glScalef(m_glScopeRect2.width() * (float)m_timeBase / (float)(m_displayTrace->size() - 1), -(m_glScopeRect2.height() / 2) * m_amp2, 1);
glEnable(GL_BLEND);
glBlendFunc(GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA);
glEnable(GL_LINE_SMOOTH);
glLineWidth(1.0f);
glColor4f(0, 1, 0, 0.5f);
glBegin(GL_LINE_LOOP);
float posLimit = 1.0 / m_amp2;
float negLimit = -1.0 / m_amp2;
glVertex2f(x, posLimit);
glVertex2f(x, negLimit);
glEnd();
glDisable(GL_LINE_SMOOTH);
glPopMatrix();
}
}
} // Both displays or secondary display only } // Both displays or secondary display only
glPopMatrix(); glPopMatrix();
@ -1363,3 +1430,8 @@ void GLScope::setTriggerLevel(Real triggerLevel)
{ {
m_triggerLevel = triggerLevel; m_triggerLevel = triggerLevel;
} }
void GLScope::setTriggerPre(Real triggerPre)
{
m_triggerPre = triggerPre;
}

1
sdrbase/gui/glscopegui.cpp
View File

@ -218,6 +218,7 @@ void GLScopeGUI::applyTriggerSettings()
m_glScope->setTriggerChannel((ScopeVis::TriggerChannel) m_triggerChannel); m_glScope->setTriggerChannel((ScopeVis::TriggerChannel) m_triggerChannel);
m_glScope->setTriggerLevel(t); // [-1.0, 1.0] m_glScope->setTriggerLevel(t); // [-1.0, 1.0]
m_glScope->setTriggerPre(m_triggerPre/100.0); // [0.0, 1.0]
m_scopeVis->configure(m_messageQueue, m_scopeVis->configure(m_messageQueue,
(ScopeVis::TriggerChannel) m_triggerChannel, (ScopeVis::TriggerChannel) m_triggerChannel,