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

Channel Analyzer: display trace max and average power. Interim state #1

Browse Source
This commit is contained in:
f4exb 2015-10-27 04:56:52 +01:00
parent 681863b2a2
commit ed6e078cff
2 changed files with 56 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
include/gui/glscope.h
View File

@ -91,6 +91,9 @@ private:
std::vector<Complex> m_rawTrace; std::vector<Complex> m_rawTrace;
std::vector<Complex> m_mathTrace; std::vector<Complex> m_mathTrace;
std::vector<Complex>* m_displayTrace; std::vector<Complex>* m_displayTrace;
std::vector<Real> m_powTrace;
Real m_maxPow;
Real m_sumPow;
int m_oldTraceSize; int m_oldTraceSize;
int m_sampleRate; int m_sampleRate;
Real m_amp1; Real m_amp1;
@ -110,6 +113,7 @@ private:
ScopeVis::TriggerChannel m_triggerChannel; ScopeVis::TriggerChannel m_triggerChannel;
Real m_triggerLevel; Real m_triggerLevel;
Real m_triggerPre; Real m_triggerPre;
int m_nbPow;
// graphics stuff // graphics stuff
QRectF m_glScopeRect1; QRectF m_glScopeRect1;
@ -145,6 +149,7 @@ private:
void handleMode(); void handleMode();
void applyConfig(); void applyConfig();
void drawPowerOverlay();
protected slots: protected slots:
void tick(); void tick();

56
sdrbase/gui/glscope.cpp
View File

@ -6,12 +6,13 @@
#include <algorithm> #include <algorithm>
#include <QDebug> #include <QDebug>
/*
#ifdef _WIN32 #ifdef _WIN32
static double log2f(double n) static double log2f(double n)
{ {
return log(n) / log(2.0); return log(n) / log(2.0);
} }
#endif #endif*/
GLScope::GLScope(QWidget* parent) : GLScope::GLScope(QWidget* parent) :
QGLWidget(parent), QGLWidget(parent),
@ -360,7 +361,8 @@ void GLScope::paintGL()
} }
// paint trace // paint trace
if(m_displayTrace->size() > 0) { if(m_displayTrace->size() > 0)
{
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() * (float)m_timeBase / (float)(m_displayTrace->size() - 1), -(m_glScopeRect1.height() / 2) * m_amp1, 1); glScalef(m_glScopeRect1.width() * (float)m_timeBase / (float)(m_displayTrace->size() - 1), -(m_glScopeRect1.height() / 2) * m_amp1, 1);
@ -375,20 +377,55 @@ void GLScope::paintGL()
start--; start--;
float posLimit = 1.0 / m_amp1; float posLimit = 1.0 / m_amp1;
float negLimit = -1.0 / m_amp1; float negLimit = -1.0 / m_amp1;
glBegin(GL_LINE_STRIP); glBegin(GL_LINE_STRIP);
for(int i = start; i < end; i++) {
for(int i = start; i < end; i++)
{
float v = (*m_displayTrace)[i].real() + m_ofs1; float v = (*m_displayTrace)[i].real() + m_ofs1;
if(v > posLimit) if(v > posLimit)
v = posLimit; v = posLimit;
else if(v < negLimit) else if(v < negLimit)
v = negLimit; v = negLimit;
glVertex2f(i - start, v); glVertex2f(i - start, v);
if (m_mode == ModeMagdBPha)
{
if (i == start)
{
m_maxPow = m_powTrace[i];
m_sumPow = m_powTrace[i];
}
else
{
if (m_powTrace[i] > m_maxPow)
{
m_maxPow = m_powTrace[i];
}
m_sumPow += m_powTrace[i];
}
}
} }
m_nbPow = end - start;
glEnd(); glEnd();
//glDisable(GL_LINE_SMOOTH); //glDisable(GL_LINE_SMOOTH);
glPopMatrix(); glPopMatrix();
} }
// Paint powers overlays
if (m_mode == ModeMagdBPha)
{
if (m_nbPow > 0)
{
qDebug("%.1f %.1f", 10.0f * log10f(m_maxPow), 10.0f * log10f(m_sumPow / m_nbPow));
}
}
// paint trigger time line if pretriggered // paint trigger time line if pretriggered
/* /*
if ((m_triggerPre > 0.0) && if ((m_triggerPre > 0.0) &&
@ -716,11 +753,15 @@ void GLScope::handleMode()
} }
case ModeMagdBPha: { case ModeMagdBPha: {
m_mathTrace.resize(m_rawTrace.size()); m_mathTrace.resize(m_rawTrace.size());
m_powTrace.resize(m_rawTrace.size());
std::vector<Complex>::iterator dst = m_mathTrace.begin(); std::vector<Complex>::iterator dst = m_mathTrace.begin();
Real mult = (10.0f / log2f(10.0f)); std::vector<Real>::iterator powDst = m_powTrace.begin();
//Real mult = (10.0f / log2f(10.0f));
for(std::vector<Complex>::const_iterator src = m_rawTrace.begin(); src != m_rawTrace.end(); ++src) { for(std::vector<Complex>::const_iterator src = m_rawTrace.begin(); src != m_rawTrace.end(); ++src) {
Real v = src->real() * src->real() + src->imag() * src->imag(); Real v = src->real() * src->real() + src->imag() * src->imag();
v = (100.0 - m_ofs*100.0 + (mult * log2f(v))) / 100.0; // TODO: first term is the offset *powDst++ = v;
//v = (100.0 - m_ofs*100.0 + (mult * log2f(v))) / 100.0; // TODO: first term is the offset
v = (100.0f - m_ofs*100.0f + (10.0f * log10f(v))) / 100.0f; // TODO: first term is the offset
*dst++ = Complex(v, arg(*src) / M_PI); *dst++ = Complex(v, arg(*src) / M_PI);
} }
m_displayTrace = &m_mathTrace; m_displayTrace = &m_mathTrace;
@ -764,6 +805,11 @@ void GLScope::handleMode()
} }
} }
void GLScope::drawPowerOverlay()
{
}
void GLScope::applyConfig() void GLScope::applyConfig()
{ {
m_configChanged = false; m_configChanged = false;