From f1cf2f4f18e70540cedac294ac2ba82d832fafe9 Mon Sep 17 00:00:00 2001 From: f4exb Date: Tue, 12 Apr 2022 18:27:27 +0200 Subject: [PATCH] Massive UI revamping (v7): persistent channel show/hide --- .../beamsteeringcwmod/beamsteeringcwmodgui.h | 2 ++ .../beamsteeringcwmodsettings.cpp | 3 +++ .../beamsteeringcwmod/beamsteeringcwmodsettings.h | 1 + .../interferometer/interferometergui.h | 2 ++ .../interferometer/interferometersettings.cpp | 3 +++ .../interferometer/interferometersettings.h | 1 + plugins/channelrx/chanalyzer/chanalyzergui.h | 2 ++ .../channelrx/chanalyzer/chanalyzersettings.cpp | 5 ++++- plugins/channelrx/chanalyzer/chanalyzersettings.h | 1 + plugins/channelrx/demodadsb/adsbdemodgui.h | 2 ++ plugins/channelrx/demodadsb/adsbdemodsettings.cpp | 3 +++ plugins/channelrx/demodadsb/adsbdemodsettings.h | 2 ++ plugins/channelrx/demodais/aisdemodgui.h | 2 ++ plugins/channelrx/demodais/aisdemodsettings.cpp | 3 +++ plugins/channelrx/demodais/aisdemodsettings.h | 1 + plugins/channelrx/demodam/amdemodgui.h | 2 ++ plugins/channelrx/demodam/amdemodsettings.cpp | 3 +++ plugins/channelrx/demodam/amdemodsettings.h | 1 + plugins/channelrx/demodapt/aptdemodgui.h | 2 ++ plugins/channelrx/demodapt/aptdemodsettings.cpp | 3 +++ plugins/channelrx/demodapt/aptdemodsettings.h | 1 + plugins/channelrx/demodatv/atvdemodgui.h | 2 ++ plugins/channelrx/demodatv/atvdemodsettings.cpp | 3 +++ plugins/channelrx/demodatv/atvdemodsettings.h | 1 + plugins/channelrx/demodbfm/bfmdemodgui.h | 2 ++ plugins/channelrx/demodbfm/bfmdemodsettings.cpp | 3 +++ plugins/channelrx/demodbfm/bfmdemodsettings.h | 1 + .../channelrx/demodchirpchat/chirpchatdemodgui.h | 2 ++ .../demodchirpchat/chirpchatdemodsettings.cpp | 3 +++ .../demodchirpchat/chirpchatdemodsettings.h | 1 + plugins/channelrx/demoddab/dabdemodgui.h | 2 ++ plugins/channelrx/demoddab/dabdemodsettings.cpp | 3 +++ plugins/channelrx/demoddab/dabdemodsettings.h | 1 + plugins/channelrx/demoddatv/datvdemodgui.h | 2 ++ plugins/channelrx/demoddatv/datvdemodsettings.cpp | 3 +++ plugins/channelrx/demoddatv/datvdemodsettings.h | 1 + plugins/channelrx/demoddsd/dsddemodgui.h | 2 ++ plugins/channelrx/demoddsd/dsddemodsettings.cpp | 3 +++ plugins/channelrx/demoddsd/dsddemodsettings.h | 1 + plugins/channelrx/demodfreedv/freedvdemodgui.h | 2 ++ .../channelrx/demodfreedv/freedvdemodsettings.cpp | 3 +++ .../channelrx/demodfreedv/freedvdemodsettings.h | 1 + plugins/channelrx/demodnfm/nfmdemodgui.h | 2 ++ plugins/channelrx/demodnfm/nfmdemodsettings.cpp | 3 +++ plugins/channelrx/demodnfm/nfmdemodsettings.h | 1 + plugins/channelrx/demodpacket/packetdemodgui.h | 2 ++ .../channelrx/demodpacket/packetdemodsettings.cpp | 3 +++ .../channelrx/demodpacket/packetdemodsettings.h | 1 + plugins/channelrx/demodpager/pagerdemodgui.h | 2 ++ .../channelrx/demodpager/pagerdemodsettings.cpp | 3 +++ plugins/channelrx/demodpager/pagerdemodsettings.h | 1 + .../demodradiosonde/radiosondedemodgui.h | 2 ++ .../demodradiosonde/radiosondedemodsettings.cpp | 3 +++ .../demodradiosonde/radiosondedemodsettings.h | 1 + plugins/channelrx/demodssb/ssbdemodgui.h | 2 ++ plugins/channelrx/demodssb/ssbdemodsettings.cpp | 3 +++ plugins/channelrx/demodssb/ssbdemodsettings.h | 1 + plugins/channelrx/demodvor/vordemodgui.h | 2 ++ plugins/channelrx/demodvor/vordemodsettings.cpp | 3 +++ plugins/channelrx/demodvor/vordemodsettings.h | 1 + plugins/channelrx/demodvorsc/vordemodscgui.h | 2 ++ .../channelrx/demodvorsc/vordemodscsettings.cpp | 3 +++ plugins/channelrx/demodvorsc/vordemodscsettings.h | 1 + plugins/channelrx/demodwfm/wfmdemodgui.h | 2 ++ plugins/channelrx/demodwfm/wfmdemodsettings.cpp | 3 +++ plugins/channelrx/demodwfm/wfmdemodsettings.h | 1 + plugins/channelrx/filesink/filesinkgui.h | 2 ++ plugins/channelrx/filesink/filesinksettings.cpp | 3 +++ plugins/channelrx/filesink/filesinksettings.h | 1 + plugins/channelrx/freqtracker/freqtrackergui.h | 2 ++ .../channelrx/freqtracker/freqtrackersettings.cpp | 3 +++ .../channelrx/freqtracker/freqtrackersettings.h | 1 + plugins/channelrx/localsink/localsinkgui.h | 2 ++ plugins/channelrx/localsink/localsinksettings.cpp | 3 +++ plugins/channelrx/localsink/localsinksettings.h | 1 + plugins/channelrx/noisefigure/noisefiguregui.h | 2 ++ .../channelrx/noisefigure/noisefiguresettings.cpp | 3 +++ .../channelrx/noisefigure/noisefiguresettings.h | 1 + .../channelrx/radioastronomy/radioastronomygui.h | 2 ++ .../radioastronomy/radioastronomysettings.cpp | 3 +++ .../radioastronomy/radioastronomysettings.h | 1 + plugins/channelrx/radioclock/radioclockgui.h | 2 ++ .../channelrx/radioclock/radioclocksettings.cpp | 3 +++ plugins/channelrx/radioclock/radioclocksettings.h | 1 + plugins/channelrx/remotesink/remotesinkgui.h | 2 ++ .../channelrx/remotesink/remotesinksettings.cpp | 3 +++ plugins/channelrx/remotesink/remotesinksettings.h | 1 + .../channelrx/sigmffilesink/sigmffilesinkgui.h | 2 ++ .../sigmffilesink/sigmffilesinksettings.cpp | 3 +++ .../sigmffilesink/sigmffilesinksettings.h | 1 + plugins/channelrx/udpsink/udpsinkgui.h | 2 ++ plugins/channelrx/udpsink/udpsinksettings.cpp | 7 +++++-- plugins/channelrx/udpsink/udpsinksettings.h | 1 + plugins/channeltx/filesource/filesourcegui.h | 2 ++ .../channeltx/filesource/filesourcesettings.cpp | 3 +++ plugins/channeltx/filesource/filesourcesettings.h | 1 + plugins/channeltx/localsource/localsourcegui.h | 2 ++ .../channeltx/localsource/localsourcesettings.cpp | 7 +++++-- .../channeltx/localsource/localsourcesettings.h | 1 + .../channeltx/mod802.15.4/ieee_802_15_4_modgui.h | 3 ++- .../mod802.15.4/ieee_802_15_4_modsettings.cpp | 3 +++ .../mod802.15.4/ieee_802_15_4_modsettings.h | 1 + plugins/channeltx/modais/aismodgui.h | 2 ++ plugins/channeltx/modais/aismodsettings.cpp | 3 +++ plugins/channeltx/modais/aismodsettings.h | 1 + plugins/channeltx/modam/ammodgui.h | 2 ++ plugins/channeltx/modam/ammodsettings.cpp | 3 +++ plugins/channeltx/modam/ammodsettings.h | 1 + plugins/channeltx/modatv/atvmodgui.h | 2 ++ plugins/channeltx/modatv/atvmodsettings.cpp | 3 +++ plugins/channeltx/modatv/atvmodsettings.h | 1 + plugins/channeltx/modchirpchat/chirpchatmodgui.h | 2 ++ .../modchirpchat/chirpchatmodsettings.cpp | 4 ++++ .../channeltx/modchirpchat/chirpchatmodsettings.h | 1 + plugins/channeltx/moddatv/datvmodgui.h | 2 ++ plugins/channeltx/moddatv/datvmodsettings.cpp | 3 +++ plugins/channeltx/moddatv/datvmodsettings.h | 1 + plugins/channeltx/modfreedv/freedvmodgui.h | 2 ++ plugins/channeltx/modfreedv/freedvmodsettings.cpp | 3 +++ plugins/channeltx/modfreedv/freedvmodsettings.h | 1 + plugins/channeltx/modnfm/nfmmodgui.h | 2 ++ plugins/channeltx/modnfm/nfmmodsettings.cpp | 3 +++ plugins/channeltx/modnfm/nfmmodsettings.h | 1 + plugins/channeltx/modpacket/packetmodgui.h | 2 ++ plugins/channeltx/modpacket/packetmodsettings.cpp | 3 +++ plugins/channeltx/modpacket/packetmodsettings.h | 1 + plugins/channeltx/modssb/ssbmodgui.h | 2 ++ plugins/channeltx/modssb/ssbmodsettings.cpp | 3 +++ plugins/channeltx/modssb/ssbmodsettings.h | 1 + plugins/channeltx/modwfm/wfmmodgui.h | 2 ++ plugins/channeltx/modwfm/wfmmodsettings.cpp | 3 +++ plugins/channeltx/modwfm/wfmmodsettings.h | 1 + plugins/channeltx/remotesource/remotesourcegui.h | 2 ++ .../remotesource/remotesourcesettings.cpp | 3 +++ .../channeltx/remotesource/remotesourcesettings.h | 1 + plugins/channeltx/udpsource/udpsourcegui.h | 2 ++ plugins/channeltx/udpsource/udpsourcesettings.cpp | 3 +++ plugins/channeltx/udpsource/udpsourcesettings.h | 1 + sdrgui/channel/channelgui.h | 2 ++ sdrgui/device/deviceuiset.cpp | 15 +++++++++++++++ 140 files changed, 300 insertions(+), 6 deletions(-) diff --git a/plugins/channelmimo/beamsteeringcwmod/beamsteeringcwmodgui.h b/plugins/channelmimo/beamsteeringcwmod/beamsteeringcwmodgui.h index 5b55b94fc..4c88cdd67 100644 --- a/plugins/channelmimo/beamsteeringcwmod/beamsteeringcwmodgui.h +++ b/plugins/channelmimo/beamsteeringcwmod/beamsteeringcwmodgui.h @@ -54,6 +54,8 @@ public: virtual QByteArray getGeometryBytes() const { return m_settings.m_geometryBytes; }; virtual QString getTitle() const { return m_settings.m_title; }; virtual QColor getTitleColor() const { return m_settings.m_rgbColor; }; + virtual void zetHidden(bool hidden) { m_settings.m_hidden = hidden; } + virtual bool getHidden() const { return m_settings.m_hidden; } private: Ui::BeamSteeringCWModGUI* ui; diff --git a/plugins/channelmimo/beamsteeringcwmod/beamsteeringcwmodsettings.cpp b/plugins/channelmimo/beamsteeringcwmod/beamsteeringcwmodsettings.cpp index 8c056d7e0..fccedcc43 100644 --- a/plugins/channelmimo/beamsteeringcwmod/beamsteeringcwmodsettings.cpp +++ b/plugins/channelmimo/beamsteeringcwmod/beamsteeringcwmodsettings.cpp @@ -44,6 +44,7 @@ void BeamSteeringCWModSettings::resetToDefaults() m_reverseAPIDeviceIndex = 0; m_reverseAPIChannelIndex = 0; m_workspaceIndex = 0; + m_hidden = false; } QByteArray BeamSteeringCWModSettings::serialize() const @@ -67,6 +68,7 @@ QByteArray BeamSteeringCWModSettings::serialize() const s.writeS32(16, m_workspaceIndex); s.writeBlob(17, m_geometryBytes); + s.writeBool(18, m_hidden); return s.final(); } @@ -120,6 +122,7 @@ bool BeamSteeringCWModSettings::deserialize(const QByteArray& data) d.readS32(16, &m_workspaceIndex); d.readBlob(17, &m_geometryBytes); + d.readBool(18, &m_hidden, false); return true; } diff --git a/plugins/channelmimo/beamsteeringcwmod/beamsteeringcwmodsettings.h b/plugins/channelmimo/beamsteeringcwmod/beamsteeringcwmodsettings.h index 1dfbba1cd..bb64cb1a2 100644 --- a/plugins/channelmimo/beamsteeringcwmod/beamsteeringcwmodsettings.h +++ b/plugins/channelmimo/beamsteeringcwmod/beamsteeringcwmodsettings.h @@ -38,6 +38,7 @@ struct BeamSteeringCWModSettings uint16_t m_reverseAPIChannelIndex; int m_workspaceIndex; QByteArray m_geometryBytes; + bool m_hidden; Serializable *m_channelMarker; Serializable *m_rollupState; diff --git a/plugins/channelmimo/interferometer/interferometergui.h b/plugins/channelmimo/interferometer/interferometergui.h index d3dd6a03d..2d8ac1670 100644 --- a/plugins/channelmimo/interferometer/interferometergui.h +++ b/plugins/channelmimo/interferometer/interferometergui.h @@ -53,6 +53,8 @@ public: virtual QByteArray getGeometryBytes() const { return m_settings.m_geometryBytes; }; virtual QString getTitle() const { return m_settings.m_title; }; virtual QColor getTitleColor() const { return m_settings.m_rgbColor; }; + virtual void zetHidden(bool hidden) { m_settings.m_hidden = hidden; } + virtual bool getHidden() const { return m_settings.m_hidden; } private: Ui::InterferometerGUI* ui; diff --git a/plugins/channelmimo/interferometer/interferometersettings.cpp b/plugins/channelmimo/interferometer/interferometersettings.cpp index e0c5846cf..013dde031 100644 --- a/plugins/channelmimo/interferometer/interferometersettings.cpp +++ b/plugins/channelmimo/interferometer/interferometersettings.cpp @@ -45,6 +45,7 @@ void InterferometerSettings::resetToDefaults() m_reverseAPIDeviceIndex = 0; m_reverseAPIChannelIndex = 0; m_workspaceIndex = 0; + m_hidden = false; } QByteArray InterferometerSettings::serialize() const @@ -64,6 +65,7 @@ QByteArray InterferometerSettings::serialize() const s.writeS32(12, m_phase); s.writeS32(13,m_workspaceIndex); s.writeBlob(14, m_geometryBytes); + s.writeBool(15, m_hidden); if (m_spectrumGUI) { s.writeBlob(20, m_spectrumGUI->serialize()); @@ -122,6 +124,7 @@ bool InterferometerSettings::deserialize(const QByteArray& data) m_phase = tmp < -180 ? -180 : tmp > 180 ? 180 : tmp; d.readS32(13, &m_workspaceIndex); d.readBlob(14, &m_geometryBytes); + d.readBool(15, &m_hidden, false); if (m_spectrumGUI) { diff --git a/plugins/channelmimo/interferometer/interferometersettings.h b/plugins/channelmimo/interferometer/interferometersettings.h index ead9dc259..30f2bf64e 100644 --- a/plugins/channelmimo/interferometer/interferometersettings.h +++ b/plugins/channelmimo/interferometer/interferometersettings.h @@ -50,6 +50,7 @@ struct InterferometerSettings uint16_t m_reverseAPIChannelIndex; int m_workspaceIndex; QByteArray m_geometryBytes; + bool m_hidden; Serializable *m_channelMarker; Serializable *m_spectrumGUI; diff --git a/plugins/channelrx/chanalyzer/chanalyzergui.h b/plugins/channelrx/chanalyzer/chanalyzergui.h index 69bee761e..1126b5fc3 100644 --- a/plugins/channelrx/chanalyzer/chanalyzergui.h +++ b/plugins/channelrx/chanalyzer/chanalyzergui.h @@ -55,6 +55,8 @@ public: virtual QByteArray getGeometryBytes() const { return m_settings.m_geometryBytes; }; virtual QString getTitle() const { return m_settings.m_title; }; virtual QColor getTitleColor() const { return m_settings.m_rgbColor; }; + virtual void zetHidden(bool hidden) { m_settings.m_hidden = hidden; } + virtual bool getHidden() const { return m_settings.m_hidden; } public slots: void channelMarkerChangedByCursor(); diff --git a/plugins/channelrx/chanalyzer/chanalyzersettings.cpp b/plugins/channelrx/chanalyzer/chanalyzersettings.cpp index 3f3a21774..7f3ee49a4 100644 --- a/plugins/channelrx/chanalyzer/chanalyzersettings.cpp +++ b/plugins/channelrx/chanalyzer/chanalyzersettings.cpp @@ -60,6 +60,7 @@ void ChannelAnalyzerSettings::resetToDefaults() m_reverseAPIDeviceIndex = 0; m_reverseAPIChannelIndex = 0; m_workspaceIndex = 0; + m_hidden = false; } QByteArray ChannelAnalyzerSettings::serialize() const @@ -107,7 +108,8 @@ QByteArray ChannelAnalyzerSettings::serialize() const s.writeU32(27, m_reverseAPIChannelIndex); s.writeS32(28, m_streamIndex); s.writeS32(29, m_workspaceIndex); - s.writeString(30, m_geometryBytes); + s.writeBlob(30, m_geometryBytes); + s.writeBool(31, m_hidden); return s.final(); } @@ -184,6 +186,7 @@ bool ChannelAnalyzerSettings::deserialize(const QByteArray& data) d.readS32(28, &m_streamIndex, 0); d.readS32(29, &m_workspaceIndex, 0); d.readBlob(30, &m_geometryBytes); + d.readBool(31, &m_hidden, false); return true; } diff --git a/plugins/channelrx/chanalyzer/chanalyzersettings.h b/plugins/channelrx/chanalyzer/chanalyzersettings.h index 2469007ca..23865a355 100644 --- a/plugins/channelrx/chanalyzer/chanalyzersettings.h +++ b/plugins/channelrx/chanalyzer/chanalyzersettings.h @@ -62,6 +62,7 @@ struct ChannelAnalyzerSettings uint16_t m_reverseAPIChannelIndex; int m_workspaceIndex; QByteArray m_geometryBytes; + bool m_hidden; ChannelAnalyzerSettings(); void resetToDefaults(); diff --git a/plugins/channelrx/demodadsb/adsbdemodgui.h b/plugins/channelrx/demodadsb/adsbdemodgui.h index 22157eecd..c37be1e15 100644 --- a/plugins/channelrx/demodadsb/adsbdemodgui.h +++ b/plugins/channelrx/demodadsb/adsbdemodgui.h @@ -758,6 +758,8 @@ public: virtual QByteArray getGeometryBytes() const { return m_settings.m_geometryBytes; }; virtual QString getTitle() const { return m_settings.m_title; }; virtual QColor getTitleColor() const { return m_settings.m_rgbColor; }; + virtual void zetHidden(bool hidden) { m_settings.m_hidden = hidden; } + virtual bool getHidden() const { return m_settings.m_hidden; } void highlightAircraft(Aircraft *aircraft); void targetAircraft(Aircraft *aircraft); diff --git a/plugins/channelrx/demodadsb/adsbdemodsettings.cpp b/plugins/channelrx/demodadsb/adsbdemodsettings.cpp index dcb35d644..b23b0fb67 100644 --- a/plugins/channelrx/demodadsb/adsbdemodsettings.cpp +++ b/plugins/channelrx/demodadsb/adsbdemodsettings.cpp @@ -97,6 +97,7 @@ void ADSBDemodSettings::resetToDefaults() m_verboseModelMatching = false; m_airfieldElevation = 0; m_workspaceIndex = 0; + m_hidden = false; } QByteArray ADSBDemodSettings::serialize() const @@ -175,6 +176,7 @@ QByteArray ADSBDemodSettings::serialize() const s.writeString(58, m_importMaxLongitude); s.writeS32(59, m_workspaceIndex); s.writeBlob(60, m_geometryBytes); + s.writeBool(61, m_hidden); for (int i = 0; i < ADSBDEMOD_COLUMNS; i++) { s.writeS32(100 + i, m_columnIndexes[i]); @@ -303,6 +305,7 @@ bool ADSBDemodSettings::deserialize(const QByteArray& data) d.readString(58, &m_importMaxLongitude, ""); d.readS32(59, &m_workspaceIndex, 0); d.readBlob(60, &m_geometryBytes); + d.readBool(61, &m_hidden, false); for (int i = 0; i < ADSBDEMOD_COLUMNS; i++) { d.readS32(100 + i, &m_columnIndexes[i], i); diff --git a/plugins/channelrx/demodadsb/adsbdemodsettings.h b/plugins/channelrx/demodadsb/adsbdemodsettings.h index 5e14da134..8fd12a054 100644 --- a/plugins/channelrx/demodadsb/adsbdemodsettings.h +++ b/plugins/channelrx/demodadsb/adsbdemodsettings.h @@ -118,6 +118,8 @@ struct ADSBDemodSettings uint16_t m_reverseAPIChannelIndex; int m_workspaceIndex; QByteArray m_geometryBytes; + bool m_hidden; + int m_columnIndexes[ADSBDEMOD_COLUMNS];//!< How the columns are ordered in the table int m_columnSizes[ADSBDEMOD_COLUMNS]; //!< Size of the coumns in the table diff --git a/plugins/channelrx/demodais/aisdemodgui.h b/plugins/channelrx/demodais/aisdemodgui.h index 1cdf5d3ba..727ac72eb 100644 --- a/plugins/channelrx/demodais/aisdemodgui.h +++ b/plugins/channelrx/demodais/aisdemodgui.h @@ -64,6 +64,8 @@ public: virtual QByteArray getGeometryBytes() const { return m_settings.m_geometryBytes; }; virtual QString getTitle() const { return m_settings.m_title; }; virtual QColor getTitleColor() const { return m_settings.m_rgbColor; }; + virtual void zetHidden(bool hidden) { m_settings.m_hidden = hidden; } + virtual bool getHidden() const { return m_settings.m_hidden; } public slots: void channelMarkerChangedByCursor(); diff --git a/plugins/channelrx/demodais/aisdemodsettings.cpp b/plugins/channelrx/demodais/aisdemodsettings.cpp index 5597c447f..b719dfb0e 100644 --- a/plugins/channelrx/demodais/aisdemodsettings.cpp +++ b/plugins/channelrx/demodais/aisdemodsettings.cpp @@ -56,6 +56,7 @@ void AISDemodSettings::resetToDefaults() m_reverseAPIDeviceIndex = 0; m_reverseAPIChannelIndex = 0; m_workspaceIndex = 0; + m_hidden = false; for (int i = 0; i < AISDEMOD_MESSAGE_COLUMNS; i++) { @@ -103,6 +104,7 @@ QByteArray AISDemodSettings::serialize() const s.writeS32(26, m_workspaceIndex); s.writeBlob(27, m_geometryBytes); + s.writeBool(28, m_hidden); for (int i = 0; i < AISDEMOD_MESSAGE_COLUMNS; i++) s.writeS32(100 + i, m_messageColumnIndexes[i]); @@ -189,6 +191,7 @@ bool AISDemodSettings::deserialize(const QByteArray& data) d.readS32(26, &m_workspaceIndex, 0); d.readBlob(27, &m_geometryBytes); + d.readBool(28, &m_hidden, false); for (int i = 0; i < AISDEMOD_MESSAGE_COLUMNS; i++) { d.readS32(100 + i, &m_messageColumnIndexes[i], i); diff --git a/plugins/channelrx/demodais/aisdemodsettings.h b/plugins/channelrx/demodais/aisdemodsettings.h index bd06a99e5..2d22273cc 100644 --- a/plugins/channelrx/demodais/aisdemodsettings.h +++ b/plugins/channelrx/demodais/aisdemodsettings.h @@ -63,6 +63,7 @@ struct AISDemodSettings Serializable *m_rollupState; int m_workspaceIndex; QByteArray m_geometryBytes; + bool m_hidden; int m_messageColumnIndexes[AISDEMOD_MESSAGE_COLUMNS];//!< How the columns are ordered in the table int m_messageColumnSizes[AISDEMOD_MESSAGE_COLUMNS]; //!< Size of the columns in the table diff --git a/plugins/channelrx/demodam/amdemodgui.h b/plugins/channelrx/demodam/amdemodgui.h index adfc37404..bfb834b78 100644 --- a/plugins/channelrx/demodam/amdemodgui.h +++ b/plugins/channelrx/demodam/amdemodgui.h @@ -37,6 +37,8 @@ public: virtual QByteArray getGeometryBytes() const { return m_settings.m_geometryBytes; }; virtual QString getTitle() const { return m_settings.m_title; }; virtual QColor getTitleColor() const { return m_settings.m_rgbColor; }; + virtual void zetHidden(bool hidden) { m_settings.m_hidden = hidden; } + virtual bool getHidden() const { return m_settings.m_hidden; } public slots: void channelMarkerChangedByCursor(); diff --git a/plugins/channelrx/demodam/amdemodsettings.cpp b/plugins/channelrx/demodam/amdemodsettings.cpp index cf5fcd8f3..8c6de24c9 100644 --- a/plugins/channelrx/demodam/amdemodsettings.cpp +++ b/plugins/channelrx/demodam/amdemodsettings.cpp @@ -50,6 +50,7 @@ void AMDemodSettings::resetToDefaults() m_reverseAPIDeviceIndex = 0; m_reverseAPIChannelIndex = 0; m_workspaceIndex = 0; + m_hidden = false; } QByteArray AMDemodSettings::serialize() const @@ -83,6 +84,7 @@ QByteArray AMDemodSettings::serialize() const s.writeS32(20, m_workspaceIndex); s.writeBlob(21, m_geometryBytes); + s.writeBool(22, m_hidden); return s.final(); } @@ -149,6 +151,7 @@ bool AMDemodSettings::deserialize(const QByteArray& data) d.readS32(20, &m_workspaceIndex, 0); d.readBlob(21, &m_geometryBytes); + d.readBool(22, &m_hidden, false); return true; } diff --git a/plugins/channelrx/demodam/amdemodsettings.h b/plugins/channelrx/demodam/amdemodsettings.h index 810d03b30..b925ac596 100644 --- a/plugins/channelrx/demodam/amdemodsettings.h +++ b/plugins/channelrx/demodam/amdemodsettings.h @@ -52,6 +52,7 @@ struct AMDemodSettings Serializable *m_rollupState; int m_workspaceIndex; QByteArray m_geometryBytes; + bool m_hidden; AMDemodSettings(); void resetToDefaults(); diff --git a/plugins/channelrx/demodapt/aptdemodgui.h b/plugins/channelrx/demodapt/aptdemodgui.h index 9b28c1641..52981e464 100644 --- a/plugins/channelrx/demodapt/aptdemodgui.h +++ b/plugins/channelrx/demodapt/aptdemodgui.h @@ -81,6 +81,8 @@ public: virtual QByteArray getGeometryBytes() const { return m_settings.m_geometryBytes; }; virtual QString getTitle() const { return m_settings.m_title; }; virtual QColor getTitleColor() const { return m_settings.m_rgbColor; }; + virtual void zetHidden(bool hidden) { m_settings.m_hidden = hidden; } + virtual bool getHidden() const { return m_settings.m_hidden; } public slots: void channelMarkerChangedByCursor(); diff --git a/plugins/channelrx/demodapt/aptdemodsettings.cpp b/plugins/channelrx/demodapt/aptdemodsettings.cpp index 115905f9b..5e4e9ed6a 100644 --- a/plugins/channelrx/demodapt/aptdemodsettings.cpp +++ b/plugins/channelrx/demodapt/aptdemodsettings.cpp @@ -70,6 +70,7 @@ void APTDemodSettings::resetToDefaults() m_reverseAPIDeviceIndex = 0; m_reverseAPIChannelIndex = 0; m_workspaceIndex = 0; + m_hidden = false; } QByteArray APTDemodSettings::serialize() const @@ -123,6 +124,7 @@ QByteArray APTDemodSettings::serialize() const s.writeFloat(38, m_satYaw); s.writeS32(39, m_workspaceIndex); s.writeBlob(40, m_geometryBytes); + s.writeBool(41, m_hidden); return s.final(); } @@ -206,6 +208,7 @@ bool APTDemodSettings::deserialize(const QByteArray& data) d.readFloat(38, &m_satYaw, 0.0f); d.readS32(39, &m_workspaceIndex, 0); d.readBlob(40, &m_geometryBytes); + d.readBool(41, &m_hidden, false); return true; } diff --git a/plugins/channelrx/demodapt/aptdemodsettings.h b/plugins/channelrx/demodapt/aptdemodsettings.h index 08a53c1af..ce42c5e6f 100644 --- a/plugins/channelrx/demodapt/aptdemodsettings.h +++ b/plugins/channelrx/demodapt/aptdemodsettings.h @@ -68,6 +68,7 @@ struct APTDemodSettings Serializable *m_rollupState; int m_workspaceIndex; QByteArray m_geometryBytes; + bool m_hidden; // The following are really working state, rather than settings QString m_tle; // Satelite two-line elements, from satellite tracker diff --git a/plugins/channelrx/demodatv/atvdemodgui.h b/plugins/channelrx/demodatv/atvdemodgui.h index c4ce6a57c..793015d60 100644 --- a/plugins/channelrx/demodatv/atvdemodgui.h +++ b/plugins/channelrx/demodatv/atvdemodgui.h @@ -56,6 +56,8 @@ public: virtual QByteArray getGeometryBytes() const { return m_settings.m_geometryBytes; }; virtual QString getTitle() const { return m_settings.m_title; }; virtual QColor getTitleColor() const { return m_settings.m_rgbColor; }; + virtual void zetHidden(bool hidden) { m_settings.m_hidden = hidden; } + virtual bool getHidden() const { return m_settings.m_hidden; } public slots: void channelMarkerChangedByCursor(); diff --git a/plugins/channelrx/demodatv/atvdemodsettings.cpp b/plugins/channelrx/demodatv/atvdemodsettings.cpp index be423fb78..2d914e7ca 100644 --- a/plugins/channelrx/demodatv/atvdemodsettings.cpp +++ b/plugins/channelrx/demodatv/atvdemodsettings.cpp @@ -60,6 +60,7 @@ void ATVDemodSettings::resetToDefaults() m_reverseAPIDeviceIndex = 0; m_reverseAPIChannelIndex = 0; m_workspaceIndex = 0; + m_hidden = false; } QByteArray ATVDemodSettings::serialize() const @@ -104,6 +105,7 @@ QByteArray ATVDemodSettings::serialize() const s.writeU32(30, m_reverseAPIChannelIndex); s.writeS32(31, m_workspaceIndex); s.writeBlob(32, m_geometryBytes); + s.writeBool(33, m_hidden); return s.final(); } @@ -183,6 +185,7 @@ bool ATVDemodSettings::deserialize(const QByteArray& arrData) m_reverseAPIChannelIndex = utmp > 99 ? 99 : utmp; d.readS32(31, &m_workspaceIndex, 0); d.readBlob(32, &m_geometryBytes); + d.readBool(33, &m_hidden, false); return true; } diff --git a/plugins/channelrx/demodatv/atvdemodsettings.h b/plugins/channelrx/demodatv/atvdemodsettings.h index 5a8eba3f3..c20afe176 100644 --- a/plugins/channelrx/demodatv/atvdemodsettings.h +++ b/plugins/channelrx/demodatv/atvdemodsettings.h @@ -82,6 +82,7 @@ struct ATVDemodSettings Serializable *m_rollupState; int m_workspaceIndex; QByteArray m_geometryBytes; + bool m_hidden; ATVDemodSettings(); void resetToDefaults(); diff --git a/plugins/channelrx/demodbfm/bfmdemodgui.h b/plugins/channelrx/demodbfm/bfmdemodgui.h index b3d8f77c5..c6d69ae75 100644 --- a/plugins/channelrx/demodbfm/bfmdemodgui.h +++ b/plugins/channelrx/demodbfm/bfmdemodgui.h @@ -54,6 +54,8 @@ public: virtual QByteArray getGeometryBytes() const { return m_settings.m_geometryBytes; }; virtual QString getTitle() const { return m_settings.m_title; }; virtual QColor getTitleColor() const { return m_settings.m_rgbColor; }; + virtual void zetHidden(bool hidden) { m_settings.m_hidden = hidden; } + virtual bool getHidden() const { return m_settings.m_hidden; } public slots: void channelMarkerChangedByCursor(); diff --git a/plugins/channelrx/demodbfm/bfmdemodsettings.cpp b/plugins/channelrx/demodbfm/bfmdemodsettings.cpp index c09fcabfa..93dd244ca 100644 --- a/plugins/channelrx/demodbfm/bfmdemodsettings.cpp +++ b/plugins/channelrx/demodbfm/bfmdemodsettings.cpp @@ -57,6 +57,7 @@ void BFMDemodSettings::resetToDefaults() m_reverseAPIDeviceIndex = 0; m_reverseAPIChannelIndex = 0; m_workspaceIndex = 0; + m_hidden = false; } QByteArray BFMDemodSettings::serialize() const @@ -96,6 +97,7 @@ QByteArray BFMDemodSettings::serialize() const s.writeBool(21, m_rdsActive); s.writeS32(22, m_workspaceIndex); s.writeBlob(23, m_geometryBytes); + s.writeBool(24, m_hidden); return s.final(); } @@ -172,6 +174,7 @@ bool BFMDemodSettings::deserialize(const QByteArray& data) d.readBool(21, &m_rdsActive, false); d.readS32(22, &m_workspaceIndex, 0); d.readBlob(23, &m_geometryBytes); + d.readBool(24, &m_hidden, false); return true; } diff --git a/plugins/channelrx/demodbfm/bfmdemodsettings.h b/plugins/channelrx/demodbfm/bfmdemodsettings.h index 866f1589e..89237d325 100644 --- a/plugins/channelrx/demodbfm/bfmdemodsettings.h +++ b/plugins/channelrx/demodbfm/bfmdemodsettings.h @@ -44,6 +44,7 @@ struct BFMDemodSettings uint16_t m_reverseAPIChannelIndex; int m_workspaceIndex; QByteArray m_geometryBytes; + bool m_hidden; Serializable *m_channelMarker; Serializable *m_spectrumGUI; diff --git a/plugins/channelrx/demodchirpchat/chirpchatdemodgui.h b/plugins/channelrx/demodchirpchat/chirpchatdemodgui.h index fd1ebf4b6..3d62b5bff 100644 --- a/plugins/channelrx/demodchirpchat/chirpchatdemodgui.h +++ b/plugins/channelrx/demodchirpchat/chirpchatdemodgui.h @@ -52,6 +52,8 @@ public: virtual QByteArray getGeometryBytes() const { return m_settings.m_geometryBytes; }; virtual QString getTitle() const { return m_settings.m_title; }; virtual QColor getTitleColor() const { return m_settings.m_rgbColor; }; + virtual void zetHidden(bool hidden) { m_settings.m_hidden = hidden; } + virtual bool getHidden() const { return m_settings.m_hidden; } private slots: void channelMarkerChangedByCursor(); diff --git a/plugins/channelrx/demodchirpchat/chirpchatdemodsettings.cpp b/plugins/channelrx/demodchirpchat/chirpchatdemodsettings.cpp index 4ae9d9411..b9b5a9388 100644 --- a/plugins/channelrx/demodchirpchat/chirpchatdemodsettings.cpp +++ b/plugins/channelrx/demodchirpchat/chirpchatdemodsettings.cpp @@ -90,6 +90,7 @@ void ChirpChatDemodSettings::resetToDefaults() m_reverseAPIDeviceIndex = 0; m_reverseAPIChannelIndex = 0; m_workspaceIndex = 0; + m_hidden = false; } QByteArray ChirpChatDemodSettings::serialize() const @@ -135,6 +136,7 @@ QByteArray ChirpChatDemodSettings::serialize() const s.writeS32(30, m_workspaceIndex); s.writeBlob(31, m_geometryBytes); + s.writeBool(32, m_hidden); return s.final(); } @@ -218,6 +220,7 @@ bool ChirpChatDemodSettings::deserialize(const QByteArray& data) d.readS32(30, &m_workspaceIndex, 0); d.readBlob(31, &m_geometryBytes); + d.readBool(32, &m_hidden, false); return true; } diff --git a/plugins/channelrx/demodchirpchat/chirpchatdemodsettings.h b/plugins/channelrx/demodchirpchat/chirpchatdemodsettings.h index f2bb10613..71c5c1384 100644 --- a/plugins/channelrx/demodchirpchat/chirpchatdemodsettings.h +++ b/plugins/channelrx/demodchirpchat/chirpchatdemodsettings.h @@ -65,6 +65,7 @@ struct ChirpChatDemodSettings uint16_t m_reverseAPIChannelIndex; int m_workspaceIndex; QByteArray m_geometryBytes; + bool m_hidden; Serializable *m_channelMarker; Serializable *m_spectrumGUI; diff --git a/plugins/channelrx/demoddab/dabdemodgui.h b/plugins/channelrx/demoddab/dabdemodgui.h index f8b59f534..9b080e1ba 100644 --- a/plugins/channelrx/demoddab/dabdemodgui.h +++ b/plugins/channelrx/demoddab/dabdemodgui.h @@ -59,6 +59,8 @@ public: virtual QByteArray getGeometryBytes() const { return m_settings.m_geometryBytes; }; virtual QString getTitle() const { return m_settings.m_title; }; virtual QColor getTitleColor() const { return m_settings.m_rgbColor; }; + virtual void zetHidden(bool hidden) { m_settings.m_hidden = hidden; } + virtual bool getHidden() const { return m_settings.m_hidden; } public slots: void channelMarkerChangedByCursor(); diff --git a/plugins/channelrx/demoddab/dabdemodsettings.cpp b/plugins/channelrx/demoddab/dabdemodsettings.cpp index db575b573..14d16ab31 100644 --- a/plugins/channelrx/demoddab/dabdemodsettings.cpp +++ b/plugins/channelrx/demoddab/dabdemodsettings.cpp @@ -48,6 +48,7 @@ void DABDemodSettings::resetToDefaults() m_reverseAPIDeviceIndex = 0; m_reverseAPIChannelIndex = 0; m_workspaceIndex = 0; + m_hidden = false; for (int i = 0; i < DABDEMOD_COLUMNS; i++) { @@ -85,6 +86,7 @@ QByteArray DABDemodSettings::serialize() const s.writeS32(17, m_workspaceIndex); s.writeBlob(18, m_geometryBytes); + s.writeBool(19, m_hidden); for (int i = 0; i < DABDEMOD_COLUMNS; i++) { s.writeS32(100 + i, m_columnIndexes[i]); @@ -152,6 +154,7 @@ bool DABDemodSettings::deserialize(const QByteArray& data) d.readS32(17, &m_workspaceIndex, 0); d.readBlob(18, &m_geometryBytes); + d.readBool(19, &m_hidden, false); for (int i = 0; i < DABDEMOD_COLUMNS; i++) { d.readS32(100 + i, &m_columnIndexes[i], i); diff --git a/plugins/channelrx/demoddab/dabdemodsettings.h b/plugins/channelrx/demoddab/dabdemodsettings.h index 596ba2eaf..c2fa8c979 100644 --- a/plugins/channelrx/demoddab/dabdemodsettings.h +++ b/plugins/channelrx/demoddab/dabdemodsettings.h @@ -48,6 +48,7 @@ struct DABDemodSettings Serializable *m_rollupState; int m_workspaceIndex; QByteArray m_geometryBytes; + bool m_hidden; int m_columnIndexes[DABDEMOD_COLUMNS];//!< How the columns are ordered in the table int m_columnSizes[DABDEMOD_COLUMNS]; //!< Size of the columns in the table diff --git a/plugins/channelrx/demoddatv/datvdemodgui.h b/plugins/channelrx/demoddatv/datvdemodgui.h index 3812290a7..5ef25996c 100644 --- a/plugins/channelrx/demoddatv/datvdemodgui.h +++ b/plugins/channelrx/demoddatv/datvdemodgui.h @@ -56,6 +56,8 @@ public: virtual QByteArray getGeometryBytes() const { return m_settings.m_geometryBytes; }; virtual QString getTitle() const { return m_settings.m_title; }; virtual QColor getTitleColor() const { return m_settings.m_rgbColor; }; + virtual void zetHidden(bool hidden) { m_settings.m_hidden = hidden; } + virtual bool getHidden() const { return m_settings.m_hidden; } virtual MessageQueue *getInputMessageQueue() { return &m_inputMessageQueue; } diff --git a/plugins/channelrx/demoddatv/datvdemodsettings.cpp b/plugins/channelrx/demoddatv/datvdemodsettings.cpp index eba558f95..da1d9773b 100644 --- a/plugins/channelrx/demoddatv/datvdemodsettings.cpp +++ b/plugins/channelrx/demoddatv/datvdemodsettings.cpp @@ -71,6 +71,7 @@ void DATVDemodSettings::resetToDefaults() m_reverseAPIDeviceIndex = 0; m_reverseAPIChannelIndex = 0; m_workspaceIndex = 0; + m_hidden = false; } QByteArray DATVDemodSettings::serialize() const @@ -122,6 +123,7 @@ QByteArray DATVDemodSettings::serialize() const s.writeS32(38, m_workspaceIndex); s.writeBlob(39, m_geometryBytes); + s.writeBool(40, m_hidden); return s.final(); } @@ -219,6 +221,7 @@ bool DATVDemodSettings::deserialize(const QByteArray& data) d.readS32(38, &m_workspaceIndex, 0); d.readBlob(39, &m_geometryBytes); + d.readBool(40, &m_hidden, false); validateSystemConfiguration(); diff --git a/plugins/channelrx/demoddatv/datvdemodsettings.h b/plugins/channelrx/demoddatv/datvdemodsettings.h index 8da3bbc9a..9c72c0a6a 100644 --- a/plugins/channelrx/demoddatv/datvdemodsettings.h +++ b/plugins/channelrx/demoddatv/datvdemodsettings.h @@ -110,6 +110,7 @@ struct DATVDemodSettings Serializable *m_rollupState; int m_workspaceIndex; QByteArray m_geometryBytes; + bool m_hidden; static const int m_softLDPCMaxMaxTrials = 50; diff --git a/plugins/channelrx/demoddsd/dsddemodgui.h b/plugins/channelrx/demoddsd/dsddemodgui.h index 1d4e4aacd..57f072a73 100644 --- a/plugins/channelrx/demoddsd/dsddemodgui.h +++ b/plugins/channelrx/demoddsd/dsddemodgui.h @@ -58,6 +58,8 @@ public: virtual QByteArray getGeometryBytes() const { return m_settings.m_geometryBytes; }; virtual QString getTitle() const { return m_settings.m_title; }; virtual QColor getTitleColor() const { return m_settings.m_rgbColor; }; + virtual void zetHidden(bool hidden) { m_settings.m_hidden = hidden; } + virtual bool getHidden() const { return m_settings.m_hidden; } public slots: void channelMarkerChangedByCursor(); diff --git a/plugins/channelrx/demoddsd/dsddemodsettings.cpp b/plugins/channelrx/demoddsd/dsddemodsettings.cpp index 3c025b48e..ed7a6394f 100644 --- a/plugins/channelrx/demoddsd/dsddemodsettings.cpp +++ b/plugins/channelrx/demoddsd/dsddemodsettings.cpp @@ -60,6 +60,7 @@ void DSDDemodSettings::resetToDefaults() m_reverseAPIDeviceIndex = 0; m_reverseAPIChannelIndex = 0; m_workspaceIndex = 0; + m_hidden = false; } QByteArray DSDDemodSettings::serialize() const @@ -105,6 +106,7 @@ QByteArray DSDDemodSettings::serialize() const s.writeS32(32, m_workspaceIndex); s.writeBlob(33, m_geometryBytes); + s.writeBool(34, m_hidden); return s.final(); } @@ -187,6 +189,7 @@ bool DSDDemodSettings::deserialize(const QByteArray& data) d.readS32(32, &m_workspaceIndex, 0); d.readBlob(33, &m_geometryBytes); + d.readBool(34, &m_hidden, false); return true; } diff --git a/plugins/channelrx/demoddsd/dsddemodsettings.h b/plugins/channelrx/demoddsd/dsddemodsettings.h index 3c875edea..3339be650 100644 --- a/plugins/channelrx/demoddsd/dsddemodsettings.h +++ b/plugins/channelrx/demoddsd/dsddemodsettings.h @@ -54,6 +54,7 @@ struct DSDDemodSettings uint16_t m_reverseAPIChannelIndex; int m_workspaceIndex; QByteArray m_geometryBytes; + bool m_hidden; Serializable *m_channelMarker; Serializable *m_rollupState; diff --git a/plugins/channelrx/demodfreedv/freedvdemodgui.h b/plugins/channelrx/demodfreedv/freedvdemodgui.h index 655e2115f..f50c72fca 100644 --- a/plugins/channelrx/demodfreedv/freedvdemodgui.h +++ b/plugins/channelrx/demodfreedv/freedvdemodgui.h @@ -56,6 +56,8 @@ public: virtual QByteArray getGeometryBytes() const { return m_settings.m_geometryBytes; }; virtual QString getTitle() const { return m_settings.m_title; }; virtual QColor getTitleColor() const { return m_settings.m_rgbColor; }; + virtual void zetHidden(bool hidden) { m_settings.m_hidden = hidden; } + virtual bool getHidden() const { return m_settings.m_hidden; } public slots: void channelMarkerChangedByCursor(); diff --git a/plugins/channelrx/demodfreedv/freedvdemodsettings.cpp b/plugins/channelrx/demodfreedv/freedvdemodsettings.cpp index ff0b51613..26a2de4b1 100644 --- a/plugins/channelrx/demodfreedv/freedvdemodsettings.cpp +++ b/plugins/channelrx/demodfreedv/freedvdemodsettings.cpp @@ -57,6 +57,7 @@ void FreeDVDemodSettings::resetToDefaults() m_reverseAPIDeviceIndex = 0; m_reverseAPIChannelIndex = 0; m_workspaceIndex = 0; + m_hidden = false; } QByteArray FreeDVDemodSettings::serialize() const @@ -89,6 +90,7 @@ QByteArray FreeDVDemodSettings::serialize() const s.writeS32(26, m_workspaceIndex); s.writeBlob(27, m_geometryBytes); + s.writeBool(28, m_hidden); return s.final(); } @@ -160,6 +162,7 @@ bool FreeDVDemodSettings::deserialize(const QByteArray& data) d.readS32(26, &m_workspaceIndex, 0); d.readBlob(27, &m_geometryBytes); + d.readBool(28, &m_hidden, false); return true; } diff --git a/plugins/channelrx/demodfreedv/freedvdemodsettings.h b/plugins/channelrx/demodfreedv/freedvdemodsettings.h index 84b4fca3a..293d94747 100644 --- a/plugins/channelrx/demodfreedv/freedvdemodsettings.h +++ b/plugins/channelrx/demodfreedv/freedvdemodsettings.h @@ -53,6 +53,7 @@ struct FreeDVDemodSettings uint16_t m_reverseAPIChannelIndex; int m_workspaceIndex; QByteArray m_geometryBytes; + bool m_hidden; Serializable *m_channelMarker; Serializable *m_spectrumGUI; diff --git a/plugins/channelrx/demodnfm/nfmdemodgui.h b/plugins/channelrx/demodnfm/nfmdemodgui.h index 1e82aed46..0514d59aa 100644 --- a/plugins/channelrx/demodnfm/nfmdemodgui.h +++ b/plugins/channelrx/demodnfm/nfmdemodgui.h @@ -36,6 +36,8 @@ public: virtual QByteArray getGeometryBytes() const { return m_settings.m_geometryBytes; }; virtual QString getTitle() const { return m_settings.m_title; }; virtual QColor getTitleColor() const { return m_settings.m_rgbColor; }; + virtual void zetHidden(bool hidden) { m_settings.m_hidden = hidden; } + virtual bool getHidden() const { return m_settings.m_hidden; } public slots: void channelMarkerChangedByCursor(); diff --git a/plugins/channelrx/demodnfm/nfmdemodsettings.cpp b/plugins/channelrx/demodnfm/nfmdemodsettings.cpp index 07160b45c..a73462ae2 100644 --- a/plugins/channelrx/demodnfm/nfmdemodsettings.cpp +++ b/plugins/channelrx/demodnfm/nfmdemodsettings.cpp @@ -75,6 +75,7 @@ void NFMDemodSettings::resetToDefaults() m_reverseAPIDeviceIndex = 0; m_reverseAPIChannelIndex = 0; m_workspaceIndex = 0; + m_hidden = false; } QByteArray NFMDemodSettings::serialize() const @@ -116,6 +117,7 @@ QByteArray NFMDemodSettings::serialize() const s.writeS32(27, m_workspaceIndex); s.writeBlob(28, m_geometryBytes); + s.writeBool(29, m_hidden); return s.final(); } @@ -188,6 +190,7 @@ bool NFMDemodSettings::deserialize(const QByteArray& data) d.readS32(27, &m_workspaceIndex, 0); d.readBlob(28, &m_geometryBytes); + d.readBool(29, &m_hidden, false); return true; } diff --git a/plugins/channelrx/demodnfm/nfmdemodsettings.h b/plugins/channelrx/demodnfm/nfmdemodsettings.h index fd7da3321..b20fa3a2b 100644 --- a/plugins/channelrx/demodnfm/nfmdemodsettings.h +++ b/plugins/channelrx/demodnfm/nfmdemodsettings.h @@ -56,6 +56,7 @@ struct NFMDemodSettings uint16_t m_reverseAPIChannelIndex; int m_workspaceIndex; QByteArray m_geometryBytes; + bool m_hidden; Serializable *m_channelMarker; Serializable *m_rollupState; diff --git a/plugins/channelrx/demodpacket/packetdemodgui.h b/plugins/channelrx/demodpacket/packetdemodgui.h index 6004a4cad..56fe1e3d7 100644 --- a/plugins/channelrx/demodpacket/packetdemodgui.h +++ b/plugins/channelrx/demodpacket/packetdemodgui.h @@ -64,6 +64,8 @@ public: virtual QByteArray getGeometryBytes() const { return m_settings.m_geometryBytes; }; virtual QString getTitle() const { return m_settings.m_title; }; virtual QColor getTitleColor() const { return m_settings.m_rgbColor; }; + virtual void zetHidden(bool hidden) { m_settings.m_hidden = hidden; } + virtual bool getHidden() const { return m_settings.m_hidden; } public slots: void channelMarkerChangedByCursor(); diff --git a/plugins/channelrx/demodpacket/packetdemodsettings.cpp b/plugins/channelrx/demodpacket/packetdemodsettings.cpp index 0aa16157b..93abb748e 100644 --- a/plugins/channelrx/demodpacket/packetdemodsettings.cpp +++ b/plugins/channelrx/demodpacket/packetdemodsettings.cpp @@ -54,6 +54,7 @@ void PacketDemodSettings::resetToDefaults() m_reverseAPIDeviceIndex = 0; m_reverseAPIChannelIndex = 0; m_workspaceIndex = 0; + m_hidden = false; for (int i = 0; i < PACKETDEMOD_COLUMNS; i++) { @@ -98,6 +99,7 @@ QByteArray PacketDemodSettings::serialize() const s.writeS32(28, m_workspaceIndex); s.writeBlob(29, m_geometryBytes); + s.writeBool(30, m_hidden); for (int i = 0; i < PACKETDEMOD_COLUMNS; i++) { s.writeS32(100 + i, m_columnIndexes[i]); @@ -179,6 +181,7 @@ bool PacketDemodSettings::deserialize(const QByteArray& data) d.readS32(28, &m_workspaceIndex, 0); d.readBlob(29, &m_geometryBytes); + d.readBool(30, &m_hidden, false); for (int i = 0; i < PACKETDEMOD_COLUMNS; i++) { d.readS32(100 + i, &m_columnIndexes[i], i); diff --git a/plugins/channelrx/demodpacket/packetdemodsettings.h b/plugins/channelrx/demodpacket/packetdemodsettings.h index 77be10352..07bd5f2ca 100644 --- a/plugins/channelrx/demodpacket/packetdemodsettings.h +++ b/plugins/channelrx/demodpacket/packetdemodsettings.h @@ -59,6 +59,7 @@ struct PacketDemodSettings Serializable *m_rollupState; int m_workspaceIndex; QByteArray m_geometryBytes; + bool m_hidden; int m_columnIndexes[PACKETDEMOD_COLUMNS];//!< How the columns are ordered in the table int m_columnSizes[PACKETDEMOD_COLUMNS]; //!< Size of the columns in the table diff --git a/plugins/channelrx/demodpager/pagerdemodgui.h b/plugins/channelrx/demodpager/pagerdemodgui.h index d17093c8a..4549f8078 100644 --- a/plugins/channelrx/demodpager/pagerdemodgui.h +++ b/plugins/channelrx/demodpager/pagerdemodgui.h @@ -58,6 +58,8 @@ public: virtual QByteArray getGeometryBytes() const { return m_settings.m_geometryBytes; }; virtual QString getTitle() const { return m_settings.m_title; }; virtual QColor getTitleColor() const { return m_settings.m_rgbColor; }; + virtual void zetHidden(bool hidden) { m_settings.m_hidden = hidden; } + virtual bool getHidden() const { return m_settings.m_hidden; } public slots: void channelMarkerChangedByCursor(); diff --git a/plugins/channelrx/demodpager/pagerdemodsettings.cpp b/plugins/channelrx/demodpager/pagerdemodsettings.cpp index c2fdbb889..76e6a5743 100644 --- a/plugins/channelrx/demodpager/pagerdemodsettings.cpp +++ b/plugins/channelrx/demodpager/pagerdemodsettings.cpp @@ -57,6 +57,7 @@ void PagerDemodSettings::resetToDefaults() m_reverseAPIChannelIndex = 0; m_reverse = false; m_workspaceIndex = 0; + m_hidden = false; for (int i = 0; i < PAGERDEMOD_MESSAGE_COLUMNS; i++) { @@ -106,6 +107,7 @@ QByteArray PagerDemodSettings::serialize() const s.writeS32(28, m_workspaceIndex); s.writeBlob(29, m_geometryBytes); + s.writeBool(30, m_hidden); for (int i = 0; i < PAGERDEMOD_MESSAGE_COLUMNS; i++) { s.writeS32(100 + i, m_messageColumnIndexes[i]); @@ -200,6 +202,7 @@ bool PagerDemodSettings::deserialize(const QByteArray& data) d.readS32(28, &m_workspaceIndex, 0); d.readBlob(29, &m_geometryBytes); + d.readBool(30, &m_hidden, false); for (int i = 0; i < PAGERDEMOD_MESSAGE_COLUMNS; i++) { d.readS32(100 + i, &m_messageColumnIndexes[i], i); diff --git a/plugins/channelrx/demodpager/pagerdemodsettings.h b/plugins/channelrx/demodpager/pagerdemodsettings.h index a56dcd916..430162214 100644 --- a/plugins/channelrx/demodpager/pagerdemodsettings.h +++ b/plugins/channelrx/demodpager/pagerdemodsettings.h @@ -69,6 +69,7 @@ struct PagerDemodSettings Serializable *m_rollupState; int m_workspaceIndex; QByteArray m_geometryBytes; + bool m_hidden; int m_messageColumnIndexes[PAGERDEMOD_MESSAGE_COLUMNS];//!< How the columns are ordered in the table int m_messageColumnSizes[PAGERDEMOD_MESSAGE_COLUMNS]; //!< Size of the columns in the table diff --git a/plugins/channelrx/demodradiosonde/radiosondedemodgui.h b/plugins/channelrx/demodradiosonde/radiosondedemodgui.h index 4db42e013..173a7a74b 100644 --- a/plugins/channelrx/demodradiosonde/radiosondedemodgui.h +++ b/plugins/channelrx/demodradiosonde/radiosondedemodgui.h @@ -60,6 +60,8 @@ public: virtual QByteArray getGeometryBytes() const { return m_settings.m_geometryBytes; }; virtual QString getTitle() const { return m_settings.m_title; }; virtual QColor getTitleColor() const { return m_settings.m_rgbColor; }; + virtual void zetHidden(bool hidden) { m_settings.m_hidden = hidden; } + virtual bool getHidden() const { return m_settings.m_hidden; } public slots: void channelMarkerChangedByCursor(); diff --git a/plugins/channelrx/demodradiosonde/radiosondedemodsettings.cpp b/plugins/channelrx/demodradiosonde/radiosondedemodsettings.cpp index 64f9d163a..0f97da8dd 100644 --- a/plugins/channelrx/demodradiosonde/radiosondedemodsettings.cpp +++ b/plugins/channelrx/demodradiosonde/radiosondedemodsettings.cpp @@ -55,6 +55,7 @@ void RadiosondeDemodSettings::resetToDefaults() m_reverseAPIDeviceIndex = 0; m_reverseAPIChannelIndex = 0; m_workspaceIndex = 0; + m_hidden = false; for (int i = 0; i < RADIOSONDEDEMOD_FRAME_COLUMNS; i++) { @@ -101,6 +102,7 @@ QByteArray RadiosondeDemodSettings::serialize() const s.writeS32(26, m_workspaceIndex); s.writeBlob(27, m_geometryBytes); + s.writeBool(28, m_hidden); for (int i = 0; i < RADIOSONDEDEMOD_FRAME_COLUMNS; i++) s.writeS32(100 + i, m_frameColumnIndexes[i]); @@ -186,6 +188,7 @@ bool RadiosondeDemodSettings::deserialize(const QByteArray& data) d.readS32(26, &m_workspaceIndex, 0); d.readBlob(27, &m_geometryBytes); + d.readBool(28, &m_hidden, false); for (int i = 0; i < RADIOSONDEDEMOD_FRAME_COLUMNS; i++) { d.readS32(100 + i, &m_frameColumnIndexes[i], i); diff --git a/plugins/channelrx/demodradiosonde/radiosondedemodsettings.h b/plugins/channelrx/demodradiosonde/radiosondedemodsettings.h index 416dbf7f7..46b5f2142 100644 --- a/plugins/channelrx/demodradiosonde/radiosondedemodsettings.h +++ b/plugins/channelrx/demodradiosonde/radiosondedemodsettings.h @@ -59,6 +59,7 @@ struct RadiosondeDemodSettings Serializable *m_rollupState; int m_workspaceIndex; QByteArray m_geometryBytes; + bool m_hidden; int m_frameColumnIndexes[RADIOSONDEDEMOD_FRAME_COLUMNS];//!< How the columns are ordered in the table int m_frameColumnSizes[RADIOSONDEDEMOD_FRAME_COLUMNS]; //!< Size of the columns in the table diff --git a/plugins/channelrx/demodssb/ssbdemodgui.h b/plugins/channelrx/demodssb/ssbdemodgui.h index b7fca1d20..c520777fc 100644 --- a/plugins/channelrx/demodssb/ssbdemodgui.h +++ b/plugins/channelrx/demodssb/ssbdemodgui.h @@ -39,6 +39,8 @@ public: virtual QByteArray getGeometryBytes() const { return m_settings.m_geometryBytes; }; virtual QString getTitle() const { return m_settings.m_title; }; virtual QColor getTitleColor() const { return m_settings.m_rgbColor; }; + virtual void zetHidden(bool hidden) { m_settings.m_hidden = hidden; } + virtual bool getHidden() const { return m_settings.m_hidden; } public slots: void channelMarkerChangedByCursor(); diff --git a/plugins/channelrx/demodssb/ssbdemodsettings.cpp b/plugins/channelrx/demodssb/ssbdemodsettings.cpp index 476f88930..3eb35e735 100644 --- a/plugins/channelrx/demodssb/ssbdemodsettings.cpp +++ b/plugins/channelrx/demodssb/ssbdemodsettings.cpp @@ -64,6 +64,7 @@ void SSBDemodSettings::resetToDefaults() m_reverseAPIDeviceIndex = 0; m_reverseAPIChannelIndex = 0; m_workspaceIndex = 0; + m_hidden = false; } QByteArray SSBDemodSettings::serialize() const @@ -103,6 +104,7 @@ QByteArray SSBDemodSettings::serialize() const s.writeS32(25, m_workspaceIndex); s.writeBlob(26, m_geometryBytes); + s.writeBool(27, m_hidden); return s.final(); } @@ -174,6 +176,7 @@ bool SSBDemodSettings::deserialize(const QByteArray& data) d.readS32(25, &m_workspaceIndex, 0); d.readBlob(26, &m_geometryBytes); + d.readBool(27, &m_hidden, false); return true; } diff --git a/plugins/channelrx/demodssb/ssbdemodsettings.h b/plugins/channelrx/demodssb/ssbdemodsettings.h index 9ecd1a637..d1c51695b 100644 --- a/plugins/channelrx/demodssb/ssbdemodsettings.h +++ b/plugins/channelrx/demodssb/ssbdemodsettings.h @@ -49,6 +49,7 @@ struct SSBDemodSettings uint16_t m_reverseAPIChannelIndex; int m_workspaceIndex; QByteArray m_geometryBytes; + bool m_hidden; Serializable *m_channelMarker; Serializable *m_spectrumGUI; diff --git a/plugins/channelrx/demodvor/vordemodgui.h b/plugins/channelrx/demodvor/vordemodgui.h index 950d040d6..a1909572a 100644 --- a/plugins/channelrx/demodvor/vordemodgui.h +++ b/plugins/channelrx/demodvor/vordemodgui.h @@ -217,6 +217,8 @@ public: virtual QByteArray getGeometryBytes() const { return m_settings.m_geometryBytes; }; virtual QString getTitle() const { return m_settings.m_title; }; virtual QColor getTitleColor() const { return m_settings.m_rgbColor; }; + virtual void zetHidden(bool hidden) { m_settings.m_hidden = hidden; } + virtual bool getHidden() const { return m_settings.m_hidden; } void selectVOR(VORGUI *vorGUI, bool selected); diff --git a/plugins/channelrx/demodvor/vordemodsettings.cpp b/plugins/channelrx/demodvor/vordemodsettings.cpp index 68d7c8c8d..97f28663e 100644 --- a/plugins/channelrx/demodvor/vordemodsettings.cpp +++ b/plugins/channelrx/demodvor/vordemodsettings.cpp @@ -45,6 +45,7 @@ void VORDemodSettings::resetToDefaults() m_reverseAPIDeviceIndex = 0; m_reverseAPIChannelIndex = 0; m_workspaceIndex = 0; + m_hidden = false; m_identThreshold = 2.0; m_refThresholdDB = -45.0; @@ -88,6 +89,7 @@ QByteArray VORDemodSettings::serialize() const s.writeS32(25, m_workspaceIndex); s.writeBlob(26, m_geometryBytes); + s.writeBool(27, m_hidden); for (int i = 0; i < VORDEMOD_COLUMNS; i++) { s.writeS32(100 + i, m_columnIndexes[i]); @@ -159,6 +161,7 @@ bool VORDemodSettings::deserialize(const QByteArray& data) d.readS32(25, &m_workspaceIndex, 0); d.readBlob(26, &m_geometryBytes); + d.readBool(27, &m_hidden, false); for (int i = 0; i < VORDEMOD_COLUMNS; i++) { d.readS32(100 + i, &m_columnIndexes[i], i); diff --git a/plugins/channelrx/demodvor/vordemodsettings.h b/plugins/channelrx/demodvor/vordemodsettings.h index 4f121a2ec..af755e360 100644 --- a/plugins/channelrx/demodvor/vordemodsettings.h +++ b/plugins/channelrx/demodvor/vordemodsettings.h @@ -56,6 +56,7 @@ struct VORDemodSettings Serializable *m_rollupState; int m_workspaceIndex; QByteArray m_geometryBytes; + bool m_hidden; int m_columnIndexes[VORDEMOD_COLUMNS];//!< How the columns are ordered in the table int m_columnSizes[VORDEMOD_COLUMNS]; //!< Size of the coumns in the table diff --git a/plugins/channelrx/demodvorsc/vordemodscgui.h b/plugins/channelrx/demodvorsc/vordemodscgui.h index 460cddd2d..c8fc4b8aa 100644 --- a/plugins/channelrx/demodvorsc/vordemodscgui.h +++ b/plugins/channelrx/demodvorsc/vordemodscgui.h @@ -54,6 +54,8 @@ public: virtual QByteArray getGeometryBytes() const { return m_settings.m_geometryBytes; }; virtual QString getTitle() const { return m_settings.m_title; }; virtual QColor getTitleColor() const { return m_settings.m_rgbColor; }; + virtual void zetHidden(bool hidden) { m_settings.m_hidden = hidden; } + virtual bool getHidden() const { return m_settings.m_hidden; } public slots: void channelMarkerChangedByCursor(); diff --git a/plugins/channelrx/demodvorsc/vordemodscsettings.cpp b/plugins/channelrx/demodvorsc/vordemodscsettings.cpp index 5f1cd2eb5..e4380ad4a 100644 --- a/plugins/channelrx/demodvorsc/vordemodscsettings.cpp +++ b/plugins/channelrx/demodvorsc/vordemodscsettings.cpp @@ -47,6 +47,7 @@ void VORDemodSCSettings::resetToDefaults() m_reverseAPIDeviceIndex = 0; m_reverseAPIChannelIndex = 0; m_workspaceIndex = 0; + m_hidden = false; m_identThreshold = 2.0; m_refThresholdDB = -45.0; @@ -83,6 +84,7 @@ QByteArray VORDemodSCSettings::serialize() const s.writeS32(24, m_workspaceIndex); s.writeBlob(25, m_geometryBytes); + s.writeBool(26, m_hidden); return s.final(); } @@ -146,6 +148,7 @@ bool VORDemodSCSettings::deserialize(const QByteArray& data) d.readS32(24, &m_workspaceIndex, 0); d.readBlob(25, &m_geometryBytes); + d.readBool(26, &m_hidden, false); return true; } diff --git a/plugins/channelrx/demodvorsc/vordemodscsettings.h b/plugins/channelrx/demodvorsc/vordemodscsettings.h index a5e1ac962..8e19f5483 100644 --- a/plugins/channelrx/demodvorsc/vordemodscsettings.h +++ b/plugins/channelrx/demodvorsc/vordemodscsettings.h @@ -48,6 +48,7 @@ struct VORDemodSCSettings Serializable *m_rollupState; int m_workspaceIndex; QByteArray m_geometryBytes; + bool m_hidden; // Highest frequency is the FM subcarrier at up to ~11kHz // However, old VORs can have 0.005% frequency offset, which is 6kHz diff --git a/plugins/channelrx/demodwfm/wfmdemodgui.h b/plugins/channelrx/demodwfm/wfmdemodgui.h index dfd2c3502..5894b8253 100644 --- a/plugins/channelrx/demodwfm/wfmdemodgui.h +++ b/plugins/channelrx/demodwfm/wfmdemodgui.h @@ -34,6 +34,8 @@ public: virtual QByteArray getGeometryBytes() const { return m_settings.m_geometryBytes; }; virtual QString getTitle() const { return m_settings.m_title; }; virtual QColor getTitleColor() const { return m_settings.m_rgbColor; }; + virtual void zetHidden(bool hidden) { m_settings.m_hidden = hidden; } + virtual bool getHidden() const { return m_settings.m_hidden; } public slots: void channelMarkerChangedByCursor(); diff --git a/plugins/channelrx/demodwfm/wfmdemodsettings.cpp b/plugins/channelrx/demodwfm/wfmdemodsettings.cpp index 779096e82..f0b778616 100644 --- a/plugins/channelrx/demodwfm/wfmdemodsettings.cpp +++ b/plugins/channelrx/demodwfm/wfmdemodsettings.cpp @@ -53,6 +53,7 @@ void WFMDemodSettings::resetToDefaults() m_reverseAPIDeviceIndex = 0; m_reverseAPIChannelIndex = 0; m_workspaceIndex = 0; + m_hidden = false; } QByteArray WFMDemodSettings::serialize() const @@ -84,6 +85,7 @@ QByteArray WFMDemodSettings::serialize() const s.writeS32(19, m_workspaceIndex); s.writeBlob(20, m_geometryBytes); + s.writeBool(21, m_hidden); return s.final(); } @@ -149,6 +151,7 @@ bool WFMDemodSettings::deserialize(const QByteArray& data) d.readS32(19, &m_workspaceIndex, 0); d.readBlob(20, &m_geometryBytes); + d.readBool(21, &m_hidden, false); return true; } diff --git a/plugins/channelrx/demodwfm/wfmdemodsettings.h b/plugins/channelrx/demodwfm/wfmdemodsettings.h index 4c98cbb4e..e839fc124 100644 --- a/plugins/channelrx/demodwfm/wfmdemodsettings.h +++ b/plugins/channelrx/demodwfm/wfmdemodsettings.h @@ -42,6 +42,7 @@ struct WFMDemodSettings uint16_t m_reverseAPIChannelIndex; int m_workspaceIndex; QByteArray m_geometryBytes; + bool m_hidden; Serializable *m_channelMarker; Serializable *m_rollupState; diff --git a/plugins/channelrx/filesink/filesinkgui.h b/plugins/channelrx/filesink/filesinkgui.h index bddedd7bb..daec1f789 100644 --- a/plugins/channelrx/filesink/filesinkgui.h +++ b/plugins/channelrx/filesink/filesinkgui.h @@ -55,6 +55,8 @@ public: virtual QByteArray getGeometryBytes() const { return m_settings.m_geometryBytes; }; virtual QString getTitle() const { return m_settings.m_title; }; virtual QColor getTitleColor() const { return m_settings.m_rgbColor; }; + virtual void zetHidden(bool hidden) { m_settings.m_hidden = hidden; } + virtual bool getHidden() const { return m_settings.m_hidden; } public slots: void channelMarkerChangedByCursor(); diff --git a/plugins/channelrx/filesink/filesinksettings.cpp b/plugins/channelrx/filesink/filesinksettings.cpp index 4730701b4..8726054a7 100644 --- a/plugins/channelrx/filesink/filesinksettings.cpp +++ b/plugins/channelrx/filesink/filesinksettings.cpp @@ -50,6 +50,7 @@ void FileSinkSettings::resetToDefaults() m_reverseAPIDeviceIndex = 0; m_reverseAPIChannelIndex = 0; m_workspaceIndex = 0; + m_hidden = false; } QByteArray FileSinkSettings::serialize() const @@ -88,6 +89,7 @@ QByteArray FileSinkSettings::serialize() const s.writeS32(20, m_workspaceIndex); s.writeBlob(21, m_geometryBytes); + s.writeBool(22, m_hidden); return s.final(); } @@ -159,6 +161,7 @@ bool FileSinkSettings::deserialize(const QByteArray& data) d.readS32(20, &m_workspaceIndex, 0); d.readBlob(21, &m_geometryBytes); + d.readBool(22, &m_hidden, false); return true; } diff --git a/plugins/channelrx/filesink/filesinksettings.h b/plugins/channelrx/filesink/filesinksettings.h index 08bc92062..4c43d43fb 100644 --- a/plugins/channelrx/filesink/filesinksettings.h +++ b/plugins/channelrx/filesink/filesinksettings.h @@ -43,6 +43,7 @@ struct FileSinkSettings uint16_t m_reverseAPIChannelIndex; int m_workspaceIndex; QByteArray m_geometryBytes; + bool m_hidden; Serializable *m_spectrumGUI; Serializable *m_channelMarker; diff --git a/plugins/channelrx/freqtracker/freqtrackergui.h b/plugins/channelrx/freqtracker/freqtrackergui.h index 310ddb19f..81990dd69 100644 --- a/plugins/channelrx/freqtracker/freqtrackergui.h +++ b/plugins/channelrx/freqtracker/freqtrackergui.h @@ -55,6 +55,8 @@ public: virtual QByteArray getGeometryBytes() const { return m_settings.m_geometryBytes; }; virtual QString getTitle() const { return m_settings.m_title; }; virtual QColor getTitleColor() const { return m_settings.m_rgbColor; }; + virtual void zetHidden(bool hidden) { m_settings.m_hidden = hidden; } + virtual bool getHidden() const { return m_settings.m_hidden; } public slots: void channelMarkerChangedByCursor(); diff --git a/plugins/channelrx/freqtracker/freqtrackersettings.cpp b/plugins/channelrx/freqtracker/freqtrackersettings.cpp index 9ac8e1e05..300e1282e 100644 --- a/plugins/channelrx/freqtracker/freqtrackersettings.cpp +++ b/plugins/channelrx/freqtracker/freqtrackersettings.cpp @@ -53,6 +53,7 @@ void FreqTrackerSettings::resetToDefaults() m_reverseAPIDeviceIndex = 0; m_reverseAPIChannelIndex = 0; m_workspaceIndex = 0; + m_hidden = false; } QByteArray FreqTrackerSettings::serialize() const @@ -94,6 +95,7 @@ QByteArray FreqTrackerSettings::serialize() const s.writeS32(24, m_workspaceIndex); s.writeBlob(25, m_geometryBytes); + s.writeBool(26, m_hidden); return s.final(); } @@ -176,6 +178,7 @@ bool FreqTrackerSettings::deserialize(const QByteArray& data) d.readS32(24, &m_workspaceIndex, 0); d.readBlob(25, &m_geometryBytes); + d.readBool(26, &m_hidden, false); return true; } diff --git a/plugins/channelrx/freqtracker/freqtrackersettings.h b/plugins/channelrx/freqtracker/freqtrackersettings.h index 0e5734f66..1129aa3ea 100644 --- a/plugins/channelrx/freqtracker/freqtrackersettings.h +++ b/plugins/channelrx/freqtracker/freqtrackersettings.h @@ -59,6 +59,7 @@ struct FreqTrackerSettings Serializable *m_rollupState; int m_workspaceIndex; QByteArray m_geometryBytes; + bool m_hidden; FreqTrackerSettings(); void resetToDefaults(); diff --git a/plugins/channelrx/localsink/localsinkgui.h b/plugins/channelrx/localsink/localsinkgui.h index 285894aca..614f64dfd 100644 --- a/plugins/channelrx/localsink/localsinkgui.h +++ b/plugins/channelrx/localsink/localsinkgui.h @@ -54,6 +54,8 @@ public: virtual QByteArray getGeometryBytes() const { return m_settings.m_geometryBytes; }; virtual QString getTitle() const { return m_settings.m_title; }; virtual QColor getTitleColor() const { return m_settings.m_rgbColor; }; + virtual void zetHidden(bool hidden) { m_settings.m_hidden = hidden; } + virtual bool getHidden() const { return m_settings.m_hidden; } private: Ui::LocalSinkGUI* ui; diff --git a/plugins/channelrx/localsink/localsinksettings.cpp b/plugins/channelrx/localsink/localsinksettings.cpp index d04577cfb..ecf2f9a48 100644 --- a/plugins/channelrx/localsink/localsinksettings.cpp +++ b/plugins/channelrx/localsink/localsinksettings.cpp @@ -45,6 +45,7 @@ void LocalSinkSettings::resetToDefaults() m_reverseAPIDeviceIndex = 0; m_reverseAPIChannelIndex = 0; m_workspaceIndex = 0; + m_hidden = false; } QByteArray LocalSinkSettings::serialize() const @@ -73,6 +74,7 @@ QByteArray LocalSinkSettings::serialize() const s.writeS32(16, m_workspaceIndex); s.writeBlob(17, m_geometryBytes); + s.writeBool(18, m_hidden); return s.final(); } @@ -130,6 +132,7 @@ bool LocalSinkSettings::deserialize(const QByteArray& data) d.readS32(16, &m_workspaceIndex, 0); d.readBlob(17, &m_geometryBytes); + d.readBool(18, &m_hidden, false); return true; } diff --git a/plugins/channelrx/localsink/localsinksettings.h b/plugins/channelrx/localsink/localsinksettings.h index 0dee85451..48a52beaa 100644 --- a/plugins/channelrx/localsink/localsinksettings.h +++ b/plugins/channelrx/localsink/localsinksettings.h @@ -39,6 +39,7 @@ struct LocalSinkSettings uint16_t m_reverseAPIChannelIndex; int m_workspaceIndex; QByteArray m_geometryBytes; + bool m_hidden; Serializable *m_channelMarker; Serializable *m_rollupState; diff --git a/plugins/channelrx/noisefigure/noisefiguregui.h b/plugins/channelrx/noisefigure/noisefiguregui.h index 29b7ba556..95981be46 100644 --- a/plugins/channelrx/noisefigure/noisefiguregui.h +++ b/plugins/channelrx/noisefigure/noisefiguregui.h @@ -61,6 +61,8 @@ public: virtual QByteArray getGeometryBytes() const { return m_settings.m_geometryBytes; }; virtual QString getTitle() const { return m_settings.m_title; }; virtual QColor getTitleColor() const { return m_settings.m_rgbColor; }; + virtual void zetHidden(bool hidden) { m_settings.m_hidden = hidden; } + virtual bool getHidden() const { return m_settings.m_hidden; } public slots: void channelMarkerChangedByCursor(); diff --git a/plugins/channelrx/noisefigure/noisefiguresettings.cpp b/plugins/channelrx/noisefigure/noisefiguresettings.cpp index fe12e037b..27dccc40f 100644 --- a/plugins/channelrx/noisefigure/noisefiguresettings.cpp +++ b/plugins/channelrx/noisefigure/noisefiguresettings.cpp @@ -66,6 +66,7 @@ void NoiseFigureSettings::resetToDefaults() m_reverseAPIDeviceIndex = 0; m_reverseAPIChannelIndex = 0; m_workspaceIndex = 0; + m_hidden = false; for (int i = 0; i < NOISEFIGURE_COLUMNS; i++) { @@ -120,6 +121,7 @@ QByteArray NoiseFigureSettings::serialize() const s.writeS32(29, m_workspaceIndex); s.writeBlob(30, m_geometryBytes); + s.writeBool(31, m_hidden); for (int i = 0; i < NOISEFIGURE_COLUMNS; i++) { s.writeS32(100 + i, m_resultsColumnIndexes[i]); @@ -203,6 +205,7 @@ bool NoiseFigureSettings::deserialize(const QByteArray& data) d.readS32(29, &m_workspaceIndex, 0); d.readBlob(30, &m_geometryBytes); + d.readBool(31, &m_hidden, false); for (int i = 0; i < NOISEFIGURE_COLUMNS; i++) { d.readS32(100 + i, &m_resultsColumnIndexes[i], i); diff --git a/plugins/channelrx/noisefigure/noisefiguresettings.h b/plugins/channelrx/noisefigure/noisefiguresettings.h index f5f121227..a57b444f7 100644 --- a/plugins/channelrx/noisefigure/noisefiguresettings.h +++ b/plugins/channelrx/noisefigure/noisefiguresettings.h @@ -88,6 +88,7 @@ struct NoiseFigureSettings Serializable *m_rollupState; int m_workspaceIndex; QByteArray m_geometryBytes; + bool m_hidden; int m_resultsColumnIndexes[NOISEFIGURE_COLUMNS];//!< How the columns are ordered in the table int m_resultsColumnSizes[NOISEFIGURE_COLUMNS]; //!< Size of the columns in the table diff --git a/plugins/channelrx/radioastronomy/radioastronomygui.h b/plugins/channelrx/radioastronomy/radioastronomygui.h index 0c7e664d3..e40761d1c 100644 --- a/plugins/channelrx/radioastronomy/radioastronomygui.h +++ b/plugins/channelrx/radioastronomy/radioastronomygui.h @@ -204,6 +204,8 @@ public: virtual QByteArray getGeometryBytes() const { return m_settings.m_geometryBytes; }; virtual QString getTitle() const { return m_settings.m_title; }; virtual QColor getTitleColor() const { return m_settings.m_rgbColor; }; + virtual void zetHidden(bool hidden) { m_settings.m_hidden = hidden; } + virtual bool getHidden() const { return m_settings.m_hidden; } public slots: void channelMarkerChangedByCursor(); diff --git a/plugins/channelrx/radioastronomy/radioastronomysettings.cpp b/plugins/channelrx/radioastronomy/radioastronomysettings.cpp index db2dfd132..66473becd 100644 --- a/plugins/channelrx/radioastronomy/radioastronomysettings.cpp +++ b/plugins/channelrx/radioastronomy/radioastronomysettings.cpp @@ -164,6 +164,7 @@ void RadioAstronomySettings::resetToDefaults() m_reverseAPIDeviceIndex = 0; m_reverseAPIChannelIndex = 0; m_workspaceIndex = 0; + m_hidden = false; for (int i = 0; i < RADIOASTRONOMY_POWERTABLE_COLUMNS; i++) { @@ -308,6 +309,7 @@ QByteArray RadioAstronomySettings::serialize() const s.writeU32(188, m_reverseAPIChannelIndex); s.writeS32(189, m_workspaceIndex); s.writeBlob(190, m_geometryBytes); + s.writeBool(191, m_hidden); for (int i = 0; i < RADIOASTRONOMY_POWERTABLE_COLUMNS; i++) { s.writeS32(400 + i, m_powerTableColumnIndexes[i]); @@ -477,6 +479,7 @@ bool RadioAstronomySettings::deserialize(const QByteArray& data) m_reverseAPIChannelIndex = utmp > 99 ? 99 : utmp; d.readS32(189, &m_workspaceIndex, 0); d.readBlob(190, &m_geometryBytes); + d.readBool(191, &m_hidden, false); for (int i = 0; i < RADIOASTRONOMY_POWERTABLE_COLUMNS; i++) { d.readS32(400 + i, &m_powerTableColumnIndexes[i], i); diff --git a/plugins/channelrx/radioastronomy/radioastronomysettings.h b/plugins/channelrx/radioastronomy/radioastronomysettings.h index cf222b5eb..f10ab2bd6 100644 --- a/plugins/channelrx/radioastronomy/radioastronomysettings.h +++ b/plugins/channelrx/radioastronomy/radioastronomysettings.h @@ -225,6 +225,7 @@ struct RadioAstronomySettings uint16_t m_reverseAPIChannelIndex; int m_workspaceIndex; QByteArray m_geometryBytes; + bool m_hidden; int m_powerTableColumnIndexes[RADIOASTRONOMY_POWERTABLE_COLUMNS];//!< How the columns are ordered in the table int m_powerTableColumnSizes[RADIOASTRONOMY_POWERTABLE_COLUMNS]; //!< Size of the columns in the table diff --git a/plugins/channelrx/radioclock/radioclockgui.h b/plugins/channelrx/radioclock/radioclockgui.h index 8d1956559..fe39104f9 100644 --- a/plugins/channelrx/radioclock/radioclockgui.h +++ b/plugins/channelrx/radioclock/radioclockgui.h @@ -57,6 +57,8 @@ public: virtual QByteArray getGeometryBytes() const { return m_settings.m_geometryBytes; }; virtual QString getTitle() const { return m_settings.m_title; }; virtual QColor getTitleColor() const { return m_settings.m_rgbColor; }; + virtual void zetHidden(bool hidden) { m_settings.m_hidden = hidden; } + virtual bool getHidden() const { return m_settings.m_hidden; } public slots: void channelMarkerChangedByCursor(); diff --git a/plugins/channelrx/radioclock/radioclocksettings.cpp b/plugins/channelrx/radioclock/radioclocksettings.cpp index 5af35acf0..6d39d78be 100644 --- a/plugins/channelrx/radioclock/radioclocksettings.cpp +++ b/plugins/channelrx/radioclock/radioclocksettings.cpp @@ -47,6 +47,7 @@ void RadioClockSettings::resetToDefaults() m_reverseAPIDeviceIndex = 0; m_reverseAPIChannelIndex = 0; m_workspaceIndex = 0; + m_hidden = false; } QByteArray RadioClockSettings::serialize() const @@ -82,6 +83,7 @@ QByteArray RadioClockSettings::serialize() const s.writeS32(23, m_workspaceIndex); s.writeBlob(24, m_geometryBytes); + s.writeBool(25, m_hidden); return s.final(); } @@ -146,6 +148,7 @@ bool RadioClockSettings::deserialize(const QByteArray& data) d.readS32(23, &m_workspaceIndex, 0); d.readBlob(24, &m_geometryBytes); + d.readBool(25, &m_hidden, false); return true; } diff --git a/plugins/channelrx/radioclock/radioclocksettings.h b/plugins/channelrx/radioclock/radioclocksettings.h index 80f01ada1..8fde86bd0 100644 --- a/plugins/channelrx/radioclock/radioclocksettings.h +++ b/plugins/channelrx/radioclock/radioclocksettings.h @@ -56,6 +56,7 @@ struct RadioClockSettings Serializable *m_rollupState; int m_workspaceIndex; QByteArray m_geometryBytes; + bool m_hidden; static const int RADIOCLOCK_CHANNEL_SAMPLE_RATE = 1000; static const int m_scopeStreams = 8; diff --git a/plugins/channelrx/remotesink/remotesinkgui.h b/plugins/channelrx/remotesink/remotesinkgui.h index 5c5104a48..10695448c 100644 --- a/plugins/channelrx/remotesink/remotesinkgui.h +++ b/plugins/channelrx/remotesink/remotesinkgui.h @@ -54,6 +54,8 @@ public: virtual QByteArray getGeometryBytes() const { return m_settings.m_geometryBytes; } virtual QString getTitle() const { return m_settings.m_title; } virtual QColor getTitleColor() const { return m_settings.m_rgbColor; } + virtual void zetHidden(bool hidden) { m_settings.m_hidden = hidden; } + virtual bool getHidden() const { return m_settings.m_hidden; } private: Ui::RemoteSinkGUI* ui; diff --git a/plugins/channelrx/remotesink/remotesinksettings.cpp b/plugins/channelrx/remotesink/remotesinksettings.cpp index 5cacc97b0..69c507638 100644 --- a/plugins/channelrx/remotesink/remotesinksettings.cpp +++ b/plugins/channelrx/remotesink/remotesinksettings.cpp @@ -54,6 +54,7 @@ void RemoteSinkSettings::resetToDefaults() m_reverseAPIDeviceIndex = 0; m_reverseAPIChannelIndex = 0; m_workspaceIndex = 0; + m_hidden = false; } QByteArray RemoteSinkSettings::serialize() const @@ -86,6 +87,7 @@ QByteArray RemoteSinkSettings::serialize() const s.writeS32(18, m_workspaceIndex); s.writeBlob(19, m_geometryBytes); + s.writeBool(20, m_hidden); return s.final(); } @@ -161,6 +163,7 @@ bool RemoteSinkSettings::deserialize(const QByteArray& data) d.readS32(18, &m_workspaceIndex, 0); d.readBlob(19, &m_geometryBytes); + d.readBool(20, &m_hidden, false); return true; } diff --git a/plugins/channelrx/remotesink/remotesinksettings.h b/plugins/channelrx/remotesink/remotesinksettings.h index 0804097c1..6284d41f3 100644 --- a/plugins/channelrx/remotesink/remotesinksettings.h +++ b/plugins/channelrx/remotesink/remotesinksettings.h @@ -48,6 +48,7 @@ struct RemoteSinkSettings uint16_t m_reverseAPIChannelIndex; int m_workspaceIndex; QByteArray m_geometryBytes; + bool m_hidden; Serializable *m_channelMarker; Serializable *m_rollupState; diff --git a/plugins/channelrx/sigmffilesink/sigmffilesinkgui.h b/plugins/channelrx/sigmffilesink/sigmffilesinkgui.h index 8aadef404..687dc3bf2 100644 --- a/plugins/channelrx/sigmffilesink/sigmffilesinkgui.h +++ b/plugins/channelrx/sigmffilesink/sigmffilesinkgui.h @@ -55,6 +55,8 @@ public: virtual QByteArray getGeometryBytes() const { return m_settings.m_geometryBytes; }; virtual QString getTitle() const { return m_settings.m_title; }; virtual QColor getTitleColor() const { return m_settings.m_rgbColor; }; + virtual void zetHidden(bool hidden) { m_settings.m_hidden = hidden; } + virtual bool getHidden() const { return m_settings.m_hidden; } public slots: void channelMarkerChangedByCursor(); diff --git a/plugins/channelrx/sigmffilesink/sigmffilesinksettings.cpp b/plugins/channelrx/sigmffilesink/sigmffilesinksettings.cpp index 0ea2a2b39..3bbf9060b 100644 --- a/plugins/channelrx/sigmffilesink/sigmffilesinksettings.cpp +++ b/plugins/channelrx/sigmffilesink/sigmffilesinksettings.cpp @@ -50,6 +50,7 @@ void SigMFFileSinkSettings::resetToDefaults() m_reverseAPIDeviceIndex = 0; m_reverseAPIChannelIndex = 0; m_workspaceIndex = 0; + m_hidden = false; } QByteArray SigMFFileSinkSettings::serialize() const @@ -88,6 +89,7 @@ QByteArray SigMFFileSinkSettings::serialize() const s.writeS32(21, m_workspaceIndex); s.writeBlob(22, m_geometryBytes); + s.writeBool(23, m_hidden); return s.final(); } @@ -159,6 +161,7 @@ bool SigMFFileSinkSettings::deserialize(const QByteArray& data) d.readS32(21, &m_workspaceIndex, 0); d.readBlob(22, &m_geometryBytes); + d.readBool(23, &m_hidden, false); return true; } diff --git a/plugins/channelrx/sigmffilesink/sigmffilesinksettings.h b/plugins/channelrx/sigmffilesink/sigmffilesinksettings.h index 470f00b15..4d3075dde 100644 --- a/plugins/channelrx/sigmffilesink/sigmffilesinksettings.h +++ b/plugins/channelrx/sigmffilesink/sigmffilesinksettings.h @@ -44,6 +44,7 @@ struct SigMFFileSinkSettings uint16_t m_reverseAPIChannelIndex; int m_workspaceIndex; QByteArray m_geometryBytes; + bool m_hidden; Serializable *m_spectrumGUI; Serializable *m_channelMarker; diff --git a/plugins/channelrx/udpsink/udpsinkgui.h b/plugins/channelrx/udpsink/udpsinkgui.h index c06e0f99b..8c58d6dd7 100644 --- a/plugins/channelrx/udpsink/udpsinkgui.h +++ b/plugins/channelrx/udpsink/udpsinkgui.h @@ -55,6 +55,8 @@ public: virtual QByteArray getGeometryBytes() const { return m_settings.m_geometryBytes; }; virtual QString getTitle() const { return m_settings.m_title; }; virtual QColor getTitleColor() const { return m_settings.m_rgbColor; }; + virtual void zetHidden(bool hidden) { m_settings.m_hidden = hidden; } + virtual bool getHidden() const { return m_settings.m_hidden; } public slots: void channelMarkerChangedByCursor(); diff --git a/plugins/channelrx/udpsink/udpsinksettings.cpp b/plugins/channelrx/udpsink/udpsinksettings.cpp index 385db5077..ea6e1eee0 100644 --- a/plugins/channelrx/udpsink/udpsinksettings.cpp +++ b/plugins/channelrx/udpsink/udpsinksettings.cpp @@ -58,6 +58,7 @@ void UDPSinkSettings::resetToDefaults() m_reverseAPIDeviceIndex = 0; m_reverseAPIChannelIndex = 0; m_workspaceIndex = 0; + m_hidden = false; } QByteArray UDPSinkSettings::serialize() const @@ -102,6 +103,7 @@ QByteArray UDPSinkSettings::serialize() const s.writeS32(30, m_workspaceIndex); s.writeBlob(31, m_geometryBytes); + s.writeBool(32, m_hidden); return s.final(); @@ -201,8 +203,9 @@ bool UDPSinkSettings::deserialize(const QByteArray& data) m_rollupState->deserialize(bytetmp); } - d.readS32(29, &m_workspaceIndex, 0); - d.readBlob(30, &m_geometryBytes); + d.readS32(30, &m_workspaceIndex, 0); + d.readBlob(31, &m_geometryBytes); + d.readBool(32, &m_hidden, false); return true; } diff --git a/plugins/channelrx/udpsink/udpsinksettings.h b/plugins/channelrx/udpsink/udpsinksettings.h index 72196f7ba..3f0b869a6 100644 --- a/plugins/channelrx/udpsink/udpsinksettings.h +++ b/plugins/channelrx/udpsink/udpsinksettings.h @@ -71,6 +71,7 @@ struct UDPSinkSettings uint16_t m_reverseAPIChannelIndex; int m_workspaceIndex; QByteArray m_geometryBytes; + bool m_hidden; Serializable *m_channelMarker; Serializable *m_spectrumGUI; diff --git a/plugins/channeltx/filesource/filesourcegui.h b/plugins/channeltx/filesource/filesourcegui.h index c748afd31..a270bdbae 100644 --- a/plugins/channeltx/filesource/filesourcegui.h +++ b/plugins/channeltx/filesource/filesourcegui.h @@ -51,6 +51,8 @@ public: virtual QByteArray getGeometryBytes() const { return m_settings.m_geometryBytes; }; virtual QString getTitle() const { return m_settings.m_title; }; virtual QColor getTitleColor() const { return m_settings.m_rgbColor; }; + virtual void zetHidden(bool hidden) { m_settings.m_hidden = hidden; } + virtual bool getHidden() const { return m_settings.m_hidden; } public slots: void channelMarkerChangedByCursor(); diff --git a/plugins/channeltx/filesource/filesourcesettings.cpp b/plugins/channeltx/filesource/filesourcesettings.cpp index b249ae363..0a181dd36 100644 --- a/plugins/channeltx/filesource/filesourcesettings.cpp +++ b/plugins/channeltx/filesource/filesourcesettings.cpp @@ -46,6 +46,7 @@ void FileSourceSettings::resetToDefaults() m_reverseAPIDeviceIndex = 0; m_reverseAPIChannelIndex = 0; m_workspaceIndex = 0; + m_hidden = false; } QByteArray FileSourceSettings::serialize() const @@ -75,6 +76,7 @@ QByteArray FileSourceSettings::serialize() const s.writeS32(16, m_workspaceIndex); s.writeBlob(17, m_geometryBytes); + s.writeBool(18, m_hidden); return s.final(); } @@ -135,6 +137,7 @@ bool FileSourceSettings::deserialize(const QByteArray& data) d.readS32(16, &m_workspaceIndex, 0); d.readBlob(17, &m_geometryBytes); + d.readBool(18, &m_hidden, false); return true; } diff --git a/plugins/channeltx/filesource/filesourcesettings.h b/plugins/channeltx/filesource/filesourcesettings.h index f20a0377f..34c5cf882 100644 --- a/plugins/channeltx/filesource/filesourcesettings.h +++ b/plugins/channeltx/filesource/filesourcesettings.h @@ -40,6 +40,7 @@ struct FileSourceSettings uint16_t m_reverseAPIChannelIndex; int m_workspaceIndex; QByteArray m_geometryBytes; + bool m_hidden; Serializable *m_channelMarker; Serializable *m_rollupState; diff --git a/plugins/channeltx/localsource/localsourcegui.h b/plugins/channeltx/localsource/localsourcegui.h index 69584295e..5ae429b53 100644 --- a/plugins/channeltx/localsource/localsourcegui.h +++ b/plugins/channeltx/localsource/localsourcegui.h @@ -54,6 +54,8 @@ public: virtual QByteArray getGeometryBytes() const { return m_settings.m_geometryBytes; }; virtual QString getTitle() const { return m_settings.m_title; }; virtual QColor getTitleColor() const { return m_settings.m_rgbColor; }; + virtual void zetHidden(bool hidden) { m_settings.m_hidden = hidden; } + virtual bool getHidden() const { return m_settings.m_hidden; } private: Ui::LocalSourceGUI* ui; diff --git a/plugins/channeltx/localsource/localsourcesettings.cpp b/plugins/channeltx/localsource/localsourcesettings.cpp index 5e33c589d..88754eb73 100644 --- a/plugins/channeltx/localsource/localsourcesettings.cpp +++ b/plugins/channeltx/localsource/localsourcesettings.cpp @@ -45,6 +45,7 @@ void LocalSourceSettings::resetToDefaults() m_reverseAPIDeviceIndex = 0; m_reverseAPIChannelIndex = 0; m_workspaceIndex = 0; + m_hidden = false; } QByteArray LocalSourceSettings::serialize() const @@ -72,6 +73,7 @@ QByteArray LocalSourceSettings::serialize() const s.writeS32(17, m_workspaceIndex); s.writeBlob(18, m_geometryBytes); + s.writeBool(19, m_hidden); return s.final(); } @@ -126,8 +128,9 @@ bool LocalSourceSettings::deserialize(const QByteArray& data) m_channelMarker->deserialize(bytetmp); } - d.readS32(27, &m_workspaceIndex, 0); - d.readBlob(28, &m_geometryBytes); + d.readS32(17, &m_workspaceIndex, 0); + d.readBlob(18, &m_geometryBytes); + d.readBool(19, &m_hidden, false); return true; } diff --git a/plugins/channeltx/localsource/localsourcesettings.h b/plugins/channeltx/localsource/localsourcesettings.h index b0b044d6b..f68b7e47f 100644 --- a/plugins/channeltx/localsource/localsourcesettings.h +++ b/plugins/channeltx/localsource/localsourcesettings.h @@ -39,6 +39,7 @@ struct LocalSourceSettings uint16_t m_reverseAPIChannelIndex; int m_workspaceIndex; QByteArray m_geometryBytes; + bool m_hidden; Serializable *m_channelMarker; Serializable *m_rollupState; diff --git a/plugins/channeltx/mod802.15.4/ieee_802_15_4_modgui.h b/plugins/channeltx/mod802.15.4/ieee_802_15_4_modgui.h index 1f96f2920..59df48f6d 100644 --- a/plugins/channeltx/mod802.15.4/ieee_802_15_4_modgui.h +++ b/plugins/channeltx/mod802.15.4/ieee_802_15_4_modgui.h @@ -61,7 +61,8 @@ public: virtual QByteArray getGeometryBytes() const { return m_settings.m_geometryBytes; }; virtual QString getTitle() const { return m_settings.m_title; }; virtual QColor getTitleColor() const { return m_settings.m_rgbColor; }; - + virtual void zetHidden(bool hidden) { m_settings.m_hidden = hidden; } + virtual bool getHidden() const { return m_settings.m_hidden; } public slots: void channelMarkerChangedByCursor(); diff --git a/plugins/channeltx/mod802.15.4/ieee_802_15_4_modsettings.cpp b/plugins/channeltx/mod802.15.4/ieee_802_15_4_modsettings.cpp index 9d71d6c9a..935f897a7 100644 --- a/plugins/channeltx/mod802.15.4/ieee_802_15_4_modsettings.cpp +++ b/plugins/channeltx/mod802.15.4/ieee_802_15_4_modsettings.cpp @@ -76,6 +76,7 @@ void IEEE_802_15_4_ModSettings::resetToDefaults() m_udpAddress = "127.0.0.1"; m_udpPort = 9998; m_workspaceIndex = 0; + m_hidden = false; } bool IEEE_802_15_4_ModSettings::setPHY(QString phy) @@ -205,6 +206,7 @@ QByteArray IEEE_802_15_4_ModSettings::serialize() const s.writeS32(39, m_workspaceIndex); s.writeBlob(40, m_geometryBytes); + s.writeBool(41, m_hidden); return s.final(); } @@ -294,6 +296,7 @@ bool IEEE_802_15_4_ModSettings::deserialize(const QByteArray& data) d.readS32(39, &m_workspaceIndex, 0); d.readBlob(40, &m_geometryBytes); + d.readBool(41, &m_hidden, false); return true; } diff --git a/plugins/channeltx/mod802.15.4/ieee_802_15_4_modsettings.h b/plugins/channeltx/mod802.15.4/ieee_802_15_4_modsettings.h index b50b69d6c..160c2d6e5 100644 --- a/plugins/channeltx/mod802.15.4/ieee_802_15_4_modsettings.h +++ b/plugins/channeltx/mod802.15.4/ieee_802_15_4_modsettings.h @@ -80,6 +80,7 @@ struct IEEE_802_15_4_ModSettings static const int m_udpBufferSize = 100000; int m_workspaceIndex; QByteArray m_geometryBytes; + bool m_hidden; IEEE_802_15_4_ModSettings(); void resetToDefaults(); diff --git a/plugins/channeltx/modais/aismodgui.h b/plugins/channeltx/modais/aismodgui.h index 4deff0459..3ceea99bb 100644 --- a/plugins/channeltx/modais/aismodgui.h +++ b/plugins/channeltx/modais/aismodgui.h @@ -55,6 +55,8 @@ public: virtual QByteArray getGeometryBytes() const { return m_settings.m_geometryBytes; }; virtual QString getTitle() const { return m_settings.m_title; }; virtual QColor getTitleColor() const { return m_settings.m_rgbColor; }; + virtual void zetHidden(bool hidden) { m_settings.m_hidden = hidden; } + virtual bool getHidden() const { return m_settings.m_hidden; } public slots: void channelMarkerChangedByCursor(); diff --git a/plugins/channeltx/modais/aismodsettings.cpp b/plugins/channeltx/modais/aismodsettings.cpp index f489b715c..f14445f1d 100644 --- a/plugins/channeltx/modais/aismodsettings.cpp +++ b/plugins/channeltx/modais/aismodsettings.cpp @@ -70,6 +70,7 @@ void AISModSettings::resetToDefaults() m_udpAddress = "127.0.0.1"; m_udpPort = 9998; m_workspaceIndex = 0; + m_hidden = false; } bool AISModSettings::setMode(QString mode) @@ -183,6 +184,7 @@ QByteArray AISModSettings::serialize() const s.writeS32(41, m_workspaceIndex); s.writeBlob(42, m_geometryBytes); + s.writeBool(43, m_hidden); return s.final(); } @@ -273,6 +275,7 @@ bool AISModSettings::deserialize(const QByteArray& data) d.readS32(41, &m_workspaceIndex, 0); d.readBlob(42, &m_geometryBytes); + d.readBool(43, &m_hidden, false); return true; } diff --git a/plugins/channeltx/modais/aismodsettings.h b/plugins/channeltx/modais/aismodsettings.h index 91e03293d..127d9f3f3 100644 --- a/plugins/channeltx/modais/aismodsettings.h +++ b/plugins/channeltx/modais/aismodsettings.h @@ -89,6 +89,7 @@ struct AISModSettings Serializable *m_rollupState; int m_workspaceIndex; QByteArray m_geometryBytes; + bool m_hidden; // Sample rate is multiple of 9600 baud rate (use even multiple so Gausian filter has odd number of taps) // Is there any benefit to having this higher? diff --git a/plugins/channeltx/modam/ammodgui.h b/plugins/channeltx/modam/ammodgui.h index 36d79ccbd..5577ab9ec 100644 --- a/plugins/channeltx/modam/ammodgui.h +++ b/plugins/channeltx/modam/ammodgui.h @@ -54,6 +54,8 @@ public: virtual QByteArray getGeometryBytes() const { return m_settings.m_geometryBytes; }; virtual QString getTitle() const { return m_settings.m_title; }; virtual QColor getTitleColor() const { return m_settings.m_rgbColor; }; + virtual void zetHidden(bool hidden) { m_settings.m_hidden = hidden; } + virtual bool getHidden() const { return m_settings.m_hidden; } public slots: void channelMarkerChangedByCursor(); diff --git a/plugins/channeltx/modam/ammodsettings.cpp b/plugins/channeltx/modam/ammodsettings.cpp index 981690912..aa87ed811 100644 --- a/plugins/channeltx/modam/ammodsettings.cpp +++ b/plugins/channeltx/modam/ammodsettings.cpp @@ -53,6 +53,7 @@ void AMModSettings::resetToDefaults() m_reverseAPIDeviceIndex = 0; m_reverseAPIChannelIndex = 0; m_workspaceIndex = 0; + m_hidden = false; } QByteArray AMModSettings::serialize() const @@ -95,6 +96,7 @@ QByteArray AMModSettings::serialize() const s.writeS32(22, m_workspaceIndex); s.writeBlob(23, m_geometryBytes); + s.writeBool(24, m_hidden); return s.final(); } @@ -172,6 +174,7 @@ bool AMModSettings::deserialize(const QByteArray& data) d.readS32(22, &m_workspaceIndex, 0); d.readBlob(23, &m_geometryBytes); + d.readBool(24, &m_hidden, false); return true; } diff --git a/plugins/channeltx/modam/ammodsettings.h b/plugins/channeltx/modam/ammodsettings.h index 4eb1120f5..78c2839e2 100644 --- a/plugins/channeltx/modam/ammodsettings.h +++ b/plugins/channeltx/modam/ammodsettings.h @@ -57,6 +57,7 @@ struct AMModSettings uint16_t m_reverseAPIChannelIndex; int m_workspaceIndex; QByteArray m_geometryBytes; + bool m_hidden; Serializable *m_channelMarker; Serializable *m_cwKeyerGUI; diff --git a/plugins/channeltx/modatv/atvmodgui.h b/plugins/channeltx/modatv/atvmodgui.h index 2a81c73d1..2c6c90604 100644 --- a/plugins/channeltx/modatv/atvmodgui.h +++ b/plugins/channeltx/modatv/atvmodgui.h @@ -53,6 +53,8 @@ public: virtual QByteArray getGeometryBytes() const { return m_settings.m_geometryBytes; }; virtual QString getTitle() const { return m_settings.m_title; }; virtual QColor getTitleColor() const { return m_settings.m_rgbColor; }; + virtual void zetHidden(bool hidden) { m_settings.m_hidden = hidden; } + virtual bool getHidden() const { return m_settings.m_hidden; } public slots: void channelMarkerChangedByCursor(); diff --git a/plugins/channeltx/modatv/atvmodsettings.cpp b/plugins/channeltx/modatv/atvmodsettings.cpp index 3f5bc0393..c3176cfa6 100644 --- a/plugins/channeltx/modatv/atvmodsettings.cpp +++ b/plugins/channeltx/modatv/atvmodsettings.cpp @@ -59,6 +59,7 @@ void ATVModSettings::resetToDefaults() m_reverseAPIDeviceIndex = 0; m_reverseAPIChannelIndex = 0; m_workspaceIndex = 0; + m_hidden = false; } QByteArray ATVModSettings::serialize() const @@ -100,6 +101,7 @@ QByteArray ATVModSettings::serialize() const s.writeS32(26, m_workspaceIndex); s.writeBlob(27, m_geometryBytes); + s.writeBool(28, m_hidden); return s.final(); } @@ -175,6 +177,7 @@ bool ATVModSettings::deserialize(const QByteArray& data) d.readS32(26, &m_workspaceIndex, 0); d.readBlob(27, &m_geometryBytes); + d.readBool(28, &m_hidden, false); return true; } diff --git a/plugins/channeltx/modatv/atvmodsettings.h b/plugins/channeltx/modatv/atvmodsettings.h index 95173938c..59984d633 100644 --- a/plugins/channeltx/modatv/atvmodsettings.h +++ b/plugins/channeltx/modatv/atvmodsettings.h @@ -91,6 +91,7 @@ struct ATVModSettings uint16_t m_reverseAPIChannelIndex; int m_workspaceIndex; QByteArray m_geometryBytes; + bool m_hidden; Serializable *m_channelMarker; Serializable *m_rollupState; diff --git a/plugins/channeltx/modchirpchat/chirpchatmodgui.h b/plugins/channeltx/modchirpchat/chirpchatmodgui.h index 5a7ae7fa2..78fd53653 100644 --- a/plugins/channeltx/modchirpchat/chirpchatmodgui.h +++ b/plugins/channeltx/modchirpchat/chirpchatmodgui.h @@ -52,6 +52,8 @@ public: virtual QByteArray getGeometryBytes() const { return m_settings.m_geometryBytes; }; virtual QString getTitle() const { return m_settings.m_title; }; virtual QColor getTitleColor() const { return m_settings.m_rgbColor; }; + virtual void zetHidden(bool hidden) { m_settings.m_hidden = hidden; } + virtual bool getHidden() const { return m_settings.m_hidden; } public slots: void channelMarkerChangedByCursor(); diff --git a/plugins/channeltx/modchirpchat/chirpchatmodsettings.cpp b/plugins/channeltx/modchirpchat/chirpchatmodsettings.cpp index 6d3c28ee6..e2a37cd75 100644 --- a/plugins/channeltx/modchirpchat/chirpchatmodsettings.cpp +++ b/plugins/channeltx/modchirpchat/chirpchatmodsettings.cpp @@ -94,6 +94,8 @@ void ChirpChatModSettings::resetToDefaults() m_reverseAPIDeviceIndex = 0; m_reverseAPIChannelIndex = 0; m_workspaceIndex = 0; + m_hidden = false; + setDefaultTemplates(); } @@ -204,6 +206,7 @@ QByteArray ChirpChatModSettings::serialize() const s.writeS32(60, m_workspaceIndex); s.writeBlob(61, m_geometryBytes); + s.writeBool(62, m_hidden); return s.final(); } @@ -311,6 +314,7 @@ bool ChirpChatModSettings::deserialize(const QByteArray& data) d.readS32(60, &m_workspaceIndex, 0); d.readBlob(61, &m_geometryBytes); + d.readBool(62, &m_hidden, false); return true; } diff --git a/plugins/channeltx/modchirpchat/chirpchatmodsettings.h b/plugins/channeltx/modchirpchat/chirpchatmodsettings.h index 710055d42..15e46323e 100644 --- a/plugins/channeltx/modchirpchat/chirpchatmodsettings.h +++ b/plugins/channeltx/modchirpchat/chirpchatmodsettings.h @@ -90,6 +90,7 @@ struct ChirpChatModSettings uint16_t m_reverseAPIChannelIndex; int m_workspaceIndex; QByteArray m_geometryBytes; + bool m_hidden; Serializable *m_channelMarker; Serializable *m_rollupState; diff --git a/plugins/channeltx/moddatv/datvmodgui.h b/plugins/channeltx/moddatv/datvmodgui.h index 0259aafa8..ea24d775f 100644 --- a/plugins/channeltx/moddatv/datvmodgui.h +++ b/plugins/channeltx/moddatv/datvmodgui.h @@ -54,6 +54,8 @@ public: virtual QByteArray getGeometryBytes() const { return m_settings.m_geometryBytes; }; virtual QString getTitle() const { return m_settings.m_title; }; virtual QColor getTitleColor() const { return m_settings.m_rgbColor; }; + virtual void zetHidden(bool hidden) { m_settings.m_hidden = hidden; } + virtual bool getHidden() const { return m_settings.m_hidden; } public slots: void channelMarkerChangedByCursor(); diff --git a/plugins/channeltx/moddatv/datvmodsettings.cpp b/plugins/channeltx/moddatv/datvmodsettings.cpp index 9428bbbd5..ab175acd9 100644 --- a/plugins/channeltx/moddatv/datvmodsettings.cpp +++ b/plugins/channeltx/moddatv/datvmodsettings.cpp @@ -58,6 +58,7 @@ void DATVModSettings::resetToDefaults() m_reverseAPIDeviceIndex = 0; m_reverseAPIChannelIndex = 0; m_workspaceIndex = 0; + m_hidden = false; } QByteArray DATVModSettings::serialize() const @@ -96,6 +97,7 @@ QByteArray DATVModSettings::serialize() const s.writeS32(30, m_workspaceIndex); s.writeBlob(31, m_geometryBytes); + s.writeBool(32, m_hidden); return s.final(); } @@ -169,6 +171,7 @@ bool DATVModSettings::deserialize(const QByteArray& data) d.readS32(30, &m_workspaceIndex, 0); d.readBlob(31, &m_geometryBytes); + d.readBool(32, &m_hidden, false); return true; } diff --git a/plugins/channeltx/moddatv/datvmodsettings.h b/plugins/channeltx/moddatv/datvmodsettings.h index 985558e48..757d4c78b 100644 --- a/plugins/channeltx/moddatv/datvmodsettings.h +++ b/plugins/channeltx/moddatv/datvmodsettings.h @@ -99,6 +99,7 @@ struct DATVModSettings Serializable *m_rollupState; int m_workspaceIndex; QByteArray m_geometryBytes; + bool m_hidden; DATVModSettings(); void resetToDefaults(); diff --git a/plugins/channeltx/modfreedv/freedvmodgui.h b/plugins/channeltx/modfreedv/freedvmodgui.h index ed7277ed9..30494d4c4 100644 --- a/plugins/channeltx/modfreedv/freedvmodgui.h +++ b/plugins/channeltx/modfreedv/freedvmodgui.h @@ -55,6 +55,8 @@ public: virtual QByteArray getGeometryBytes() const { return m_settings.m_geometryBytes; }; virtual QString getTitle() const { return m_settings.m_title; }; virtual QColor getTitleColor() const { return m_settings.m_rgbColor; }; + virtual void zetHidden(bool hidden) { m_settings.m_hidden = hidden; } + virtual bool getHidden() const { return m_settings.m_hidden; } public slots: void channelMarkerChangedByCursor(); diff --git a/plugins/channeltx/modfreedv/freedvmodsettings.cpp b/plugins/channeltx/modfreedv/freedvmodsettings.cpp index 1514fd198..f2b1ea565 100644 --- a/plugins/channeltx/modfreedv/freedvmodsettings.cpp +++ b/plugins/channeltx/modfreedv/freedvmodsettings.cpp @@ -52,6 +52,7 @@ void FreeDVModSettings::resetToDefaults() m_reverseAPIDeviceIndex = 0; m_reverseAPIChannelIndex = 0; m_workspaceIndex = 0; + m_hidden = false; } QByteArray FreeDVModSettings::serialize() const @@ -97,6 +98,7 @@ QByteArray FreeDVModSettings::serialize() const s.writeS32(29, m_workspaceIndex); s.writeBlob(30, m_geometryBytes); + s.writeBool(31, m_hidden); return s.final(); } @@ -187,6 +189,7 @@ bool FreeDVModSettings::deserialize(const QByteArray& data) d.readS32(29, &m_workspaceIndex, 0); d.readBlob(30, &m_geometryBytes); + d.readBool(31, &m_hidden, false); return true; } diff --git a/plugins/channeltx/modfreedv/freedvmodsettings.h b/plugins/channeltx/modfreedv/freedvmodsettings.h index 1195c894f..4f7bcf96d 100644 --- a/plugins/channeltx/modfreedv/freedvmodsettings.h +++ b/plugins/channeltx/modfreedv/freedvmodsettings.h @@ -68,6 +68,7 @@ struct FreeDVModSettings uint16_t m_reverseAPIChannelIndex; int m_workspaceIndex; QByteArray m_geometryBytes; + bool m_hidden; Serializable *m_channelMarker; Serializable *m_spectrumGUI; diff --git a/plugins/channeltx/modnfm/nfmmodgui.h b/plugins/channeltx/modnfm/nfmmodgui.h index 5d386b285..10af4b8c0 100644 --- a/plugins/channeltx/modnfm/nfmmodgui.h +++ b/plugins/channeltx/modnfm/nfmmodgui.h @@ -54,6 +54,8 @@ public: virtual QByteArray getGeometryBytes() const { return m_settings.m_geometryBytes; }; virtual QString getTitle() const { return m_settings.m_title; }; virtual QColor getTitleColor() const { return m_settings.m_rgbColor; }; + virtual void zetHidden(bool hidden) { m_settings.m_hidden = hidden; } + virtual bool getHidden() const { return m_settings.m_hidden; } public slots: void channelMarkerChangedByCursor(); diff --git a/plugins/channeltx/modnfm/nfmmodsettings.cpp b/plugins/channeltx/modnfm/nfmmodsettings.cpp index 8344c59bf..956466aaa 100644 --- a/plugins/channeltx/modnfm/nfmmodsettings.cpp +++ b/plugins/channeltx/modnfm/nfmmodsettings.cpp @@ -80,6 +80,7 @@ void NFMModSettings::resetToDefaults() m_reverseAPIDeviceIndex = 0; m_reverseAPIChannelIndex = 0; m_workspaceIndex = 0; + m_hidden = false; } QByteArray NFMModSettings::serialize() const @@ -128,6 +129,7 @@ QByteArray NFMModSettings::serialize() const s.writeS32(28, m_workspaceIndex); s.writeBlob(29, m_geometryBytes); + s.writeBool(30, m_hidden); return s.final(); } @@ -214,6 +216,7 @@ bool NFMModSettings::deserialize(const QByteArray& data) d.readS32(28, &m_workspaceIndex, 0); d.readBlob(29, &m_geometryBytes); + d.readBool(30, &m_hidden, false); return true; } diff --git a/plugins/channeltx/modnfm/nfmmodsettings.h b/plugins/channeltx/modnfm/nfmmodsettings.h index bc74e4c99..9ce5fbf68 100644 --- a/plugins/channeltx/modnfm/nfmmodsettings.h +++ b/plugins/channeltx/modnfm/nfmmodsettings.h @@ -69,6 +69,7 @@ struct NFMModSettings uint16_t m_reverseAPIChannelIndex; int m_workspaceIndex; QByteArray m_geometryBytes; + bool m_hidden; Serializable *m_channelMarker; Serializable *m_cwKeyerGUI; diff --git a/plugins/channeltx/modpacket/packetmodgui.h b/plugins/channeltx/modpacket/packetmodgui.h index a875801e7..dbc2c1779 100644 --- a/plugins/channeltx/modpacket/packetmodgui.h +++ b/plugins/channeltx/modpacket/packetmodgui.h @@ -54,6 +54,8 @@ public: virtual QByteArray getGeometryBytes() const { return m_settings.m_geometryBytes; }; virtual QString getTitle() const { return m_settings.m_title; }; virtual QColor getTitleColor() const { return m_settings.m_rgbColor; }; + virtual void zetHidden(bool hidden) { m_settings.m_hidden = hidden; } + virtual bool getHidden() const { return m_settings.m_hidden; } public slots: void channelMarkerChangedByCursor(); diff --git a/plugins/channeltx/modpacket/packetmodsettings.cpp b/plugins/channeltx/modpacket/packetmodsettings.cpp index 4ddb2a678..5939717f2 100644 --- a/plugins/channeltx/modpacket/packetmodsettings.cpp +++ b/plugins/channeltx/modpacket/packetmodsettings.cpp @@ -86,6 +86,7 @@ void PacketModSettings::resetToDefaults() m_udpAddress = "127.0.0.1"; m_udpPort = 9998; m_workspaceIndex = 0; + m_hidden = false; } bool PacketModSettings::setMode(QString mode) @@ -234,6 +235,7 @@ QByteArray PacketModSettings::serialize() const s.writeS32(55, m_workspaceIndex); s.writeBlob(56, m_geometryBytes); + s.writeBool(57, m_hidden); return s.final(); } @@ -338,6 +340,7 @@ bool PacketModSettings::deserialize(const QByteArray& data) d.readS32(55, &m_workspaceIndex, 0); d.readBlob(56, &m_geometryBytes); + d.readBool(57, &m_hidden, false); return true; } diff --git a/plugins/channeltx/modpacket/packetmodsettings.h b/plugins/channeltx/modpacket/packetmodsettings.h index c4dad2789..25d79ad52 100644 --- a/plugins/channeltx/modpacket/packetmodsettings.h +++ b/plugins/channeltx/modpacket/packetmodsettings.h @@ -85,6 +85,7 @@ struct PacketModSettings Serializable *m_rollupState; int m_workspaceIndex; QByteArray m_geometryBytes; + bool m_hidden; PacketModSettings(); void resetToDefaults(); diff --git a/plugins/channeltx/modssb/ssbmodgui.h b/plugins/channeltx/modssb/ssbmodgui.h index 3f4e21b8a..8ac6de0bd 100644 --- a/plugins/channeltx/modssb/ssbmodgui.h +++ b/plugins/channeltx/modssb/ssbmodgui.h @@ -55,6 +55,8 @@ public: virtual QByteArray getGeometryBytes() const { return m_settings.m_geometryBytes; }; virtual QString getTitle() const { return m_settings.m_title; }; virtual QColor getTitleColor() const { return m_settings.m_rgbColor; }; + virtual void zetHidden(bool hidden) { m_settings.m_hidden = hidden; } + virtual bool getHidden() const { return m_settings.m_hidden; } public slots: void channelMarkerChangedByCursor(); diff --git a/plugins/channeltx/modssb/ssbmodsettings.cpp b/plugins/channeltx/modssb/ssbmodsettings.cpp index 14961ea31..3cc48adeb 100644 --- a/plugins/channeltx/modssb/ssbmodsettings.cpp +++ b/plugins/channeltx/modssb/ssbmodsettings.cpp @@ -76,6 +76,7 @@ void SSBModSettings::resetToDefaults() m_reverseAPIDeviceIndex = 0; m_reverseAPIChannelIndex = 0; m_workspaceIndex = 0; + m_hidden = false; } QByteArray SSBModSettings::serialize() const @@ -130,6 +131,7 @@ QByteArray SSBModSettings::serialize() const s.writeS32(32, m_workspaceIndex); s.writeBlob(33, m_geometryBytes); + s.writeBool(34, m_hidden); return s.final(); } @@ -225,6 +227,7 @@ bool SSBModSettings::deserialize(const QByteArray& data) d.readS32(32, &m_workspaceIndex, 0); d.readBlob(33, &m_geometryBytes); + d.readBool(34, &m_hidden, false); return true; } diff --git a/plugins/channeltx/modssb/ssbmodsettings.h b/plugins/channeltx/modssb/ssbmodsettings.h index d1e40115b..5327a8106 100644 --- a/plugins/channeltx/modssb/ssbmodsettings.h +++ b/plugins/channeltx/modssb/ssbmodsettings.h @@ -72,6 +72,7 @@ struct SSBModSettings uint16_t m_reverseAPIChannelIndex; int m_workspaceIndex; QByteArray m_geometryBytes; + bool m_hidden; Serializable *m_channelMarker; Serializable *m_spectrumGUI; diff --git a/plugins/channeltx/modwfm/wfmmodgui.h b/plugins/channeltx/modwfm/wfmmodgui.h index 8188452dc..928173855 100644 --- a/plugins/channeltx/modwfm/wfmmodgui.h +++ b/plugins/channeltx/modwfm/wfmmodgui.h @@ -52,6 +52,8 @@ public: virtual QByteArray getGeometryBytes() const { return m_settings.m_geometryBytes; }; virtual QString getTitle() const { return m_settings.m_title; }; virtual QColor getTitleColor() const { return m_settings.m_rgbColor; }; + virtual void zetHidden(bool hidden) { m_settings.m_hidden = hidden; } + virtual bool getHidden() const { return m_settings.m_hidden; } public slots: void channelMarkerChangedByCursor(); diff --git a/plugins/channeltx/modwfm/wfmmodsettings.cpp b/plugins/channeltx/modwfm/wfmmodsettings.cpp index bff6853a9..ccf7501ca 100644 --- a/plugins/channeltx/modwfm/wfmmodsettings.cpp +++ b/plugins/channeltx/modwfm/wfmmodsettings.cpp @@ -61,6 +61,7 @@ void WFMModSettings::resetToDefaults() m_reverseAPIDeviceIndex = 0; m_reverseAPIChannelIndex = 0; m_workspaceIndex = 0; + m_hidden = false; } QByteArray WFMModSettings::serialize() const @@ -104,6 +105,7 @@ QByteArray WFMModSettings::serialize() const s.writeS32(23, m_workspaceIndex); s.writeBlob(24, m_geometryBytes); + s.writeBool(25, m_hidden); return s.final(); } @@ -183,6 +185,7 @@ bool WFMModSettings::deserialize(const QByteArray& data) d.readS32(23, &m_workspaceIndex, 0); d.readBlob(24, &m_geometryBytes); + d.readBool(25, &m_hidden, false); return true; } diff --git a/plugins/channeltx/modwfm/wfmmodsettings.h b/plugins/channeltx/modwfm/wfmmodsettings.h index c17fff830..9d5edd10b 100644 --- a/plugins/channeltx/modwfm/wfmmodsettings.h +++ b/plugins/channeltx/modwfm/wfmmodsettings.h @@ -61,6 +61,7 @@ struct WFMModSettings uint16_t m_reverseAPIChannelIndex; int m_workspaceIndex; QByteArray m_geometryBytes; + bool m_hidden; Serializable *m_channelMarker; Serializable *m_cwKeyerGUI; diff --git a/plugins/channeltx/remotesource/remotesourcegui.h b/plugins/channeltx/remotesource/remotesourcegui.h index 340d7ad86..630204fb7 100644 --- a/plugins/channeltx/remotesource/remotesourcegui.h +++ b/plugins/channeltx/remotesource/remotesourcegui.h @@ -53,6 +53,8 @@ public: virtual QByteArray getGeometryBytes() const { return m_settings.m_geometryBytes; }; virtual QString getTitle() const { return m_settings.m_title; }; virtual QColor getTitleColor() const { return m_settings.m_rgbColor; }; + virtual void zetHidden(bool hidden) { m_settings.m_hidden = hidden; } + virtual bool getHidden() const { return m_settings.m_hidden; } public slots: void channelMarkerChangedByCursor(); diff --git a/plugins/channeltx/remotesource/remotesourcesettings.cpp b/plugins/channeltx/remotesource/remotesourcesettings.cpp index d8a5d7b96..77124000b 100644 --- a/plugins/channeltx/remotesource/remotesourcesettings.cpp +++ b/plugins/channeltx/remotesource/remotesourcesettings.cpp @@ -45,6 +45,7 @@ void RemoteSourceSettings::resetToDefaults() m_reverseAPIDeviceIndex = 0; m_reverseAPIChannelIndex = 0; m_workspaceIndex = 0; + m_hidden = false; } QByteArray RemoteSourceSettings::serialize() const @@ -74,6 +75,7 @@ QByteArray RemoteSourceSettings::serialize() const s.writeS32(15, m_workspaceIndex); s.writeBlob(16, m_geometryBytes); + s.writeBool(17, m_hidden); return s.final(); } @@ -138,6 +140,7 @@ bool RemoteSourceSettings::deserialize(const QByteArray& data) d.readS32(15, &m_workspaceIndex, 0); d.readBlob(16, &m_geometryBytes); + d.readBool(17, &m_hidden, false); return true; } diff --git a/plugins/channeltx/remotesource/remotesourcesettings.h b/plugins/channeltx/remotesource/remotesourcesettings.h index 1bb40ffdd..a58039ad2 100644 --- a/plugins/channeltx/remotesource/remotesourcesettings.h +++ b/plugins/channeltx/remotesource/remotesourcesettings.h @@ -39,6 +39,7 @@ struct RemoteSourceSettings uint16_t m_reverseAPIChannelIndex; int m_workspaceIndex; QByteArray m_geometryBytes; + bool m_hidden; Serializable *m_channelMarker; Serializable *m_rollupState; diff --git a/plugins/channeltx/udpsource/udpsourcegui.h b/plugins/channeltx/udpsource/udpsourcegui.h index 372fd6b99..a009ee03a 100644 --- a/plugins/channeltx/udpsource/udpsourcegui.h +++ b/plugins/channeltx/udpsource/udpsourcegui.h @@ -55,6 +55,8 @@ public: virtual QByteArray getGeometryBytes() const { return m_settings.m_geometryBytes; }; virtual QString getTitle() const { return m_settings.m_title; }; virtual QColor getTitleColor() const { return m_settings.m_rgbColor; }; + virtual void zetHidden(bool hidden) { m_settings.m_hidden = hidden; } + virtual bool getHidden() const { return m_settings.m_hidden; } public slots: void channelMarkerChangedByCursor(); diff --git a/plugins/channeltx/udpsource/udpsourcesettings.cpp b/plugins/channeltx/udpsource/udpsourcesettings.cpp index b270d7707..346cb996c 100644 --- a/plugins/channeltx/udpsource/udpsourcesettings.cpp +++ b/plugins/channeltx/udpsource/udpsourcesettings.cpp @@ -61,6 +61,7 @@ void UDPSourceSettings::resetToDefaults() m_reverseAPIDeviceIndex = 0; m_reverseAPIChannelIndex = 0; m_workspaceIndex = 0; + m_hidden = false; } QByteArray UDPSourceSettings::serialize() const @@ -105,6 +106,7 @@ QByteArray UDPSourceSettings::serialize() const s.writeS32(28, m_workspaceIndex); s.writeBlob(29, m_geometryBytes); + s.writeBool(30, m_hidden); return s.final(); } @@ -201,6 +203,7 @@ bool UDPSourceSettings::deserialize(const QByteArray& data) d.readS32(28, &m_workspaceIndex, 0); d.readBlob(29, &m_geometryBytes); + d.readBool(30, &m_hidden, false); return true; } diff --git a/plugins/channeltx/udpsource/udpsourcesettings.h b/plugins/channeltx/udpsource/udpsourcesettings.h index 1b02f8fcf..3aa3b5429 100644 --- a/plugins/channeltx/udpsource/udpsourcesettings.h +++ b/plugins/channeltx/udpsource/udpsourcesettings.h @@ -69,6 +69,7 @@ struct UDPSourceSettings uint16_t m_reverseAPIChannelIndex; int m_workspaceIndex; QByteArray m_geometryBytes; + bool m_hidden; Serializable *m_channelMarker; Serializable *m_spectrumGUI; diff --git a/sdrgui/channel/channelgui.h b/sdrgui/channel/channelgui.h index 4b8424314..c305b0aa5 100644 --- a/sdrgui/channel/channelgui.h +++ b/sdrgui/channel/channelgui.h @@ -64,6 +64,8 @@ public: virtual QByteArray getGeometryBytes() const = 0; virtual QString getTitle() const = 0; virtual QColor getTitleColor() const = 0; + virtual void zetHidden(bool hidden) = 0; + virtual bool getHidden() const = 0; virtual MessageQueue* getInputMessageQueue() = 0; diff --git a/sdrgui/device/deviceuiset.cpp b/sdrgui/device/deviceuiset.cpp index 74f813e4a..da3373072 100644 --- a/sdrgui/device/deviceuiset.cpp +++ b/sdrgui/device/deviceuiset.cpp @@ -306,6 +306,10 @@ void DeviceUISet::loadRxChannelSettings(const Preset *preset, PluginAPI *pluginA currentWorkspace->addToMdiArea((QMdiSubWindow*) rxChannelGUI); } + if (rxChannelGUI->getHidden()) { + rxChannelGUI->hide(); + } + rxChannelGUI->restoreGeometry(rxChannelGUI->getGeometryBytes()); rxChannelGUI->setDeviceType(ChannelGUI::DeviceRx); rxChannelGUI->setDeviceSetIndex(m_deviceSetIndex); @@ -336,6 +340,7 @@ void DeviceUISet::saveRxChannelSettings(Preset *preset) const ChannelGUI *channelGUI = m_channelInstanceRegistrations[i].m_gui; qDebug("DeviceUISet::saveRxChannelSettings: saving channel [%s]", qPrintable(m_channelInstanceRegistrations[i].m_channelAPI->getURI())); channelGUI->setGeometryBytes(channelGUI->saveGeometry()); + channelGUI->zetHidden(channelGUI->isHidden()); preset->addChannel(m_channelInstanceRegistrations[i].m_channelAPI->getURI(), channelGUI->serialize()); } } @@ -415,6 +420,10 @@ void DeviceUISet::loadTxChannelSettings(const Preset *preset, PluginAPI *pluginA currentWorkspace->addToMdiArea((QMdiSubWindow*) txChannelGUI); } + if (txChannelGUI->getHidden()) { + txChannelGUI->hide(); + } + txChannelGUI->restoreGeometry(txChannelGUI->getGeometryBytes()); txChannelGUI->setDeviceType(ChannelGUI::DeviceRx); txChannelGUI->setDeviceSetIndex(m_deviceSetIndex); @@ -446,6 +455,7 @@ void DeviceUISet::saveTxChannelSettings(Preset *preset) const ChannelGUI *channelGUI = m_channelInstanceRegistrations[i].m_gui; qDebug("DeviceUISet::saveTxChannelSettings: saving channel [%s]", qPrintable(m_channelInstanceRegistrations[i].m_channelAPI->getURI())); channelGUI->setGeometryBytes(channelGUI->saveGeometry()); + channelGUI->zetHidden(channelGUI->isHidden()); preset->addChannel(m_channelInstanceRegistrations[i].m_channelAPI->getURI(), channelGUI->serialize()); } } @@ -526,6 +536,10 @@ void DeviceUISet::loadMIMOChannelSettings(const Preset *preset, PluginAPI *plugi currentWorkspace->addToMdiArea((QMdiSubWindow*) mimoChannelGUI); } + if (mimoChannelGUI->getHidden()) { + mimoChannelGUI->hide(); + } + mimoChannelGUI->restoreGeometry(mimoChannelGUI->getGeometryBytes()); mimoChannelGUI->setDeviceType(ChannelGUI::DeviceRx); mimoChannelGUI->setDeviceSetIndex(m_deviceSetIndex); @@ -556,6 +570,7 @@ void DeviceUISet::saveMIMOChannelSettings(Preset *preset) const ChannelGUI *channelGUI = m_channelInstanceRegistrations[i].m_gui; qDebug("DeviceUISet::saveMIMOChannelSettings: saving channel [%s]", qPrintable(m_channelInstanceRegistrations[i].m_channelAPI->getURI())); channelGUI->setGeometryBytes(channelGUI->saveGeometry()); + channelGUI->zetHidden(channelGUI->isHidden()); preset->addChannel(m_channelInstanceRegistrations[i].m_channelAPI->getURI(), channelGUI->serialize()); } }