1
0
mirror of https://github.com/f4exb/sdrangel.git synced 2026-07-25 19:44:12 -04:00

Specify Scope and Spectrum Vis floating point sample scale

This commit is contained in:
f4exb
2018-01-22 14:07:24 +01:00
parent 61a16eade9
commit a47587e16f
17 changed files with 45 additions and 29 deletions
+5 -4
View File
@@ -17,8 +17,9 @@ MESSAGE_CLASS_DEFINITION(ScopeVis::MsgConfigureScopeVis, Message)
const uint ScopeVis::m_traceChunkSize = 4800;
ScopeVis::ScopeVis(GLScope* glScope) :
ScopeVis::ScopeVis(Real scalef, GLScope* glScope) :
m_glScope(glScope),
m_scalef(scalef),
m_tracebackCount(0),
m_fill(0),
m_triggerState(Untriggered),
@@ -111,7 +112,7 @@ void ScopeVis::feed(const SampleVector::const_iterator& cbegin, const SampleVect
for(int i = 0; i < count; ++i)
{
*it++ = Complex(begin->real() / SDR_RX_SCALEF, begin->imag() / SDR_RX_SCALEF);
*it++ = Complex(begin->real() / m_scalef, begin->imag() / m_scalef);
++begin;
}
@@ -234,7 +235,7 @@ void ScopeVis::feed(const SampleVector::const_iterator& cbegin, const SampleVect
for(int i = 0; i < count; ++i)
{
*it++ = Complex(begin->real() / SDR_RX_SCALEF, begin->imag() / SDR_RX_SCALEF);
*it++ = Complex(begin->real() / m_scalef, begin->imag() / m_scalef);
++begin;
}
@@ -341,7 +342,7 @@ void ScopeVis::setSampleRate(int sampleRate)
bool ScopeVis::triggerCondition(SampleVector::const_iterator& it)
{
Complex c(it->real()/SDR_RX_SCALEF, it->imag()/SDR_RX_SCALEF);
Complex c(it->real()/m_scalef, it->imag()/m_scalef);
m_traceback.push_back(c); // store into trace memory FIFO
if (m_tracebackCount < m_traceback.size())