From 249db03cf3b1d9fa6c866161e9b19606cb3222f3 Mon Sep 17 00:00:00 2001 From: f4exb Date: Wed, 20 Apr 2022 20:08:41 +0200 Subject: [PATCH] Massive UI revamping (v7): fixed device workspace index save/restore and removed useless geometry blobs. Fixes #1207 --- plugins/samplemimo/bladerf2mimo/bladerf2mimogui.h | 4 ---- plugins/samplemimo/bladerf2mimo/bladerf2mimosettings.cpp | 8 -------- plugins/samplemimo/bladerf2mimo/bladerf2mimosettings.h | 2 -- plugins/samplemimo/limesdrmimo/limesdrmimogui.h | 4 ---- plugins/samplemimo/limesdrmimo/limesdrmimosettings.cpp | 8 -------- plugins/samplemimo/limesdrmimo/limesdrmimosettings.h | 3 --- plugins/samplemimo/metismiso/metismisogui.h | 4 ---- plugins/samplemimo/metismiso/metismisosettings.cpp | 5 ----- plugins/samplemimo/metismiso/metismisosettings.h | 2 -- plugins/samplemimo/plutosdrmimo/plutosdrmimogui.h | 4 ---- plugins/samplemimo/plutosdrmimo/plutosdrmimosettings.cpp | 7 ------- plugins/samplemimo/plutosdrmimo/plutosdrmimosettings.h | 2 -- plugins/samplemimo/testmi/testmigui.h | 4 ---- plugins/samplemimo/testmi/testmisettings.cpp | 6 ------ plugins/samplemimo/testmi/testmisettings.h | 2 -- plugins/samplemimo/testmosync/testmosyncgui.h | 4 ---- plugins/samplemimo/testmosync/testmosyncsettings.cpp | 5 ----- plugins/samplemimo/testmosync/testmosyncsettings.h | 4 ---- plugins/samplemimo/xtrxmimo/xtrxmimogui.h | 4 ---- plugins/samplemimo/xtrxmimo/xtrxmimosettings.cpp | 5 ----- plugins/samplemimo/xtrxmimo/xtrxmimosettings.h | 3 --- plugins/samplesink/audiooutput/audiooutputgui.h | 4 ---- plugins/samplesink/audiooutput/audiooutputsettings.cpp | 5 ----- plugins/samplesink/audiooutput/audiooutputsettings.h | 2 -- plugins/samplesink/bladerf1output/bladerf1outputgui.h | 4 ---- .../samplesink/bladerf1output/bladerf1outputsettings.cpp | 5 ----- .../samplesink/bladerf1output/bladerf1outputsettings.h | 2 -- plugins/samplesink/bladerf2output/bladerf2outputgui.h | 4 ---- .../samplesink/bladerf2output/bladerf2outputsettings.cpp | 5 ----- .../samplesink/bladerf2output/bladerf2outputsettings.h | 2 -- plugins/samplesink/fileoutput/fileoutputgui.h | 4 ---- plugins/samplesink/fileoutput/fileoutputsettings.cpp | 5 ----- plugins/samplesink/fileoutput/fileoutputsettings.h | 4 ---- plugins/samplesink/hackrfoutput/hackrfoutputgui.h | 4 ---- plugins/samplesink/hackrfoutput/hackrfoutputsettings.cpp | 5 ----- plugins/samplesink/hackrfoutput/hackrfoutputsettings.h | 2 -- plugins/samplesink/limesdroutput/limesdroutputgui.h | 4 ---- .../samplesink/limesdroutput/limesdroutputsettings.cpp | 5 ----- plugins/samplesink/limesdroutput/limesdroutputsettings.h | 2 -- plugins/samplesink/localoutput/localoutputgui.h | 4 ---- plugins/samplesink/localoutput/localoutputsettings.cpp | 5 ----- plugins/samplesink/localoutput/localoutputsettings.h | 2 -- plugins/samplesink/plutosdroutput/plutosdroutputgui.h | 4 ---- .../samplesink/plutosdroutput/plutosdroutputsettings.cpp | 5 ----- .../samplesink/plutosdroutput/plutosdroutputsettings.h | 2 -- plugins/samplesink/remoteoutput/remoteoutputgui.h | 4 ---- plugins/samplesink/remoteoutput/remoteoutputsettings.cpp | 5 ----- plugins/samplesink/remoteoutput/remoteoutputsettings.h | 2 -- plugins/samplesink/soapysdroutput/soapysdroutputgui.h | 4 ---- .../samplesink/soapysdroutput/soapysdroutputsettings.cpp | 5 ----- .../samplesink/soapysdroutput/soapysdroutputsettings.h | 2 -- plugins/samplesink/testsink/testsinkgui.h | 4 ---- plugins/samplesink/testsink/testsinksettings.cpp | 5 ----- plugins/samplesink/testsink/testsinksettings.h | 2 -- plugins/samplesink/usrpoutput/usrpoutputgui.h | 4 ---- plugins/samplesink/usrpoutput/usrpoutputsettings.cpp | 5 ----- plugins/samplesink/usrpoutput/usrpoutputsettings.h | 2 -- plugins/samplesink/xtrxoutput/xtrxoutputgui.h | 4 ---- plugins/samplesink/xtrxoutput/xtrxoutputsettings.cpp | 5 ----- plugins/samplesink/xtrxoutput/xtrxoutputsettings.h | 2 -- plugins/samplesource/airspy/airspygui.h | 4 ---- plugins/samplesource/airspy/airspysettings.cpp | 5 ----- plugins/samplesource/airspy/airspysettings.h | 2 -- plugins/samplesource/airspyhf/airspyhfgui.h | 4 ---- plugins/samplesource/airspyhf/airspyhfsettings.cpp | 5 ----- plugins/samplesource/airspyhf/airspyhfsettings.h | 2 -- plugins/samplesource/audioinput/audioinputgui.h | 4 ---- plugins/samplesource/audioinput/audioinputsettings.cpp | 5 ----- plugins/samplesource/audioinput/audioinputsettings.h | 2 -- plugins/samplesource/bladerf1input/bladerf1inputgui.h | 4 ---- .../samplesource/bladerf1input/bladerf1inputsettings.cpp | 5 ----- .../samplesource/bladerf1input/bladerf1inputsettings.h | 2 -- plugins/samplesource/bladerf2input/bladerf2inputgui.h | 4 ---- .../samplesource/bladerf2input/bladerf2inputsettings.cpp | 5 ----- .../samplesource/bladerf2input/bladerf2inputsettings.h | 2 -- plugins/samplesource/fcdpro/fcdprogui.h | 4 ---- plugins/samplesource/fcdpro/fcdprosettings.cpp | 5 ----- plugins/samplesource/fcdpro/fcdprosettings.h | 2 -- plugins/samplesource/fcdproplus/fcdproplusgui.h | 4 ---- plugins/samplesource/fcdproplus/fcdproplussettings.cpp | 5 ----- plugins/samplesource/fcdproplus/fcdproplussettings.h | 2 -- plugins/samplesource/fileinput/fileinputgui.h | 4 ---- plugins/samplesource/fileinput/fileinputsettings.cpp | 5 ----- plugins/samplesource/fileinput/fileinputsettings.h | 2 -- plugins/samplesource/hackrfinput/hackrfinputgui.h | 4 ---- plugins/samplesource/hackrfinput/hackrfinputsettings.cpp | 5 ----- plugins/samplesource/hackrfinput/hackrfinputsettings.h | 2 -- plugins/samplesource/kiwisdr/kiwisdrgui.h | 4 ---- plugins/samplesource/kiwisdr/kiwisdrsettings.cpp | 6 ------ plugins/samplesource/kiwisdr/kiwisdrsettings.h | 3 --- plugins/samplesource/limesdrinput/limesdrinputgui.h | 4 ---- .../samplesource/limesdrinput/limesdrinputsettings.cpp | 5 ----- plugins/samplesource/limesdrinput/limesdrinputsettings.h | 2 -- plugins/samplesource/localinput/localinputgui.h | 4 ---- plugins/samplesource/localinput/localinputsettings.cpp | 5 ----- plugins/samplesource/localinput/localinputsettings.h | 2 -- plugins/samplesource/perseus/perseusgui.h | 4 ---- plugins/samplesource/perseus/perseussettings.cpp | 5 ----- plugins/samplesource/perseus/perseussettings.h | 2 -- plugins/samplesource/plutosdrinput/plutosdrinputgui.h | 4 ---- .../samplesource/plutosdrinput/plutosdrinputsettings.cpp | 5 ----- .../samplesource/plutosdrinput/plutosdrinputsettings.h | 2 -- plugins/samplesource/remoteinput/remoteinputgui.h | 4 ---- plugins/samplesource/remoteinput/remoteinputsettings.cpp | 5 ----- plugins/samplesource/remoteinput/remoteinputsettings.h | 2 -- plugins/samplesource/rtlsdr/rtlsdrgui.h | 4 ---- plugins/samplesource/rtlsdr/rtlsdrsettings.cpp | 5 ----- plugins/samplesource/rtlsdr/rtlsdrsettings.h | 2 -- plugins/samplesource/sdrplay/sdrplaygui.h | 4 ---- plugins/samplesource/sdrplay/sdrplaysettings.cpp | 5 ----- plugins/samplesource/sdrplay/sdrplaysettings.h | 2 -- plugins/samplesource/sdrplayv3/sdrplayv3gui.h | 4 ---- plugins/samplesource/sdrplayv3/sdrplayv3settings.cpp | 5 ----- plugins/samplesource/sdrplayv3/sdrplayv3settings.h | 2 -- plugins/samplesource/sigmffileinput/sigmffileinputgui.h | 4 ---- .../sigmffileinput/sigmffileinputsettings.cpp | 5 ----- .../samplesource/sigmffileinput/sigmffileinputsettings.h | 2 -- plugins/samplesource/soapysdrinput/soapysdrinputgui.h | 4 ---- .../samplesource/soapysdrinput/soapysdrinputsettings.cpp | 5 ----- .../samplesource/soapysdrinput/soapysdrinputsettings.h | 2 -- plugins/samplesource/testsource/testsourcegui.h | 4 ---- plugins/samplesource/testsource/testsourcesettings.cpp | 5 ----- plugins/samplesource/testsource/testsourcesettings.h | 2 -- plugins/samplesource/usrpinput/usrpinputgui.h | 4 ---- plugins/samplesource/usrpinput/usrpinputsettings.cpp | 5 ----- plugins/samplesource/usrpinput/usrpinputsettings.h | 2 -- plugins/samplesource/xtrxinput/xtrxinputgui.h | 4 ---- plugins/samplesource/xtrxinput/xtrxinputsettings.cpp | 5 ----- plugins/samplesource/xtrxinput/xtrxinputsettings.h | 2 -- sdrgui/channel/readme.md | 2 +- sdrgui/device/devicegui.h | 8 +++----- sdrgui/device/readme.md | 2 +- sdrgui/mainwindow.cpp | 5 +++-- 133 files changed, 8 insertions(+), 499 deletions(-) diff --git a/plugins/samplemimo/bladerf2mimo/bladerf2mimogui.h b/plugins/samplemimo/bladerf2mimo/bladerf2mimogui.h index 471d36a79..b8ae967f6 100644 --- a/plugins/samplemimo/bladerf2mimo/bladerf2mimogui.h +++ b/plugins/samplemimo/bladerf2mimo/bladerf2mimogui.h @@ -44,10 +44,6 @@ public: QByteArray serialize() const; bool deserialize(const QByteArray& data); virtual MessageQueue *getInputMessageQueue() { return &m_inputMessageQueue; } - virtual void setWorkspaceIndex(int index) { m_settings.m_workspaceIndex = index; } - virtual int getWorkspaceIndex() const { return m_settings.m_workspaceIndex; } - virtual void setGeometryBytes(const QByteArray& blob) { m_settings.m_geometryBytes = blob; } - virtual QByteArray getGeometryBytes() const { return m_settings.m_geometryBytes; } private: Ui::BladeRF2MIMOGui* ui; diff --git a/plugins/samplemimo/bladerf2mimo/bladerf2mimosettings.cpp b/plugins/samplemimo/bladerf2mimo/bladerf2mimosettings.cpp index 0a2058d59..650dd62f1 100644 --- a/plugins/samplemimo/bladerf2mimo/bladerf2mimosettings.cpp +++ b/plugins/samplemimo/bladerf2mimo/bladerf2mimosettings.cpp @@ -58,8 +58,6 @@ void BladeRF2MIMOSettings::resetToDefaults() m_reverseAPIAddress = "127.0.0.1"; m_reverseAPIPort = 8888; m_reverseAPIDeviceIndex = 0; - - m_workspaceIndex = 0; } QByteArray BladeRF2MIMOSettings::serialize() const @@ -99,9 +97,6 @@ QByteArray BladeRF2MIMOSettings::serialize() const s.writeU32(53, m_reverseAPIPort); s.writeU32(54, m_reverseAPIDeviceIndex); - s.writeS32(55, m_workspaceIndex); - s.writeBlob(56, m_geometryBytes); - return s.final(); } @@ -163,9 +158,6 @@ bool BladeRF2MIMOSettings::deserialize(const QByteArray& data) d.readU32(54, &uintval, 0); m_reverseAPIDeviceIndex = uintval > 99 ? 99 : uintval; - d.readS32(55,&m_workspaceIndex, 0); - d.readBlob(56, &m_geometryBytes); - return true; } else diff --git a/plugins/samplemimo/bladerf2mimo/bladerf2mimosettings.h b/plugins/samplemimo/bladerf2mimo/bladerf2mimosettings.h index 98e69d66d..2f2104630 100644 --- a/plugins/samplemimo/bladerf2mimo/bladerf2mimosettings.h +++ b/plugins/samplemimo/bladerf2mimo/bladerf2mimosettings.h @@ -60,8 +60,6 @@ struct BladeRF2MIMOSettings { QString m_reverseAPIAddress; uint16_t m_reverseAPIPort; uint16_t m_reverseAPIDeviceIndex; - int m_workspaceIndex; - QByteArray m_geometryBytes; BladeRF2MIMOSettings(); void resetToDefaults(); diff --git a/plugins/samplemimo/limesdrmimo/limesdrmimogui.h b/plugins/samplemimo/limesdrmimo/limesdrmimogui.h index 666f8d3a6..2352938c7 100644 --- a/plugins/samplemimo/limesdrmimo/limesdrmimogui.h +++ b/plugins/samplemimo/limesdrmimo/limesdrmimogui.h @@ -44,10 +44,6 @@ public: QByteArray serialize() const; bool deserialize(const QByteArray& data); virtual MessageQueue *getInputMessageQueue() { return &m_inputMessageQueue; } - virtual void setWorkspaceIndex(int index) { m_settings.m_workspaceIndex = index; } - virtual int getWorkspaceIndex() const { return m_settings.m_workspaceIndex; } - virtual void setGeometryBytes(const QByteArray& blob) { m_settings.m_geometryBytes = blob; } - virtual QByteArray getGeometryBytes() const { return m_settings.m_geometryBytes; } private: Ui::LimeSDRMIMOGUI* ui; diff --git a/plugins/samplemimo/limesdrmimo/limesdrmimosettings.cpp b/plugins/samplemimo/limesdrmimo/limesdrmimosettings.cpp index c25f25965..22b1a28c2 100644 --- a/plugins/samplemimo/limesdrmimo/limesdrmimosettings.cpp +++ b/plugins/samplemimo/limesdrmimo/limesdrmimosettings.cpp @@ -86,8 +86,6 @@ void LimeSDRMIMOSettings::resetToDefaults() m_lpfFIRBWTx1 = 2.5e6f; m_gainTx1 = 4; m_antennaPathTx1 = PATH_RFE_TX_NONE; - - m_workspaceIndex = 0; } QByteArray LimeSDRMIMOSettings::serialize() const @@ -155,9 +153,6 @@ QByteArray LimeSDRMIMOSettings::serialize() const s.writeU32(93, m_gainTx1); s.writeS32(94, (int) m_antennaPathTx1); - s.writeS32(95, m_workspaceIndex); - s.writeBlob(96, m_geometryBytes); - return s.final(); } @@ -253,9 +248,6 @@ bool LimeSDRMIMOSettings::deserialize(const QByteArray& data) d.readS32(94, &intval, 0); m_antennaPathTx1 = (PathTxRFE) intval; - d.readS32(95, &m_workspaceIndex, 0); - d.readBlob(96, &m_geometryBytes); - return true; } else diff --git a/plugins/samplemimo/limesdrmimo/limesdrmimosettings.h b/plugins/samplemimo/limesdrmimo/limesdrmimosettings.h index ae189e162..75049a5bd 100644 --- a/plugins/samplemimo/limesdrmimo/limesdrmimosettings.h +++ b/plugins/samplemimo/limesdrmimo/limesdrmimosettings.h @@ -119,9 +119,6 @@ struct LimeSDRMIMOSettings uint32_t m_gainTx1; //!< Tx[1] Optimally distributed gain (dB) PathTxRFE m_antennaPathTx1; //!< Tx[1] Antenna connection - int m_workspaceIndex; - QByteArray m_geometryBytes; - LimeSDRMIMOSettings(); void resetToDefaults(); QByteArray serialize() const; diff --git a/plugins/samplemimo/metismiso/metismisogui.h b/plugins/samplemimo/metismiso/metismisogui.h index b54780ef7..adaa68cd2 100644 --- a/plugins/samplemimo/metismiso/metismisogui.h +++ b/plugins/samplemimo/metismiso/metismisogui.h @@ -45,10 +45,6 @@ public: QByteArray serialize() const; bool deserialize(const QByteArray& data); virtual MessageQueue *getInputMessageQueue() { return &m_inputMessageQueue; } - virtual void setWorkspaceIndex(int index) { m_settings.m_workspaceIndex = index; } - virtual int getWorkspaceIndex() const { return m_settings.m_workspaceIndex; } - virtual void setGeometryBytes(const QByteArray& blob) { m_settings.m_geometryBytes = blob; } - virtual QByteArray getGeometryBytes() const { return m_settings.m_geometryBytes; } private: Ui::MetisMISOGui* ui; diff --git a/plugins/samplemimo/metismiso/metismisosettings.cpp b/plugins/samplemimo/metismiso/metismisosettings.cpp index e636bbfd6..2e3a0e45a 100644 --- a/plugins/samplemimo/metismiso/metismisosettings.cpp +++ b/plugins/samplemimo/metismiso/metismisosettings.cpp @@ -82,7 +82,6 @@ void MetisMISOSettings::resetToDefaults() m_reverseAPIAddress = "127.0.0.1"; m_reverseAPIPort = 8888; m_reverseAPIDeviceIndex = 0; - m_workspaceIndex = 0; } QByteArray MetisMISOSettings::serialize() const @@ -113,8 +112,6 @@ QByteArray MetisMISOSettings::serialize() const s.writeU32(22, m_reverseAPIDeviceIndex); s.writeS32(23, m_streamIndex); s.writeS32(24, m_spectrumStreamIndex); - s.writeS32(25, m_workspaceIndex); - s.writeBlob(26, m_geometryBytes); for (int i = 0; i < m_maxReceivers; i++) { @@ -178,8 +175,6 @@ bool MetisMISOSettings::deserialize(const QByteArray& data) d.readS32(23, &m_streamIndex, 0); d.readS32(24, &m_spectrumStreamIndex, 0); - d.readS32(25, &m_workspaceIndex, 0); - d.readBlob(26, &m_geometryBytes); return true; } diff --git a/plugins/samplemimo/metismiso/metismisosettings.h b/plugins/samplemimo/metismiso/metismisosettings.h index 26257d225..3fd3ee396 100644 --- a/plugins/samplemimo/metismiso/metismisosettings.h +++ b/plugins/samplemimo/metismiso/metismisosettings.h @@ -48,8 +48,6 @@ struct MetisMISOSettings { QString m_reverseAPIAddress; uint16_t m_reverseAPIPort; uint16_t m_reverseAPIDeviceIndex; - int m_workspaceIndex; - QByteArray m_geometryBytes; MetisMISOSettings(); MetisMISOSettings(const MetisMISOSettings& other); diff --git a/plugins/samplemimo/plutosdrmimo/plutosdrmimogui.h b/plugins/samplemimo/plutosdrmimo/plutosdrmimogui.h index cbd816025..3984ee6cc 100644 --- a/plugins/samplemimo/plutosdrmimo/plutosdrmimogui.h +++ b/plugins/samplemimo/plutosdrmimo/plutosdrmimogui.h @@ -44,10 +44,6 @@ public: QByteArray serialize() const; bool deserialize(const QByteArray& data); virtual MessageQueue *getInputMessageQueue() { return &m_inputMessageQueue; } - virtual void setWorkspaceIndex(int index) { m_settings.m_workspaceIndex = index; } - virtual int getWorkspaceIndex() const { return m_settings.m_workspaceIndex; } - virtual void setGeometryBytes(const QByteArray& blob) { m_settings.m_geometryBytes = blob; } - virtual QByteArray getGeometryBytes() const { return m_settings.m_geometryBytes; } private: Ui::PlutoSDRMIMOGUI* ui; diff --git a/plugins/samplemimo/plutosdrmimo/plutosdrmimosettings.cpp b/plugins/samplemimo/plutosdrmimo/plutosdrmimosettings.cpp index 887c6d6d7..ceb4441d3 100644 --- a/plugins/samplemimo/plutosdrmimo/plutosdrmimosettings.cpp +++ b/plugins/samplemimo/plutosdrmimo/plutosdrmimosettings.cpp @@ -77,7 +77,6 @@ void PlutoSDRMIMOSettings::resetToDefaults() m_reverseAPIAddress = "127.0.0.1"; m_reverseAPIPort = 8888; m_reverseAPIDeviceIndex = 0; - m_workspaceIndex = 0; } QByteArray PlutoSDRMIMOSettings::serialize() const @@ -142,9 +141,6 @@ QByteArray PlutoSDRMIMOSettings::serialize() const s.writeU32(102, m_reverseAPIPort); s.writeU32(103, m_reverseAPIDeviceIndex); - s.writeS32(104, m_workspaceIndex); - s.writeBlob(105, m_geometryBytes); - return s.final(); } @@ -279,9 +275,6 @@ bool PlutoSDRMIMOSettings::deserialize(const QByteArray& data) d.readU32(103, &uintval, 0); m_reverseAPIDeviceIndex = uintval > 99 ? 99 : uintval; - d.readS32(104, &m_workspaceIndex, 0); - d.readBlob(105, &m_geometryBytes); - return true; } else diff --git a/plugins/samplemimo/plutosdrmimo/plutosdrmimosettings.h b/plugins/samplemimo/plutosdrmimo/plutosdrmimosettings.h index 3fda801be..d99efd8f2 100644 --- a/plugins/samplemimo/plutosdrmimo/plutosdrmimosettings.h +++ b/plugins/samplemimo/plutosdrmimo/plutosdrmimosettings.h @@ -121,8 +121,6 @@ struct PlutoSDRMIMOSettings { QString m_reverseAPIAddress; uint16_t m_reverseAPIPort; uint16_t m_reverseAPIDeviceIndex; - int m_workspaceIndex; - QByteArray m_geometryBytes; static const int m_plutoSDRBlockSizeSamples = 64*256; //complex samples per buffer (must be multiple of 64) diff --git a/plugins/samplemimo/testmi/testmigui.h b/plugins/samplemimo/testmi/testmigui.h index ec27cbaae..410fa1099 100644 --- a/plugins/samplemimo/testmi/testmigui.h +++ b/plugins/samplemimo/testmi/testmigui.h @@ -45,10 +45,6 @@ public: QByteArray serialize() const; bool deserialize(const QByteArray& data); virtual MessageQueue *getInputMessageQueue() { return &m_inputMessageQueue; } - virtual void setWorkspaceIndex(int index) { m_settings.m_workspaceIndex = index; } - virtual int getWorkspaceIndex() const { return m_settings.m_workspaceIndex; } - virtual void setGeometryBytes(const QByteArray& blob) { m_settings.m_geometryBytes = blob; } - virtual QByteArray getGeometryBytes() const { return m_settings.m_geometryBytes; } private: Ui::TestMIGui* ui; diff --git a/plugins/samplemimo/testmi/testmisettings.cpp b/plugins/samplemimo/testmi/testmisettings.cpp index 66d43f192..7461e52b4 100644 --- a/plugins/samplemimo/testmi/testmisettings.cpp +++ b/plugins/samplemimo/testmi/testmisettings.cpp @@ -50,7 +50,6 @@ TestMISettings::TestMISettings() m_reverseAPIAddress = "127.0.0.1"; m_reverseAPIPort = 8888; m_reverseAPIDeviceIndex = 0; - m_workspaceIndex = 0; m_streams.push_back(TestMIStreamSettings()); m_streams.push_back(TestMIStreamSettings()); } @@ -62,7 +61,6 @@ TestMISettings::TestMISettings(const TestMISettings& other) : m_reverseAPIAddress = other.m_reverseAPIAddress; m_reverseAPIPort = other.m_reverseAPIPort; m_reverseAPIDeviceIndex = other.m_reverseAPIDeviceIndex; - m_workspaceIndex = other.m_workspaceIndex; } void TestMISettings::resetToDefaults() @@ -80,8 +78,6 @@ QByteArray TestMISettings::serialize() const s.writeString(2, m_reverseAPIAddress); s.writeU32(3, m_reverseAPIPort); s.writeU32(4, m_reverseAPIDeviceIndex); - s.writeS32(5, m_workspaceIndex); - s.writeBlob(6, m_geometryBytes); for (unsigned int i = 0; i < m_streams.size(); i++) { @@ -132,8 +128,6 @@ bool TestMISettings::deserialize(const QByteArray& data) d.readU32(4, &utmp, 0); m_reverseAPIDeviceIndex = utmp > 99 ? 99 : utmp; - d.readS32(5, &m_workspaceIndex, 0); - d.readBlob(6, &m_geometryBytes); for (unsigned int i = 0; i < m_streams.size(); i++) { diff --git a/plugins/samplemimo/testmi/testmisettings.h b/plugins/samplemimo/testmi/testmisettings.h index 063b9ba19..63c11889b 100644 --- a/plugins/samplemimo/testmi/testmisettings.h +++ b/plugins/samplemimo/testmi/testmisettings.h @@ -71,8 +71,6 @@ struct TestMISettings QString m_reverseAPIAddress; uint16_t m_reverseAPIPort; uint16_t m_reverseAPIDeviceIndex; - int m_workspaceIndex; - QByteArray m_geometryBytes; std::vector m_streams; TestMISettings(); diff --git a/plugins/samplemimo/testmosync/testmosyncgui.h b/plugins/samplemimo/testmosync/testmosyncgui.h index be24d06e1..7c712e1af 100644 --- a/plugins/samplemimo/testmosync/testmosyncgui.h +++ b/plugins/samplemimo/testmosync/testmosyncgui.h @@ -47,10 +47,6 @@ public: QByteArray serialize() const; bool deserialize(const QByteArray& data); virtual MessageQueue *getInputMessageQueue() { return &m_inputMessageQueue; } - virtual void setWorkspaceIndex(int index) { m_settings.m_workspaceIndex = index; } - virtual int getWorkspaceIndex() const { return m_settings.m_workspaceIndex; } - virtual void setGeometryBytes(const QByteArray& blob) { m_settings.m_geometryBytes = blob; } - virtual QByteArray getGeometryBytes() const { return m_settings.m_geometryBytes; } private: Ui::TestMOSyncGui* ui; diff --git a/plugins/samplemimo/testmosync/testmosyncsettings.cpp b/plugins/samplemimo/testmosync/testmosyncsettings.cpp index 5b53cdcf7..020551f31 100644 --- a/plugins/samplemimo/testmosync/testmosyncsettings.cpp +++ b/plugins/samplemimo/testmosync/testmosyncsettings.cpp @@ -31,7 +31,6 @@ void TestMOSyncSettings::resetToDefaults() m_sampleRate = 48000; m_log2Interp = 0; m_fcPosTx = FC_POS_CENTER; - m_workspaceIndex = 0; m_useReverseAPI = false; m_reverseAPIAddress = "127.0.0.1"; m_reverseAPIPort = 8888; @@ -45,8 +44,6 @@ QByteArray TestMOSyncSettings::serialize() const s.writeU64(1, m_sampleRate); s.writeU32(2, m_log2Interp); s.writeS32(3, (int) m_fcPosTx); - s.writeS32(4, m_workspaceIndex); - s.writeBlob(5, m_geometryBytes); s.writeBool(6, m_useReverseAPI); s.writeString(7, m_reverseAPIAddress); s.writeU32(8, m_reverseAPIPort); @@ -74,8 +71,6 @@ bool TestMOSyncSettings::deserialize(const QByteArray& data) d.readU32(2, &m_log2Interp, 0); d.readS32(3, &intval, 2); m_fcPosTx = (fcPos_t) intval; - d.readS32(4, &m_workspaceIndex, 0); - d.readBlob(5, &m_geometryBytes); d.readBool(1, &m_useReverseAPI, false); d.readString(2, &m_reverseAPIAddress, "127.0.0.1"); d.readU32(3, &utmp, 0); diff --git a/plugins/samplemimo/testmosync/testmosyncsettings.h b/plugins/samplemimo/testmosync/testmosyncsettings.h index 8743979a7..31cbe3774 100644 --- a/plugins/samplemimo/testmosync/testmosyncsettings.h +++ b/plugins/samplemimo/testmosync/testmosyncsettings.h @@ -18,8 +18,6 @@ #ifndef PLUGINS_SAMPLEMIMO_TESTMOSYNC_TESTMOSYNCSETTINGS_H_ #define PLUGINS_SAMPLEMIMO_TESTMOSYNC_TESTMOSYNCSETTINGS_H_ -#include - struct TestMOSyncSettings { typedef enum { FC_POS_INFRA = 0, @@ -35,8 +33,6 @@ struct TestMOSyncSettings { QString m_reverseAPIAddress; uint16_t m_reverseAPIPort; uint16_t m_reverseAPIDeviceIndex; - int m_workspaceIndex; - QByteArray m_geometryBytes; static const unsigned int m_msThrottle; diff --git a/plugins/samplemimo/xtrxmimo/xtrxmimogui.h b/plugins/samplemimo/xtrxmimo/xtrxmimogui.h index 2f40493d7..a41eee57b 100644 --- a/plugins/samplemimo/xtrxmimo/xtrxmimogui.h +++ b/plugins/samplemimo/xtrxmimo/xtrxmimogui.h @@ -44,10 +44,6 @@ public: QByteArray serialize() const; bool deserialize(const QByteArray& data); virtual MessageQueue *getInputMessageQueue() { return &m_inputMessageQueue; } - virtual void setWorkspaceIndex(int index) { m_settings.m_workspaceIndex = index; } - virtual int getWorkspaceIndex() const { return m_settings.m_workspaceIndex; } - virtual void setGeometryBytes(const QByteArray& blob) { m_settings.m_geometryBytes = blob; } - virtual QByteArray getGeometryBytes() const { return m_settings.m_geometryBytes; } private: Ui::XTRXMIMOGUI* ui; diff --git a/plugins/samplemimo/xtrxmimo/xtrxmimosettings.cpp b/plugins/samplemimo/xtrxmimo/xtrxmimosettings.cpp index 2d6cb75f1..fcde1096d 100644 --- a/plugins/samplemimo/xtrxmimo/xtrxmimosettings.cpp +++ b/plugins/samplemimo/xtrxmimo/xtrxmimosettings.cpp @@ -75,8 +75,6 @@ void XTRXMIMOSettings::resetToDefaults() m_lpfBWTx1 = 4.5e6f; m_gainTx1 = 20; m_pwrmodeTx1 = 4; - // GUI - m_workspaceIndex = 0; } QByteArray XTRXMIMOSettings::serialize() const @@ -131,9 +129,6 @@ QByteArray XTRXMIMOSettings::serialize() const s.writeFloat(90, m_lpfBWTx1); s.writeU32(91, m_gainTx1); s.writeU32(92, m_pwrmodeTx1); - // GUI - s.writeS32(93, m_workspaceIndex); - s.writeBlob(94, m_geometryBytes); return s.final(); } diff --git a/plugins/samplemimo/xtrxmimo/xtrxmimosettings.h b/plugins/samplemimo/xtrxmimo/xtrxmimosettings.h index f86fdb5ce..8dc3a7a19 100644 --- a/plugins/samplemimo/xtrxmimo/xtrxmimosettings.h +++ b/plugins/samplemimo/xtrxmimo/xtrxmimosettings.h @@ -93,9 +93,6 @@ struct XTRXMIMOSettings float m_lpfBWTx1; //!< LMS analog lowpass filter bandwidth (Hz) uint32_t m_gainTx1; //!< Optimally distributed gain (dB) uint32_t m_pwrmodeTx1; - // GUI - int m_workspaceIndex; - QByteArray m_geometryBytes; XTRXMIMOSettings(); void resetToDefaults(); diff --git a/plugins/samplesink/audiooutput/audiooutputgui.h b/plugins/samplesink/audiooutput/audiooutputgui.h index d53748dfc..4a5b2d406 100644 --- a/plugins/samplesink/audiooutput/audiooutputgui.h +++ b/plugins/samplesink/audiooutput/audiooutputgui.h @@ -45,10 +45,6 @@ public: QByteArray serialize() const; bool deserialize(const QByteArray& data); virtual MessageQueue *getInputMessageQueue() { return &m_inputMessageQueue; } - virtual void setWorkspaceIndex(int index) { m_settings.m_workspaceIndex = index; } - virtual int getWorkspaceIndex() const { return m_settings.m_workspaceIndex; } - virtual void setGeometryBytes(const QByteArray& blob) { m_settings.m_geometryBytes = blob; } - virtual QByteArray getGeometryBytes() const { return m_settings.m_geometryBytes; } private: Ui::AudioOutputGui* ui; diff --git a/plugins/samplesink/audiooutput/audiooutputsettings.cpp b/plugins/samplesink/audiooutput/audiooutputsettings.cpp index b11772506..e6d39f949 100644 --- a/plugins/samplesink/audiooutput/audiooutputsettings.cpp +++ b/plugins/samplesink/audiooutput/audiooutputsettings.cpp @@ -34,7 +34,6 @@ void AudioOutputSettings::resetToDefaults() m_reverseAPIAddress = "127.0.0.1"; m_reverseAPIPort = 8888; m_reverseAPIDeviceIndex = 0; - m_workspaceIndex = 0; } QByteArray AudioOutputSettings::serialize() const @@ -44,8 +43,6 @@ QByteArray AudioOutputSettings::serialize() const s.writeString(1, m_deviceName); s.writeFloat(3, m_volume); s.writeS32(5, (int)m_iqMapping); - s.writeS32(6, m_workspaceIndex); - s.writeBlob(7, m_geometryBytes); s.writeBool(24, m_useReverseAPI); s.writeString(25, m_reverseAPIAddress); @@ -72,8 +69,6 @@ bool AudioOutputSettings::deserialize(const QByteArray& data) d.readString(1, &m_deviceName, ""); d.readFloat(3, &m_volume, 1.0f); d.readS32(5, (int *)&m_iqMapping, IQMapping::LR); - d.readS32(6, &m_workspaceIndex, 0); - d.readBlob(7, &m_geometryBytes); d.readBool(24, &m_useReverseAPI, false); d.readString(25, &m_reverseAPIAddress, "127.0.0.1"); diff --git a/plugins/samplesink/audiooutput/audiooutputsettings.h b/plugins/samplesink/audiooutput/audiooutputsettings.h index 66335e21d..d2f9e7634 100644 --- a/plugins/samplesink/audiooutput/audiooutputsettings.h +++ b/plugins/samplesink/audiooutput/audiooutputsettings.h @@ -34,8 +34,6 @@ struct AudioOutputSettings { QString m_reverseAPIAddress; uint16_t m_reverseAPIPort; uint16_t m_reverseAPIDeviceIndex; - int m_workspaceIndex; - QByteArray m_geometryBytes; AudioOutputSettings(); void resetToDefaults(); diff --git a/plugins/samplesink/bladerf1output/bladerf1outputgui.h b/plugins/samplesink/bladerf1output/bladerf1outputgui.h index af5cc768e..31ea820f6 100644 --- a/plugins/samplesink/bladerf1output/bladerf1outputgui.h +++ b/plugins/samplesink/bladerf1output/bladerf1outputgui.h @@ -45,10 +45,6 @@ public: QByteArray serialize() const; bool deserialize(const QByteArray& data); virtual MessageQueue *getInputMessageQueue() { return &m_inputMessageQueue; } - virtual void setWorkspaceIndex(int index) { m_settings.m_workspaceIndex = index; } - virtual int getWorkspaceIndex() const { return m_settings.m_workspaceIndex; } - virtual void setGeometryBytes(const QByteArray& blob) { m_settings.m_geometryBytes = blob; } - virtual QByteArray getGeometryBytes() const { return m_settings.m_geometryBytes; } private: Ui::Bladerf1OutputGui* ui; diff --git a/plugins/samplesink/bladerf1output/bladerf1outputsettings.cpp b/plugins/samplesink/bladerf1output/bladerf1outputsettings.cpp index 4e29762e4..42e33f262 100644 --- a/plugins/samplesink/bladerf1output/bladerf1outputsettings.cpp +++ b/plugins/samplesink/bladerf1output/bladerf1outputsettings.cpp @@ -41,7 +41,6 @@ void BladeRF1OutputSettings::resetToDefaults() m_reverseAPIAddress = "127.0.0.1"; m_reverseAPIPort = 8888; m_reverseAPIDeviceIndex = 0; - m_workspaceIndex = 0; } QByteArray BladeRF1OutputSettings::serialize() const @@ -60,8 +59,6 @@ QByteArray BladeRF1OutputSettings::serialize() const s.writeString(10, m_reverseAPIAddress); s.writeU32(11, m_reverseAPIPort); s.writeU32(12, m_reverseAPIDeviceIndex); - s.writeS32(13, m_workspaceIndex); - s.writeBlob(14, m_geometryBytes); return s.final(); } @@ -103,8 +100,6 @@ bool BladeRF1OutputSettings::deserialize(const QByteArray& data) d.readU32(12, &uintval, 0); m_reverseAPIDeviceIndex = uintval > 99 ? 99 : uintval; - d.readS32(13, &m_workspaceIndex, 0); - d.readBlob(14, &m_geometryBytes); return true; } diff --git a/plugins/samplesink/bladerf1output/bladerf1outputsettings.h b/plugins/samplesink/bladerf1output/bladerf1outputsettings.h index 44c0b5d0b..71d15376c 100644 --- a/plugins/samplesink/bladerf1output/bladerf1outputsettings.h +++ b/plugins/samplesink/bladerf1output/bladerf1outputsettings.h @@ -37,8 +37,6 @@ struct BladeRF1OutputSettings { QString m_reverseAPIAddress; uint16_t m_reverseAPIPort; uint16_t m_reverseAPIDeviceIndex; - int m_workspaceIndex; - QByteArray m_geometryBytes; BladeRF1OutputSettings(); void resetToDefaults(); diff --git a/plugins/samplesink/bladerf2output/bladerf2outputgui.h b/plugins/samplesink/bladerf2output/bladerf2outputgui.h index c4930bbce..bd447541e 100644 --- a/plugins/samplesink/bladerf2output/bladerf2outputgui.h +++ b/plugins/samplesink/bladerf2output/bladerf2outputgui.h @@ -46,10 +46,6 @@ public: virtual bool deserialize(const QByteArray& data); virtual MessageQueue *getInputMessageQueue() { return &m_inputMessageQueue; } virtual bool handleMessage(const Message& message); - virtual void setWorkspaceIndex(int index) { m_settings.m_workspaceIndex = index; } - virtual int getWorkspaceIndex() const { return m_settings.m_workspaceIndex; } - virtual void setGeometryBytes(const QByteArray& blob) { m_settings.m_geometryBytes = blob; } - virtual QByteArray getGeometryBytes() const { return m_settings.m_geometryBytes; } private: Ui::BladeRF2OutputGui* ui; diff --git a/plugins/samplesink/bladerf2output/bladerf2outputsettings.cpp b/plugins/samplesink/bladerf2output/bladerf2outputsettings.cpp index 1aa48b762..a50ee005f 100644 --- a/plugins/samplesink/bladerf2output/bladerf2outputsettings.cpp +++ b/plugins/samplesink/bladerf2output/bladerf2outputsettings.cpp @@ -41,7 +41,6 @@ void BladeRF2OutputSettings::resetToDefaults() m_reverseAPIAddress = "127.0.0.1"; m_reverseAPIPort = 8888; m_reverseAPIDeviceIndex = 0; - m_workspaceIndex = 0; } QByteArray BladeRF2OutputSettings::serialize() const @@ -60,8 +59,6 @@ QByteArray BladeRF2OutputSettings::serialize() const s.writeString(10, m_reverseAPIAddress); s.writeU32(11, m_reverseAPIPort); s.writeU32(12, m_reverseAPIDeviceIndex); - s.writeS32(13, m_workspaceIndex); - s.writeBlob(14, m_geometryBytes); return s.final(); } @@ -100,8 +97,6 @@ bool BladeRF2OutputSettings::deserialize(const QByteArray& data) d.readU32(12, &uintval, 0); m_reverseAPIDeviceIndex = uintval > 99 ? 99 : uintval; - d.readS32(13, &m_workspaceIndex, 0); - d.readBlob(14, &m_geometryBytes); return true; } diff --git a/plugins/samplesink/bladerf2output/bladerf2outputsettings.h b/plugins/samplesink/bladerf2output/bladerf2outputsettings.h index 21e5e762a..69a4dd3b3 100644 --- a/plugins/samplesink/bladerf2output/bladerf2outputsettings.h +++ b/plugins/samplesink/bladerf2output/bladerf2outputsettings.h @@ -35,8 +35,6 @@ struct BladeRF2OutputSettings { QString m_reverseAPIAddress; uint16_t m_reverseAPIPort; uint16_t m_reverseAPIDeviceIndex; - int m_workspaceIndex; - QByteArray m_geometryBytes; BladeRF2OutputSettings(); void resetToDefaults(); diff --git a/plugins/samplesink/fileoutput/fileoutputgui.h b/plugins/samplesink/fileoutput/fileoutputgui.h index a95c25b92..7d8906ebe 100644 --- a/plugins/samplesink/fileoutput/fileoutputgui.h +++ b/plugins/samplesink/fileoutput/fileoutputgui.h @@ -47,10 +47,6 @@ public: QByteArray serialize() const; bool deserialize(const QByteArray& data); virtual MessageQueue *getInputMessageQueue() { return &m_inputMessageQueue; } - virtual void setWorkspaceIndex(int index) { m_settings.m_workspaceIndex = index; } - virtual int getWorkspaceIndex() const { return m_settings.m_workspaceIndex; } - virtual void setGeometryBytes(const QByteArray& blob) { m_settings.m_geometryBytes = blob; } - virtual QByteArray getGeometryBytes() const { return m_settings.m_geometryBytes; } private: Ui::FileOutputGui* ui; diff --git a/plugins/samplesink/fileoutput/fileoutputsettings.cpp b/plugins/samplesink/fileoutput/fileoutputsettings.cpp index e07abde6a..a4affa826 100644 --- a/plugins/samplesink/fileoutput/fileoutputsettings.cpp +++ b/plugins/samplesink/fileoutput/fileoutputsettings.cpp @@ -33,7 +33,6 @@ void FileOutputSettings::resetToDefaults() m_reverseAPIAddress = "127.0.0.1"; m_reverseAPIPort = 8888; m_reverseAPIDeviceIndex = 0; - m_workspaceIndex = 0; } QByteArray FileOutputSettings::serialize() const @@ -47,8 +46,6 @@ QByteArray FileOutputSettings::serialize() const s.writeString(5, m_reverseAPIAddress); s.writeU32(6, m_reverseAPIPort); s.writeU32(7, m_reverseAPIDeviceIndex); - s.writeS32(8, m_workspaceIndex); - s.writeBlob(9, m_geometryBytes); return s.final(); } @@ -82,8 +79,6 @@ bool FileOutputSettings::deserialize(const QByteArray& data) d.readU32(7, &uintval, 0); m_reverseAPIDeviceIndex = uintval > 99 ? 99 : uintval; - d.readS32(8, &m_workspaceIndex, 0); - d.readBlob(9, &m_geometryBytes); return true; } diff --git a/plugins/samplesink/fileoutput/fileoutputsettings.h b/plugins/samplesink/fileoutput/fileoutputsettings.h index a75d9af88..91b0df057 100644 --- a/plugins/samplesink/fileoutput/fileoutputsettings.h +++ b/plugins/samplesink/fileoutput/fileoutputsettings.h @@ -18,8 +18,6 @@ #ifndef PLUGINS_SAMPLESINK_FILEOUTPUT_FILEOUTPUTSETTINGS_H_ #define PLUGINS_SAMPLESINK_FILEOUTPUT_FILEOUTPUTSETTINGS_H_ -#include - struct FileOutputSettings { quint64 m_centerFrequency; quint64 m_sampleRate; @@ -29,8 +27,6 @@ struct FileOutputSettings { QString m_reverseAPIAddress; uint16_t m_reverseAPIPort; uint16_t m_reverseAPIDeviceIndex; - int m_workspaceIndex; - QByteArray m_geometryBytes; FileOutputSettings(); void resetToDefaults(); diff --git a/plugins/samplesink/hackrfoutput/hackrfoutputgui.h b/plugins/samplesink/hackrfoutput/hackrfoutputgui.h index 44ac8ab02..78d834806 100644 --- a/plugins/samplesink/hackrfoutput/hackrfoutputgui.h +++ b/plugins/samplesink/hackrfoutput/hackrfoutputgui.h @@ -55,10 +55,6 @@ public: QByteArray serialize() const; bool deserialize(const QByteArray& data); virtual MessageQueue *getInputMessageQueue() { return &m_inputMessageQueue; } - virtual void setWorkspaceIndex(int index) { m_settings.m_workspaceIndex = index; } - virtual int getWorkspaceIndex() const { return m_settings.m_workspaceIndex; } - virtual void setGeometryBytes(const QByteArray& blob) { m_settings.m_geometryBytes = blob; } - virtual QByteArray getGeometryBytes() const { return m_settings.m_geometryBytes; } private: Ui::HackRFOutputGui* ui; diff --git a/plugins/samplesink/hackrfoutput/hackrfoutputsettings.cpp b/plugins/samplesink/hackrfoutput/hackrfoutputsettings.cpp index 498b18951..e876d4c66 100644 --- a/plugins/samplesink/hackrfoutput/hackrfoutputsettings.cpp +++ b/plugins/samplesink/hackrfoutput/hackrfoutputsettings.cpp @@ -43,7 +43,6 @@ void HackRFOutputSettings::resetToDefaults() m_reverseAPIAddress = "127.0.0.1"; m_reverseAPIPort = 8888; m_reverseAPIDeviceIndex = 0; - m_workspaceIndex = 0; } QByteArray HackRFOutputSettings::serialize() const @@ -64,8 +63,6 @@ QByteArray HackRFOutputSettings::serialize() const s.writeU32(12, m_reverseAPIDeviceIndex); s.writeBool(13, m_transverterMode); s.writeS64(14, m_transverterDeltaFrequency); - s.writeS32(15, m_workspaceIndex); - s.writeBlob(16, m_geometryBytes); return s.final(); } @@ -108,8 +105,6 @@ bool HackRFOutputSettings::deserialize(const QByteArray& data) m_reverseAPIDeviceIndex = uintval > 99 ? 99 : uintval; d.readBool(13, &m_transverterMode, false); d.readS64(14, &m_transverterDeltaFrequency, 0); - d.readS32(15, &m_workspaceIndex, 0); - d.readBlob(16, &m_geometryBytes); return true; } diff --git a/plugins/samplesink/hackrfoutput/hackrfoutputsettings.h b/plugins/samplesink/hackrfoutput/hackrfoutputsettings.h index e8b4ee158..25ffe4c54 100644 --- a/plugins/samplesink/hackrfoutput/hackrfoutputsettings.h +++ b/plugins/samplesink/hackrfoutput/hackrfoutputsettings.h @@ -43,8 +43,6 @@ struct HackRFOutputSettings { QString m_reverseAPIAddress; uint16_t m_reverseAPIPort; uint16_t m_reverseAPIDeviceIndex; - int m_workspaceIndex; - QByteArray m_geometryBytes; HackRFOutputSettings(); void resetToDefaults(); diff --git a/plugins/samplesink/limesdroutput/limesdroutputgui.h b/plugins/samplesink/limesdroutput/limesdroutputgui.h index 8ba79e4e3..125414032 100644 --- a/plugins/samplesink/limesdroutput/limesdroutputgui.h +++ b/plugins/samplesink/limesdroutput/limesdroutputgui.h @@ -45,10 +45,6 @@ public: QByteArray serialize() const; bool deserialize(const QByteArray& data); virtual MessageQueue *getInputMessageQueue() { return &m_inputMessageQueue; } - virtual void setWorkspaceIndex(int index) { m_settings.m_workspaceIndex = index; } - virtual int getWorkspaceIndex() const { return m_settings.m_workspaceIndex; } - virtual void setGeometryBytes(const QByteArray& blob) { m_settings.m_geometryBytes = blob; } - virtual QByteArray getGeometryBytes() const { return m_settings.m_geometryBytes; } private: Ui::LimeSDROutputGUI* ui; diff --git a/plugins/samplesink/limesdroutput/limesdroutputsettings.cpp b/plugins/samplesink/limesdroutput/limesdroutputsettings.cpp index 6164e616b..bd54bb58b 100644 --- a/plugins/samplesink/limesdroutput/limesdroutputsettings.cpp +++ b/plugins/samplesink/limesdroutput/limesdroutputsettings.cpp @@ -47,7 +47,6 @@ void LimeSDROutputSettings::resetToDefaults() m_reverseAPIAddress = "127.0.0.1"; m_reverseAPIPort = 8888; m_reverseAPIDeviceIndex = 0; - m_workspaceIndex = 0; } QByteArray LimeSDROutputSettings::serialize() const @@ -74,8 +73,6 @@ QByteArray LimeSDROutputSettings::serialize() const s.writeString(21, m_reverseAPIAddress); s.writeU32(22, m_reverseAPIPort); s.writeU32(23, m_reverseAPIDeviceIndex); - s.writeS32(24, m_workspaceIndex); - s.writeBlob(25, m_geometryBytes); return s.final(); } @@ -126,8 +123,6 @@ bool LimeSDROutputSettings::deserialize(const QByteArray& data) d.readU32(23, &uintval, 0); m_reverseAPIDeviceIndex = uintval > 99 ? 99 : uintval; - d.readS32(24, &m_workspaceIndex, 0); - d.readBlob(25, &m_geometryBytes); return true; } diff --git a/plugins/samplesink/limesdroutput/limesdroutputsettings.h b/plugins/samplesink/limesdroutput/limesdroutputsettings.h index 148493670..6bed846c4 100644 --- a/plugins/samplesink/limesdroutput/limesdroutputsettings.h +++ b/plugins/samplesink/limesdroutput/limesdroutputsettings.h @@ -65,8 +65,6 @@ struct LimeSDROutputSettings QString m_reverseAPIAddress; uint16_t m_reverseAPIPort; uint16_t m_reverseAPIDeviceIndex; - int m_workspaceIndex; - QByteArray m_geometryBytes; LimeSDROutputSettings(); void resetToDefaults(); diff --git a/plugins/samplesink/localoutput/localoutputgui.h b/plugins/samplesink/localoutput/localoutputgui.h index 50a9ecead..da888c787 100644 --- a/plugins/samplesink/localoutput/localoutputgui.h +++ b/plugins/samplesink/localoutput/localoutputgui.h @@ -46,10 +46,6 @@ public: QByteArray serialize() const; bool deserialize(const QByteArray& data); virtual MessageQueue *getInputMessageQueue() { return &m_inputMessageQueue; } - virtual void setWorkspaceIndex(int index) { m_settings.m_workspaceIndex = index; } - virtual int getWorkspaceIndex() const { return m_settings.m_workspaceIndex; } - virtual void setGeometryBytes(const QByteArray& blob) { m_settings.m_geometryBytes = blob; } - virtual QByteArray getGeometryBytes() const { return m_settings.m_geometryBytes; } private: Ui::LocalOutputGui* ui; diff --git a/plugins/samplesink/localoutput/localoutputsettings.cpp b/plugins/samplesink/localoutput/localoutputsettings.cpp index 8165dd454..1b4bfe3cf 100644 --- a/plugins/samplesink/localoutput/localoutputsettings.cpp +++ b/plugins/samplesink/localoutput/localoutputsettings.cpp @@ -29,7 +29,6 @@ void LocalOutputSettings::resetToDefaults() m_reverseAPIAddress = "127.0.0.1"; m_reverseAPIPort = 8888; m_reverseAPIDeviceIndex = 0; - m_workspaceIndex = 0; } QByteArray LocalOutputSettings::serialize() const @@ -39,8 +38,6 @@ QByteArray LocalOutputSettings::serialize() const s.writeString(4, m_reverseAPIAddress); s.writeU32(5, m_reverseAPIPort); s.writeU32(6, m_reverseAPIDeviceIndex); - s.writeS32(7, m_workspaceIndex); - s.writeBlob(8, m_geometryBytes); return s.final(); } @@ -70,8 +67,6 @@ bool LocalOutputSettings::deserialize(const QByteArray& data) d.readU32(6, &uintval, 0); m_reverseAPIDeviceIndex = uintval > 99 ? 99 : uintval; - d.readS32(7, &m_workspaceIndex, 0); - d.readBlob(8, &m_geometryBytes); return true; } diff --git a/plugins/samplesink/localoutput/localoutputsettings.h b/plugins/samplesink/localoutput/localoutputsettings.h index 5b42fe082..6c7569f7f 100644 --- a/plugins/samplesink/localoutput/localoutputsettings.h +++ b/plugins/samplesink/localoutput/localoutputsettings.h @@ -26,8 +26,6 @@ struct LocalOutputSettings { QString m_reverseAPIAddress; uint16_t m_reverseAPIPort; uint16_t m_reverseAPIDeviceIndex; - int m_workspaceIndex; - QByteArray m_geometryBytes; LocalOutputSettings(); void resetToDefaults(); diff --git a/plugins/samplesink/plutosdroutput/plutosdroutputgui.h b/plugins/samplesink/plutosdroutput/plutosdroutputgui.h index 9851da659..46bbd040d 100644 --- a/plugins/samplesink/plutosdroutput/plutosdroutputgui.h +++ b/plugins/samplesink/plutosdroutput/plutosdroutputgui.h @@ -47,10 +47,6 @@ public: virtual QByteArray serialize() const; virtual bool deserialize(const QByteArray& data); virtual MessageQueue *getInputMessageQueue() { return &m_inputMessageQueue; } - virtual void setWorkspaceIndex(int index) { m_settings.m_workspaceIndex = index; } - virtual int getWorkspaceIndex() const { return m_settings.m_workspaceIndex; } - virtual void setGeometryBytes(const QByteArray& blob) { m_settings.m_geometryBytes = blob; } - virtual QByteArray getGeometryBytes() const { return m_settings.m_geometryBytes; } private: Ui::PlutoSDROutputGUI* ui; diff --git a/plugins/samplesink/plutosdroutput/plutosdroutputsettings.cpp b/plugins/samplesink/plutosdroutput/plutosdroutputsettings.cpp index 6885defcc..d42615dac 100644 --- a/plugins/samplesink/plutosdroutput/plutosdroutputsettings.cpp +++ b/plugins/samplesink/plutosdroutput/plutosdroutputsettings.cpp @@ -44,7 +44,6 @@ void PlutoSDROutputSettings::resetToDefaults() m_reverseAPIAddress = "127.0.0.1"; m_reverseAPIPort = 8888; m_reverseAPIDeviceIndex = 0; - m_workspaceIndex = 0; } QByteArray PlutoSDROutputSettings::serialize() const @@ -67,8 +66,6 @@ QByteArray PlutoSDROutputSettings::serialize() const s.writeString(18, m_reverseAPIAddress); s.writeU32(19, m_reverseAPIPort); s.writeU32(20, m_reverseAPIDeviceIndex); - s.writeS32(21, m_workspaceIndex); - s.writeBlob(22, m_geometryBytes); return s.final(); } @@ -122,8 +119,6 @@ bool PlutoSDROutputSettings::deserialize(const QByteArray& data) d.readU32(20, &uintval, 0); m_reverseAPIDeviceIndex = uintval > 99 ? 99 : uintval; - d.readS32(21, &m_workspaceIndex, 0); - d.readBlob(22, &m_geometryBytes); return true; } diff --git a/plugins/samplesink/plutosdroutput/plutosdroutputsettings.h b/plugins/samplesink/plutosdroutput/plutosdroutputsettings.h index db4f4d5ad..02f917885 100644 --- a/plugins/samplesink/plutosdroutput/plutosdroutputsettings.h +++ b/plugins/samplesink/plutosdroutput/plutosdroutputsettings.h @@ -51,8 +51,6 @@ struct PlutoSDROutputSettings { QString m_reverseAPIAddress; uint16_t m_reverseAPIPort; uint16_t m_reverseAPIDeviceIndex; - int m_workspaceIndex; - QByteArray m_geometryBytes; PlutoSDROutputSettings(); void resetToDefaults(); diff --git a/plugins/samplesink/remoteoutput/remoteoutputgui.h b/plugins/samplesink/remoteoutput/remoteoutputgui.h index f2f440d74..3e7df619f 100644 --- a/plugins/samplesink/remoteoutput/remoteoutputgui.h +++ b/plugins/samplesink/remoteoutput/remoteoutputgui.h @@ -77,10 +77,6 @@ public: QByteArray serialize() const; bool deserialize(const QByteArray& data); virtual MessageQueue *getInputMessageQueue() { return &m_inputMessageQueue; } - virtual void setWorkspaceIndex(int index) { m_settings.m_workspaceIndex = index; } - virtual int getWorkspaceIndex() const { return m_settings.m_workspaceIndex; } - virtual void setGeometryBytes(const QByteArray& blob) { m_settings.m_geometryBytes = blob; } - virtual QByteArray getGeometryBytes() const { return m_settings.m_geometryBytes; } private: Ui::RemoteOutputGui* ui; diff --git a/plugins/samplesink/remoteoutput/remoteoutputsettings.cpp b/plugins/samplesink/remoteoutput/remoteoutputsettings.cpp index 65a222484..cbff6e6f0 100644 --- a/plugins/samplesink/remoteoutput/remoteoutputsettings.cpp +++ b/plugins/samplesink/remoteoutput/remoteoutputsettings.cpp @@ -37,7 +37,6 @@ void RemoteOutputSettings::resetToDefaults() m_reverseAPIAddress = "127.0.0.1"; m_reverseAPIPort = 8888; m_reverseAPIDeviceIndex = 0; - m_workspaceIndex = 0; } QByteArray RemoteOutputSettings::serialize() const @@ -56,8 +55,6 @@ QByteArray RemoteOutputSettings::serialize() const s.writeString(13, m_reverseAPIAddress); s.writeU32(14, m_reverseAPIPort); s.writeU32(15, m_reverseAPIDeviceIndex); - s.writeS32(16, m_workspaceIndex); - s.writeBlob(17, m_geometryBytes); return s.final(); } @@ -98,8 +95,6 @@ bool RemoteOutputSettings::deserialize(const QByteArray& data) d.readU32(15, &uintval, 0); m_reverseAPIDeviceIndex = uintval > 99 ? 99 : uintval; - d.readS32(16, &m_workspaceIndex, 0); - d.readBlob(17, &m_geometryBytes); return true; } diff --git a/plugins/samplesink/remoteoutput/remoteoutputsettings.h b/plugins/samplesink/remoteoutput/remoteoutputsettings.h index 814577e3a..830e056dd 100644 --- a/plugins/samplesink/remoteoutput/remoteoutputsettings.h +++ b/plugins/samplesink/remoteoutput/remoteoutputsettings.h @@ -34,8 +34,6 @@ struct RemoteOutputSettings { QString m_reverseAPIAddress; uint16_t m_reverseAPIPort; uint16_t m_reverseAPIDeviceIndex; - int m_workspaceIndex; - QByteArray m_geometryBytes; RemoteOutputSettings(); void resetToDefaults(); diff --git a/plugins/samplesink/soapysdroutput/soapysdroutputgui.h b/plugins/samplesink/soapysdroutput/soapysdroutputgui.h index 8f3b53e7f..a17339dfe 100644 --- a/plugins/samplesink/soapysdroutput/soapysdroutputgui.h +++ b/plugins/samplesink/soapysdroutput/soapysdroutputgui.h @@ -53,10 +53,6 @@ public: virtual QByteArray serialize() const; virtual bool deserialize(const QByteArray& data); virtual MessageQueue *getInputMessageQueue() { return &m_inputMessageQueue; } - virtual void setWorkspaceIndex(int index) { m_settings.m_workspaceIndex = index; } - virtual int getWorkspaceIndex() const { return m_settings.m_workspaceIndex; } - virtual void setGeometryBytes(const QByteArray& blob) { m_settings.m_geometryBytes = blob; } - virtual QByteArray getGeometryBytes() const { return m_settings.m_geometryBytes; } private: void createRangesControl( diff --git a/plugins/samplesink/soapysdroutput/soapysdroutputsettings.cpp b/plugins/samplesink/soapysdroutput/soapysdroutputsettings.cpp index 2cc77d0fe..7d7a431d0 100644 --- a/plugins/samplesink/soapysdroutput/soapysdroutputsettings.cpp +++ b/plugins/samplesink/soapysdroutput/soapysdroutputsettings.cpp @@ -47,7 +47,6 @@ void SoapySDROutputSettings::resetToDefaults() m_reverseAPIAddress = "127.0.0.1"; m_reverseAPIPort = 8888; m_reverseAPIDeviceIndex = 0; - m_workspaceIndex = 0; } QByteArray SoapySDROutputSettings::serialize() const @@ -77,8 +76,6 @@ QByteArray SoapySDROutputSettings::serialize() const s.writeString(24, m_reverseAPIAddress); s.writeU32(25, m_reverseAPIPort); s.writeU32(26, m_reverseAPIDeviceIndex); - s.writeS32(27, m_workspaceIndex); - s.writeBlob(28, m_geometryBytes); return s.final(); } @@ -136,8 +133,6 @@ bool SoapySDROutputSettings::deserialize(const QByteArray& data) d.readU32(26, &uintval, 0); m_reverseAPIDeviceIndex = uintval > 99 ? 99 : uintval; - d.readS32(27, &m_workspaceIndex, 0); - d.readBlob(28, &m_geometryBytes); return true; } diff --git a/plugins/samplesink/soapysdroutput/soapysdroutputsettings.h b/plugins/samplesink/soapysdroutput/soapysdroutputsettings.h index 7216385aa..9589a65f1 100644 --- a/plugins/samplesink/soapysdroutput/soapysdroutputsettings.h +++ b/plugins/samplesink/soapysdroutput/soapysdroutputsettings.h @@ -45,8 +45,6 @@ struct SoapySDROutputSettings { QString m_reverseAPIAddress; uint16_t m_reverseAPIPort; uint16_t m_reverseAPIDeviceIndex; - int m_workspaceIndex; - QByteArray m_geometryBytes; SoapySDROutputSettings(); void resetToDefaults(); diff --git a/plugins/samplesink/testsink/testsinkgui.h b/plugins/samplesink/testsink/testsinkgui.h index dc7566492..6e861d24b 100644 --- a/plugins/samplesink/testsink/testsinkgui.h +++ b/plugins/samplesink/testsink/testsinkgui.h @@ -48,10 +48,6 @@ public: QByteArray serialize() const; bool deserialize(const QByteArray& data); virtual MessageQueue *getInputMessageQueue() { return &m_inputMessageQueue; } - virtual void setWorkspaceIndex(int index) { m_settings.m_workspaceIndex = index; } - virtual int getWorkspaceIndex() const { return m_settings.m_workspaceIndex; } - virtual void setGeometryBytes(const QByteArray& blob) { m_settings.m_geometryBytes = blob; } - virtual QByteArray getGeometryBytes() const { return m_settings.m_geometryBytes; } private: Ui::TestSinkGui* ui; diff --git a/plugins/samplesink/testsink/testsinksettings.cpp b/plugins/samplesink/testsink/testsinksettings.cpp index ec32a5dbf..3b8fe09b5 100644 --- a/plugins/samplesink/testsink/testsinksettings.cpp +++ b/plugins/samplesink/testsink/testsinksettings.cpp @@ -30,7 +30,6 @@ void TestSinkSettings::resetToDefaults() m_sampleRate = 48000; m_log2Interp = 0; m_spectrumGUI = nullptr; - m_workspaceIndex = 0; m_useReverseAPI = false; m_reverseAPIAddress = "127.0.0.1"; m_reverseAPIPort = 8888; @@ -49,8 +48,6 @@ QByteArray TestSinkSettings::serialize() const s.writeBlob(4, m_spectrumGUI->serialize()); } - s.writeS32(5, m_workspaceIndex); - s.writeBlob(6, m_geometryBytes); s.writeBool(7, m_useReverseAPI); s.writeString(8, m_reverseAPIAddress); s.writeU32(9, m_reverseAPIPort); @@ -83,8 +80,6 @@ bool TestSinkSettings::deserialize(const QByteArray& data) m_spectrumGUI->deserialize(bytetmp); } - d.readS32(5, &m_workspaceIndex, 0); - d.readBlob(6, &m_geometryBytes); d.readBool(7, &m_useReverseAPI, false); d.readString(8, &m_reverseAPIAddress, "127.0.0.1"); d.readU32(9, &uintval, 0); diff --git a/plugins/samplesink/testsink/testsinksettings.h b/plugins/samplesink/testsink/testsinksettings.h index 6f6377ae6..27a7d0589 100644 --- a/plugins/samplesink/testsink/testsinksettings.h +++ b/plugins/samplesink/testsink/testsinksettings.h @@ -27,8 +27,6 @@ struct TestSinkSettings { quint64 m_sampleRate; quint32 m_log2Interp; Serializable *m_spectrumGUI; - int m_workspaceIndex; - QByteArray m_geometryBytes; bool m_useReverseAPI; QString m_reverseAPIAddress; uint16_t m_reverseAPIPort; diff --git a/plugins/samplesink/usrpoutput/usrpoutputgui.h b/plugins/samplesink/usrpoutput/usrpoutputgui.h index 4d602bc92..ac6205488 100644 --- a/plugins/samplesink/usrpoutput/usrpoutputgui.h +++ b/plugins/samplesink/usrpoutput/usrpoutputgui.h @@ -52,10 +52,6 @@ public: bool deserialize(const QByteArray& data); virtual MessageQueue *getInputMessageQueue() { return &m_inputMessageQueue; } virtual bool handleMessage(const Message& message); - virtual void setWorkspaceIndex(int index) { m_settings.m_workspaceIndex = index; } - virtual int getWorkspaceIndex() const { return m_settings.m_workspaceIndex; } - virtual void setGeometryBytes(const QByteArray& blob) { m_settings.m_geometryBytes = blob; } - virtual QByteArray getGeometryBytes() const { return m_settings.m_geometryBytes; } private: Ui::USRPOutputGUI* ui; diff --git a/plugins/samplesink/usrpoutput/usrpoutputsettings.cpp b/plugins/samplesink/usrpoutput/usrpoutputsettings.cpp index 3483bd7fd..ef7c067c2 100644 --- a/plugins/samplesink/usrpoutput/usrpoutputsettings.cpp +++ b/plugins/samplesink/usrpoutput/usrpoutputsettings.cpp @@ -42,7 +42,6 @@ void USRPOutputSettings::resetToDefaults() m_reverseAPIAddress = "127.0.0.1"; m_reverseAPIPort = 8888; m_reverseAPIDeviceIndex = 0; - m_workspaceIndex = 0; } QByteArray USRPOutputSettings::serialize() const @@ -62,8 +61,6 @@ QByteArray USRPOutputSettings::serialize() const s.writeU32(11, m_reverseAPIPort); s.writeU32(12, m_reverseAPIDeviceIndex); s.writeS32(13, m_loOffset); - s.writeS32(14, m_workspaceIndex); - s.writeBlob(15, m_geometryBytes); return s.final(); } @@ -103,8 +100,6 @@ bool USRPOutputSettings::deserialize(const QByteArray& data) d.readU32(12, &uintval, 0); m_reverseAPIDeviceIndex = uintval > 99 ? 99 : uintval; d.readS32(13, &m_loOffset, 0); - d.readS32(14, &m_workspaceIndex, 0); - d.readBlob(15, &m_geometryBytes); return true; } diff --git a/plugins/samplesink/usrpoutput/usrpoutputsettings.h b/plugins/samplesink/usrpoutput/usrpoutputsettings.h index 968e9de84..80e20d281 100644 --- a/plugins/samplesink/usrpoutput/usrpoutputsettings.h +++ b/plugins/samplesink/usrpoutput/usrpoutputsettings.h @@ -47,8 +47,6 @@ struct USRPOutputSettings QString m_reverseAPIAddress; uint16_t m_reverseAPIPort; uint16_t m_reverseAPIDeviceIndex; - int m_workspaceIndex; - QByteArray m_geometryBytes; USRPOutputSettings(); void resetToDefaults(); diff --git a/plugins/samplesink/xtrxoutput/xtrxoutputgui.h b/plugins/samplesink/xtrxoutput/xtrxoutputgui.h index c355e7524..1e724396c 100644 --- a/plugins/samplesink/xtrxoutput/xtrxoutputgui.h +++ b/plugins/samplesink/xtrxoutput/xtrxoutputgui.h @@ -44,10 +44,6 @@ public: QByteArray serialize() const; bool deserialize(const QByteArray& data); virtual MessageQueue *getInputMessageQueue() { return &m_inputMessageQueue; } - virtual void setWorkspaceIndex(int index) { m_settings.m_workspaceIndex = index; } - virtual int getWorkspaceIndex() const { return m_settings.m_workspaceIndex; } - virtual void setGeometryBytes(const QByteArray& blob) { m_settings.m_geometryBytes = blob; } - virtual QByteArray getGeometryBytes() const { return m_settings.m_geometryBytes; } private: Ui::XTRXOutputGUI* ui; diff --git a/plugins/samplesink/xtrxoutput/xtrxoutputsettings.cpp b/plugins/samplesink/xtrxoutput/xtrxoutputsettings.cpp index 42ed29e20..f5dfe188c 100644 --- a/plugins/samplesink/xtrxoutput/xtrxoutputsettings.cpp +++ b/plugins/samplesink/xtrxoutput/xtrxoutputsettings.cpp @@ -42,7 +42,6 @@ void XTRXOutputSettings::resetToDefaults() m_reverseAPIAddress = "127.0.0.1"; m_reverseAPIPort = 8888; m_reverseAPIDeviceIndex = 0; - m_workspaceIndex = 0; } QByteArray XTRXOutputSettings::serialize() const @@ -64,8 +63,6 @@ QByteArray XTRXOutputSettings::serialize() const s.writeString(13, m_reverseAPIAddress); s.writeU32(14, m_reverseAPIPort); s.writeU32(15, m_reverseAPIDeviceIndex); - s.writeS32(16, m_workspaceIndex); - s.writeBlob(17, m_geometryBytes); return s.final(); } @@ -109,8 +106,6 @@ bool XTRXOutputSettings::deserialize(const QByteArray& data) d.readU32(15, &uintval, 0); m_reverseAPIDeviceIndex = uintval > 99 ? 99 : uintval; - d.readS32(16, &m_workspaceIndex, 0); - d.readBlob(17, &m_geometryBytes); return true; } diff --git a/plugins/samplesink/xtrxoutput/xtrxoutputsettings.h b/plugins/samplesink/xtrxoutput/xtrxoutputsettings.h index a7a9909e8..71954f555 100644 --- a/plugins/samplesink/xtrxoutput/xtrxoutputsettings.h +++ b/plugins/samplesink/xtrxoutput/xtrxoutputsettings.h @@ -49,8 +49,6 @@ struct XTRXOutputSettings QString m_reverseAPIAddress; uint16_t m_reverseAPIPort; uint16_t m_reverseAPIDeviceIndex; - int m_workspaceIndex; - QByteArray m_geometryBytes; XTRXOutputSettings(); void resetToDefaults(); diff --git a/plugins/samplesource/airspy/airspygui.h b/plugins/samplesource/airspy/airspygui.h index 2f0a9c03c..4d9ac8006 100644 --- a/plugins/samplesource/airspy/airspygui.h +++ b/plugins/samplesource/airspy/airspygui.h @@ -44,10 +44,6 @@ public: QByteArray serialize() const; bool deserialize(const QByteArray& data); virtual MessageQueue* getInputMessageQueue() { return &m_inputMessageQueue; } - virtual void setWorkspaceIndex(int index) { m_settings.m_workspaceIndex = index; } - virtual int getWorkspaceIndex() const { return m_settings.m_workspaceIndex; } - virtual void setGeometryBytes(const QByteArray& blob) { m_settings.m_geometryBytes = blob; } - virtual QByteArray getGeometryBytes() const { return m_settings.m_geometryBytes; } uint32_t getDevSampleRate(unsigned int index); int getDevSampleRateIndex(uint32_t sampleRate); diff --git a/plugins/samplesource/airspy/airspysettings.cpp b/plugins/samplesource/airspy/airspysettings.cpp index 1026a1213..5be260a5a 100644 --- a/plugins/samplesource/airspy/airspysettings.cpp +++ b/plugins/samplesource/airspy/airspysettings.cpp @@ -46,7 +46,6 @@ void AirspySettings::resetToDefaults() m_reverseAPIAddress = "127.0.0.1"; m_reverseAPIPort = 8888; m_reverseAPIDeviceIndex = 0; - m_workspaceIndex = 0; } QByteArray AirspySettings::serialize() const @@ -72,8 +71,6 @@ QByteArray AirspySettings::serialize() const s.writeU32(17, m_reverseAPIPort); s.writeU32(18, m_reverseAPIDeviceIndex); s.writeBool(19, m_iqOrder); - s.writeS32(20, m_workspaceIndex); - s.writeBlob(21, m_geometryBytes); return s.final(); } @@ -121,8 +118,6 @@ bool AirspySettings::deserialize(const QByteArray& data) d.readU32(18, &uintval, 0); m_reverseAPIDeviceIndex = uintval > 99 ? 99 : uintval; d.readBool(19, &m_iqOrder, true); - d.readS32(20, &m_workspaceIndex, 0); - d.readBlob(21, &m_geometryBytes); return true; } diff --git a/plugins/samplesource/airspy/airspysettings.h b/plugins/samplesource/airspy/airspysettings.h index 9b6275aa4..5b2850fcd 100644 --- a/plugins/samplesource/airspy/airspysettings.h +++ b/plugins/samplesource/airspy/airspysettings.h @@ -47,8 +47,6 @@ struct AirspySettings { QString m_reverseAPIAddress; uint16_t m_reverseAPIPort; uint16_t m_reverseAPIDeviceIndex; - int m_workspaceIndex; - QByteArray m_geometryBytes; AirspySettings(); void resetToDefaults(); diff --git a/plugins/samplesource/airspyhf/airspyhfgui.h b/plugins/samplesource/airspyhf/airspyhfgui.h index 58e2ce8fa..aeb7bc5b1 100644 --- a/plugins/samplesource/airspyhf/airspyhfgui.h +++ b/plugins/samplesource/airspyhf/airspyhfgui.h @@ -45,10 +45,6 @@ public: QByteArray serialize() const; bool deserialize(const QByteArray& data); virtual MessageQueue* getInputMessageQueue() { return &m_inputMessageQueue; } - virtual void setWorkspaceIndex(int index) { m_settings.m_workspaceIndex = index; } - virtual int getWorkspaceIndex() const { return m_settings.m_workspaceIndex; } - virtual void setGeometryBytes(const QByteArray& blob) { m_settings.m_geometryBytes = blob; } - virtual QByteArray getGeometryBytes() const { return m_settings.m_geometryBytes; } uint32_t getDevSampleRate(unsigned int index); int getDevSampleRateIndex(uint32_t sampleRate); diff --git a/plugins/samplesource/airspyhf/airspyhfsettings.cpp b/plugins/samplesource/airspyhf/airspyhfsettings.cpp index ead7a0f1b..4f7ae4b57 100644 --- a/plugins/samplesource/airspyhf/airspyhfsettings.cpp +++ b/plugins/samplesource/airspyhf/airspyhfsettings.cpp @@ -46,7 +46,6 @@ void AirspyHFSettings::resetToDefaults() m_attenuatorSteps = 0; m_dcBlock = false; m_iqCorrection = false; - m_workspaceIndex = 0; } QByteArray AirspyHFSettings::serialize() const @@ -71,8 +70,6 @@ QByteArray AirspyHFSettings::serialize() const s.writeBool(19, m_dcBlock); s.writeBool(20, m_iqCorrection); s.writeBool(21, m_iqOrder); - s.writeS32(22, m_workspaceIndex); - s.writeBlob(23, m_geometryBytes); return s.final(); } @@ -120,8 +117,6 @@ bool AirspyHFSettings::deserialize(const QByteArray& data) d.readBool(19, &m_dcBlock, false); d.readBool(20, &m_iqCorrection, false); d.readBool(21, &m_iqOrder, true); - d.readS32(22, &m_workspaceIndex, 0); - d.readBlob(23, &m_geometryBytes); return true; } diff --git a/plugins/samplesource/airspyhf/airspyhfsettings.h b/plugins/samplesource/airspyhf/airspyhfsettings.h index d093f747f..805a0a708 100644 --- a/plugins/samplesource/airspyhf/airspyhfsettings.h +++ b/plugins/samplesource/airspyhf/airspyhfsettings.h @@ -41,8 +41,6 @@ struct AirspyHFSettings quint32 m_attenuatorSteps; bool m_dcBlock; bool m_iqCorrection; - int m_workspaceIndex; - QByteArray m_geometryBytes; AirspyHFSettings(); void resetToDefaults(); diff --git a/plugins/samplesource/audioinput/audioinputgui.h b/plugins/samplesource/audioinput/audioinputgui.h index 46775ba21..9febcfbfd 100644 --- a/plugins/samplesource/audioinput/audioinputgui.h +++ b/plugins/samplesource/audioinput/audioinputgui.h @@ -46,10 +46,6 @@ public: QByteArray serialize() const; bool deserialize(const QByteArray& data); virtual MessageQueue *getInputMessageQueue() { return &m_inputMessageQueue; } - virtual void setWorkspaceIndex(int index) { m_settings.m_workspaceIndex = index; } - virtual int getWorkspaceIndex() const { return m_settings.m_workspaceIndex; } - virtual void setGeometryBytes(const QByteArray& blob) { m_settings.m_geometryBytes = blob; } - virtual QByteArray getGeometryBytes() const { return m_settings.m_geometryBytes; } private: Ui::AudioInputGui* ui; diff --git a/plugins/samplesource/audioinput/audioinputsettings.cpp b/plugins/samplesource/audioinput/audioinputsettings.cpp index 777ccfd02..84fb1ae07 100644 --- a/plugins/samplesource/audioinput/audioinputsettings.cpp +++ b/plugins/samplesource/audioinput/audioinputsettings.cpp @@ -36,7 +36,6 @@ void AudioInputSettings::resetToDefaults() m_reverseAPIAddress = "127.0.0.1"; m_reverseAPIPort = 8888; m_reverseAPIDeviceIndex = 0; - m_workspaceIndex = 0; } QByteArray AudioInputSettings::serialize() const @@ -48,8 +47,6 @@ QByteArray AudioInputSettings::serialize() const s.writeFloat(3, m_volume); s.writeU32(4, m_log2Decim); s.writeS32(5, (int)m_iqMapping); - s.writeS32(6, m_workspaceIndex); - s.writeBlob(7, m_geometryBytes); s.writeBool(24, m_useReverseAPI); s.writeString(25, m_reverseAPIAddress); @@ -78,8 +75,6 @@ bool AudioInputSettings::deserialize(const QByteArray& data) d.readFloat(3, &m_volume, 1.0f); d.readU32(4, &m_log2Decim, 0); d.readS32(5, (int *)&m_iqMapping, IQMapping::L); - d.readS32(6, &m_workspaceIndex, 0); - d.readBlob(7, &m_geometryBytes); d.readBool(24, &m_useReverseAPI, false); d.readString(25, &m_reverseAPIAddress, "127.0.0.1"); diff --git a/plugins/samplesource/audioinput/audioinputsettings.h b/plugins/samplesource/audioinput/audioinputsettings.h index f707fbead..16f8eb4f1 100644 --- a/plugins/samplesource/audioinput/audioinputsettings.h +++ b/plugins/samplesource/audioinput/audioinputsettings.h @@ -39,8 +39,6 @@ struct AudioInputSettings { QString m_reverseAPIAddress; uint16_t m_reverseAPIPort; uint16_t m_reverseAPIDeviceIndex; - int m_workspaceIndex; - QByteArray m_geometryBytes; AudioInputSettings(); void resetToDefaults(); diff --git a/plugins/samplesource/bladerf1input/bladerf1inputgui.h b/plugins/samplesource/bladerf1input/bladerf1inputgui.h index a774bc4c1..45e6b7294 100644 --- a/plugins/samplesource/bladerf1input/bladerf1inputgui.h +++ b/plugins/samplesource/bladerf1input/bladerf1inputgui.h @@ -44,10 +44,6 @@ public: QByteArray serialize() const; bool deserialize(const QByteArray& data); virtual MessageQueue *getInputMessageQueue() { return &m_inputMessageQueue; } - virtual void setWorkspaceIndex(int index) { m_settings.m_workspaceIndex = index; } - virtual int getWorkspaceIndex() const { return m_settings.m_workspaceIndex; } - virtual void setGeometryBytes(const QByteArray& blob) { m_settings.m_geometryBytes = blob; } - virtual QByteArray getGeometryBytes() const { return m_settings.m_geometryBytes; } private: Ui::Bladerf1InputGui* ui; diff --git a/plugins/samplesource/bladerf1input/bladerf1inputsettings.cpp b/plugins/samplesource/bladerf1input/bladerf1inputsettings.cpp index 4975d5c85..6745b693e 100644 --- a/plugins/samplesource/bladerf1input/bladerf1inputsettings.cpp +++ b/plugins/samplesource/bladerf1input/bladerf1inputsettings.cpp @@ -47,7 +47,6 @@ void BladeRF1InputSettings::resetToDefaults() m_reverseAPIAddress = "127.0.0.1"; m_reverseAPIPort = 8888; m_reverseAPIDeviceIndex = 0; - m_workspaceIndex = 0; } QByteArray BladeRF1InputSettings::serialize() const @@ -71,8 +70,6 @@ QByteArray BladeRF1InputSettings::serialize() const s.writeU32(15, m_reverseAPIPort); s.writeU32(16, m_reverseAPIDeviceIndex); s.writeBool(17, m_iqOrder); - s.writeS32(18, m_workspaceIndex); - s.writeBlob(19, m_geometryBytes); return s.final(); } @@ -120,8 +117,6 @@ bool BladeRF1InputSettings::deserialize(const QByteArray& data) d.readU32(16, &uintval, 0); m_reverseAPIDeviceIndex = uintval > 99 ? 99 : uintval; d.readBool(17, &m_iqOrder); - d.readS32(18, &m_workspaceIndex, 0); - d.readBlob(19, &m_geometryBytes); return true; } diff --git a/plugins/samplesource/bladerf1input/bladerf1inputsettings.h b/plugins/samplesource/bladerf1input/bladerf1inputsettings.h index 333218ffd..32ab4ba33 100644 --- a/plugins/samplesource/bladerf1input/bladerf1inputsettings.h +++ b/plugins/samplesource/bladerf1input/bladerf1inputsettings.h @@ -48,8 +48,6 @@ struct BladeRF1InputSettings { QString m_reverseAPIAddress; uint16_t m_reverseAPIPort; uint16_t m_reverseAPIDeviceIndex; - int m_workspaceIndex; - QByteArray m_geometryBytes; BladeRF1InputSettings(); void resetToDefaults(); diff --git a/plugins/samplesource/bladerf2input/bladerf2inputgui.h b/plugins/samplesource/bladerf2input/bladerf2inputgui.h index 08cb773a2..2647fccd6 100644 --- a/plugins/samplesource/bladerf2input/bladerf2inputgui.h +++ b/plugins/samplesource/bladerf2input/bladerf2inputgui.h @@ -44,10 +44,6 @@ public: virtual QByteArray serialize() const; virtual bool deserialize(const QByteArray& data); virtual MessageQueue *getInputMessageQueue() { return &m_inputMessageQueue; } - virtual void setWorkspaceIndex(int index) { m_settings.m_workspaceIndex = index; } - virtual int getWorkspaceIndex() const { return m_settings.m_workspaceIndex; } - virtual void setGeometryBytes(const QByteArray& blob) { m_settings.m_geometryBytes = blob; } - virtual QByteArray getGeometryBytes() const { return m_settings.m_geometryBytes; } private: Ui::Bladerf2InputGui* ui; diff --git a/plugins/samplesource/bladerf2input/bladerf2inputsettings.cpp b/plugins/samplesource/bladerf2input/bladerf2inputsettings.cpp index f0de33bae..17c975f62 100644 --- a/plugins/samplesource/bladerf2input/bladerf2inputsettings.cpp +++ b/plugins/samplesource/bladerf2input/bladerf2inputsettings.cpp @@ -44,7 +44,6 @@ void BladeRF2InputSettings::resetToDefaults() m_reverseAPIAddress = "127.0.0.1"; m_reverseAPIPort = 8888; m_reverseAPIDeviceIndex = 0; - m_workspaceIndex = 0; } QByteArray BladeRF2InputSettings::serialize() const @@ -68,8 +67,6 @@ QByteArray BladeRF2InputSettings::serialize() const s.writeU32(15, m_reverseAPIPort); s.writeU32(16, m_reverseAPIDeviceIndex); s.writeBool(17, m_iqOrder); - s.writeS32(18, m_workspaceIndex); - s.writeBlob(19, m_geometryBytes); return s.final(); } @@ -115,8 +112,6 @@ bool BladeRF2InputSettings::deserialize(const QByteArray& data) d.readU32(16, &uintval, 0); m_reverseAPIDeviceIndex = uintval > 99 ? 99 : uintval; d.readBool(17, &m_iqOrder, true); - d.readS32(18, &m_workspaceIndex, 0); - d.readBlob(19, &m_geometryBytes); return true; } diff --git a/plugins/samplesource/bladerf2input/bladerf2inputsettings.h b/plugins/samplesource/bladerf2input/bladerf2inputsettings.h index 7059be36a..6fb1a2952 100644 --- a/plugins/samplesource/bladerf2input/bladerf2inputsettings.h +++ b/plugins/samplesource/bladerf2input/bladerf2inputsettings.h @@ -46,8 +46,6 @@ struct BladeRF2InputSettings { QString m_reverseAPIAddress; uint16_t m_reverseAPIPort; uint16_t m_reverseAPIDeviceIndex; - int m_workspaceIndex; - QByteArray m_geometryBytes; BladeRF2InputSettings(); void resetToDefaults(); diff --git a/plugins/samplesource/fcdpro/fcdprogui.h b/plugins/samplesource/fcdpro/fcdprogui.h index 50c7594fb..4ddf0afa2 100644 --- a/plugins/samplesource/fcdpro/fcdprogui.h +++ b/plugins/samplesource/fcdpro/fcdprogui.h @@ -45,10 +45,6 @@ public: QByteArray serialize() const; bool deserialize(const QByteArray& data); virtual MessageQueue *getInputMessageQueue() { return &m_inputMessageQueue; } - virtual void setWorkspaceIndex(int index) { m_settings.m_workspaceIndex = index; } - virtual int getWorkspaceIndex() const { return m_settings.m_workspaceIndex; } - virtual void setGeometryBytes(const QByteArray& blob) { m_settings.m_geometryBytes = blob; } - virtual QByteArray getGeometryBytes() const { return m_settings.m_geometryBytes; } private: Ui::FCDProGui* ui; diff --git a/plugins/samplesource/fcdpro/fcdprosettings.cpp b/plugins/samplesource/fcdpro/fcdprosettings.cpp index 3765dc3fb..075419d6b 100644 --- a/plugins/samplesource/fcdpro/fcdprosettings.cpp +++ b/plugins/samplesource/fcdpro/fcdprosettings.cpp @@ -55,7 +55,6 @@ void FCDProSettings::resetToDefaults() m_reverseAPIAddress = "127.0.0.1"; m_reverseAPIPort = 8888; m_reverseAPIDeviceIndex = 0; - m_workspaceIndex = 0; } QByteArray FCDProSettings::serialize() const @@ -90,8 +89,6 @@ QByteArray FCDProSettings::serialize() const s.writeU32(26, m_reverseAPIPort); s.writeU32(27, m_reverseAPIDeviceIndex); s.writeBool(28, m_iqOrder); - s.writeS32(29, m_workspaceIndex); - s.writeBlob(30, m_geometryBytes); return s.final(); } @@ -148,8 +145,6 @@ bool FCDProSettings::deserialize(const QByteArray& data) d.readU32(27, &uintval, 0); m_reverseAPIDeviceIndex = uintval > 99 ? 99 : uintval; d.readBool(28, &m_iqOrder, true); - d.readS32(29, &m_workspaceIndex, 0); - d.readBlob(30, &m_geometryBytes); return true; } diff --git a/plugins/samplesource/fcdpro/fcdprosettings.h b/plugins/samplesource/fcdpro/fcdprosettings.h index e00a1292a..03d126c7e 100644 --- a/plugins/samplesource/fcdpro/fcdprosettings.h +++ b/plugins/samplesource/fcdpro/fcdprosettings.h @@ -56,8 +56,6 @@ struct FCDProSettings { QString m_reverseAPIAddress; uint16_t m_reverseAPIPort; uint16_t m_reverseAPIDeviceIndex; - int m_workspaceIndex; - QByteArray m_geometryBytes; FCDProSettings(); void resetToDefaults(); diff --git a/plugins/samplesource/fcdproplus/fcdproplusgui.h b/plugins/samplesource/fcdproplus/fcdproplusgui.h index 11955c69c..8e4090fe7 100644 --- a/plugins/samplesource/fcdproplus/fcdproplusgui.h +++ b/plugins/samplesource/fcdproplus/fcdproplusgui.h @@ -44,10 +44,6 @@ public: QByteArray serialize() const; bool deserialize(const QByteArray& data); virtual MessageQueue *getInputMessageQueue() { return &m_inputMessageQueue; } - virtual void setWorkspaceIndex(int index) { m_settings.m_workspaceIndex = index; } - virtual int getWorkspaceIndex() const { return m_settings.m_workspaceIndex; } - virtual void setGeometryBytes(const QByteArray& blob) { m_settings.m_geometryBytes = blob; } - virtual QByteArray getGeometryBytes() const { return m_settings.m_geometryBytes; } private: Ui::FCDProPlusGui* ui; diff --git a/plugins/samplesource/fcdproplus/fcdproplussettings.cpp b/plugins/samplesource/fcdproplus/fcdproplussettings.cpp index 53fd2be89..aaa302934 100644 --- a/plugins/samplesource/fcdproplus/fcdproplussettings.cpp +++ b/plugins/samplesource/fcdproplus/fcdproplussettings.cpp @@ -46,7 +46,6 @@ void FCDProPlusSettings::resetToDefaults() m_reverseAPIAddress = "127.0.0.1"; m_reverseAPIPort = 8888; m_reverseAPIDeviceIndex = 0; - m_workspaceIndex = 0; } QByteArray FCDProPlusSettings::serialize() const @@ -71,8 +70,6 @@ QByteArray FCDProPlusSettings::serialize() const s.writeU32(16, m_reverseAPIPort); s.writeU32(17, m_reverseAPIDeviceIndex); s.writeBool(18, m_iqOrder); - s.writeS32(19, m_workspaceIndex); - s.writeBlob(20, m_geometryBytes); return s.final(); } @@ -119,8 +116,6 @@ bool FCDProPlusSettings::deserialize(const QByteArray& data) d.readU32(17, &uintval, 0); m_reverseAPIDeviceIndex = uintval > 99 ? 99 : uintval; d.readBool(18, &m_iqOrder, true); - d.readS32(19, &m_workspaceIndex, 0); - d.readBlob(20, &m_geometryBytes); return true; } diff --git a/plugins/samplesource/fcdproplus/fcdproplussettings.h b/plugins/samplesource/fcdproplus/fcdproplussettings.h index 5b9397805..ed5bf7401 100644 --- a/plugins/samplesource/fcdproplus/fcdproplussettings.h +++ b/plugins/samplesource/fcdproplus/fcdproplussettings.h @@ -47,8 +47,6 @@ struct FCDProPlusSettings { QString m_reverseAPIAddress; uint16_t m_reverseAPIPort; uint16_t m_reverseAPIDeviceIndex; - int m_workspaceIndex; - QByteArray m_geometryBytes; FCDProPlusSettings(); void resetToDefaults(); diff --git a/plugins/samplesource/fileinput/fileinputgui.h b/plugins/samplesource/fileinput/fileinputgui.h index 6f6e7b01e..b447b2cb6 100644 --- a/plugins/samplesource/fileinput/fileinputgui.h +++ b/plugins/samplesource/fileinput/fileinputgui.h @@ -46,10 +46,6 @@ public: bool deserialize(const QByteArray& data); virtual MessageQueue *getInputMessageQueue() { return &m_inputMessageQueue; } virtual bool handleMessage(const Message& message); - virtual void setWorkspaceIndex(int index) { m_settings.m_workspaceIndex = index; } - virtual int getWorkspaceIndex() const { return m_settings.m_workspaceIndex; } - virtual void setGeometryBytes(const QByteArray& blob) { m_settings.m_geometryBytes = blob; } - virtual QByteArray getGeometryBytes() const { return m_settings.m_geometryBytes; } private: Ui::FileInputGUI* ui; diff --git a/plugins/samplesource/fileinput/fileinputsettings.cpp b/plugins/samplesource/fileinput/fileinputsettings.cpp index 0bbf959cc..c63128502 100644 --- a/plugins/samplesource/fileinput/fileinputsettings.cpp +++ b/plugins/samplesource/fileinput/fileinputsettings.cpp @@ -36,7 +36,6 @@ void FileInputSettings::resetToDefaults() m_reverseAPIAddress = "127.0.0.1"; m_reverseAPIPort = 8888; m_reverseAPIDeviceIndex = 0; - m_workspaceIndex = 0; } QByteArray FileInputSettings::serialize() const @@ -49,8 +48,6 @@ QByteArray FileInputSettings::serialize() const s.writeString(5, m_reverseAPIAddress); s.writeU32(6, m_reverseAPIPort); s.writeU32(7, m_reverseAPIDeviceIndex); - s.writeS32(8, m_workspaceIndex); - s.writeBlob(9, m_geometryBytes); return s.final(); } @@ -83,8 +80,6 @@ bool FileInputSettings::deserialize(const QByteArray& data) d.readU32(7, &uintval, 0); m_reverseAPIDeviceIndex = uintval > 99 ? 99 : uintval; - d.readS32(8, &m_workspaceIndex, 0); - d.readBlob(9, &m_geometryBytes); return true; } diff --git a/plugins/samplesource/fileinput/fileinputsettings.h b/plugins/samplesource/fileinput/fileinputsettings.h index 1d9bdaf33..d007000e5 100644 --- a/plugins/samplesource/fileinput/fileinputsettings.h +++ b/plugins/samplesource/fileinput/fileinputsettings.h @@ -29,8 +29,6 @@ struct FileInputSettings { QString m_reverseAPIAddress; uint16_t m_reverseAPIPort; uint16_t m_reverseAPIDeviceIndex; - int m_workspaceIndex; - QByteArray m_geometryBytes; static const unsigned int m_accelerationMaxScale; //!< Max power of 10 multiplier to 2,5,10 base ex: 2 -> 2,5,10,20,50,100,200,500,1000 diff --git a/plugins/samplesource/hackrfinput/hackrfinputgui.h b/plugins/samplesource/hackrfinput/hackrfinputgui.h index 51cac6209..2a90c045c 100644 --- a/plugins/samplesource/hackrfinput/hackrfinputgui.h +++ b/plugins/samplesource/hackrfinput/hackrfinputgui.h @@ -54,10 +54,6 @@ public: QByteArray serialize() const; bool deserialize(const QByteArray& data); virtual MessageQueue *getInputMessageQueue() { return &m_inputMessageQueue; } - virtual void setWorkspaceIndex(int index) { m_settings.m_workspaceIndex = index; } - virtual int getWorkspaceIndex() const { return m_settings.m_workspaceIndex; } - virtual void setGeometryBytes(const QByteArray& blob) { m_settings.m_geometryBytes = blob; } - virtual QByteArray getGeometryBytes() const { return m_settings.m_geometryBytes; } private: Ui::HackRFInputGui* ui; diff --git a/plugins/samplesource/hackrfinput/hackrfinputsettings.cpp b/plugins/samplesource/hackrfinput/hackrfinputsettings.cpp index 7c20b4454..e7b14f65c 100644 --- a/plugins/samplesource/hackrfinput/hackrfinputsettings.cpp +++ b/plugins/samplesource/hackrfinput/hackrfinputsettings.cpp @@ -48,7 +48,6 @@ void HackRFInputSettings::resetToDefaults() m_reverseAPIAddress = "127.0.0.1"; m_reverseAPIPort = 8888; m_reverseAPIDeviceIndex = 0; - m_workspaceIndex = 0; } QByteArray HackRFInputSettings::serialize() const @@ -74,8 +73,6 @@ QByteArray HackRFInputSettings::serialize() const s.writeS64(19, m_transverterDeltaFrequency); s.writeBool(20, m_iqOrder); s.writeBool(21, m_autoBBF); - s.writeS32(22, m_workspaceIndex); - s.writeBlob(23, m_geometryBytes); return s.final(); } @@ -123,8 +120,6 @@ bool HackRFInputSettings::deserialize(const QByteArray& data) d.readS64(19, &m_transverterDeltaFrequency, 0); d.readBool(20, &m_iqOrder, true); d.readBool(21, &m_autoBBF, true); - d.readS32(22, &m_workspaceIndex, 0); - d.readBlob(23, &m_geometryBytes); return true; } diff --git a/plugins/samplesource/hackrfinput/hackrfinputsettings.h b/plugins/samplesource/hackrfinput/hackrfinputsettings.h index 36bad5903..de756e03e 100644 --- a/plugins/samplesource/hackrfinput/hackrfinputsettings.h +++ b/plugins/samplesource/hackrfinput/hackrfinputsettings.h @@ -48,8 +48,6 @@ struct HackRFInputSettings { QString m_reverseAPIAddress; uint16_t m_reverseAPIPort; uint16_t m_reverseAPIDeviceIndex; - int m_workspaceIndex; - QByteArray m_geometryBytes; HackRFInputSettings(); void resetToDefaults(); diff --git a/plugins/samplesource/kiwisdr/kiwisdrgui.h b/plugins/samplesource/kiwisdr/kiwisdrgui.h index 125fd6111..60b0936f2 100644 --- a/plugins/samplesource/kiwisdr/kiwisdrgui.h +++ b/plugins/samplesource/kiwisdr/kiwisdrgui.h @@ -46,10 +46,6 @@ public: QByteArray serialize() const; bool deserialize(const QByteArray& data); virtual MessageQueue *getInputMessageQueue() { return &m_inputMessageQueue; } - virtual void setWorkspaceIndex(int index) { m_settings.m_workspaceIndex = index; } - virtual int getWorkspaceIndex() const { return m_settings.m_workspaceIndex; } - virtual void setGeometryBytes(const QByteArray& blob) { m_settings.m_geometryBytes = blob; } - virtual QByteArray getGeometryBytes() const { return m_settings.m_geometryBytes; } private: Ui::KiwiSDRGui* ui; diff --git a/plugins/samplesource/kiwisdr/kiwisdrsettings.cpp b/plugins/samplesource/kiwisdr/kiwisdrsettings.cpp index 8dfbecd14..f894288c7 100644 --- a/plugins/samplesource/kiwisdr/kiwisdrsettings.cpp +++ b/plugins/samplesource/kiwisdr/kiwisdrsettings.cpp @@ -38,8 +38,6 @@ void KiwiSDRSettings::resetToDefaults() m_reverseAPIAddress = "127.0.0.1"; m_reverseAPIPort = 8888; m_reverseAPIDeviceIndex = 0; - - m_workspaceIndex = 0; } QByteArray KiwiSDRSettings::serialize() const @@ -49,8 +47,6 @@ QByteArray KiwiSDRSettings::serialize() const s.writeString(2, m_serverAddress); s.writeU32(3, m_gain); s.writeBool(4, m_useAGC); - s.writeS32(5, m_workspaceIndex); - s.writeBlob(6, m_geometryBytes); s.writeBool(100, m_useReverseAPI); s.writeString(101, m_reverseAPIAddress); @@ -77,8 +73,6 @@ bool KiwiSDRSettings::deserialize(const QByteArray& data) d.readString(2, &m_serverAddress, "127.0.0.1:8073"); d.readU32(3, &m_gain, 20); d.readBool(4, &m_useAGC, true); - d.readS32(5, &m_workspaceIndex, 0); - d.readBlob(6, &m_geometryBytes); d.readBool(100, &m_useReverseAPI, false); d.readString(101, &m_reverseAPIAddress, "127.0.0.1"); diff --git a/plugins/samplesource/kiwisdr/kiwisdrsettings.h b/plugins/samplesource/kiwisdr/kiwisdrsettings.h index d084df434..23b09f312 100644 --- a/plugins/samplesource/kiwisdr/kiwisdrsettings.h +++ b/plugins/samplesource/kiwisdr/kiwisdrsettings.h @@ -35,9 +35,6 @@ struct KiwiSDRSettings { uint16_t m_reverseAPIPort; uint16_t m_reverseAPIDeviceIndex; - int m_workspaceIndex; - QByteArray m_geometryBytes; - KiwiSDRSettings(); void resetToDefaults(); QByteArray serialize() const; diff --git a/plugins/samplesource/limesdrinput/limesdrinputgui.h b/plugins/samplesource/limesdrinput/limesdrinputgui.h index e58cd27dc..2da4a4a39 100644 --- a/plugins/samplesource/limesdrinput/limesdrinputgui.h +++ b/plugins/samplesource/limesdrinput/limesdrinputgui.h @@ -44,10 +44,6 @@ public: QByteArray serialize() const; bool deserialize(const QByteArray& data); virtual MessageQueue *getInputMessageQueue() { return &m_inputMessageQueue; } - virtual void setWorkspaceIndex(int index) { m_settings.m_workspaceIndex = index; } - virtual int getWorkspaceIndex() const { return m_settings.m_workspaceIndex; } - virtual void setGeometryBytes(const QByteArray& blob) { m_settings.m_geometryBytes = blob; } - virtual QByteArray getGeometryBytes() const { return m_settings.m_geometryBytes; } private: Ui::LimeSDRInputGUI* ui; diff --git a/plugins/samplesource/limesdrinput/limesdrinputsettings.cpp b/plugins/samplesource/limesdrinput/limesdrinputsettings.cpp index ba08ac6c5..01d7340c0 100644 --- a/plugins/samplesource/limesdrinput/limesdrinputsettings.cpp +++ b/plugins/samplesource/limesdrinput/limesdrinputsettings.cpp @@ -53,7 +53,6 @@ void LimeSDRInputSettings::resetToDefaults() m_reverseAPIAddress = "127.0.0.1"; m_reverseAPIPort = 8888; m_reverseAPIDeviceIndex = 0; - m_workspaceIndex = 0; } QByteArray LimeSDRInputSettings::serialize() const @@ -87,8 +86,6 @@ QByteArray LimeSDRInputSettings::serialize() const s.writeU32(26, m_reverseAPIPort); s.writeU32(27, m_reverseAPIDeviceIndex); s.writeBool(28, m_iqOrder); - s.writeS32(29, m_workspaceIndex); - s.writeBlob(30, m_geometryBytes); return s.final(); } @@ -147,8 +144,6 @@ bool LimeSDRInputSettings::deserialize(const QByteArray& data) d.readU32(27, &uintval, 0); m_reverseAPIDeviceIndex = uintval > 99 ? 99 : uintval; d.readBool(28, &m_iqOrder, true); - d.readS32(29, &m_workspaceIndex, 0); - d.readBlob(20, &m_geometryBytes); return true; } diff --git a/plugins/samplesource/limesdrinput/limesdrinputsettings.h b/plugins/samplesource/limesdrinput/limesdrinputsettings.h index 96f5fdae5..ef43bbadf 100644 --- a/plugins/samplesource/limesdrinput/limesdrinputsettings.h +++ b/plugins/samplesource/limesdrinput/limesdrinputsettings.h @@ -73,8 +73,6 @@ struct LimeSDRInputSettings QString m_reverseAPIAddress; uint16_t m_reverseAPIPort; uint16_t m_reverseAPIDeviceIndex; - int m_workspaceIndex; - QByteArray m_geometryBytes; LimeSDRInputSettings(); void resetToDefaults(); diff --git a/plugins/samplesource/localinput/localinputgui.h b/plugins/samplesource/localinput/localinputgui.h index 191b7bea8..3822ee69a 100644 --- a/plugins/samplesource/localinput/localinputgui.h +++ b/plugins/samplesource/localinput/localinputgui.h @@ -46,10 +46,6 @@ public: QByteArray serialize() const; bool deserialize(const QByteArray& data); virtual MessageQueue *getInputMessageQueue() { return &m_inputMessageQueue; } - virtual void setWorkspaceIndex(int index) { m_settings.m_workspaceIndex = index; } - virtual int getWorkspaceIndex() const { return m_settings.m_workspaceIndex; } - virtual void setGeometryBytes(const QByteArray& blob) { m_settings.m_geometryBytes = blob; } - virtual QByteArray getGeometryBytes() const { return m_settings.m_geometryBytes; } private: Ui::LocalInputGui* ui; diff --git a/plugins/samplesource/localinput/localinputsettings.cpp b/plugins/samplesource/localinput/localinputsettings.cpp index 7c48abbe3..f567857ab 100644 --- a/plugins/samplesource/localinput/localinputsettings.cpp +++ b/plugins/samplesource/localinput/localinputsettings.cpp @@ -31,7 +31,6 @@ void LocalInputSettings::resetToDefaults() m_reverseAPIAddress = "127.0.0.1"; m_reverseAPIPort = 8888; m_reverseAPIDeviceIndex = 0; - m_workspaceIndex = 0; } QByteArray LocalInputSettings::serialize() const @@ -44,8 +43,6 @@ QByteArray LocalInputSettings::serialize() const s.writeString(4, m_reverseAPIAddress); s.writeU32(5, m_reverseAPIPort); s.writeU32(6, m_reverseAPIDeviceIndex); - s.writeS32(7, m_workspaceIndex); - s.writeBlob(8, m_geometryBytes); return s.final(); } @@ -78,8 +75,6 @@ bool LocalInputSettings::deserialize(const QByteArray& data) d.readU32(6, &uintval, 0); m_reverseAPIDeviceIndex = uintval > 99 ? 99 : uintval; - d.readS32(7, &m_workspaceIndex, 0); - d.readBlob(8, &m_geometryBytes); return true; } diff --git a/plugins/samplesource/localinput/localinputsettings.h b/plugins/samplesource/localinput/localinputsettings.h index 3f6beb9f0..42689d497 100644 --- a/plugins/samplesource/localinput/localinputsettings.h +++ b/plugins/samplesource/localinput/localinputsettings.h @@ -28,8 +28,6 @@ struct LocalInputSettings { QString m_reverseAPIAddress; uint16_t m_reverseAPIPort; uint16_t m_reverseAPIDeviceIndex; - int m_workspaceIndex; - QByteArray m_geometryBytes; LocalInputSettings(); void resetToDefaults(); diff --git a/plugins/samplesource/perseus/perseusgui.h b/plugins/samplesource/perseus/perseusgui.h index 38a8d1a5c..26e51a937 100644 --- a/plugins/samplesource/perseus/perseusgui.h +++ b/plugins/samplesource/perseus/perseusgui.h @@ -44,10 +44,6 @@ public: QByteArray serialize() const; bool deserialize(const QByteArray& data); virtual MessageQueue* getInputMessageQueue() { return &m_inputMessageQueue; } - virtual void setWorkspaceIndex(int index) { m_settings.m_workspaceIndex = index; } - virtual int getWorkspaceIndex() const { return m_settings.m_workspaceIndex; } - virtual void setGeometryBytes(const QByteArray& blob) { m_settings.m_geometryBytes = blob; } - virtual QByteArray getGeometryBytes() const { return m_settings.m_geometryBytes; } uint32_t getDevSampleRate(unsigned int index); int getDevSampleRateIndex(uint32_t sampleRate); diff --git a/plugins/samplesource/perseus/perseussettings.cpp b/plugins/samplesource/perseus/perseussettings.cpp index 37e8e34c2..c75e08e00 100644 --- a/plugins/samplesource/perseus/perseussettings.cpp +++ b/plugins/samplesource/perseus/perseussettings.cpp @@ -41,7 +41,6 @@ void PerseusSettings::resetToDefaults() m_reverseAPIAddress = "127.0.0.1"; m_reverseAPIPort = 8888; m_reverseAPIDeviceIndex = 0; - m_workspaceIndex = 0; } QByteArray PerseusSettings::serialize() const @@ -62,8 +61,6 @@ QByteArray PerseusSettings::serialize() const s.writeU32(12, m_reverseAPIPort); s.writeU32(13, m_reverseAPIDeviceIndex); s.writeBool(14, m_iqOrder); - s.writeS32(15, m_workspaceIndex); - s.writeBlob(16, m_geometryBytes); return s.final(); } @@ -112,8 +109,6 @@ bool PerseusSettings::deserialize(const QByteArray& data) d.readU32(13, &uintval, 0); m_reverseAPIDeviceIndex = uintval > 99 ? 99 : uintval; d.readBool(14, &m_iqOrder, true); - d.readS32(15, &m_workspaceIndex, 0); - d.readBlob(16, &m_geometryBytes); return true; } diff --git a/plugins/samplesource/perseus/perseussettings.h b/plugins/samplesource/perseus/perseussettings.h index 284c86395..6c28b142a 100644 --- a/plugins/samplesource/perseus/perseussettings.h +++ b/plugins/samplesource/perseus/perseussettings.h @@ -47,8 +47,6 @@ struct PerseusSettings QString m_reverseAPIAddress; uint16_t m_reverseAPIPort; uint16_t m_reverseAPIDeviceIndex; - int m_workspaceIndex; - QByteArray m_geometryBytes; PerseusSettings(); void resetToDefaults(); diff --git a/plugins/samplesource/plutosdrinput/plutosdrinputgui.h b/plugins/samplesource/plutosdrinput/plutosdrinputgui.h index 003c6d298..2ed58ae5c 100644 --- a/plugins/samplesource/plutosdrinput/plutosdrinputgui.h +++ b/plugins/samplesource/plutosdrinput/plutosdrinputgui.h @@ -47,10 +47,6 @@ public: virtual QByteArray serialize() const; virtual bool deserialize(const QByteArray& data); virtual MessageQueue *getInputMessageQueue() { return &m_inputMessageQueue; } - virtual void setWorkspaceIndex(int index) { m_settings.m_workspaceIndex = index; } - virtual int getWorkspaceIndex() const { return m_settings.m_workspaceIndex; } - virtual void setGeometryBytes(const QByteArray& blob) { m_settings.m_geometryBytes = blob; } - virtual QByteArray getGeometryBytes() const { return m_settings.m_geometryBytes; } private: Ui::PlutoSDRInputGUI* ui; diff --git a/plugins/samplesource/plutosdrinput/plutosdrinputsettings.cpp b/plugins/samplesource/plutosdrinput/plutosdrinputsettings.cpp index 4d7c3ab9d..72cb5fae1 100644 --- a/plugins/samplesource/plutosdrinput/plutosdrinputsettings.cpp +++ b/plugins/samplesource/plutosdrinput/plutosdrinputsettings.cpp @@ -53,7 +53,6 @@ void PlutoSDRInputSettings::resetToDefaults() m_reverseAPIAddress = "127.0.0.1"; m_reverseAPIPort = 8888; m_reverseAPIDeviceIndex = 0; - m_workspaceIndex = 0; } QByteArray PlutoSDRInputSettings::serialize() const @@ -84,8 +83,6 @@ QByteArray PlutoSDRInputSettings::serialize() const s.writeBool(23, m_hwRFDCBlock); s.writeBool(24, m_hwIQCorrection); s.writeBool(25, m_iqOrder); - s.writeS32(26, m_workspaceIndex); - s.writeBlob(27, m_geometryBytes); return s.final(); } @@ -158,8 +155,6 @@ bool PlutoSDRInputSettings::deserialize(const QByteArray& data) d.readBool(23, &m_hwRFDCBlock, true); d.readBool(24, &m_hwIQCorrection, true); d.readBool(25, &m_iqOrder, true); - d.readS32(26, &m_workspaceIndex, 0); - d.readBlob(27, &m_geometryBytes); return true; } diff --git a/plugins/samplesource/plutosdrinput/plutosdrinputsettings.h b/plugins/samplesource/plutosdrinput/plutosdrinputsettings.h index 0a3397534..7dabb7310 100644 --- a/plugins/samplesource/plutosdrinput/plutosdrinputsettings.h +++ b/plugins/samplesource/plutosdrinput/plutosdrinputsettings.h @@ -83,8 +83,6 @@ struct PlutoSDRInputSettings { QString m_reverseAPIAddress; uint16_t m_reverseAPIPort; uint16_t m_reverseAPIDeviceIndex; - int m_workspaceIndex; - QByteArray m_geometryBytes; PlutoSDRInputSettings(); void resetToDefaults(); diff --git a/plugins/samplesource/remoteinput/remoteinputgui.h b/plugins/samplesource/remoteinput/remoteinputgui.h index 6de55ffc2..aaea76579 100644 --- a/plugins/samplesource/remoteinput/remoteinputgui.h +++ b/plugins/samplesource/remoteinput/remoteinputgui.h @@ -48,10 +48,6 @@ public: QByteArray serialize() const; bool deserialize(const QByteArray& data); virtual MessageQueue *getInputMessageQueue() { return &m_inputMessageQueue; } - virtual void setWorkspaceIndex(int index) { m_settings.m_workspaceIndex = index; } - virtual int getWorkspaceIndex() const { return m_settings.m_workspaceIndex; } - virtual void setGeometryBytes(const QByteArray& blob) { m_settings.m_geometryBytes = blob; } - virtual QByteArray getGeometryBytes() const { return m_settings.m_geometryBytes; } private: Ui::RemoteInputGui* ui; diff --git a/plugins/samplesource/remoteinput/remoteinputsettings.cpp b/plugins/samplesource/remoteinput/remoteinputsettings.cpp index 97ede685d..c581c397f 100644 --- a/plugins/samplesource/remoteinput/remoteinputsettings.cpp +++ b/plugins/samplesource/remoteinput/remoteinputsettings.cpp @@ -37,7 +37,6 @@ void RemoteInputSettings::resetToDefaults() m_reverseAPIAddress = "127.0.0.1"; m_reverseAPIPort = 8888; m_reverseAPIDeviceIndex = 0; - m_workspaceIndex = 0; } QByteArray RemoteInputSettings::serialize() const @@ -56,8 +55,6 @@ QByteArray RemoteInputSettings::serialize() const s.writeString(12, m_reverseAPIAddress); s.writeU32(13, m_reverseAPIPort); s.writeU32(14, m_reverseAPIDeviceIndex); - s.writeS32(15, m_workspaceIndex); - s.writeBlob(16, m_geometryBytes); return s.final(); } @@ -98,8 +95,6 @@ bool RemoteInputSettings::deserialize(const QByteArray& data) d.readU32(14, &uintval, 0); m_reverseAPIDeviceIndex = uintval > 99 ? 99 : uintval; - d.readS32(15, &m_workspaceIndex, 0); - d.readBlob(16, &m_geometryBytes); return true; } diff --git a/plugins/samplesource/remoteinput/remoteinputsettings.h b/plugins/samplesource/remoteinput/remoteinputsettings.h index bb544070e..60cec764d 100644 --- a/plugins/samplesource/remoteinput/remoteinputsettings.h +++ b/plugins/samplesource/remoteinput/remoteinputsettings.h @@ -34,8 +34,6 @@ struct RemoteInputSettings { QString m_reverseAPIAddress; uint16_t m_reverseAPIPort; uint16_t m_reverseAPIDeviceIndex; - int m_workspaceIndex; - QByteArray m_geometryBytes; RemoteInputSettings(); void resetToDefaults(); diff --git a/plugins/samplesource/rtlsdr/rtlsdrgui.h b/plugins/samplesource/rtlsdr/rtlsdrgui.h index a6c3f0e98..ec1e22bd3 100644 --- a/plugins/samplesource/rtlsdr/rtlsdrgui.h +++ b/plugins/samplesource/rtlsdr/rtlsdrgui.h @@ -46,10 +46,6 @@ public: QByteArray serialize() const; bool deserialize(const QByteArray& data); virtual MessageQueue *getInputMessageQueue() { return &m_inputMessageQueue; } - virtual void setWorkspaceIndex(int index) { m_settings.m_workspaceIndex = index; } - virtual int getWorkspaceIndex() const { return m_settings.m_workspaceIndex; } - virtual void setGeometryBytes(const QByteArray& blob) { m_settings.m_geometryBytes = blob; } - virtual QByteArray getGeometryBytes() const { return m_settings.m_geometryBytes; } private: Ui::RTLSDRGui* ui; diff --git a/plugins/samplesource/rtlsdr/rtlsdrsettings.cpp b/plugins/samplesource/rtlsdr/rtlsdrsettings.cpp index c8326fdf9..ace5e0f89 100644 --- a/plugins/samplesource/rtlsdr/rtlsdrsettings.cpp +++ b/plugins/samplesource/rtlsdr/rtlsdrsettings.cpp @@ -47,7 +47,6 @@ void RTLSDRSettings::resetToDefaults() m_reverseAPIAddress = "127.0.0.1"; m_reverseAPIPort = 8888; m_reverseAPIDeviceIndex = 0; - m_workspaceIndex = 0; } QByteArray RTLSDRSettings::serialize() const @@ -74,8 +73,6 @@ QByteArray RTLSDRSettings::serialize() const s.writeU32(19, m_reverseAPIDeviceIndex); s.writeBool(20, m_iqOrder); s.writeBool(21, m_biasTee); - s.writeS32(22, m_workspaceIndex); - s.writeBlob(23, m_geometryBytes); return s.final(); } @@ -124,8 +121,6 @@ bool RTLSDRSettings::deserialize(const QByteArray& data) m_reverseAPIDeviceIndex = utmp > 99 ? 99 : utmp; d.readBool(20, &m_iqOrder, true); d.readBool(21, &m_biasTee, false); - d.readS32(22, &m_workspaceIndex, 0); - d.readBlob(23, &m_geometryBytes); return true; } diff --git a/plugins/samplesource/rtlsdr/rtlsdrsettings.h b/plugins/samplesource/rtlsdr/rtlsdrsettings.h index 2d9913816..a80649339 100644 --- a/plugins/samplesource/rtlsdr/rtlsdrsettings.h +++ b/plugins/samplesource/rtlsdr/rtlsdrsettings.h @@ -48,8 +48,6 @@ struct RTLSDRSettings { QString m_reverseAPIAddress; uint16_t m_reverseAPIPort; uint16_t m_reverseAPIDeviceIndex; - int m_workspaceIndex; - QByteArray m_geometryBytes; RTLSDRSettings(); void resetToDefaults(); diff --git a/plugins/samplesource/sdrplay/sdrplaygui.h b/plugins/samplesource/sdrplay/sdrplaygui.h index 31e783831..d9d720084 100644 --- a/plugins/samplesource/sdrplay/sdrplaygui.h +++ b/plugins/samplesource/sdrplay/sdrplaygui.h @@ -46,10 +46,6 @@ public: virtual QByteArray serialize() const; virtual bool deserialize(const QByteArray& data); virtual MessageQueue *getInputMessageQueue() { return &m_inputMessageQueue; } - virtual void setWorkspaceIndex(int index) { m_settings.m_workspaceIndex = index; } - virtual int getWorkspaceIndex() const { return m_settings.m_workspaceIndex; } - virtual void setGeometryBytes(const QByteArray& blob) { m_settings.m_geometryBytes = blob; } - virtual QByteArray getGeometryBytes() const { return m_settings.m_geometryBytes; } private: Ui::SDRPlayGui* ui; diff --git a/plugins/samplesource/sdrplay/sdrplaysettings.cpp b/plugins/samplesource/sdrplay/sdrplaysettings.cpp index 626ab4ec0..4828bb086 100644 --- a/plugins/samplesource/sdrplay/sdrplaysettings.cpp +++ b/plugins/samplesource/sdrplay/sdrplaysettings.cpp @@ -47,7 +47,6 @@ void SDRPlaySettings::resetToDefaults() m_reverseAPIAddress = "127.0.0.1"; m_reverseAPIPort = 8888; m_reverseAPIDeviceIndex = 0; - m_workspaceIndex = 0; } QByteArray SDRPlaySettings::serialize() const @@ -73,8 +72,6 @@ QByteArray SDRPlaySettings::serialize() const s.writeU32(17, m_reverseAPIPort); s.writeU32(18, m_reverseAPIDeviceIndex); s.writeBool(19, m_iqOrder); - s.writeS32(20, m_workspaceIndex); - s.writeBlob(21, m_geometryBytes); return s.final(); } @@ -122,8 +119,6 @@ bool SDRPlaySettings::deserialize(const QByteArray& data) d.readU32(18, &uintval, 0); m_reverseAPIDeviceIndex = uintval > 99 ? 99 : uintval; d.readBool(19, &m_iqOrder, true); - d.readS32(20, &m_workspaceIndex, 0); - d.readBlob(21, &m_geometryBytes); return true; } diff --git a/plugins/samplesource/sdrplay/sdrplaysettings.h b/plugins/samplesource/sdrplay/sdrplaysettings.h index 1242b532a..7dbe2765c 100644 --- a/plugins/samplesource/sdrplay/sdrplaysettings.h +++ b/plugins/samplesource/sdrplay/sdrplaysettings.h @@ -50,8 +50,6 @@ struct SDRPlaySettings { QString m_reverseAPIAddress; uint16_t m_reverseAPIPort; uint16_t m_reverseAPIDeviceIndex; - int m_workspaceIndex; - QByteArray m_geometryBytes; SDRPlaySettings(); void resetToDefaults(); diff --git a/plugins/samplesource/sdrplayv3/sdrplayv3gui.h b/plugins/samplesource/sdrplayv3/sdrplayv3gui.h index b3fb7df14..39462b66d 100644 --- a/plugins/samplesource/sdrplayv3/sdrplayv3gui.h +++ b/plugins/samplesource/sdrplayv3/sdrplayv3gui.h @@ -46,10 +46,6 @@ public: virtual QByteArray serialize() const; virtual bool deserialize(const QByteArray& data); virtual MessageQueue *getInputMessageQueue() { return &m_inputMessageQueue; } - virtual void setWorkspaceIndex(int index) { m_settings.m_workspaceIndex = index; } - virtual int getWorkspaceIndex() const { return m_settings.m_workspaceIndex; } - virtual void setGeometryBytes(const QByteArray& blob) { m_settings.m_geometryBytes = blob; } - virtual QByteArray getGeometryBytes() const { return m_settings.m_geometryBytes; } private: Ui::SDRPlayV3Gui* ui; diff --git a/plugins/samplesource/sdrplayv3/sdrplayv3settings.cpp b/plugins/samplesource/sdrplayv3/sdrplayv3settings.cpp index 2cc56029d..3787f473b 100644 --- a/plugins/samplesource/sdrplayv3/sdrplayv3settings.cpp +++ b/plugins/samplesource/sdrplayv3/sdrplayv3settings.cpp @@ -54,7 +54,6 @@ void SDRPlayV3Settings::resetToDefaults() m_reverseAPIAddress = "127.0.0.1"; m_reverseAPIPort = 8888; m_reverseAPIDeviceIndex = 0; - m_workspaceIndex = 0; } QByteArray SDRPlayV3Settings::serialize() const @@ -86,8 +85,6 @@ QByteArray SDRPlayV3Settings::serialize() const s.writeBool(26, m_transverterMode); s.writeS64(27, m_transverterDeltaFrequency); s.writeBool(28, m_iqOrder); - s.writeS32(29, m_workspaceIndex); - s.writeBlob(30, m_geometryBytes); return s.final(); } @@ -141,8 +138,6 @@ bool SDRPlayV3Settings::deserialize(const QByteArray& data) d.readBool(26, &m_transverterMode, false); d.readS64(27, &m_transverterDeltaFrequency, 0); d.readBool(28, &m_iqOrder, true); - d.readS32(29, &m_workspaceIndex, 0); - d.readBlob(30, &m_geometryBytes); return true; } diff --git a/plugins/samplesource/sdrplayv3/sdrplayv3settings.h b/plugins/samplesource/sdrplayv3/sdrplayv3settings.h index f5c0c6466..6a2ed2a90 100644 --- a/plugins/samplesource/sdrplayv3/sdrplayv3settings.h +++ b/plugins/samplesource/sdrplayv3/sdrplayv3settings.h @@ -57,8 +57,6 @@ struct SDRPlayV3Settings { QString m_reverseAPIAddress; uint16_t m_reverseAPIPort; uint16_t m_reverseAPIDeviceIndex; - int m_workspaceIndex; - QByteArray m_geometryBytes; SDRPlayV3Settings(); void resetToDefaults(); diff --git a/plugins/samplesource/sigmffileinput/sigmffileinputgui.h b/plugins/samplesource/sigmffileinput/sigmffileinputgui.h index f468bcc03..381ad5ea9 100644 --- a/plugins/samplesource/sigmffileinput/sigmffileinputgui.h +++ b/plugins/samplesource/sigmffileinput/sigmffileinputgui.h @@ -46,10 +46,6 @@ public: QByteArray serialize() const; bool deserialize(const QByteArray& data); virtual MessageQueue *getInputMessageQueue() { return &m_inputMessageQueue; } - virtual void setWorkspaceIndex(int index) { m_settings.m_workspaceIndex = index; } - virtual int getWorkspaceIndex() const { return m_settings.m_workspaceIndex; } - virtual void setGeometryBytes(const QByteArray& blob) { m_settings.m_geometryBytes = blob; } - virtual QByteArray getGeometryBytes() const { return m_settings.m_geometryBytes; } private: Ui::SigMFFileInputGUI* ui; diff --git a/plugins/samplesource/sigmffileinput/sigmffileinputsettings.cpp b/plugins/samplesource/sigmffileinput/sigmffileinputsettings.cpp index 2104b9c16..5abdce315 100644 --- a/plugins/samplesource/sigmffileinput/sigmffileinputsettings.cpp +++ b/plugins/samplesource/sigmffileinput/sigmffileinputsettings.cpp @@ -36,7 +36,6 @@ void SigMFFileInputSettings::resetToDefaults() m_reverseAPIAddress = "127.0.0.1"; m_reverseAPIPort = 8888; m_reverseAPIDeviceIndex = 0; - m_workspaceIndex = 0; } QByteArray SigMFFileInputSettings::serialize() const @@ -50,8 +49,6 @@ QByteArray SigMFFileInputSettings::serialize() const s.writeString(6, m_reverseAPIAddress); s.writeU32(7, m_reverseAPIPort); s.writeU32(8, m_reverseAPIDeviceIndex); - s.writeS32(9, m_workspaceIndex); - s.writeBlob(10, m_geometryBytes); return s.final(); } @@ -85,8 +82,6 @@ bool SigMFFileInputSettings::deserialize(const QByteArray& data) d.readU32(8, &uintval, 0); m_reverseAPIDeviceIndex = uintval > 99 ? 99 : uintval; - d.readS32(9, &m_workspaceIndex, 0); - d.readBlob(10, &m_geometryBytes); return true; } diff --git a/plugins/samplesource/sigmffileinput/sigmffileinputsettings.h b/plugins/samplesource/sigmffileinput/sigmffileinputsettings.h index 30ce9149e..9e365494f 100644 --- a/plugins/samplesource/sigmffileinput/sigmffileinputsettings.h +++ b/plugins/samplesource/sigmffileinput/sigmffileinputsettings.h @@ -30,8 +30,6 @@ struct SigMFFileInputSettings { QString m_reverseAPIAddress; uint16_t m_reverseAPIPort; uint16_t m_reverseAPIDeviceIndex; - int m_workspaceIndex; - QByteArray m_geometryBytes; static const unsigned int m_accelerationMaxScale; //!< Max power of 10 multiplier to 2,5,10 base ex: 2 -> 2,5,10,20,50,100,200,500,1000 diff --git a/plugins/samplesource/soapysdrinput/soapysdrinputgui.h b/plugins/samplesource/soapysdrinput/soapysdrinputgui.h index b1bc40230..483f9e823 100644 --- a/plugins/samplesource/soapysdrinput/soapysdrinputgui.h +++ b/plugins/samplesource/soapysdrinput/soapysdrinputgui.h @@ -51,10 +51,6 @@ public: virtual QByteArray serialize() const; virtual bool deserialize(const QByteArray& data); virtual MessageQueue *getInputMessageQueue() { return &m_inputMessageQueue; } - virtual void setWorkspaceIndex(int index) { m_settings.m_workspaceIndex = index; } - virtual int getWorkspaceIndex() const { return m_settings.m_workspaceIndex; } - virtual void setGeometryBytes(const QByteArray& blob) { m_settings.m_geometryBytes = blob; } - virtual QByteArray getGeometryBytes() const { return m_settings.m_geometryBytes; } private: void createRangesControl( diff --git a/plugins/samplesource/soapysdrinput/soapysdrinputsettings.cpp b/plugins/samplesource/soapysdrinput/soapysdrinputsettings.cpp index 0709f7f3f..6583dde0a 100644 --- a/plugins/samplesource/soapysdrinput/soapysdrinputsettings.cpp +++ b/plugins/samplesource/soapysdrinput/soapysdrinputsettings.cpp @@ -50,7 +50,6 @@ void SoapySDRInputSettings::resetToDefaults() m_reverseAPIAddress = "127.0.0.1"; m_reverseAPIPort = 8888; m_reverseAPIDeviceIndex = 0; - m_workspaceIndex = 0; } QByteArray SoapySDRInputSettings::serialize() const @@ -84,8 +83,6 @@ QByteArray SoapySDRInputSettings::serialize() const s.writeU32(25, m_reverseAPIPort); s.writeU32(26, m_reverseAPIDeviceIndex); s.writeBool(27, m_iqOrder); - s.writeS32(28, m_workspaceIndex); - s.writeBlob(29, m_geometryBytes); return s.final(); } @@ -149,8 +146,6 @@ bool SoapySDRInputSettings::deserialize(const QByteArray& data) d.readU32(26, &uintval, 0); m_reverseAPIDeviceIndex = uintval > 99 ? 99 : uintval; d.readBool(27, &m_iqOrder, true); - d.readS32(28, &m_workspaceIndex, 0); - d.readBlob(29, &m_geometryBytes); return true; } diff --git a/plugins/samplesource/soapysdrinput/soapysdrinputsettings.h b/plugins/samplesource/soapysdrinput/soapysdrinputsettings.h index d68416238..baab1b235 100644 --- a/plugins/samplesource/soapysdrinput/soapysdrinputsettings.h +++ b/plugins/samplesource/soapysdrinput/soapysdrinputsettings.h @@ -56,8 +56,6 @@ struct SoapySDRInputSettings { QString m_reverseAPIAddress; uint16_t m_reverseAPIPort; uint16_t m_reverseAPIDeviceIndex; - int m_workspaceIndex; - QByteArray m_geometryBytes; SoapySDRInputSettings(); void resetToDefaults(); diff --git a/plugins/samplesource/testsource/testsourcegui.h b/plugins/samplesource/testsource/testsourcegui.h index 61b34eab1..c6243b0ff 100644 --- a/plugins/samplesource/testsource/testsourcegui.h +++ b/plugins/samplesource/testsource/testsourcegui.h @@ -45,10 +45,6 @@ public: QByteArray serialize() const; bool deserialize(const QByteArray& data); virtual MessageQueue *getInputMessageQueue() { return &m_inputMessageQueue; } - virtual void setWorkspaceIndex(int index) { m_settings.m_workspaceIndex = index; } - virtual int getWorkspaceIndex() const { return m_settings.m_workspaceIndex; } - virtual void setGeometryBytes(const QByteArray& blob) { m_settings.m_geometryBytes = blob; } - virtual QByteArray getGeometryBytes() const { return m_settings.m_geometryBytes; } private: Ui::TestSourceGui* ui; diff --git a/plugins/samplesource/testsource/testsourcesettings.cpp b/plugins/samplesource/testsource/testsourcesettings.cpp index 3db304e51..b94d7e044 100644 --- a/plugins/samplesource/testsource/testsourcesettings.cpp +++ b/plugins/samplesource/testsource/testsourcesettings.cpp @@ -46,7 +46,6 @@ void TestSourceSettings::resetToDefaults() m_reverseAPIAddress = "127.0.0.1"; m_reverseAPIPort = 8888; m_reverseAPIDeviceIndex = 0; - m_workspaceIndex = 0; } QByteArray TestSourceSettings::serialize() const @@ -72,8 +71,6 @@ QByteArray TestSourceSettings::serialize() const s.writeString(19, m_reverseAPIAddress); s.writeU32(20, m_reverseAPIPort); s.writeU32(21, m_reverseAPIDeviceIndex); - s.writeS32(22, m_workspaceIndex); - s.writeBlob(23, m_geometryBytes); return s.final(); } @@ -136,8 +133,6 @@ bool TestSourceSettings::deserialize(const QByteArray& data) d.readU32(21, &utmp, 0); m_reverseAPIDeviceIndex = utmp > 99 ? 99 : utmp; - d.readS32(22, &m_workspaceIndex, 0); - d.readBlob(23, &m_geometryBytes); return true; } diff --git a/plugins/samplesource/testsource/testsourcesettings.h b/plugins/samplesource/testsource/testsourcesettings.h index c22ffbb25..e7529d51a 100644 --- a/plugins/samplesource/testsource/testsourcesettings.h +++ b/plugins/samplesource/testsource/testsourcesettings.h @@ -64,8 +64,6 @@ struct TestSourceSettings { QString m_reverseAPIAddress; uint16_t m_reverseAPIPort; uint16_t m_reverseAPIDeviceIndex; - int m_workspaceIndex; - QByteArray m_geometryBytes; TestSourceSettings(); void resetToDefaults(); diff --git a/plugins/samplesource/usrpinput/usrpinputgui.h b/plugins/samplesource/usrpinput/usrpinputgui.h index 4facc1e5a..d9c61d808 100644 --- a/plugins/samplesource/usrpinput/usrpinputgui.h +++ b/plugins/samplesource/usrpinput/usrpinputgui.h @@ -50,10 +50,6 @@ public: QByteArray serialize() const; bool deserialize(const QByteArray& data); virtual MessageQueue *getInputMessageQueue() { return &m_inputMessageQueue; } - virtual void setWorkspaceIndex(int index) { m_settings.m_workspaceIndex = index; } - virtual int getWorkspaceIndex() const { return m_settings.m_workspaceIndex; } - virtual void setGeometryBytes(const QByteArray& blob) { m_settings.m_geometryBytes = blob; } - virtual QByteArray getGeometryBytes() const { return m_settings.m_geometryBytes; } private: Ui::USRPInputGUI* ui; diff --git a/plugins/samplesource/usrpinput/usrpinputsettings.cpp b/plugins/samplesource/usrpinput/usrpinputsettings.cpp index 76cfc3061..9cd5210de 100644 --- a/plugins/samplesource/usrpinput/usrpinputsettings.cpp +++ b/plugins/samplesource/usrpinput/usrpinputsettings.cpp @@ -44,7 +44,6 @@ void USRPInputSettings::resetToDefaults() m_reverseAPIAddress = "127.0.0.1"; m_reverseAPIPort = 8888; m_reverseAPIDeviceIndex = 0; - m_workspaceIndex = 0; } QByteArray USRPInputSettings::serialize() const @@ -67,8 +66,6 @@ QByteArray USRPInputSettings::serialize() const s.writeU32(14, m_reverseAPIPort); s.writeU32(15, m_reverseAPIDeviceIndex); s.writeS32(16, m_loOffset); - s.writeS32(17, m_workspaceIndex); - s.writeBlob(18, m_geometryBytes); return s.final(); } @@ -113,8 +110,6 @@ bool USRPInputSettings::deserialize(const QByteArray& data) d.readU32(15, &uintval, 0); m_reverseAPIDeviceIndex = uintval > 99 ? 99 : uintval; d.readS32(16, &m_loOffset, 0); - d.readS32(17, &m_workspaceIndex, 0); - d.readBlob(18, &m_geometryBytes); return true; } diff --git a/plugins/samplesource/usrpinput/usrpinputsettings.h b/plugins/samplesource/usrpinput/usrpinputsettings.h index e843f0092..9f6aa5372 100644 --- a/plugins/samplesource/usrpinput/usrpinputsettings.h +++ b/plugins/samplesource/usrpinput/usrpinputsettings.h @@ -54,8 +54,6 @@ struct USRPInputSettings QString m_reverseAPIAddress; uint16_t m_reverseAPIPort; uint16_t m_reverseAPIDeviceIndex; - int m_workspaceIndex; - QByteArray m_geometryBytes; USRPInputSettings(); void resetToDefaults(); diff --git a/plugins/samplesource/xtrxinput/xtrxinputgui.h b/plugins/samplesource/xtrxinput/xtrxinputgui.h index d727a5c4d..7f8221479 100644 --- a/plugins/samplesource/xtrxinput/xtrxinputgui.h +++ b/plugins/samplesource/xtrxinput/xtrxinputgui.h @@ -45,10 +45,6 @@ public: QByteArray serialize() const; bool deserialize(const QByteArray& data); virtual MessageQueue *getInputMessageQueue() { return &m_inputMessageQueue; } - virtual void setWorkspaceIndex(int index) { m_settings.m_workspaceIndex = index; } - virtual int getWorkspaceIndex() const { return m_settings.m_workspaceIndex; } - virtual void setGeometryBytes(const QByteArray& blob) { m_settings.m_geometryBytes = blob; } - virtual QByteArray getGeometryBytes() const { return m_settings.m_geometryBytes; } private: Ui::XTRXInputGUI* ui; diff --git a/plugins/samplesource/xtrxinput/xtrxinputsettings.cpp b/plugins/samplesource/xtrxinput/xtrxinputsettings.cpp index 47bbe02d3..98584835d 100644 --- a/plugins/samplesource/xtrxinput/xtrxinputsettings.cpp +++ b/plugins/samplesource/xtrxinput/xtrxinputsettings.cpp @@ -48,7 +48,6 @@ void XTRXInputSettings::resetToDefaults() m_reverseAPIAddress = "127.0.0.1"; m_reverseAPIPort = 8888; m_reverseAPIDeviceIndex = 0; - m_workspaceIndex = 0; } QByteArray XTRXInputSettings::serialize() const @@ -77,8 +76,6 @@ QByteArray XTRXInputSettings::serialize() const s.writeU32(24, m_reverseAPIPort); s.writeU32(25, m_reverseAPIDeviceIndex); s.writeBool(26, m_iqOrder); - s.writeS32(27, m_workspaceIndex); - s.writeBlob(28, m_geometryBytes); return s.final(); } @@ -130,8 +127,6 @@ bool XTRXInputSettings::deserialize(const QByteArray& data) d.readU32(25, &uintval, 0); m_reverseAPIDeviceIndex = uintval > 99 ? 99 : uintval; d.readBool(26, &m_iqOrder, true); - d.readS32(27, &m_workspaceIndex, 0); - d.readBlob(28, &m_geometryBytes); return true; } diff --git a/plugins/samplesource/xtrxinput/xtrxinputsettings.h b/plugins/samplesource/xtrxinput/xtrxinputsettings.h index 40c771af8..fb0e9a63e 100644 --- a/plugins/samplesource/xtrxinput/xtrxinputsettings.h +++ b/plugins/samplesource/xtrxinput/xtrxinputsettings.h @@ -61,8 +61,6 @@ struct XTRXInputSettings QString m_reverseAPIAddress; uint16_t m_reverseAPIPort; uint16_t m_reverseAPIDeviceIndex; - int m_workspaceIndex; - QByteArray m_geometryBytes; XTRXInputSettings(); void resetToDefaults(); diff --git a/sdrgui/channel/readme.md b/sdrgui/channel/readme.md index 6ed955ce1..d99ad4ed2 100644 --- a/sdrgui/channel/readme.md +++ b/sdrgui/channel/readme.md @@ -58,7 +58,7 @@ If the device is a MIMO device and the channel is single stream based i.e. not M

