VE7UWU/sdrangel
1
0
Fork 0
mirror of https://github.com/f4exb/sdrangel.git synced 2026-08-14 15:33:34 -04:00
Code Issues Projects Releases Wiki Activity

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

Browse Source
This commit is contained in:
f4exb
2026-01-28 02:48:42 +01:00
parent 5d6840b55a
commit 63348eeee1
354 changed files with 3956 additions and 479 deletions
Download Patch File Download Diff File Expand all files Collapse all files
plugins/samplesource/plutosdrinput/plutosdrinput.cpp
+12
View File
@@ -827,6 +827,9 @@ void PlutoSDRInput::webapiUpdateDeviceSettings(
const QStringList& deviceSettingsKeys,
SWGSDRangel::SWGDeviceSettings& response)
{
if (deviceSettingsKeys.contains("title")) {
settings.m_title = *response.getPlutoSdrInputSettings()->getTitle();
}
if (deviceSettingsKeys.contains("centerFrequency")) {
settings.m_centerFrequency = response.getPlutoSdrInputSettings()->getCenterFrequency();
}
@@ -923,6 +926,12 @@ int PlutoSDRInput::webapiReportGet(
void PlutoSDRInput::webapiFormatDeviceSettings(SWGSDRangel::SWGDeviceSettings& response, const PlutoSDRInputSettings& settings)
{
if (response.getPlutoSdrInputSettings()->getTitle()) {
*response.getPlutoSdrInputSettings()->getTitle() = settings.m_title;
} else {
response.getPlutoSdrInputSettings()->setTitle(new QString(settings.m_title));
}
response.getPlutoSdrInputSettings()->setCenterFrequency(settings.m_centerFrequency);
response.getPlutoSdrInputSettings()->setDevSampleRate(settings.m_devSampleRate);
response.getPlutoSdrInputSettings()->setLOppmTenths(settings.m_LOppmTenths);
@@ -981,6 +990,9 @@ void PlutoSDRInput::webapiReverseSendSettings(const QList<QString>& deviceSettin
// transfer data that has been modified. When force is on transfer all data except reverse API data
if (deviceSettingsKeys.contains("title") || force) {
swgPlutoSdrInputSettings->setTitle(new QString(settings.m_title));
}
if (deviceSettingsKeys.contains("centerFrequency") || force) {
swgPlutoSdrInputSettings->setCenterFrequency(settings.m_centerFrequency);
}
plugins/samplesource/plutosdrinput/plutosdrinputgui.cpp
+20 -9
View File
@@ -29,6 +29,7 @@
#include "gui/basicdevicesettingsdialog.h"
#include "gui/dialpopup.h"
#include "gui/dialogpositioner.h"
#include "mainspectrum/mainspectrumgui.h"
#include "device/deviceapi.h"
#include "device/deviceuiset.h"
#include "plutosdr/deviceplutosdr.h"
@@ -402,6 +403,8 @@ void PlutoSDRInputGui::displayFcTooltip()
void PlutoSDRInputGui::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);
ui->transverter->setIQOrder(m_settings.m_iqOrder);
@@ -609,21 +612,29 @@ void PlutoSDRInputGui::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_settingsKeys.append("useReverseAPI");
m_settingsKeys.append("reverseAPIAddress");
m_settingsKeys.append("reverseAPIPort");
m_settingsKeys.append("reverseAPIDeviceIndex");
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_settingsKeys.append("useReverseAPI");
m_settingsKeys.append("reverseAPIAddress");
m_settingsKeys.append("reverseAPIPort");
m_settingsKeys.append("reverseAPIDeviceIndex");
sendSettings();
sendSettings();
}
}
resetContextMenuType();
plugins/samplesource/plutosdrinput/plutosdrinputsettings.cpp
+9
View File
@@ -28,6 +28,7 @@ PlutoSDRInputSettings::PlutoSDRInputSettings()
void PlutoSDRInputSettings::resetToDefaults()
{
m_title = "PlutoSDR";
m_centerFrequency = 435000 * 1000;
m_fcPos = FC_POS_CENTER;
m_LOppmTenths = 0;
@@ -83,6 +84,7 @@ QByteArray PlutoSDRInputSettings::serialize() const
s.writeBool(23, m_hwRFDCBlock);
s.writeBool(24, m_hwIQCorrection);
s.writeBool(25, m_iqOrder);
s.writeString(26, m_title);
return s.final();
}
@@ -155,6 +157,7 @@ bool PlutoSDRInputSettings::deserialize(const QByteArray& data)
d.readBool(23, &m_hwRFDCBlock, true);
d.readBool(24, &m_hwIQCorrection, true);
d.readBool(25, &m_iqOrder, true);
d.readString(26, &m_title, "PlutoSDR");
return true;
}
@@ -235,6 +238,9 @@ void PlutoSDRInputSettings::translateGainMode(GainMode mode, QString& s)
void PlutoSDRInputSettings::applySettings(const QStringList& settingsKeys, const PlutoSDRInputSettings& settings)
{
if (settingsKeys.contains("title")) {
m_title = settings.m_title;
}
if (settingsKeys.contains("centerFrequency")) {
m_centerFrequency = settings.m_centerFrequency;
}
@@ -316,6 +322,9 @@ QString PlutoSDRInputSettings::getDebugString(const QStringList& settingsKeys, b
{
std::ostringstream ostr;
if (settingsKeys.contains("title") || force) {
ostr << " m_title: " << m_title.toStdString();
}
if (settingsKeys.contains("centerFrequency") || force) {
ostr << " m_centerFrequency: " << m_centerFrequency;
}
plugins/samplesource/plutosdrinput/plutosdrinputsettings.h
+1
View File
@@ -59,6 +59,7 @@ struct PlutoSDRInputSettings {
} GainMode;
// global settings to be saved
QString m_title;
quint64 m_centerFrequency;
// common device settings
quint64 m_devSampleRate; //!< Host interface sample rate