VE7UWU/sdrangel
1
0
Fork 0
mirror of https://github.com/f4exb/sdrangel.git synced 2025-10-30 20:40:20 -04:00
Code Issues Projects Releases Wiki Activity

Display trigger line in logarithmic magnitude mode

Browse Source
This commit is contained in:
f4exb 2015-07-26 17:33:30 +02:00
parent da9d4d7d52
commit 6dea38ab47
1 changed files with 13 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
sdrbase/gui/glscope.cpp
View File

@ -332,7 +332,7 @@ void GLScope::paintGL()
glBlendFunc(GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA); glBlendFunc(GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA);
glEnable(GL_LINE_SMOOTH); glEnable(GL_LINE_SMOOTH);
glLineWidth(1.0f); glLineWidth(1.0f);
glColor4f(0, 1, 0, 0.3f); glColor4f(0, 1, 0, 0.5f);
glBegin(GL_LINE_LOOP); glBegin(GL_LINE_LOOP);
if (m_triggerChannel == ScopeVis::TriggerChannelI) if (m_triggerChannel == ScopeVis::TriggerChannelI)
@ -347,14 +347,19 @@ void GLScope::paintGL()
glVertex2f(0, (y - 1.0)/m_amp1); glVertex2f(0, (y - 1.0)/m_amp1);
glVertex2f(1, (y - 1.0)/m_amp1); glVertex2f(1, (y - 1.0)/m_amp1);
} }
else if (m_triggerChannel == ScopeVis::TriggerMagDb)
{
Real y = (m_triggerLevel - m_ofs) * m_amp1;
/*
std::cerr << "m_triggerLevel=" << m_triggerLevel
<< " amp1=" << m_amp1
<< " ofs=" << m_ofs
<< " ofs1=" << m_ofs1 << std::endl;*/
glVertex2f(0, (y - 1.0)/m_amp1);
glVertex2f(1, (y - 1.0)/m_amp1);
}
glEnd(); glEnd();
/*
glColor4f(0, 0.8f, 0.0, 0.3f);
glBegin(GL_LINE_LOOP);
glVertex2f(0, m_triggerLevelLow);
glVertex2f(1, m_triggerLevelLow);
glEnd();*/
glDisable(GL_LINE_SMOOTH); glDisable(GL_LINE_SMOOTH);
glPopMatrix(); glPopMatrix();
} }
@ -517,7 +522,7 @@ void GLScope::paintGL()
glBlendFunc(GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA); glBlendFunc(GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA);
glEnable(GL_LINE_SMOOTH); glEnable(GL_LINE_SMOOTH);
glLineWidth(1.0f); glLineWidth(1.0f);
glColor4f(0, 1, 0, 0.3f); glColor4f(0, 1, 0, 0.5f);
glBegin(GL_LINE_LOOP); glBegin(GL_LINE_LOOP);
glVertex2f(0, m_triggerLevel); glVertex2f(0, m_triggerLevel);
glVertex2f(1, m_triggerLevel); glVertex2f(1, m_triggerLevel);