A.2.6: Toggle reverse API feature

-Use this checkbox to toggle on/off the reverse API feature. With reverse API engaged the changes in the channel settings are forwarded to an API endpoint given by address (5.1.5), port (5.1.6), device index (5.1.7) and channel index (5.1.8) in the same format as the SDRangel REST API channel settings endpoint. With the values of the screenshot the API URL is: `http://127.0.0.1:8888/sdrangel/deviceset/0/channel/0/settings` The JSON payload follows the same format as the SDRangel REST API channel settings. Using the same example this would be: +Use this checkbox to toggle on/off the reverse API feature. With reverse API engaged the changes in the channel settings are forwarded to an API endpoint given by address (A.2.7), port (A.2.8), device index (A.2.9) and channel index (A.2.10) in the same format as the SDRangel REST API channel settings endpoint. With the values of the screenshot the API URL is: `http://127.0.0.1:8888/sdrangel/deviceset/0/channel/0/settings` The JSON payload follows the same format as the SDRangel REST API channel settings. Using the same example this would be: ``` { diff --git a/sdrgui/device/devicegui.h b/sdrgui/device/devicegui.h index 13fd111da..d4899c84d 100644 --- a/sdrgui/device/devicegui.h +++ b/sdrgui/device/devicegui.h @@ -59,11 +59,8 @@ public: virtual void resetToDefaults() = 0; virtual QByteArray serialize() const = 0; virtual bool deserialize(const QByteArray& data) = 0; - // Data saved in the derived settings - virtual void setWorkspaceIndex(int index)= 0; - virtual int getWorkspaceIndex() const = 0; - virtual void setGeometryBytes(const QByteArray& blob) = 0; - virtual QByteArray getGeometryBytes() const = 0; + void setWorkspaceIndex(int index) { m_workspaceIndex = index; } + int getWorkspaceIndex() const { return m_workspaceIndex; } virtual MessageQueue* getInputMessageQueue() = 0; @@ -86,6 +83,7 @@ protected: DeviceType m_deviceType; int m_deviceSetIndex; + int m_workspaceIndex; QString m_helpURL; QWidget *m_contents; ContextMenuType m_contextMenuType; diff --git a/sdrgui/device/readme.md b/sdrgui/device/readme.md index 0cddbbcaf..ee0f66265 100644 --- a/sdrgui/device/readme.md +++ b/sdrgui/device/readme.md @@ -30,7 +30,7 @@ All device types have common settings. Clicking on the button opens a dialog to

A.2.1: Toggle reverse API feature

-Use this checkbox to toggle on/off the reverse API feature. With reverse API engaged the changes in the device settings are forwarded to an API endpoint given by address (2.1.2.2), port (2.1.2.3) and device index (2.1.2.4) in the same format as the SDRangel REST API device settings endpoint. With the values of the screenshot the API URL is: `http://127.0.0.1:8888/sdrangel/deviceset/0/device/settings` The JSON payload follows the same format as the SDRangel REST API device settings. For example with HachRF Rx this would be something like: +Use this checkbox to toggle on/off the reverse API feature. With reverse API engaged the changes in the device settings are forwarded to an API endpoint given by address (A.2.2), port (A.2.3) and device index A.2.4) in the same format as the SDRangel REST API device settings endpoint. With the values of the screenshot the API URL is: `http://127.0.0.1:8888/sdrangel/deviceset/0/device/settings` The JSON payload follows the same format as the SDRangel REST API device settings. For example with HachRF Rx this would be something like: ``` { diff --git a/sdrgui/mainwindow.cpp b/sdrgui/mainwindow.cpp index 84bba6c5e..9995a75bc 100644 --- a/sdrgui/mainwindow.cpp +++ b/sdrgui/mainwindow.cpp @@ -1266,7 +1266,8 @@ void MainWindow::loadConfiguration(const Configuration *configuration, bool from deviceSetPreset.getSpectrumWorkspaceIndex() : deviceWorkspaceIndex; sampleSinkAdd(m_workspaces[deviceWorkspaceIndex], m_workspaces[spectrumWorkspaceIndex], bestDeviceIndex); - } else if (deviceSetPreset.isMIMOPreset()) + } + else if (deviceSetPreset.isMIMOPreset()) { int bestDeviceIndex = DeviceEnumerator::instance()->getBestMIMOSamplingDeviceIndex( deviceSetPreset.getSelectedDevice().m_deviceId, @@ -1350,7 +1351,7 @@ void MainWindow::saveConfiguration(Configuration *configuration) deviceSetPresets.back().setSpectrumWorkspaceIndex(deviceUISet->m_mainSpectrumGUI->getWorkspaceIndex()); deviceSetPresets.back().setDeviceGeometry(deviceUISet->m_deviceGUI->saveGeometry()); deviceSetPresets.back().setDeviceWorkspaceIndex(deviceUISet->m_deviceGUI->getWorkspaceIndex()); - qDebug("MainWindow::saveConfiguration: %s device in workspace %d spectrun in %d", + qDebug("MainWindow::saveConfiguration: %s device in workspace %d spectrum in %d", qPrintable(deviceUISet->m_deviceAPI->getSamplingDeviceId()), deviceUISet->m_deviceGUI->getWorkspaceIndex(), deviceUISet->m_mainSpectrumGUI->getWorkspaceIndex());