mirror of
https://github.com/f4exb/sdrangel.git
synced 2024-09-27 15:26:33 -04:00
AMBE feature: Make settings assignments atomic. Part of #1329
This commit is contained in:
parent
1972b74099
commit
7562d847ce
@ -299,6 +299,8 @@ void AFCGUI::onMenuDialogCalled(const QPoint &p)
|
|||||||
setTitle(m_settings.m_title);
|
setTitle(m_settings.m_title);
|
||||||
setTitleColor(m_settings.m_rgbColor);
|
setTitleColor(m_settings.m_rgbColor);
|
||||||
|
|
||||||
|
m_settingsKeys.append("title");
|
||||||
|
m_settingsKeys.append("rgbColor");
|
||||||
m_settingsKeys.append("useReverseAPI");
|
m_settingsKeys.append("useReverseAPI");
|
||||||
m_settingsKeys.append("reverseAPIAddress");
|
m_settingsKeys.append("reverseAPIAddress");
|
||||||
m_settingsKeys.append("reverseAPIPort");
|
m_settingsKeys.append("reverseAPIPort");
|
||||||
|
@ -303,6 +303,8 @@ void AISGUI::onMenuDialogCalled(const QPoint &p)
|
|||||||
setTitle(m_settings.m_title);
|
setTitle(m_settings.m_title);
|
||||||
setTitleColor(m_settings.m_rgbColor);
|
setTitleColor(m_settings.m_rgbColor);
|
||||||
|
|
||||||
|
m_settingsKeys.append("title");
|
||||||
|
m_settingsKeys.append("rgbColor");
|
||||||
m_settingsKeys.append("useReverseAPI");
|
m_settingsKeys.append("useReverseAPI");
|
||||||
m_settingsKeys.append("reverseAPIAddress");
|
m_settingsKeys.append("reverseAPIAddress");
|
||||||
m_settingsKeys.append("reverseAPIPort");
|
m_settingsKeys.append("reverseAPIPort");
|
||||||
|
@ -77,10 +77,13 @@ void AMBE::stop()
|
|||||||
m_state = StIdle;
|
m_state = StIdle;
|
||||||
}
|
}
|
||||||
|
|
||||||
void AMBE::applySettings(const AMBESettings& settings, bool force)
|
void AMBE::applySettings(const AMBESettings& settings, const QList<QString>& settingsKeys, bool force)
|
||||||
{
|
{
|
||||||
(void) force;
|
if (force) {
|
||||||
m_settings = settings;
|
m_settings = settings;
|
||||||
|
} else {
|
||||||
|
m_settings.applySettings(settingsKeys, settings);
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
bool AMBE::handleMessage(const Message& cmd)
|
bool AMBE::handleMessage(const Message& cmd)
|
||||||
@ -89,7 +92,7 @@ bool AMBE::handleMessage(const Message& cmd)
|
|||||||
{
|
{
|
||||||
MsgConfigureAMBE& cfg = (MsgConfigureAMBE&) cmd;
|
MsgConfigureAMBE& cfg = (MsgConfigureAMBE&) cmd;
|
||||||
qDebug() << "AMBE::handleMessage: MsgConfigureAMBE";
|
qDebug() << "AMBE::handleMessage: MsgConfigureAMBE";
|
||||||
applySettings(cfg.getSettings(), cfg.getForce());
|
applySettings(cfg.getSettings(), cfg.getSettingsKeys(), cfg.getForce());
|
||||||
return true;
|
return true;
|
||||||
}
|
}
|
||||||
else if (DSPPushMbeFrame::match(cmd))
|
else if (DSPPushMbeFrame::match(cmd))
|
||||||
@ -134,14 +137,14 @@ bool AMBE::deserialize(const QByteArray& data)
|
|||||||
|
|
||||||
if (m_settings.deserialize(bytetmp))
|
if (m_settings.deserialize(bytetmp))
|
||||||
{
|
{
|
||||||
MsgConfigureAMBE *msg = MsgConfigureAMBE::create(m_settings, true);
|
MsgConfigureAMBE *msg = MsgConfigureAMBE::create(m_settings, QList<QString>(), true);
|
||||||
m_inputMessageQueue.push(msg);
|
m_inputMessageQueue.push(msg);
|
||||||
return true;
|
return true;
|
||||||
}
|
}
|
||||||
else
|
else
|
||||||
{
|
{
|
||||||
m_settings.resetToDefaults();
|
m_settings.resetToDefaults();
|
||||||
MsgConfigureAMBE *msg = MsgConfigureAMBE::create(m_settings, true);
|
MsgConfigureAMBE *msg = MsgConfigureAMBE::create(m_settings, QList<QString>(), true);
|
||||||
m_inputMessageQueue.push(msg);
|
m_inputMessageQueue.push(msg);
|
||||||
return false;
|
return false;
|
||||||
}
|
}
|
||||||
@ -194,12 +197,12 @@ int AMBE::webapiSettingsPutPatch(
|
|||||||
AMBESettings settings = m_settings;
|
AMBESettings settings = m_settings;
|
||||||
webapiUpdateFeatureSettings(settings, featureSettingsKeys, response);
|
webapiUpdateFeatureSettings(settings, featureSettingsKeys, response);
|
||||||
|
|
||||||
MsgConfigureAMBE *msg = MsgConfigureAMBE::create(settings, force);
|
MsgConfigureAMBE *msg = MsgConfigureAMBE::create(settings, featureSettingsKeys, force);
|
||||||
m_inputMessageQueue.push(msg);
|
m_inputMessageQueue.push(msg);
|
||||||
|
|
||||||
if (m_guiMessageQueue) // forward to GUI if any
|
if (m_guiMessageQueue) // forward to GUI if any
|
||||||
{
|
{
|
||||||
MsgConfigureAMBE *msgToGUI = MsgConfigureAMBE::create(settings, force);
|
MsgConfigureAMBE *msgToGUI = MsgConfigureAMBE::create(settings, featureSettingsKeys, force);
|
||||||
m_guiMessageQueue->push(msgToGUI);
|
m_guiMessageQueue->push(msgToGUI);
|
||||||
}
|
}
|
||||||
|
|
||||||
@ -288,7 +291,7 @@ void AMBE::webapiUpdateFeatureSettings(
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
void AMBE::webapiReverseSendSettings(QList<QString>& featureSettingsKeys, const AMBESettings& settings, bool force)
|
void AMBE::webapiReverseSendSettings(const QList<QString>& featureSettingsKeys, const AMBESettings& settings, bool force)
|
||||||
{
|
{
|
||||||
SWGSDRangel::SWGFeatureSettings *swgFeatureSettings = new SWGSDRangel::SWGFeatureSettings();
|
SWGSDRangel::SWGFeatureSettings *swgFeatureSettings = new SWGSDRangel::SWGFeatureSettings();
|
||||||
// swgFeatureSettings->setOriginatorFeatureIndex(getIndexInDeviceSet());
|
// swgFeatureSettings->setOriginatorFeatureIndex(getIndexInDeviceSet());
|
||||||
|
@ -40,19 +40,22 @@ public:
|
|||||||
|
|
||||||
public:
|
public:
|
||||||
const AMBESettings& getSettings() const { return m_settings; }
|
const AMBESettings& getSettings() const { return m_settings; }
|
||||||
|
const QList<QString>& getSettingsKeys() const { return m_settingsKeys; }
|
||||||
bool getForce() const { return m_force; }
|
bool getForce() const { return m_force; }
|
||||||
|
|
||||||
static MsgConfigureAMBE* create(const AMBESettings& settings, bool force) {
|
static MsgConfigureAMBE* create(const AMBESettings& settings, const QList<QString>& settingsKeys, bool force) {
|
||||||
return new MsgConfigureAMBE(settings, force);
|
return new MsgConfigureAMBE(settings, settingsKeys, force);
|
||||||
}
|
}
|
||||||
|
|
||||||
private:
|
private:
|
||||||
AMBESettings m_settings;
|
AMBESettings m_settings;
|
||||||
|
QList<QString> m_settingsKeys;
|
||||||
bool m_force;
|
bool m_force;
|
||||||
|
|
||||||
MsgConfigureAMBE(const AMBESettings& settings, bool force) :
|
MsgConfigureAMBE(const AMBESettings& settings, const QList<QString>& settingsKeys, bool force) :
|
||||||
Message(),
|
Message(),
|
||||||
m_settings(settings),
|
m_settings(settings),
|
||||||
|
m_settingsKeys(settingsKeys),
|
||||||
m_force(force)
|
m_force(force)
|
||||||
{ }
|
{ }
|
||||||
};
|
};
|
||||||
@ -131,9 +134,9 @@ private:
|
|||||||
|
|
||||||
void start();
|
void start();
|
||||||
void stop();
|
void stop();
|
||||||
void applySettings(const AMBESettings& settings, bool force = false);
|
void applySettings(const AMBESettings& settings, const QList<QString>& settingsKeys, bool force = false);
|
||||||
void webapiFormatFeatureReport(SWGSDRangel::SWGFeatureReport& response);
|
void webapiFormatFeatureReport(SWGSDRangel::SWGFeatureReport& response);
|
||||||
void webapiReverseSendSettings(QList<QString>& featureSettingsKeys, const AMBESettings& settings, bool force);
|
void webapiReverseSendSettings(const QList<QString>& featureSettingsKeys, const AMBESettings& settings, bool force);
|
||||||
|
|
||||||
private slots:
|
private slots:
|
||||||
void networkManagerFinished(QNetworkReply *reply);
|
void networkManagerFinished(QNetworkReply *reply);
|
||||||
|
@ -137,6 +137,14 @@ void AMBEGUI::onMenuDialogCalled(const QPoint &p)
|
|||||||
setTitle(m_settings.m_title);
|
setTitle(m_settings.m_title);
|
||||||
setTitleColor(m_settings.m_rgbColor);
|
setTitleColor(m_settings.m_rgbColor);
|
||||||
|
|
||||||
|
m_settingsKeys.append("title");
|
||||||
|
m_settingsKeys.append("rgbColor");
|
||||||
|
m_settingsKeys.append("useReverseAPI");
|
||||||
|
m_settingsKeys.append("reverseAPIAddress");
|
||||||
|
m_settingsKeys.append("reverseAPIPort");
|
||||||
|
m_settingsKeys.append("reverseAPIFeatureSetIndex");
|
||||||
|
m_settingsKeys.append("reverseAPIFeatureIndex");
|
||||||
|
|
||||||
applySettings();
|
applySettings();
|
||||||
}
|
}
|
||||||
|
|
||||||
@ -154,9 +162,11 @@ void AMBEGUI::applySettings(bool force)
|
|||||||
{
|
{
|
||||||
if (m_doApplySettings)
|
if (m_doApplySettings)
|
||||||
{
|
{
|
||||||
AMBE::MsgConfigureAMBE* message = AMBE::MsgConfigureAMBE::create( m_settings, force);
|
AMBE::MsgConfigureAMBE* message = AMBE::MsgConfigureAMBE::create( m_settings, m_settingsKeys, force);
|
||||||
m_ambe->getInputMessageQueue()->push(message);
|
m_ambe->getInputMessageQueue()->push(message);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
m_settingsKeys.clear();
|
||||||
}
|
}
|
||||||
|
|
||||||
bool AMBEGUI::handleMessage(const Message& message)
|
bool AMBEGUI::handleMessage(const Message& message)
|
||||||
@ -165,7 +175,13 @@ bool AMBEGUI::handleMessage(const Message& message)
|
|||||||
{
|
{
|
||||||
qDebug("AMBEGUI::handleMessage: AMBE::MsgConfigureAMBE");
|
qDebug("AMBEGUI::handleMessage: AMBE::MsgConfigureAMBE");
|
||||||
const AMBE::MsgConfigureAMBE& cfg = (AMBE::MsgConfigureAMBE&) message;
|
const AMBE::MsgConfigureAMBE& cfg = (AMBE::MsgConfigureAMBE&) message;
|
||||||
m_settings = cfg.getSettings();
|
|
||||||
|
if (cfg.getForce()) {
|
||||||
|
m_settings = cfg.getSettings();
|
||||||
|
} else {
|
||||||
|
m_settings.applySettings(cfg.getSettingsKeys(), cfg.getSettings());
|
||||||
|
}
|
||||||
|
|
||||||
displaySettings();
|
displaySettings();
|
||||||
return true;
|
return true;
|
||||||
}
|
}
|
||||||
|
@ -58,6 +58,7 @@ private:
|
|||||||
PluginAPI* m_pluginAPI;
|
PluginAPI* m_pluginAPI;
|
||||||
FeatureUISet* m_featureUISet;
|
FeatureUISet* m_featureUISet;
|
||||||
AMBESettings m_settings;
|
AMBESettings m_settings;
|
||||||
|
QList<QString> m_settingsKeys;
|
||||||
RollupState m_rollupState;
|
RollupState m_rollupState;
|
||||||
bool m_doApplySettings;
|
bool m_doApplySettings;
|
||||||
MessageQueue m_inputMessageQueue;
|
MessageQueue m_inputMessageQueue;
|
||||||
|
@ -112,3 +112,63 @@ bool AMBESettings::deserialize(const QByteArray& data)
|
|||||||
return false;
|
return false;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
void AMBESettings::applySettings(const QStringList& settingsKeys, const AMBESettings& settings)
|
||||||
|
{
|
||||||
|
if (settingsKeys.contains("title")) {
|
||||||
|
m_title = settings.m_title;
|
||||||
|
}
|
||||||
|
if (settingsKeys.contains("rgbColor")) {
|
||||||
|
m_rgbColor = settings.m_rgbColor;
|
||||||
|
}
|
||||||
|
if (settingsKeys.contains("useReverseAPI")) {
|
||||||
|
m_useReverseAPI = settings.m_useReverseAPI;
|
||||||
|
}
|
||||||
|
if (settingsKeys.contains("reverseAPIAddress")) {
|
||||||
|
m_reverseAPIAddress = settings.m_reverseAPIAddress;
|
||||||
|
}
|
||||||
|
if (settingsKeys.contains("reverseAPIPort")) {
|
||||||
|
m_reverseAPIPort = settings.m_reverseAPIPort;
|
||||||
|
}
|
||||||
|
if (settingsKeys.contains("reverseAPIFeatureSetIndex")) {
|
||||||
|
m_reverseAPIFeatureSetIndex = settings.m_reverseAPIFeatureSetIndex;
|
||||||
|
}
|
||||||
|
if (settingsKeys.contains("reverseAPIFeatureIndex")) {
|
||||||
|
m_reverseAPIFeatureIndex = settings.m_reverseAPIFeatureIndex;
|
||||||
|
}
|
||||||
|
if (settingsKeys.contains("workspaceIndex")) {
|
||||||
|
m_workspaceIndex = settings.m_workspaceIndex;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
QString AMBESettings::getDebugString(const QStringList& settingsKeys, bool force) const
|
||||||
|
{
|
||||||
|
std::ostringstream ostr;
|
||||||
|
|
||||||
|
if (settingsKeys.contains("title") || force) {
|
||||||
|
ostr << " m_title: " << m_title.toStdString();
|
||||||
|
}
|
||||||
|
if (settingsKeys.contains("rgbColor") || force) {
|
||||||
|
ostr << " m_rgbColor: " << m_rgbColor;
|
||||||
|
}
|
||||||
|
if (settingsKeys.contains("useReverseAPI") || force) {
|
||||||
|
ostr << " m_useReverseAPI: " << m_useReverseAPI;
|
||||||
|
}
|
||||||
|
if (settingsKeys.contains("reverseAPIAddress") || force) {
|
||||||
|
ostr << " m_reverseAPIAddress: " << m_reverseAPIAddress.toStdString();
|
||||||
|
}
|
||||||
|
if (settingsKeys.contains("reverseAPIPort") || force) {
|
||||||
|
ostr << " m_reverseAPIPort: " << m_reverseAPIPort;
|
||||||
|
}
|
||||||
|
if (settingsKeys.contains("reverseAPIFeatureSetIndex") || force) {
|
||||||
|
ostr << " m_reverseAPIFeatureSetIndex: " << m_reverseAPIFeatureSetIndex;
|
||||||
|
}
|
||||||
|
if (settingsKeys.contains("reverseAPIFeatureIndex") || force) {
|
||||||
|
ostr << " m_reverseAPIFeatureIndex: " << m_reverseAPIFeatureIndex;
|
||||||
|
}
|
||||||
|
if (settingsKeys.contains("workspaceIndex") || force) {
|
||||||
|
ostr << " m_workspaceIndex: " << m_workspaceIndex;
|
||||||
|
}
|
||||||
|
|
||||||
|
return QString(ostr.str().c_str());
|
||||||
|
}
|
||||||
|
@ -41,6 +41,8 @@ struct AMBESettings
|
|||||||
QByteArray serialize() const;
|
QByteArray serialize() const;
|
||||||
bool deserialize(const QByteArray& data);
|
bool deserialize(const QByteArray& data);
|
||||||
void setRollupState(Serializable *rollupState) { m_rollupState = rollupState; }
|
void setRollupState(Serializable *rollupState) { m_rollupState = rollupState; }
|
||||||
|
void applySettings(const QStringList& settingsKeys, const AMBESettings& settings);
|
||||||
|
QString getDebugString(const QStringList& settingsKeys, bool force=false) const;
|
||||||
};
|
};
|
||||||
|
|
||||||
#endif // INCLUDE_FEATURE_AMBESETTINGS_H_
|
#endif // INCLUDE_FEATURE_AMBESETTINGS_H_
|
||||||
|
Loading…
Reference in New Issue
Block a user