VE7UWU/sdrangel
1
0
Fork 0
mirror of https://github.com/f4exb/sdrangel.git synced 2026-06-17 05:08:54 -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/localinput/localinput.cpp
+9
View File
@@ -306,6 +306,9 @@ void LocalInput::webapiUpdateDeviceSettings(
const QStringList& deviceSettingsKeys,
SWGSDRangel::SWGDeviceSettings& response)
{
if (deviceSettingsKeys.contains("title")) {
settings.m_title = *response.getLocalInputSettings()->getTitle();
}
if (deviceSettingsKeys.contains("dcBlock")) {
settings.m_dcBlock = response.getLocalInputSettings()->getDcBlock() != 0;
}
@@ -328,6 +331,12 @@ void LocalInput::webapiUpdateDeviceSettings(
void LocalInput::webapiFormatDeviceSettings(SWGSDRangel::SWGDeviceSettings& response, const LocalInputSettings& settings)
{
if (response.getLocalInputSettings()->getTitle()) {
*response.getLocalInputSettings()->getTitle() = settings.m_title;
} else {
response.getLocalInputSettings()->setTitle(new QString(settings.m_title));
}
response.getLocalInputSettings()->setDcBlock(settings.m_dcBlock ? 1 : 0);
response.getLocalInputSettings()->setIqCorrection(settings.m_iqCorrection);
plugins/samplesource/localinput/localinputgui.cpp
+21 -9
View File
@@ -35,6 +35,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"
@@ -235,6 +236,8 @@ void LocalInputGui::displaySettings()
{
blockApplySettings(true);
setTitle(m_settings.m_title);
getDeviceUISet()->m_mainSpectrumGUI->setTitle(m_settings.m_title);
ui->centerFrequency->setText(tr("%L1").arg(m_streamCenterFrequency));
ui->deviceRateText->setText(tr("%1k").arg(m_streamSampleRate / 1000.0));
@@ -325,21 +328,30 @@ void LocalInputGui::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("title");
m_settingsKeys.append("useReverseAPI");
m_settingsKeys.append("reverseAPIAddress");
m_settingsKeys.append("reverseAPIPort");
m_settingsKeys.append("reverseAPIDeviceIndex");
sendSettings();
sendSettings();
}
}
resetContextMenuType();
plugins/samplesource/localinput/localinputsettings.cpp
+9
View File
@@ -27,6 +27,7 @@ LocalInputSettings::LocalInputSettings()
void LocalInputSettings::resetToDefaults()
{
m_title = "LocalInput";
m_dcBlock = false;
m_iqCorrection = false;
m_useReverseAPI = false;
@@ -45,6 +46,7 @@ QByteArray LocalInputSettings::serialize() const
s.writeString(4, m_reverseAPIAddress);
s.writeU32(5, m_reverseAPIPort);
s.writeU32(6, m_reverseAPIDeviceIndex);
s.writeString(7, m_title);
return s.final();
}
@@ -77,6 +79,7 @@ bool LocalInputSettings::deserialize(const QByteArray& data)
d.readU32(6, &uintval, 0);
m_reverseAPIDeviceIndex = uintval > 99 ? 99 : uintval;
d.readString(7, &m_title, "LocalInput");
return true;
}
@@ -89,6 +92,9 @@ bool LocalInputSettings::deserialize(const QByteArray& data)
void LocalInputSettings::applySettings(const QStringList& settingsKeys, const LocalInputSettings& settings)
{
if (settingsKeys.contains("title")) {
m_title = settings.m_title;
}
if (settingsKeys.contains("dcBlock")) {
m_dcBlock = settings.m_dcBlock;
}
@@ -113,6 +119,9 @@ QString LocalInputSettings::getDebugString(const QStringList& settingsKeys, bool
{
std::ostringstream ostr;
if (settingsKeys.contains("title") || force) {
ostr << " m_title: " << m_title.toStdString();
}
if (settingsKeys.contains("dcBlock") || force) {
ostr << " m_dcBlock: " << m_dcBlock;
}
plugins/samplesource/localinput/localinputsettings.h
+3 -1
View File
@@ -23,7 +23,9 @@
#include <QByteArray>
#include <QString>
struct LocalInputSettings {
struct LocalInputSettings
{
QString m_title;
bool m_dcBlock;
bool m_iqCorrection;
bool m_useReverseAPI;