VE7UWU/sdrangel
1
0
Fork 0
mirror of https://github.com/f4exb/sdrangel.git synced 2024-12-17 23:28:50 -05:00
Code Issues Projects Releases Wiki Activity

Scope: block incoming traces (trigger) while in trace memory

Browse Source
This commit is contained in:
f4exb 2016-04-01 04:42:47 +02:00
parent 42ba2ca5a0
commit dc16def6e3
4 changed files with 22 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
sdrbase/dsp/scopevis.cpp
View File

@ -409,6 +409,22 @@ void ScopeVis::setOneShot(bool oneShot)
}
}
void ScopeVis::blockTrigger(bool blocked)
{
if (blocked)
{
m_triggerState = WaitForReset;
}
else
{
if (!m_triggerOneShot) {
m_tracebackCount = 0;
m_triggerState = Untriggered;
m_triggerIndex = 0;
}
}
}
bool ScopeVis::nextTrigger()
{
if (m_triggerCount < m_triggerCounts[m_triggerIndex])

1
sdrbase/dsp/scopevis.h
View File

@ -38,6 +38,7 @@ public:
uint triggerCounts,
uint traceSize);
void setOneShot(bool oneShot);
void blockTrigger(bool blecked);
virtual void feed(const SampleVector::const_iterator& begin, const SampleVector::const_iterator& end, bool positiveOnly);
virtual void start();

2
sdrbase/gui/glscopegui.cpp
View File

@ -782,7 +782,9 @@ void GLScopeGUI::on_memIndex_valueChanged(int value)
if(m_glScope != 0)
{
m_scopeVis->blockTrigger(value != 0);
m_glScope->setMemHistoryShift(value);
emit traceMemoryChanged(value);
}
}

3
sdrbase/gui/glscopegui.h
View File

@ -30,6 +30,9 @@ public:
bool handleMessage(Message* message);
signals:
void traceMemoryChanged(int);
private:
Ui::GLScopeGUI* ui;