VE7UWU
/
sdrangel
mirror of https://github.com/f4exb/sdrangel.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

GLScope: fixed pre-trigger samples initialization when trace size changes

This commit is contained in:
f4exb 2016-04-03 01:49:58 +02:00
parent ca52dbf5b4
commit f245dc8206
2 changed files with 18 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
sdrbase/gui/glscopegui.cpp
View File

@ -183,7 +183,6 @@ bool GLScopeGUI::deserialize(const QByteArray& data)
setTrigUI(m_triggerIndex); setTrigUI(m_triggerIndex);
setTrigLevelDisplay(); setTrigLevelDisplay();
applySettings(); applySettings();
applyTriggerSettings();
return true; return true;
} else { } else {
resetToDefaults(); resetToDefaults();
@ -191,6 +190,19 @@ bool GLScopeGUI::deserialize(const QByteArray& data)
} }
} }
void GLScopeGUI::applyAllTriggerSettings()
{
quint32 currentTriggerIndex = m_triggerIndex;
for (int i = 0; i < ScopeVis::m_nbTriggers; i++)
{
m_triggerIndex = i;
applyTriggerSettings();
}
m_triggerIndex = currentTriggerIndex;
}
void GLScopeGUI::setTrigUI(uint index) void GLScopeGUI::setTrigUI(uint index)
{ {
index %= ScopeVis::m_nbTriggers; index %= ScopeVis::m_nbTriggers;
@ -479,6 +491,10 @@ void GLScopeGUI::on_scope_traceSizeChanged(int)
setTrigPreDisplay(); setTrigPreDisplay();
setTrigDelayDisplay(); setTrigDelayDisplay();
applySettings(); applySettings();
if (m_triggerPre > 0) {
applyAllTriggerSettings(); // change of trace size changes number of pre-trigger samples
}
} }
void GLScopeGUI::on_scope_sampleRateChanged(int) void GLScopeGUI::on_scope_sampleRateChanged(int)

1
sdrbase/gui/glscopegui.h
View File

@ -67,6 +67,7 @@ private:
void applySettings(); void applySettings();
void applyTriggerSettings(); void applyTriggerSettings();
void applyAllTriggerSettings();
void setTimeScaleDisplay(); void setTimeScaleDisplay();
void setTraceLenDisplay(); void setTraceLenDisplay();
void setTimeOfsDisplay(); void setTimeOfsDisplay();