VE7UWU/sdrangel
1
0
Fork 0
mirror of https://github.com/f4exb/sdrangel.git synced 2026-06-05 15:34:57 -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/fcdproplus/fcdproplusgui.cpp
+21 -9
View File
@@ -26,6 +26,7 @@
#include "gui/glspectrum.h"
#include "gui/basicdevicesettingsdialog.h"
#include "gui/dialogpositioner.h"
#include "mainspectrum/mainspectrumgui.h"
#include "dsp/dspcommands.h"
#include "fcdproplusgui.h"
@@ -210,6 +211,8 @@ void FCDProPlusGui::updateFrequencyLimits()
void FCDProPlusGui::displaySettings()
{
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);
@@ -404,21 +407,30 @@ void FCDProPlusGui::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/fcdproplus/fcdproplusinput.cpp
+12
View File
@@ -591,6 +591,9 @@ void FCDProPlusInput::webapiUpdateDeviceSettings(
const QStringList& deviceSettingsKeys,
SWGSDRangel::SWGDeviceSettings& response)
{
if (deviceSettingsKeys.contains("title")) {
settings.m_title = *response.getFcdProPlusSettings()->getTitle();
}
if (deviceSettingsKeys.contains("centerFrequency")) {
settings.m_centerFrequency = response.getFcdProPlusSettings()->getCenterFrequency();
}
@@ -655,6 +658,12 @@ void FCDProPlusInput::webapiUpdateDeviceSettings(
void FCDProPlusInput::webapiFormatDeviceSettings(SWGSDRangel::SWGDeviceSettings& response, const FCDProPlusSettings& settings)
{
if (response.getFcdProPlusSettings()->getTitle()) {
*response.getFcdProPlusSettings()->getTitle() = settings.m_title;
} else {
response.getFcdProPlusSettings()->setTitle(new QString(settings.m_title));
}
response.getFcdProPlusSettings()->setCenterFrequency(settings.m_centerFrequency);
response.getFcdProPlusSettings()->setLog2Decim(settings.m_log2Decim);
response.getFcdProPlusSettings()->setIqOrder(settings.m_iqOrder ? 1 : 0);
@@ -695,6 +704,9 @@ void FCDProPlusInput::webapiReverseSendSettings(const QList<QString>& deviceSett
// transfer data that has been modified. When force is on transfer all data except reverse API data
if (deviceSettingsKeys.contains("title") || force) {
swgFCDProPlusSettings->setTitle(new QString(settings.m_title));
}
if (deviceSettingsKeys.contains("centerFrequency") || force) {
swgFCDProPlusSettings->setCenterFrequency(settings.m_centerFrequency);
}
plugins/samplesource/fcdproplus/fcdproplussettings.cpp
+9
View File
@@ -26,6 +26,7 @@ FCDProPlusSettings::FCDProPlusSettings()
void FCDProPlusSettings::resetToDefaults()
{
m_title = "FCDProPlus";
m_centerFrequency = 435000000;
m_rangeLow = true;
m_lnaGain = true;
@@ -70,6 +71,7 @@ QByteArray FCDProPlusSettings::serialize() const
s.writeU32(16, m_reverseAPIPort);
s.writeU32(17, m_reverseAPIDeviceIndex);
s.writeBool(18, m_iqOrder);
s.writeString(19, m_title);
return s.final();
}
@@ -116,6 +118,7 @@ bool FCDProPlusSettings::deserialize(const QByteArray& data)
d.readU32(17, &uintval, 0);
m_reverseAPIDeviceIndex = uintval > 99 ? 99 : uintval;
d.readBool(18, &m_iqOrder, true);
d.readString(19, &m_title, "FCDProPlus");
return true;
}
@@ -128,6 +131,9 @@ bool FCDProPlusSettings::deserialize(const QByteArray& data)
void FCDProPlusSettings::applySettings(const QStringList& settingsKeys, const FCDProPlusSettings& settings)
{
if (settingsKeys.contains("title")) {
m_title = settings.m_title;
}
if (settingsKeys.contains("centerFrequency")) {
m_centerFrequency = settings.m_centerFrequency;
}
@@ -197,6 +203,9 @@ QString FCDProPlusSettings::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/fcdproplus/fcdproplussettings.h
+1
View File
@@ -30,6 +30,7 @@ struct FCDProPlusSettings {
FC_POS_CENTER
} fcPos_t;
QString m_title;
quint64 m_centerFrequency;
bool m_rangeLow;
bool m_lnaGain;