Skip to content

Q
qgroundcontrol
Commit 06f400b0 authored by DonLakeFlyer's avatar DonLakeFlyer
Browse files
Options

parent 7dd98eac
Hide whitespace changes
Inline Side-by-side
Showing with 12 additions and 10 deletions
src/FactSystem/SettingsFact.cc
View file @ 06f400b0
...@@ -35,16 +35,18 @@ SettingsFact::SettingsFact(QString settingsGroup, FactMetaData* metaData, QObjec ...@@ -35,16 +35,18 @@ SettingsFact::SettingsFact(QString settingsGroup, FactMetaData* metaData, QObjec
_visible = qgcApp()->toolbox()->corePlugin()->adjustSettingMetaData(settingsGroup, *metaData); _visible = qgcApp()->toolbox()->corePlugin()->adjustSettingMetaData(settingsGroup, *metaData);
setMetaData(metaData); setMetaData(metaData);
QVariant rawDefaultValue = metaData->rawDefaultValue(); if (metaData->defaultValueAvailable()) {
if (_visible) { QVariant rawDefaultValue = metaData->rawDefaultValue();
QVariant typedValue; if (_visible) {
QString errorString; QVariant typedValue;
metaData->convertAndValidateRaw(settings.value(_name, rawDefaultValue), true /* conertOnly */, typedValue, errorString); QString errorString;
_rawValue = typedValue; metaData->convertAndValidateRaw(settings.value(_name, rawDefaultValue), true /* conertOnly */, typedValue, errorString);
} else { _rawValue = typedValue;
// Setting is not visible, force to default value always } else {
settings.setValue(_name, rawDefaultValue); // Setting is not visible, force to default value always
_rawValue = rawDefaultValue; settings.setValue(_name, rawDefaultValue);
_rawValue = rawDefaultValue;
}
} }
connect(this, &Fact::rawValueChanged, this, &SettingsFact::_rawValueChanged); connect(this, &Fact::rawValueChanged, this, &SettingsFact::_rawValueChanged);
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment