flightsimulatorplatfrom/pilotclient
1
0
Fork 0
mirror of https://github.com/swift-project/pilotclient.git synced 2026-04-26 02:35:38 +08:00
Code Issues Packages Projects Releases Wiki Activity

Remove enum coverage from CCloudLayer and calculate it from percentage

Browse Source 
refs #612
This commit is contained in:
Roland Winklmeier
2016-03-26 21:22:34 +01:00
parent 779191e66b
commit 5d93144c3c
2 changed files with 30 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

36
src/blackmisc/weather/cloudlayer.cpp
View File

@@ -24,8 +24,10 @@ namespace BlackMisc
CCloudLayer::CCloudLayer(BlackMisc::Aviation::CAltitude base, CCloudLayer::CCloudLayer(BlackMisc::Aviation::CAltitude base,
BlackMisc::Aviation::CAltitude top, BlackMisc::Aviation::CAltitude top,
Coverage coverage) : Coverage coverage) :
m_base(base), m_top(top), m_coverage(coverage) m_base(base), m_top(top)
{ } {
setCoverage(coverage);
}
CCloudLayer::CCloudLayer(BlackMisc::Aviation::CAltitude base, CCloudLayer::CCloudLayer(BlackMisc::Aviation::CAltitude base,
BlackMisc::Aviation::CAltitude top, BlackMisc::Aviation::CAltitude top,
@@ -34,8 +36,24 @@ namespace BlackMisc
Clouds clouds, Clouds clouds,
Coverage coverage) : Coverage coverage) :
m_base(base), m_top(top), m_precipitationRate(precipitationRate), m_base(base), m_top(top), m_precipitationRate(precipitationRate),
m_precipitation(precipitation), m_clouds(clouds), m_coverage(coverage) m_precipitation(precipitation), m_clouds(clouds)
{ } {
setCoverage(coverage);
}
void CCloudLayer::setCoverage(Coverage coverage)
{
m_coveragePercent = 100 * coverage / 4;
}
CCloudLayer::Coverage CCloudLayer::getCoverage() const
{
if (m_coveragePercent > 80) { return Overcast; }
if (m_coveragePercent > 60 && m_coveragePercent <= 80) { return Broken; }
if (m_coveragePercent > 40 && m_coveragePercent <= 60) { return Scattered; }
if (m_coveragePercent > 20 && m_coveragePercent <= 40) { return Few; }
return None;
}
CVariant CCloudLayer::propertyByIndex(const BlackMisc::CPropertyIndex &index) const CVariant CCloudLayer::propertyByIndex(const BlackMisc::CPropertyIndex &index) const
{ {
@@ -47,8 +65,8 @@ namespace BlackMisc
return CVariant::fromValue(m_base); return CVariant::fromValue(m_base);
case IndexTop: case IndexTop:
return CVariant::fromValue(m_top); return CVariant::fromValue(m_top);
case IndexCoverage: case IndexCoveragePercent:
return CVariant::fromValue(m_coverage); return CVariant::fromValue(m_coveragePercent);
default: default:
return CValueObject::propertyByIndex(index); return CValueObject::propertyByIndex(index);
} }
@@ -66,8 +84,8 @@ namespace BlackMisc
case IndexTop: case IndexTop:
setTop(variant.value<CAltitude>()); setTop(variant.value<CAltitude>());
break; break;
case IndexCoverage: case IndexCoveragePercent:
setCoverage(variant.value<Coverage>()); setCoveragePercent(variant.value<int>());
break; break;
default: default:
CValueObject::setPropertyByIndex(variant, index); CValueObject::setPropertyByIndex(variant, index);
@@ -86,7 +104,7 @@ namespace BlackMisc
{ Overcast, "overcast" } { Overcast, "overcast" }
}; };
return QString("%1 from %2 to %3").arg(hash.value(m_coverage), m_base.toQString(), m_top.toQString()); return QString("%1 from %2 to %3").arg(hash.value(getCoverage()), m_base.toQString(), m_top.toQString());
} }
} // namespace } // namespace

8
src/blackmisc/weather/cloudlayer.h
View File

@@ -60,7 +60,7 @@ namespace BlackMisc
{ {
IndexBase = BlackMisc::CPropertyIndex::GlobalIndexCCloudLayer, IndexBase = BlackMisc::CPropertyIndex::GlobalIndexCCloudLayer,
IndexTop, IndexTop,
IndexCoverage IndexCoveragePercent
}; };
//! Default constructor. //! Default constructor.
@@ -110,10 +110,10 @@ namespace BlackMisc
Clouds getClouds() const { return m_clouds; } Clouds getClouds() const { return m_clouds; }
//! Set coverage //! Set coverage
void setCoverage(Coverage coverage) { m_coverage = coverage; } void setCoverage(Coverage coverage);
//! Get coverage //! Get coverage
Coverage getCoverage() const { return m_coverage; } Coverage getCoverage() const;
//! Set coverage in % //! Set coverage in %
void setCoveragePercent(int coverage) { m_coveragePercent = coverage; } void setCoveragePercent(int coverage) { m_coveragePercent = coverage; }
@@ -136,7 +136,6 @@ namespace BlackMisc
int m_precipitationRate = 0; int m_precipitationRate = 0;
Precipitation m_precipitation = NoPrecipitation; Precipitation m_precipitation = NoPrecipitation;
Clouds m_clouds = NoClouds; Clouds m_clouds = NoClouds;
Coverage m_coverage;
int m_coveragePercent; int m_coveragePercent;
BLACK_METACLASS( BLACK_METACLASS(
@@ -146,7 +145,6 @@ namespace BlackMisc
BLACK_METAMEMBER(precipitationRate), BLACK_METAMEMBER(precipitationRate),
BLACK_METAMEMBER(precipitation), BLACK_METAMEMBER(precipitation),
BLACK_METAMEMBER(clouds), BLACK_METAMEMBER(clouds),
BLACK_METAMEMBER(coverage),
BLACK_METAMEMBER(coveragePercent) BLACK_METAMEMBER(coveragePercent)
); );
}; };