VE7UWU/sdrangel
1
0
Fork 0
mirror of https://github.com/f4exb/sdrangel.git synced 2024-11-22 08:04:49 -05:00
Code Issues Projects Releases Wiki Activity

GLScope redesign: set number of streams separately

Browse Source
This commit is contained in:
f4exb 2021-06-12 10:47:03 +02:00
parent 7dbbd9f2ee
commit 5fde3dfb18
3 changed files with 12 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
sdrbase/dsp/scopevis.cpp
View File

@ -133,8 +133,18 @@ void ScopeVis::setPreTriggerDelay(uint32_t preTriggerDelay, bool emitSignal)
}
}
void ScopeVis::setNbStreams(uint32_t nbStreams)
{
QMutexLocker configLocker(&m_mutex);
if (m_nbStreams != nbStreams)
{
m_traceDiscreteMemory.setNbStreams(nbStreams);
m_nbStreams = nbStreams;
}
}
void ScopeVis::configure(
uint32_t nbStreams,
uint32_t traceSize,
uint32_t timeBase,
uint32_t timeOfsProMill,
@ -150,12 +160,6 @@ void ScopeVis::configure(
m_settings.m_traceLen = traceSize;
}
if (m_nbStreams != nbStreams)
{
m_traceDiscreteMemory.setNbStreams(nbStreams);
m_nbStreams = nbStreams;
}
if (m_timeBase != timeBase)
{
m_timeBase = timeBase;

2
sdrbase/dsp/scopevis.h
View File

@ -345,8 +345,8 @@ public:
MessageQueue *getInputMessageQueue() { return &m_inputMessageQueue; } //!< Get the queue for asynchronous inbound communication
void setLiveRate(int sampleRate);
void setNbStreams(uint32_t nbStreams);
void configure(
uint32_t nbStreams,
uint32_t traceSize,
uint32_t timeBase,
uint32_t timeOfsProMill,

7
sdrgui/gui/glscopegui.cpp
View File

@ -114,7 +114,6 @@ void GLScopeGUI::setBuddies(MessageQueue* messageQueue, ScopeVis* scopeVis, GLSc
fillProjectionCombo(ui->trigMode);
m_scopeVis->configure(
1,
2*m_traceLenMult*m_scopeVis->getTraceChunkSize(),
m_timeBase,
m_timeOffset*10,
@ -123,7 +122,6 @@ void GLScopeGUI::setBuddies(MessageQueue* messageQueue, ScopeVis* scopeVis, GLSc
);
m_scopeVis->configure(
1,
m_traceLenMult*m_scopeVis->getTraceChunkSize(),
m_timeBase,
m_timeOffset*10,
@ -591,7 +589,6 @@ void GLScopeGUI::on_time_valueChanged(int value)
setTimeScaleDisplay();
setTraceDelayDisplay();
m_scopeVis->configure(
1,
m_traceLenMult*m_scopeVis->getTraceChunkSize(),
m_timeBase,
m_timeOffset*10,
@ -610,7 +607,6 @@ void GLScopeGUI::on_timeOfs_valueChanged(int value)
m_settings.m_timeOfs = value;
setTimeOfsDisplay();
m_scopeVis->configure(
1,
m_traceLenMult*m_scopeVis->getTraceChunkSize(),
m_timeBase,
m_timeOffset*10,
@ -634,7 +630,6 @@ void GLScopeGUI::on_traceLen_valueChanged(int value)
m_traceLenMult = value;
m_settings.m_traceLen = m_traceLenMult*m_scopeVis->getTraceChunkSize();
m_scopeVis->configure(
1,
m_traceLenMult*m_scopeVis->getTraceChunkSize(),
m_timeBase,
m_timeOffset*10,
@ -1022,7 +1017,6 @@ void GLScopeGUI::on_trigPre_valueChanged(int value)
(void) value;
setTrigPreDisplay();
m_scopeVis->configure(
1,
m_traceLenMult*m_scopeVis->getTraceChunkSize(),
m_timeBase,
m_timeOffset*10,
@ -1064,7 +1058,6 @@ void GLScopeGUI::on_freerun_toggled(bool checked)
}
m_scopeVis->configure(
1,
m_traceLenMult*m_scopeVis->getTraceChunkSize(),
m_timeBase,
m_timeOffset*10,