VE7UWU/sdrangel
1
0
Fork 0
mirror of https://github.com/f4exb/sdrangel.git synced 2026-06-07 08:24:43 -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/xtrxinput/xtrxinputgui.cpp
+20 -9
View File
@@ -31,6 +31,7 @@
#include "gui/basicdevicesettingsdialog.h"
#include "gui/dialpopup.h"
#include "gui/dialogpositioner.h"
#include "mainspectrum/mainspectrumgui.h"
#include "dsp/dspcommands.h"
#include "device/deviceapi.h"
#include "device/deviceuiset.h"
@@ -313,6 +314,8 @@ void XTRXInputGUI::displaySampleRate()
void XTRXInputGUI::displaySettings()
{
setTitle(m_settings.m_title);
getDeviceUISet()->m_mainSpectrumGUI->setTitle(m_settings.m_title);
ui->extClock->setExternalClockFrequency(m_settings.m_extClockFreq);
ui->extClock->setExternalClockActive(m_settings.m_extClock);
@@ -675,21 +678,29 @@ void XTRXInputGUI::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();
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/xtrxinput/xtrxinputsettings.cpp
+9
View File
@@ -28,6 +28,7 @@ XTRXInputSettings::XTRXInputSettings()
void XTRXInputSettings::resetToDefaults()
{
m_title = "XTRX";
m_centerFrequency = 435000*1000;
m_devSampleRate = 5e6;
m_log2HardDecim = 1;
@@ -79,6 +80,7 @@ QByteArray XTRXInputSettings::serialize() const
s.writeU32(24, m_reverseAPIPort);
s.writeU32(25, m_reverseAPIDeviceIndex);
s.writeBool(26, m_iqOrder);
s.writeString(27, m_title);
return s.final();
}
@@ -130,6 +132,7 @@ bool XTRXInputSettings::deserialize(const QByteArray& data)
d.readU32(25, &uintval, 0);
m_reverseAPIDeviceIndex = uintval > 99 ? 99 : uintval;
d.readBool(26, &m_iqOrder, true);
d.readString(27, &m_title, "XTRX");
return true;
}
@@ -143,6 +146,9 @@ bool XTRXInputSettings::deserialize(const QByteArray& data)
void XTRXInputSettings::applySettings(const QStringList& settingsKeys, const XTRXInputSettings& settings)
{
if (settingsKeys.contains("title")) {
m_title = settings.m_title;
}
if (settingsKeys.contains("centerFrequency")) {
m_centerFrequency = settings.m_centerFrequency;
}
@@ -218,6 +224,9 @@ QString XTRXInputSettings::getDebugString(const QStringList& settingsKeys, bool
{
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/xtrxinput/xtrxinputsettings.h
+1
View File
@@ -40,6 +40,7 @@ struct XTRXInputSettings
} GainMode;
// global settings to be saved
QString m_title;
uint64_t m_centerFrequency;
double m_devSampleRate;
uint32_t m_log2HardDecim;