flightsimulatorplatfrom/pilotclient
1
0
Fork 0
mirror of https://github.com/swift-project/pilotclient.git synced 2026-04-07 11:05:33 +08:00
Code Issues Packages Projects Releases Wiki Activity

Consistent default values for weather scenario (avoid empty name)

Browse Source
This commit is contained in:
Klaus Basan
2019-07-11 20:16:23 +02:00
committed by Mat Sutcliffe
parent ca7f11eb81
commit edbdcf3437
2 changed files with 10 additions and 20 deletions
Download Patch File Download Diff File Expand all files Collapse all files

26
src/blackmisc/weather/weatherscenario.cpp
View File

@@ -12,7 +12,6 @@ namespace BlackMisc
{ {
namespace Weather namespace Weather
{ {
void CWeatherScenario::registerMetadata() void CWeatherScenario::registerMetadata()
{ {
CValueObject<CWeatherScenario>::registerMetadata(); CValueObject<CWeatherScenario>::registerMetadata();
@@ -28,15 +27,12 @@ namespace BlackMisc
CVariant CWeatherScenario::propertyByIndex(const BlackMisc::CPropertyIndex &index) const CVariant CWeatherScenario::propertyByIndex(const BlackMisc::CPropertyIndex &index) const
{ {
if (index.isMyself()) { return CVariant::from(*this); } if (index.isMyself()) { return CVariant::from(*this); }
ColumnIndex i = index.frontCasted<ColumnIndex>(); const ColumnIndex i = index.frontCasted<ColumnIndex>();
switch (i) switch (i)
{ {
case IndexScenarioIndex: case IndexScenarioIndex: return CVariant::fromValue(m_scenarioIndex);
return CVariant::fromValue(m_scenarioIndex); case IndexScenarioName: return CVariant::fromValue(m_scenarioName);
case IndexScenarioName: case IndexScenarioDescription: return CVariant::fromValue(m_scenarioDescription);
return CVariant::fromValue(m_scenarioName);
case IndexScenarioDescription:
return CVariant::fromValue(m_scenarioDescription);
default: default:
return CValueObject::propertyByIndex(index); return CValueObject::propertyByIndex(index);
} }
@@ -45,18 +41,12 @@ namespace BlackMisc
void CWeatherScenario::setPropertyByIndex(const CPropertyIndex &index, const CVariant &variant) void CWeatherScenario::setPropertyByIndex(const CPropertyIndex &index, const CVariant &variant)
{ {
if (index.isMyself()) { (*this) = variant.to<CWeatherScenario>(); return; } if (index.isMyself()) { (*this) = variant.to<CWeatherScenario>(); return; }
ColumnIndex i = index.frontCasted<ColumnIndex>(); const ColumnIndex i = index.frontCasted<ColumnIndex>();
switch (i) switch (i)
{ {
case IndexScenarioIndex: case IndexScenarioIndex: setIndex(variant.value<ScenarioIndex>()); break;
setIndex(variant.value<ScenarioIndex>()); case IndexScenarioName: setName(variant.value<QString>()); break;
break; case IndexScenarioDescription: setDescription(variant.value<QString>()); break;
case IndexScenarioName:
setName(variant.value<QString>());
break;
case IndexScenarioDescription:
setDescription(variant.value<QString>());
break;
default: default:
CValueObject::setPropertyByIndex(index, variant); CValueObject::setPropertyByIndex(index, variant);
break; break;

4
src/blackmisc/weather/weatherscenario.h
View File

@@ -84,8 +84,8 @@ namespace BlackMisc
private: private:
ScenarioIndex m_scenarioIndex = ClearSky; ScenarioIndex m_scenarioIndex = ClearSky;
QString m_scenarioName; QString m_scenarioName {"Clear Sky"};
QString m_scenarioDescription; QString m_scenarioDescription {"Clear Sky default"};
BLACK_METACLASS( BLACK_METACLASS(
CWeatherScenario, CWeatherScenario,