Make device title editable in the basic device settings. Fixes #2292

plugins/samplesource/usrpinput/usrpinput.cpp

@@ -1145,6 +1145,9 @@ void USRPInput::webapiUpdateDeviceSettings(
         const QStringList& deviceSettingsKeys,
         SWGSDRangel::SWGDeviceSettings& response)
 {
+    if (deviceSettingsKeys.contains("title")) {
+        settings.m_title = *response.getUsrpInputSettings()->getTitle();
+    }
     if (deviceSettingsKeys.contains("antennaPath")) {
         settings.m_antennaPath = *response.getUsrpInputSettings()->getAntennaPath();
     }
@@ -1206,6 +1209,12 @@ void USRPInput::webapiUpdateDeviceSettings(
 
 void USRPInput::webapiFormatDeviceSettings(SWGSDRangel::SWGDeviceSettings& response, const USRPInputSettings& settings)
 {
+    if (response.getUsrpInputSettings()->getTitle()) {
+        *response.getUsrpInputSettings()->getTitle() = settings.m_title;
+    } else {
+        response.getUsrpInputSettings()->setTitle(new QString(settings.m_title));
+    }
+
     response.getUsrpInputSettings()->setAntennaPath(new QString(settings.m_antennaPath));
     response.getUsrpInputSettings()->setCenterFrequency(settings.m_centerFrequency);
     response.getUsrpInputSettings()->setDcBlock(settings.m_dcBlock ? 1 : 0);
@@ -1302,6 +1311,9 @@ void USRPInput::webapiReverseSendSettings(const QList<QString>& deviceSettingsKe
 
     // transfer data that has been modified. When force is on transfer all data except reverse API data
 
+    if (deviceSettingsKeys.contains("title") || force) {
+        swgUsrpInputSettings->setTitle(new QString(settings.m_title));
+    }
     if (deviceSettingsKeys.contains("antennaPath") || force) {
         swgUsrpInputSettings->setAntennaPath(new QString(settings.m_antennaPath));
     }

plugins/samplesource/usrpinput/usrpinputgui.cpp

@@ -29,6 +29,7 @@
 #include "gui/glspectrum.h"
 #include "gui/basicdevicesettingsdialog.h"
 #include "gui/dialogpositioner.h"
+#include "mainspectrum/mainspectrumgui.h"
 #include "dsp/dspcommands.h"
 #include "device/deviceapi.h"
 #include "device/deviceuiset.h"
@@ -375,6 +376,8 @@ void USRPInputGUI::displaySampleRate()
 
 void USRPInputGUI::displaySettings()
 {
+    setTitle(m_settings.m_title);
+    getDeviceUISet()->m_mainSpectrumGUI->setTitle(m_settings.m_title);
     ui->transverter->setDeltaFrequency(m_settings.m_transverterDeltaFrequency);
     ui->transverter->setDeltaFrequencyActive(m_settings.m_transverterMode);
 
@@ -656,28 +659,37 @@ void USRPInputGUI::openDeviceSettingsDialog(const QPoint& p)
         dialog.setReverseAPIAddress(m_settings.m_reverseAPIAddress);
         dialog.setReverseAPIPort(m_settings.m_reverseAPIPort);
         dialog.setReverseAPIDeviceIndex(m_settings.m_reverseAPIDeviceIndex);
+        dialog.setTitle(m_settings.m_title);
+        dialog.setDefaultTitle(getDefaultTitle());
 
         dialog.move(p);
         new DialogPositioner(&dialog, false);
         dialog.exec();
 
-        m_settings.m_useReverseAPI = dialog.useReverseAPI();
-        m_settings.m_reverseAPIAddress = dialog.getReverseAPIAddress();
-        m_settings.m_reverseAPIPort = dialog.getReverseAPIPort();
-        m_settings.m_reverseAPIDeviceIndex = dialog.getReverseAPIDeviceIndex();
-        m_settings.m_replayLength = dialog.getReplayLength();
-        m_settings.m_replayStep = dialog.getReplayStep();
-        displayReplayLength();
-        displayReplayOffset();
-        displayReplayStep();
-        m_settingsKeys.append("useReverseAPI");
-        m_settingsKeys.append("reverseAPIAddress");
-        m_settingsKeys.append("reverseAPIPort");
-        m_settingsKeys.append("reverseAPIDeviceIndex");
-        m_settingsKeys.append("replayLength");
-        m_settingsKeys.append("replayStep");
+        if (dialog.result() == QDialog::Accepted)
+        {
+            m_settings.m_title = dialog.getTitle();
+            setTitle(m_settings.m_title);
+            getDeviceUISet()->m_mainSpectrumGUI->setTitle(m_settings.m_title);
+            m_settings.m_useReverseAPI = dialog.useReverseAPI();
+            m_settings.m_reverseAPIAddress = dialog.getReverseAPIAddress();
+            m_settings.m_reverseAPIPort = dialog.getReverseAPIPort();
+            m_settings.m_reverseAPIDeviceIndex = dialog.getReverseAPIDeviceIndex();
+            m_settings.m_replayLength = dialog.getReplayLength();
+            m_settings.m_replayStep = dialog.getReplayStep();
+            displayReplayLength();
+            displayReplayOffset();
+            displayReplayStep();
+            m_settingsKeys.append("title");
+            m_settingsKeys.append("useReverseAPI");
+            m_settingsKeys.append("reverseAPIAddress");
+            m_settingsKeys.append("reverseAPIPort");
+            m_settingsKeys.append("reverseAPIDeviceIndex");
+            m_settingsKeys.append("replayLength");
+            m_settingsKeys.append("replayStep");
 
-        sendSettings();
+            sendSettings();
+        }
     }
 
     resetContextMenuType();

plugins/samplesource/usrpinput/usrpinputsettings.cpp

@@ -28,6 +28,7 @@ USRPInputSettings::USRPInputSettings()
 
 void USRPInputSettings::resetToDefaults()
 {
+    m_title = "USRP";
     m_masterClockRate = -1; // Calculated by UHD
     m_centerFrequency = 435000*1000;
     m_devSampleRate = 3000000;
@@ -80,6 +81,7 @@ QByteArray USRPInputSettings::serialize() const
     s.writeBool(20, m_replayLoop);
     s.writeU32(21, m_gpioDir);
     s.writeU32(22, m_gpioPins);
+    s.writeString(23, m_title);
 
     return s.final();
 }
@@ -132,6 +134,7 @@ bool USRPInputSettings::deserialize(const QByteArray& data)
         m_gpioDir = uintval & 0xFF;
         d.readU32(22, &uintval, 0);
         m_gpioPins = uintval & 0xFF;
+        d.readString(23, &m_title, "USRP");
 
         return true;
     }
@@ -145,6 +148,9 @@ bool USRPInputSettings::deserialize(const QByteArray& data)
 
 void USRPInputSettings::applySettings(const QStringList& settingsKeys, const USRPInputSettings& settings)
 {
+    if (settingsKeys.contains("title")) {
+        m_title = settings.m_title;
+    }
     if (settingsKeys.contains("masterClockRate")) {
         m_masterClockRate = settings.m_masterClockRate;
     }
@@ -223,6 +229,9 @@ QString USRPInputSettings::getDebugString(const QStringList& settingsKeys, bool
 {
     std::ostringstream ostr;
 
+    if (settingsKeys.contains("title") || force) {
+        ostr << " m_title: " << m_title.toStdString();
+    }
     if (settingsKeys.contains("masterClockRate") || force) {
         ostr << " m_masterClockRate: " << m_masterClockRate;
     }

plugins/samplesource/usrpinput/usrpinputsettings.h

@@ -36,6 +36,7 @@ struct USRPInputSettings
         GAIN_MANUAL
     } GainMode;
 
+    QString  m_title;
     int      m_masterClockRate;
     // global settings to be saved
     uint64_t m_centerFrequency;