diff --git a/Readme.md b/Readme.md
index 25fb0c325..f05b758d6 100644
--- a/Readme.md
+++ b/Readme.md
@@ -176,7 +176,9 @@ For Debian Jessie or Stretch:
- Coarse and fine trigger level sliders
- Minimalist recording (no file choice)
- File sample source plugin (recording reader)
- - Trace history in the Channel Analyzer
+ - Scope: trace history
+ - Scope: trigger countdown
+ - Scope: multiple trigger chaining
Major redesign
@@ -199,8 +201,6 @@ For Debian Jessie or Stretch:
- Tx channels
- Possibility to connect channels for example Rx to Tx or single Rx channel to dual Rx channel supporting MI(MO) features like 360 degree polarization detection.
- Specialize plugins into channel and sample source plugins since both have almost complete different requirements and only little in common
- - Scope: trigger countdown
- - Scope: multiple trigger chaining
- 32 bit samples for the Channel Analyzer
- Enhance presets management (Edit, Move, Import/Export from/to human readable format like JSON).
- Headless mode based on a saved configuration in above human readable form
diff --git a/include/gui/glscopegui.h b/include/gui/glscopegui.h
index 63a130224..85251ec6e 100644
--- a/include/gui/glscopegui.h
+++ b/include/gui/glscopegui.h
@@ -98,6 +98,7 @@ private slots:
void on_trigDelay_valueChanged(int value);
void on_memHistory_valueChanged(int value);
void on_trigCount_valueChanged(int value);
+ void on_trigIndex_valueChanged(int value);
void on_horizView_clicked();
void on_vertView_clicked();
diff --git a/sdrbase/gui/glscopegui.cpp b/sdrbase/gui/glscopegui.cpp
index 9ff69392e..d6fe025ad 100644
--- a/sdrbase/gui/glscopegui.cpp
+++ b/sdrbase/gui/glscopegui.cpp
@@ -202,9 +202,13 @@ bool GLScopeGUI::deserialize(const QByteArray& data)
d.readBool(54 + 10*i, &m_triggerBothEdges[i], false);
d.readS32(55 + 10*i, &m_triggerDelay[i], 0);
d.readS32(56 + 10*i, &m_triggerCounts[i], 0);
+ m_triggerIndex = i;
+ applyTriggerSettings();
}
- setTrigUI(0);
+ m_triggerIndex = 0;
+
+ setTrigUI(m_triggerIndex);
setTrigLevelDisplay();
applySettings();
applyTriggerSettings();
@@ -818,6 +822,16 @@ void GLScopeGUI::on_trigCount_valueChanged(int value)
applyTriggerSettings();
}
+void GLScopeGUI::on_trigIndex_valueChanged(int value)
+{
+ m_triggerIndex = value;
+ QString text;
+ text.sprintf("%d", value);
+ ui->trigIndexText->setText(text);
+ setTrigLevelDisplay();
+ setTrigUI(m_triggerIndex);
+}
+
void GLScopeGUI::on_slopePos_clicked()
{
m_triggerPositiveEdge[m_triggerIndex] = true;