VE7UWU/sdrangel
1
0
Fork 0
mirror of https://github.com/f4exb/sdrangel.git synced 2026-06-08 17:04:46 -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/sigmffileinput/sigmffileinput.cpp
+9
View File
@@ -884,6 +884,9 @@ void SigMFFileInput::webapiUpdateDeviceSettings(
const QStringList& deviceSettingsKeys,
SWGSDRangel::SWGDeviceSettings& response)
{
if (deviceSettingsKeys.contains("title")) {
settings.m_title = *response.getSigMfFileInputSettings()->getTitle();
}
if (deviceSettingsKeys.contains("fileName")) {
settings.m_fileName = *response.getSigMfFileInputSettings()->getFileName();
}
@@ -1030,6 +1033,12 @@ int SigMFFileInput::webapiActionsPost(
void SigMFFileInput::webapiFormatDeviceSettings(SWGSDRangel::SWGDeviceSettings& response, const SigMFFileInputSettings& settings)
{
if (response.getSigMfFileInputSettings()->getTitle()) {
*response.getSigMfFileInputSettings()->getTitle() = settings.m_title;
} else {
response.getSigMfFileInputSettings()->setTitle(new QString(settings.m_title));
}
response.getSigMfFileInputSettings()->setFileName(new QString(settings.m_fileName));
response.getSigMfFileInputSettings()->setAccelerationFactor(settings.m_accelerationFactor);
response.getSigMfFileInputSettings()->setTrackLoop(settings.m_trackLoop ? 1 : 0);
plugins/samplesource/sigmffileinput/sigmffileinputgui.cpp
+21 -9
View File
@@ -28,6 +28,7 @@
#include "gui/glspectrum.h"
#include "gui/basicdevicesettingsdialog.h"
#include "gui/dialogpositioner.h"
#include "mainspectrum/mainspectrumgui.h"
#include "dsp/dspcommands.h"
#include "dsp/filerecordinterface.h"
#include "device/deviceapi.h"
@@ -334,6 +335,8 @@ void SigMFFileInputGUI::updateSampleRateAndFrequency()
void SigMFFileInputGUI::displaySettings()
{
blockApplySettings(true);
setTitle(m_settings.m_title);
getDeviceUISet()->m_mainSpectrumGUI->setTitle(m_settings.m_title);
ui->playTrackLoop->setChecked(m_settings.m_trackLoop);
ui->playFullLoop->setChecked(m_settings.m_fullLoop);
ui->acceleration->setCurrentIndex(SigMFFileInputSettings::getAccelerationIndex(m_settings.m_accelerationFactor));
@@ -690,21 +693,30 @@ void SigMFFileInputGUI::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/sigmffileinput/sigmffileinputsettings.cpp
+9
View File
@@ -30,6 +30,7 @@ SigMFFileInputSettings::SigMFFileInputSettings()
void SigMFFileInputSettings::resetToDefaults()
{
m_title = "SigMFFileInput";
m_fileName = "./test.sdriq";
m_accelerationFactor = 1;
m_trackLoop = false;
@@ -51,6 +52,7 @@ QByteArray SigMFFileInputSettings::serialize() const
s.writeString(6, m_reverseAPIAddress);
s.writeU32(7, m_reverseAPIPort);
s.writeU32(8, m_reverseAPIDeviceIndex);
s.writeString(9, m_title);
return s.final();
}
@@ -84,6 +86,7 @@ bool SigMFFileInputSettings::deserialize(const QByteArray& data)
d.readU32(8, &uintval, 0);
m_reverseAPIDeviceIndex = uintval > 99 ? 99 : uintval;
d.readString(9, &m_title, "SigMFFileInput");
return true;
}
@@ -96,6 +99,9 @@ bool SigMFFileInputSettings::deserialize(const QByteArray& data)
void SigMFFileInputSettings::applySettings(const QStringList& settingsKeys, const SigMFFileInputSettings& settings)
{
if (settingsKeys.contains("title")) {
m_title = settings.m_title;
}
if (settingsKeys.contains("fileName")) {
m_fileName = settings.m_fileName;
}
@@ -126,6 +132,9 @@ QString SigMFFileInputSettings::getDebugString(const QStringList& settingsKeys,
{
std::ostringstream ostr;
if (settingsKeys.contains("title") || force) {
ostr << " m_title: " << m_title.toStdString();
}
if (settingsKeys.contains("m_fileName") || force) {
ostr << " m_fileName: " << m_fileName.toStdString();
}
plugins/samplesource/sigmffileinput/sigmffileinputsettings.h
+3 -1
View File
@@ -23,7 +23,9 @@
#include <QString>
#include <QByteArray>
struct SigMFFileInputSettings {
struct SigMFFileInputSettings
{
QString m_title;
QString m_fileName;
quint32 m_accelerationFactor;
bool m_trackLoop;