VE7UWU/sdrangel
1
0
Fork 0
mirror of https://github.com/f4exb/sdrangel.git synced 2026-06-04 23:14:47 -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/bladerf2input/bladerf2input.cpp
+12
View File
@@ -1041,6 +1041,9 @@ void BladeRF2Input::webapiUpdateDeviceSettings(
const QStringList& deviceSettingsKeys,
SWGSDRangel::SWGDeviceSettings& response)
{
if (deviceSettingsKeys.contains("title")) {
settings.m_title = *response.getBladeRf2InputSettings()->getTitle();
}
if (deviceSettingsKeys.contains("centerFrequency")) {
settings.m_centerFrequency = response.getBladeRf2InputSettings()->getCenterFrequency();
}
@@ -1108,6 +1111,12 @@ int BladeRF2Input::webapiReportGet(SWGSDRangel::SWGDeviceReport& response, QStri
void BladeRF2Input::webapiFormatDeviceSettings(SWGSDRangel::SWGDeviceSettings& response, const BladeRF2InputSettings& settings)
{
if (response.getBladeRf2InputSettings()->getTitle()) {
*response.getBladeRf2InputSettings()->getTitle() = settings.m_title;
} else {
response.getBladeRf2InputSettings()->setTitle(new QString(settings.m_title));
}
response.getBladeRf2InputSettings()->setCenterFrequency(settings.m_centerFrequency);
response.getBladeRf2InputSettings()->setLOppmTenths(settings.m_LOppmTenths);
response.getBladeRf2InputSettings()->setDevSampleRate(settings.m_devSampleRate);
@@ -1230,6 +1239,9 @@ void BladeRF2Input::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) {
swgBladeRF2Settings->setTitle(new QString(settings.m_title));
}
if (deviceSettingsKeys.contains("centerFrequency") || force) {
swgBladeRF2Settings->setCenterFrequency(settings.m_centerFrequency);
}
plugins/samplesource/bladerf2input/bladerf2inputgui.cpp
+20 -10
View File
@@ -27,6 +27,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"
@@ -313,6 +314,8 @@ void BladeRF2InputGui::displaySettings()
{
blockApplySettings(true);
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);
@@ -556,22 +559,29 @@ void BladeRF2InputGui::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();
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");
m_settingsKeys.append("useReverseAPI");
m_settingsKeys.append("reverseAPIAddress");
m_settingsKeys.append("reverseAPIPort");
m_settingsKeys.append("reverseAPIDeviceIndex");
sendSettings();
sendSettings();
}
}
resetContextMenuType();
plugins/samplesource/bladerf2input/bladerf2inputsettings.cpp
+9
View File
@@ -28,6 +28,7 @@ BladeRF2InputSettings::BladeRF2InputSettings()
void BladeRF2InputSettings::resetToDefaults()
{
m_title = "BladeRF2";
m_centerFrequency = 435000*1000;
m_LOppmTenths = 0;
m_devSampleRate = 3072000;
@@ -69,6 +70,7 @@ QByteArray BladeRF2InputSettings::serialize() const
s.writeU32(15, m_reverseAPIPort);
s.writeU32(16, m_reverseAPIDeviceIndex);
s.writeBool(17, m_iqOrder);
s.writeString(18, m_title);
return s.final();
}
@@ -114,6 +116,7 @@ bool BladeRF2InputSettings::deserialize(const QByteArray& data)
d.readU32(16, &uintval, 0);
m_reverseAPIDeviceIndex = uintval > 99 ? 99 : uintval;
d.readBool(17, &m_iqOrder, true);
d.readString(18, &m_title, "BladeRF2");
return true;
}
@@ -126,6 +129,9 @@ bool BladeRF2InputSettings::deserialize(const QByteArray& data)
void BladeRF2InputSettings::applySettings(const QStringList& settingsKeys, const BladeRF2InputSettings& settings)
{
if (settingsKeys.contains("title")) {
m_title = settings.m_title;
}
if (settingsKeys.contains("centerFrequency")) {
m_centerFrequency = settings.m_centerFrequency;
}
@@ -183,6 +189,9 @@ QString BladeRF2InputSettings::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/bladerf2input/bladerf2inputsettings.h
+1
View File
@@ -30,6 +30,7 @@ struct BladeRF2InputSettings {
FC_POS_CENTER
} fcPos_t;
QString m_title;
quint64 m_centerFrequency;
qint32 m_LOppmTenths;
qint32 m_devSampleRate;