VE7UWU/sdrangel
1
0
Fork 0
mirror of https://github.com/f4exb/sdrangel.git synced 2026-06-08 00:44:48 -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/samplemimo/testmosync/testmosync.cpp
+9
View File
@@ -401,6 +401,12 @@ void TestMOSync::webapiFormatDeviceSettings(
SWGSDRangel::SWGDeviceSettings& response,
const TestMOSyncSettings& settings)
{
if (response.getTestMoSyncSettings()->getTitle()) {
*response.getTestMoSyncSettings()->getTitle() = settings.m_title;
} else {
response.getTestMoSyncSettings()->setTitle(new QString(settings.m_title));
}
response.getTestMoSyncSettings()->setCenterFrequency(settings.m_centerFrequency);
response.getTestMoSyncSettings()->setFcPosTx((int) settings.m_fcPosTx);
response.getTestMoSyncSettings()->setLog2Interp(settings.m_log2Interp);
@@ -412,6 +418,9 @@ void TestMOSync::webapiUpdateDeviceSettings(
const QStringList& deviceSettingsKeys,
SWGSDRangel::SWGDeviceSettings& response)
{
if (deviceSettingsKeys.contains("title")) {
settings.m_title = *response.getTestMoSyncSettings()->getTitle();
}
if (deviceSettingsKeys.contains("centerFrequency")) {
settings.m_centerFrequency = response.getTestMoSyncSettings()->getCenterFrequency();
}
plugins/samplemimo/testmosync/testmosyncgui.cpp
+21 -9
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 "dsp/spectrumvis.h"
#include "device/deviceapi.h"
@@ -204,6 +205,8 @@ void TestMOSyncGui::updateSampleRateAndFrequency()
void TestMOSyncGui::displaySettings()
{
setTitle(m_settings.m_title);
getDeviceUISet()->m_mainSpectrumGUI->setTitle(m_settings.m_title);
ui->centerFrequency->setValue(m_settings.m_centerFrequency / 1000);
ui->sampleRate->setValue(m_settings.m_sampleRate);
}
@@ -314,21 +317,30 @@ void TestMOSyncGui::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/samplemimo/testmosync/testmosyncsettings.cpp
+14 -4
View File
@@ -29,6 +29,7 @@ TestMOSyncSettings::TestMOSyncSettings()
void TestMOSyncSettings::resetToDefaults()
{
m_title = "TestMOSync";
m_centerFrequency = 435000*1000;
m_sampleRate = 48000;
m_log2Interp = 0;
@@ -50,6 +51,7 @@ QByteArray TestMOSyncSettings::serialize() const
s.writeString(7, m_reverseAPIAddress);
s.writeU32(8, m_reverseAPIPort);
s.writeU32(9, m_reverseAPIDeviceIndex);
s.writeString(10, m_title);
return s.final();
}
@@ -73,9 +75,9 @@ bool TestMOSyncSettings::deserialize(const QByteArray& data)
d.readU32(2, &m_log2Interp, 0);
d.readS32(3, &intval, 2);
m_fcPosTx = (fcPos_t) intval;
d.readBool(1, &m_useReverseAPI, false);
d.readString(2, &m_reverseAPIAddress, "127.0.0.1");
d.readU32(3, &utmp, 0);
d.readBool(6, &m_useReverseAPI, false);
d.readString(7, &m_reverseAPIAddress, "127.0.0.1");
d.readU32(8, &utmp, 0);
if ((utmp > 1023) && (utmp < 65535)) {
m_reverseAPIPort = utmp;
@@ -83,9 +85,11 @@ bool TestMOSyncSettings::deserialize(const QByteArray& data)
m_reverseAPIPort = 8888;
}
d.readU32(4, &utmp, 0);
d.readU32(9, &utmp, 0);
m_reverseAPIDeviceIndex = utmp > 99 ? 99 : utmp;
d.readString(10, &m_title, "TestMOSync");
return true;
}
else
@@ -97,6 +101,9 @@ bool TestMOSyncSettings::deserialize(const QByteArray& data)
void TestMOSyncSettings::applySettings(const QStringList& settingsKeys, const TestMOSyncSettings& settings)
{
if (settingsKeys.contains("title")) {
m_title = settings.m_title;
}
if (settingsKeys.contains("centerFrequency")) {
m_centerFrequency = settings.m_centerFrequency;
}
@@ -127,6 +134,9 @@ QString TestMOSyncSettings::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/samplemimo/testmosync/testmosyncsettings.h
+1
View File
@@ -27,6 +27,7 @@ struct TestMOSyncSettings {
FC_POS_CENTER
} fcPos_t;
QString m_title;
quint64 m_centerFrequency;
quint64 m_sampleRate;
quint32 m_log2Interp;