mirror of
https://github.com/f4exb/sdrangel.git
synced 2025-09-06 15:17:48 -04:00
Scope: update trace continuously for sweep times of one second or more
This commit is contained in:
parent
ba64e1cd52
commit
7ab87d594a
@ -32,7 +32,9 @@ The interface is essentially divided in the following sections
|
|||||||
4. Scope trace control
|
4. Scope trace control
|
||||||
5. Scope trigger control
|
5. Scope trigger control
|
||||||
|
|
||||||
Note: the spectrum view (Channel spectrum) is not presented here.
|
Note 1: the scope trace is updated continuously for sweep times of 1 second or more else the display is refreshed only when the trace finishes.
|
||||||
|
|
||||||
|
Note 2: the spectrum view (Channel spectrum) is not presented here.
|
||||||
|
|
||||||
<h2>C. Channel controls</h2>
|
<h2>C. Channel controls</h2>
|
||||||
|
|
||||||
|
@ -595,10 +595,17 @@ int ScopeVis::processTraces(const SampleVector::const_iterator& cbegin, const Sa
|
|||||||
m_nbSamples--;
|
m_nbSamples--;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
float traceTime = ((float) m_traceSize) / m_sampleRate;
|
||||||
|
|
||||||
|
if (traceTime >= 1.0f) { // display continuously if trace time is 1 second or more
|
||||||
|
m_glScope->newTraces(&m_traces.m_traces[m_traces.currentBufferIndex()]);
|
||||||
|
}
|
||||||
|
|
||||||
if (m_nbSamples == 0) // finished
|
if (m_nbSamples == 0) // finished
|
||||||
{
|
{
|
||||||
//sqDebug("ScopeVis::processTraces: m_traceCount: %d", m_traces.m_tracesControl.begin()->m_traceCount[m_traces.currentBufferIndex()]);
|
if (traceTime < 1.0f) { // display only at trace end if trace time is less than 1 second
|
||||||
m_glScope->newTraces(&m_traces.m_traces[m_traces.currentBufferIndex()]);
|
m_glScope->newTraces(&m_traces.m_traces[m_traces.currentBufferIndex()]);
|
||||||
|
}
|
||||||
m_traces.switchBuffer();
|
m_traces.switchBuffer();
|
||||||
return end - begin; // return remainder count
|
return end - begin; // return remainder count
|
||||||
}
|
}
|
||||||
|
@ -562,7 +562,6 @@ private:
|
|||||||
TriggerUntriggered, //!< Trigger is not kicked off yet (or trigger list is empty)
|
TriggerUntriggered, //!< Trigger is not kicked off yet (or trigger list is empty)
|
||||||
TriggerTriggered, //!< Trigger has been kicked off
|
TriggerTriggered, //!< Trigger has been kicked off
|
||||||
TriggerDelay, //!< Trigger conditions have been kicked off but it is waiting for delay before final kick off
|
TriggerDelay, //!< Trigger conditions have been kicked off but it is waiting for delay before final kick off
|
||||||
TriggerNewConfig, //!< Special condition when a new configuration has been received
|
|
||||||
};
|
};
|
||||||
|
|
||||||
struct TriggerCondition
|
struct TriggerCondition
|
||||||
|
Loading…
x
Reference in New Issue
Block a user