VE7UWU/sdrangel
1
0
Fork 0
mirror of https://github.com/f4exb/sdrangel.git synced 2026-06-01 13:47:01 -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/hackrfinput/hackrfinput.cpp
+12
View File
@@ -583,6 +583,9 @@ void HackRFInput::webapiUpdateDeviceSettings(
const QStringList& deviceSettingsKeys,
SWGSDRangel::SWGDeviceSettings& response)
{
if (deviceSettingsKeys.contains("title")) {
settings.m_title = *response.getHackRfInputSettings()->getTitle();
}
if (deviceSettingsKeys.contains("centerFrequency")) {
settings.m_centerFrequency = response.getHackRfInputSettings()->getCenterFrequency();
}
@@ -647,6 +650,12 @@ void HackRFInput::webapiUpdateDeviceSettings(
void HackRFInput::webapiFormatDeviceSettings(SWGSDRangel::SWGDeviceSettings& response, const HackRFInputSettings& settings)
{
if (response.getHackRfInputSettings()->getTitle()) {
*response.getHackRfInputSettings()->getTitle() = settings.m_title;
} else {
response.getHackRfInputSettings()->setTitle(new QString(settings.m_title));
}
response.getHackRfInputSettings()->setCenterFrequency(settings.m_centerFrequency);
response.getHackRfInputSettings()->setLOppmTenths(settings.m_LOppmTenths);
response.getHackRfInputSettings()->setBandwidth(settings.m_bandwidth);
@@ -714,6 +723,9 @@ void HackRFInput::webapiReverseSendSettings(const QList<QString>& deviceSettings
// transfer data that has been modified. When force is on transfer all data except reverse API data
if (deviceSettingsKeys.contains("title") || force) {
swgHackRFInputSettings->setTitle(new QString(settings.m_title));
}
if (deviceSettingsKeys.contains("centerFrequency") || force) {
swgHackRFInputSettings->setCenterFrequency(settings.m_centerFrequency);
}
plugins/samplesource/hackrfinput/hackrfinputgui.cpp
+21 -5
View File
@@ -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"
@@ -259,6 +260,8 @@ void HackRFInputGui::displaySettings()
{
blockApplySettings(true);
setTitle(m_settings.m_title);
m_deviceUISet->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);
@@ -544,17 +547,30 @@ void HackRFInputGui::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();
if (dialog.result() == QDialog::Accepted)
{
m_settings.m_title = dialog.getTitle();
setTitle(m_settings.m_title);
m_deviceUISet->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/hackrfinput/hackrfinputsettings.cpp
+9
View File
@@ -29,6 +29,7 @@ HackRFInputSettings::HackRFInputSettings()
void HackRFInputSettings::resetToDefaults()
{
m_title = "HackRF";
m_centerFrequency = 435000 * 1000;
m_LOppmTenths = 0;
m_biasT = false;
@@ -74,6 +75,7 @@ QByteArray HackRFInputSettings::serialize() const
s.writeS64(19, m_transverterDeltaFrequency);
s.writeBool(20, m_iqOrder);
s.writeBool(21, m_autoBBF);
s.writeString(22, m_title);
return s.final();
}
@@ -121,6 +123,7 @@ bool HackRFInputSettings::deserialize(const QByteArray& data)
d.readS64(19, &m_transverterDeltaFrequency, 0);
d.readBool(20, &m_iqOrder, true);
d.readBool(21, &m_autoBBF, true);
d.readString(22, &m_title, "HackRF");
return true;
}
@@ -133,6 +136,9 @@ bool HackRFInputSettings::deserialize(const QByteArray& data)
void HackRFInputSettings::applySettings(const QStringList& settingsKeys, const HackRFInputSettings& settings)
{
if (settingsKeys.contains("title")) {
m_title = settings.m_title;
}
if (settingsKeys.contains("centerFrequency")) {
m_centerFrequency = settings.m_centerFrequency;
}
@@ -199,6 +205,9 @@ QString HackRFInputSettings::getDebugString(const QStringList& settingsKeys, boo
{
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/hackrfinput/hackrfinputsettings.h
+1
View File
@@ -32,6 +32,7 @@ struct HackRFInputSettings {
FC_POS_CENTER
} fcPos_t;
QString m_title;
quint64 m_centerFrequency;
qint32 m_LOppmTenths;
quint32 m_bandwidth;