SHS/pip
4
3
Fork 0
Code Issues 67 Pull Requests 1 Actions Releases Wiki Activity

config

Browse Source
This commit is contained in:
Пелипенко Иван
2020-04-29 17:31:35 +03:00
parent 43588d076f
commit ad374ea17e
1 changed files with 5 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
src_main/io_devices/piconfig.h
View File

@@ -526,15 +526,13 @@ inline PICout operator <<(PICout s, const PIConfig::Entry & v) {s << v.value();
template<typename T> template<typename T>
T readDeviceSetting(const PIString & name, const T & def, const PIConfig::Entry * em, const PIConfig::Entry * ep) { T readDeviceSetting(const PIString & name, const T & def, const PIConfig::Entry * em, const PIConfig::Entry * ep) {
PIVariant v = PIVariant::fromValue<T>(def); PIVariant v = PIVariant::fromValue<T>(def);
if (ep) { if (ep != 0) {
bool ex = false; bool ex = false;
PIString sv = ep->getValue(name, def, &ex).toString(); v.setValueFromString(ep->getValue(name, def, &ex).toString());
if (!ex) if (ex) return v.value<T>();
return def;
v.setValueFromString(sv);
return v.value<T>();
} }
return def; v.setValueFromString(em->getValue(name, def).toString());
return v.value<T>();
} }
#endif // PICONFIG_H #endif // PICONFIG_H