From 28214de97836ba88f2744a361bb2cc6121808c83 Mon Sep 17 00:00:00 2001 From: f4exb Date: Wed, 16 Jun 2021 06:47:44 +0200 Subject: [PATCH] Issue #925. Issue was in GLScopeGUI::setBuddies not the plugin(s) --- plugins/channelrx/demodais/aisdemodgui.cpp | 4 ++-- sdrgui/gui/glscopegui.h | 2 ++ 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/plugins/channelrx/demodais/aisdemodgui.cpp b/plugins/channelrx/demodais/aisdemodgui.cpp index 3418055df..8b439eb8c 100644 --- a/plugins/channelrx/demodais/aisdemodgui.cpp +++ b/plugins/channelrx/demodais/aisdemodgui.cpp @@ -433,7 +433,7 @@ AISDemodGUI::AISDemodGUI(PluginAPI* pluginAPI, DeviceUISet *deviceUISet, Baseban traceDataQ.m_ampIndex = 0; traceDataQ.m_ofs = 0.0; traceDataQ.m_ofsCoarse = 0; - ui->scopeGUI->addTrace(traceDataI); + ui->scopeGUI->changeTrace(0, traceDataI); ui->scopeGUI->addTrace(traceDataQ); ui->scopeGUI->setDisplayMode(GLScopeSettings::DisplayXYV); ui->scopeGUI->focusOnTrace(0); // re-focus to take changes into account in the GUI @@ -442,7 +442,7 @@ AISDemodGUI::AISDemodGUI(PluginAPI* pluginAPI, DeviceUISet *deviceUISet, Baseban triggerData.m_triggerLevel = 0.1; triggerData.m_triggerLevelCoarse = 10; triggerData.m_triggerPositiveEdge = true; - ui->scopeGUI->addTrigger(triggerData); + ui->scopeGUI->changeTrigger(0, triggerData); ui->scopeGUI->focusOnTrigger(0); // re-focus to take changes into account in the GUI m_scopeVis->setLiveRate(9600*6); diff --git a/sdrgui/gui/glscopegui.h b/sdrgui/gui/glscopegui.h index 05b378018..db7550bb9 100644 --- a/sdrgui/gui/glscopegui.h +++ b/sdrgui/gui/glscopegui.h @@ -51,6 +51,8 @@ public: virtual bool deserialize(const QByteArray& data); bool handleMessage(Message* message); + unsigned int getNbTraces() const { return m_settings.m_tracesData.size(); } + unsigned int getNbTriggers() const { return m_settings.m_triggersData.size(); } // preconfiguration methods // global (first line):