diff --git a/plugins/channelmimo/beamsteeringcwmod/beamsteeringcwmodgui.cpp b/plugins/channelmimo/beamsteeringcwmod/beamsteeringcwmodgui.cpp index 4077b9114..5acd991ba 100644 --- a/plugins/channelmimo/beamsteeringcwmod/beamsteeringcwmodgui.cpp +++ b/plugins/channelmimo/beamsteeringcwmod/beamsteeringcwmodgui.cpp @@ -37,25 +37,6 @@ void BeamSteeringCWModGUI::destroy() delete this; } -void BeamSteeringCWModGUI::setName(const QString& name) -{ - setObjectName(name); -} - -QString BeamSteeringCWModGUI::getName() const -{ - return objectName(); -} - -qint64 BeamSteeringCWModGUI::getCenterFrequency() const { - return 0; -} - -void BeamSteeringCWModGUI::setCenterFrequency(qint64 centerFrequency) -{ - (void) centerFrequency; -} - void BeamSteeringCWModGUI::resetToDefaults() { m_settings.resetToDefaults(); diff --git a/plugins/channelmimo/beamsteeringcwmod/beamsteeringcwmodgui.h b/plugins/channelmimo/beamsteeringcwmod/beamsteeringcwmodgui.h index eef3b71c4..6dd2921ae 100644 --- a/plugins/channelmimo/beamsteeringcwmod/beamsteeringcwmodgui.h +++ b/plugins/channelmimo/beamsteeringcwmod/beamsteeringcwmodgui.h @@ -44,11 +44,7 @@ public: static BeamSteeringCWModGUI* create(PluginAPI* pluginAPI, DeviceUISet *deviceUISet, MIMOChannel *mimoChannel); virtual void destroy(); - void setName(const QString& name); - QString getName() const; virtual void resetToDefaults(); - virtual qint64 getCenterFrequency() const; - virtual void setCenterFrequency(qint64 centerFrequency); QByteArray serialize() const; bool deserialize(const QByteArray& data); virtual MessageQueue *getInputMessageQueue() { return &m_inputMessageQueue; } diff --git a/plugins/channelmimo/interferometer/interferometergui.cpp b/plugins/channelmimo/interferometer/interferometergui.cpp index 04672d332..2906c6455 100644 --- a/plugins/channelmimo/interferometer/interferometergui.cpp +++ b/plugins/channelmimo/interferometer/interferometergui.cpp @@ -39,25 +39,6 @@ void InterferometerGUI::destroy() delete this; } -void InterferometerGUI::setName(const QString& name) -{ - setObjectName(name); -} - -QString InterferometerGUI::getName() const -{ - return objectName(); -} - -qint64 InterferometerGUI::getCenterFrequency() const { - return m_centerFrequency; -} - -void InterferometerGUI::setCenterFrequency(qint64 centerFrequency) -{ - (void) centerFrequency; -} - void InterferometerGUI::resetToDefaults() { m_settings.resetToDefaults(); diff --git a/plugins/channelmimo/interferometer/interferometergui.h b/plugins/channelmimo/interferometer/interferometergui.h index 707da03d0..6bdd82e28 100644 --- a/plugins/channelmimo/interferometer/interferometergui.h +++ b/plugins/channelmimo/interferometer/interferometergui.h @@ -43,11 +43,7 @@ public: static InterferometerGUI* create(PluginAPI* pluginAPI, DeviceUISet *deviceUISet, MIMOChannel *mimoChannel); virtual void destroy(); - virtual void setName(const QString& name); - virtual QString getName() const; virtual void resetToDefaults(); - virtual qint64 getCenterFrequency() const; - virtual void setCenterFrequency(qint64 centerFrequency); virtual QByteArray serialize() const; virtual bool deserialize(const QByteArray& data); virtual MessageQueue* getInputMessageQueue(); @@ -94,4 +90,4 @@ private slots: void tick(); }; -#endif // INCLUDE_INTERFEROMETERGUI_H \ No newline at end of file +#endif // INCLUDE_INTERFEROMETERGUI_H diff --git a/plugins/channelrx/demodchirpchat/chirpchatdemodgui.cpp b/plugins/channelrx/demodchirpchat/chirpchatdemodgui.cpp index 4166effcd..4ebd74836 100644 --- a/plugins/channelrx/demodchirpchat/chirpchatdemodgui.cpp +++ b/plugins/channelrx/demodchirpchat/chirpchatdemodgui.cpp @@ -47,26 +47,6 @@ void ChirpChatDemodGUI::destroy() delete this; } -void ChirpChatDemodGUI::setName(const QString& name) -{ - setObjectName(name); -} - -QString ChirpChatDemodGUI::getName() const -{ - return objectName(); -} - -qint64 ChirpChatDemodGUI::getCenterFrequency() const { - return m_channelMarker.getCenterFrequency(); -} - -void ChirpChatDemodGUI::setCenterFrequency(qint64 centerFrequency) -{ - m_channelMarker.setCenterFrequency(centerFrequency); - applySettings(); -} - void ChirpChatDemodGUI::resetToDefaults() { m_settings.resetToDefaults(); diff --git a/plugins/channelrx/demodchirpchat/chirpchatdemodgui.h b/plugins/channelrx/demodchirpchat/chirpchatdemodgui.h index 423f7390f..b75f30c4d 100644 --- a/plugins/channelrx/demodchirpchat/chirpchatdemodgui.h +++ b/plugins/channelrx/demodchirpchat/chirpchatdemodgui.h @@ -42,11 +42,6 @@ public: static ChirpChatDemodGUI* create(PluginAPI* pluginAPI, DeviceUISet *deviceAPI, BasebandSampleSink *rxChannel); virtual void destroy(); - void setName(const QString& name); - QString getName() const; - virtual qint64 getCenterFrequency() const; - virtual void setCenterFrequency(qint64 centerFrequency); - void resetToDefaults(); QByteArray serialize() const; bool deserialize(const QByteArray& data); diff --git a/plugins/channelrx/sigmffilesink/sigmffilesinkgui.cpp b/plugins/channelrx/sigmffilesink/sigmffilesinkgui.cpp index c32eed9e3..05854089a 100644 --- a/plugins/channelrx/sigmffilesink/sigmffilesinkgui.cpp +++ b/plugins/channelrx/sigmffilesink/sigmffilesinkgui.cpp @@ -43,25 +43,6 @@ void SigMFFileSinkGUI::destroy() delete this; } -void SigMFFileSinkGUI::setName(const QString& name) -{ - setObjectName(name); -} - -QString SigMFFileSinkGUI::getName() const -{ - return objectName(); -} - -qint64 SigMFFileSinkGUI::getCenterFrequency() const { - return 0; -} - -void SigMFFileSinkGUI::setCenterFrequency(qint64 centerFrequency) -{ - (void) centerFrequency; -} - void SigMFFileSinkGUI::resetToDefaults() { m_settings.resetToDefaults(); diff --git a/plugins/channelrx/sigmffilesink/sigmffilesinkgui.h b/plugins/channelrx/sigmffilesink/sigmffilesinkgui.h index 6d375650f..46acee218 100644 --- a/plugins/channelrx/sigmffilesink/sigmffilesinkgui.h +++ b/plugins/channelrx/sigmffilesink/sigmffilesinkgui.h @@ -45,11 +45,6 @@ public: static SigMFFileSinkGUI* create(PluginAPI* pluginAPI, DeviceUISet *deviceUISet, BasebandSampleSink *rxChannel); virtual void destroy(); - void setName(const QString& name); - QString getName() const; - virtual qint64 getCenterFrequency() const; - virtual void setCenterFrequency(qint64 centerFrequency); - void resetToDefaults(); QByteArray serialize() const; bool deserialize(const QByteArray& data); diff --git a/plugins/channeltx/modchirpchat/chirpchatmodgui.cpp b/plugins/channeltx/modchirpchat/chirpchatmodgui.cpp index c859dbdce..bc1667db5 100644 --- a/plugins/channeltx/modchirpchat/chirpchatmodgui.cpp +++ b/plugins/channeltx/modchirpchat/chirpchatmodgui.cpp @@ -47,26 +47,6 @@ void ChirpChatModGUI::destroy() delete this; } -void ChirpChatModGUI::setName(const QString& name) -{ - setObjectName(name); -} - -QString ChirpChatModGUI::getName() const -{ - return objectName(); -} - -qint64 ChirpChatModGUI::getCenterFrequency() const { - return m_channelMarker.getCenterFrequency(); -} - -void ChirpChatModGUI::setCenterFrequency(qint64 centerFrequency) -{ - m_channelMarker.setCenterFrequency(centerFrequency); - applySettings(); -} - void ChirpChatModGUI::resetToDefaults() { m_settings.resetToDefaults(); diff --git a/plugins/channeltx/modchirpchat/chirpchatmodgui.h b/plugins/channeltx/modchirpchat/chirpchatmodgui.h index f10a77acb..8294f1e4e 100644 --- a/plugins/channeltx/modchirpchat/chirpchatmodgui.h +++ b/plugins/channeltx/modchirpchat/chirpchatmodgui.h @@ -42,11 +42,6 @@ public: static ChirpChatModGUI* create(PluginAPI* pluginAPI, DeviceUISet *deviceUISet, BasebandSampleSource *channelTx); virtual void destroy(); - void setName(const QString& name); - QString getName() const; - virtual qint64 getCenterFrequency() const; - virtual void setCenterFrequency(qint64 centerFrequency); - void resetToDefaults(); QByteArray serialize() const; bool deserialize(const QByteArray& data); diff --git a/plugins/samplemimo/bladerf2mimo/bladerf2mimogui.cpp b/plugins/samplemimo/bladerf2mimo/bladerf2mimogui.cpp index 6e42c33f6..cb302274c 100644 --- a/plugins/samplemimo/bladerf2mimo/bladerf2mimogui.cpp +++ b/plugins/samplemimo/bladerf2mimo/bladerf2mimogui.cpp @@ -112,16 +112,6 @@ void BladeRF2MIMOGui::destroy() delete this; } -void BladeRF2MIMOGui::setName(const QString& name) -{ - setObjectName(name); -} - -QString BladeRF2MIMOGui::getName() const -{ - return objectName(); -} - void BladeRF2MIMOGui::resetToDefaults() { m_settings.resetToDefaults(); @@ -129,18 +119,6 @@ void BladeRF2MIMOGui::resetToDefaults() sendSettings(); } -qint64 BladeRF2MIMOGui::getCenterFrequency() const -{ - return m_settings.m_rxCenterFrequency; -} - -void BladeRF2MIMOGui::setCenterFrequency(qint64 centerFrequency) -{ - m_settings.m_rxCenterFrequency = centerFrequency; - displaySettings(); - sendSettings(); -} - QByteArray BladeRF2MIMOGui::serialize() const { return m_settings.serialize(); @@ -842,4 +820,4 @@ int BladeRF2MIMOGui::getGainValue(float gainDB, int gainMin, int gainMax, int ga qDebug("BladeRF2MIMOGui::getGainValue: gainDB: %f m_gainMin: %d m_gainMax: %d m_gainStep: %d gainScale: %f gain: %d", gainDB, gainMin, gainMax, gainStep, gainScale, gain); return gain; -} \ No newline at end of file +} diff --git a/plugins/samplemimo/bladerf2mimo/bladerf2mimogui.h b/plugins/samplemimo/bladerf2mimo/bladerf2mimogui.h index 223a42f95..892d03092 100644 --- a/plugins/samplemimo/bladerf2mimo/bladerf2mimogui.h +++ b/plugins/samplemimo/bladerf2mimo/bladerf2mimogui.h @@ -40,12 +40,7 @@ public: virtual ~BladeRF2MIMOGui(); virtual void destroy(); - void setName(const QString& name); - QString getName() const; - void resetToDefaults(); - virtual qint64 getCenterFrequency() const; - virtual void setCenterFrequency(qint64 centerFrequency); QByteArray serialize() const; bool deserialize(const QByteArray& data); virtual MessageQueue *getInputMessageQueue() { return &m_inputMessageQueue; } diff --git a/plugins/samplemimo/limesdrmimo/limesdrmimogui.cpp b/plugins/samplemimo/limesdrmimo/limesdrmimogui.cpp index ac561e1ca..df3d35fbc 100644 --- a/plugins/samplemimo/limesdrmimo/limesdrmimogui.cpp +++ b/plugins/samplemimo/limesdrmimo/limesdrmimogui.cpp @@ -112,16 +112,6 @@ void LimeSDRMIMOGUI::destroy() delete this; } -void LimeSDRMIMOGUI::setName(const QString& name) -{ - setObjectName(name); -} - -QString LimeSDRMIMOGUI::getName() const -{ - return objectName(); -} - void LimeSDRMIMOGUI::resetToDefaults() { m_settings.resetToDefaults(); @@ -129,18 +119,6 @@ void LimeSDRMIMOGUI::resetToDefaults() sendSettings(); } -qint64 LimeSDRMIMOGUI::getCenterFrequency() const -{ - return m_settings.m_rxCenterFrequency; -} - -void LimeSDRMIMOGUI::setCenterFrequency(qint64 centerFrequency) -{ - m_settings.m_rxCenterFrequency = centerFrequency; - displaySettings(); - sendSettings(); -} - QByteArray LimeSDRMIMOGUI::serialize() const { return m_settings.serialize(); diff --git a/plugins/samplemimo/limesdrmimo/limesdrmimogui.h b/plugins/samplemimo/limesdrmimo/limesdrmimogui.h index bd7ec8324..06f329ebc 100644 --- a/plugins/samplemimo/limesdrmimo/limesdrmimogui.h +++ b/plugins/samplemimo/limesdrmimo/limesdrmimogui.h @@ -40,12 +40,7 @@ public: virtual ~LimeSDRMIMOGUI(); virtual void destroy(); - void setName(const QString& name); - QString getName() const; - void resetToDefaults(); - virtual qint64 getCenterFrequency() const; - virtual void setCenterFrequency(qint64 centerFrequency); QByteArray serialize() const; bool deserialize(const QByteArray& data); virtual MessageQueue *getInputMessageQueue() { return &m_inputMessageQueue; } @@ -135,4 +130,4 @@ private slots: void openDeviceSettingsDialog(const QPoint& p); }; -#endif // PLUGINS_SAMPLEMIMO_LIMESDRMIMO_LIMESDRMIMOGUI_H_ \ No newline at end of file +#endif // PLUGINS_SAMPLEMIMO_LIMESDRMIMO_LIMESDRMIMOGUI_H_ diff --git a/plugins/samplemimo/metismiso/metismisogui.cpp b/plugins/samplemimo/metismiso/metismisogui.cpp index 245ebc07e..66228cd37 100644 --- a/plugins/samplemimo/metismiso/metismisogui.cpp +++ b/plugins/samplemimo/metismiso/metismisogui.cpp @@ -85,16 +85,6 @@ void MetisMISOGui::destroy() delete this; } -void MetisMISOGui::setName(const QString& name) -{ - setObjectName(name); -} - -QString MetisMISOGui::getName() const -{ - return objectName(); -} - void MetisMISOGui::resetToDefaults() { m_settings.resetToDefaults(); @@ -102,15 +92,6 @@ void MetisMISOGui::resetToDefaults() sendSettings(); } -qint64 MetisMISOGui::getCenterFrequency() const -{ - if (m_streamIndex < MetisMISOSettings::m_maxReceivers) { - return m_settings.m_rxCenterFrequencies[m_streamIndex]; - } else { - return 0; - } -} - void MetisMISOGui::setCenterFrequency(qint64 centerFrequency) { if (m_streamIndex < MetisMISOSettings::m_maxReceivers) { diff --git a/plugins/samplemimo/metismiso/metismisogui.h b/plugins/samplemimo/metismiso/metismisogui.h index 362632e7b..7329a36dc 100644 --- a/plugins/samplemimo/metismiso/metismisogui.h +++ b/plugins/samplemimo/metismiso/metismisogui.h @@ -41,12 +41,7 @@ public: virtual ~MetisMISOGui(); virtual void destroy(); - void setName(const QString& name); - QString getName() const; - void resetToDefaults(); - virtual qint64 getCenterFrequency() const; - virtual void setCenterFrequency(qint64 centerFrequency); QByteArray serialize() const; bool deserialize(const QByteArray& data); virtual MessageQueue *getInputMessageQueue() { return &m_inputMessageQueue; } @@ -79,6 +74,7 @@ private: void updateSubsamplingIndex(); void updateSpectrum(); void sendSettings(); + void setCenterFrequency(qint64 centerFrequency); private slots: void handleInputMessages(); diff --git a/plugins/samplemimo/testmi/testmigui.cpp b/plugins/samplemimo/testmi/testmigui.cpp index 3b24a2c0b..33f72f347 100644 --- a/plugins/samplemimo/testmi/testmigui.cpp +++ b/plugins/samplemimo/testmi/testmigui.cpp @@ -93,16 +93,6 @@ void TestMIGui::destroy() delete this; } -void TestMIGui::setName(const QString& name) -{ - setObjectName(name); -} - -QString TestMIGui::getName() const -{ - return objectName(); -} - void TestMIGui::resetToDefaults() { m_settings.resetToDefaults(); @@ -110,18 +100,6 @@ void TestMIGui::resetToDefaults() sendSettings(); } -qint64 TestMIGui::getCenterFrequency() const -{ - return m_settings.m_streams[m_streamIndex].m_centerFrequency; -} - -void TestMIGui::setCenterFrequency(qint64 centerFrequency) -{ - m_settings.m_streams[m_streamIndex].m_centerFrequency = centerFrequency; - displaySettings(); - sendSettings(); -} - QByteArray TestMIGui::serialize() const { return m_settings.serialize(); diff --git a/plugins/samplemimo/testmi/testmigui.h b/plugins/samplemimo/testmi/testmigui.h index 493fef049..4f7fa8ac5 100644 --- a/plugins/samplemimo/testmi/testmigui.h +++ b/plugins/samplemimo/testmi/testmigui.h @@ -41,12 +41,7 @@ public: virtual ~TestMIGui(); virtual void destroy(); - void setName(const QString& name); - QString getName() const; - void resetToDefaults(); - virtual qint64 getCenterFrequency() const; - virtual void setCenterFrequency(qint64 centerFrequency); QByteArray serialize() const; bool deserialize(const QByteArray& data); virtual MessageQueue *getInputMessageQueue() { return &m_inputMessageQueue; } diff --git a/plugins/samplemimo/testmosync/testmosyncgui.cpp b/plugins/samplemimo/testmosync/testmosyncgui.cpp index 7ee38ff7f..6d24a9f61 100644 --- a/plugins/samplemimo/testmosync/testmosyncgui.cpp +++ b/plugins/samplemimo/testmosync/testmosyncgui.cpp @@ -90,16 +90,6 @@ void TestMOSyncGui::destroy() delete this; } -void TestMOSyncGui::setName(const QString& name) -{ - setObjectName(name); -} - -QString TestMOSyncGui::getName() const -{ - return objectName(); -} - void TestMOSyncGui::resetToDefaults() { m_settings.resetToDefaults(); @@ -107,18 +97,6 @@ void TestMOSyncGui::resetToDefaults() sendSettings(); } -qint64 TestMOSyncGui::getCenterFrequency() const -{ - return m_settings.m_centerFrequency; -} - -void TestMOSyncGui::setCenterFrequency(qint64 centerFrequency) -{ - m_settings.m_centerFrequency = centerFrequency; - displaySettings(); - sendSettings(); -} - QByteArray TestMOSyncGui::serialize() const { return m_settings.serialize(); diff --git a/plugins/samplemimo/testmosync/testmosyncgui.h b/plugins/samplemimo/testmosync/testmosyncgui.h index d0006afd2..6ce4763a4 100644 --- a/plugins/samplemimo/testmosync/testmosyncgui.h +++ b/plugins/samplemimo/testmosync/testmosyncgui.h @@ -43,12 +43,7 @@ public: virtual ~TestMOSyncGui(); virtual void destroy(); - void setName(const QString& name); - QString getName() const; - void resetToDefaults(); - virtual qint64 getCenterFrequency() const; - virtual void setCenterFrequency(qint64 centerFrequency); QByteArray serialize() const; bool deserialize(const QByteArray& data); virtual MessageQueue *getInputMessageQueue() { return &m_inputMessageQueue; } diff --git a/plugins/samplemimo/xtrxmimo/xtrxmimogui.cpp b/plugins/samplemimo/xtrxmimo/xtrxmimogui.cpp index 3f526ac39..28f1a8f2a 100644 --- a/plugins/samplemimo/xtrxmimo/xtrxmimogui.cpp +++ b/plugins/samplemimo/xtrxmimo/xtrxmimogui.cpp @@ -109,16 +109,6 @@ void XTRXMIMOGUI::destroy() delete this; } -void XTRXMIMOGUI::setName(const QString& name) -{ - setObjectName(name); -} - -QString XTRXMIMOGUI::getName() const -{ - return objectName(); -} - void XTRXMIMOGUI::resetToDefaults() { m_settings.resetToDefaults(); @@ -126,18 +116,6 @@ void XTRXMIMOGUI::resetToDefaults() sendSettings(); } -qint64 XTRXMIMOGUI::getCenterFrequency() const -{ - return m_settings.m_rxCenterFrequency; -} - -void XTRXMIMOGUI::setCenterFrequency(qint64 centerFrequency) -{ - m_settings.m_rxCenterFrequency = centerFrequency; - displaySettings(); - sendSettings(); -} - QByteArray XTRXMIMOGUI::serialize() const { return m_settings.serialize(); diff --git a/plugins/samplemimo/xtrxmimo/xtrxmimogui.h b/plugins/samplemimo/xtrxmimo/xtrxmimogui.h index 05fcfa1b7..ab8837292 100644 --- a/plugins/samplemimo/xtrxmimo/xtrxmimogui.h +++ b/plugins/samplemimo/xtrxmimo/xtrxmimogui.h @@ -40,12 +40,7 @@ public: virtual ~XTRXMIMOGUI(); virtual void destroy(); - void setName(const QString& name); - QString getName() const; - void resetToDefaults(); - virtual qint64 getCenterFrequency() const; - virtual void setCenterFrequency(qint64 centerFrequency); QByteArray serialize() const; bool deserialize(const QByteArray& data); virtual MessageQueue *getInputMessageQueue() { return &m_inputMessageQueue; } diff --git a/plugins/samplesource/sigmffileinput/sigmffileinputgui.cpp b/plugins/samplesource/sigmffileinput/sigmffileinputgui.cpp index 82bf5b985..b42c1490a 100644 --- a/plugins/samplesource/sigmffileinput/sigmffileinputgui.cpp +++ b/plugins/samplesource/sigmffileinput/sigmffileinputgui.cpp @@ -108,16 +108,6 @@ void SigMFFileInputGUI::destroy() delete this; } -void SigMFFileInputGUI::setName(const QString& name) -{ - setObjectName(name); -} - -QString SigMFFileInputGUI::getName() const -{ - return objectName(); -} - void SigMFFileInputGUI::resetToDefaults() { m_settings.resetToDefaults(); @@ -125,18 +115,6 @@ void SigMFFileInputGUI::resetToDefaults() sendSettings(); } -qint64 SigMFFileInputGUI::getCenterFrequency() const -{ - return m_centerFrequency; -} - -void SigMFFileInputGUI::setCenterFrequency(qint64 centerFrequency) -{ - m_centerFrequency = centerFrequency; - displaySettings(); - sendSettings(); -} - QByteArray SigMFFileInputGUI::serialize() const { return m_settings.serialize(); diff --git a/plugins/samplesource/sigmffileinput/sigmffileinputgui.h b/plugins/samplesource/sigmffileinput/sigmffileinputgui.h index 7908e2970..59d394dfa 100644 --- a/plugins/samplesource/sigmffileinput/sigmffileinputgui.h +++ b/plugins/samplesource/sigmffileinput/sigmffileinputgui.h @@ -42,12 +42,7 @@ public: virtual ~SigMFFileInputGUI(); virtual void destroy(); - void setName(const QString& name); - QString getName() const; - void resetToDefaults(); - virtual qint64 getCenterFrequency() const; - virtual void setCenterFrequency(qint64 centerFrequency); QByteArray serialize() const; bool deserialize(const QByteArray& data); virtual MessageQueue *getInputMessageQueue() { return &m_inputMessageQueue; }