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

Cloud layers have a base and a top

Browse Source 
refs #579
This commit is contained in:
Roland Winklmeier
2016-03-01 23:48:13 +01:00
parent fe9c8ca3de
commit 48fdfbea3e
9 changed files with 46 additions and 41 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -59,8 +59,8 @@ namespace BlackMisc
//! Properties by index
enum ColumnIndex
{
IndexCloudLayer = BlackMisc::CPropertyIndex::GlobalIndexCCloudLayer,
IndexCeiling,
IndexBase = BlackMisc::CPropertyIndex::GlobalIndexCCloudLayer,
IndexTop,
IndexCoverage
};
@@ -69,12 +69,12 @@ namespace BlackMisc
//! Constructor
CCloudLayer(BlackMisc::Aviation::CAltitude base,
BlackMisc::Aviation::CAltitude ceiling,
BlackMisc::Aviation::CAltitude top,
Coverage coverage);
//! Constructor
CCloudLayer(BlackMisc::Aviation::CAltitude base,
BlackMisc::Aviation::CAltitude ceiling,
BlackMisc::Aviation::CAltitude top,
int precipitationRate,
Precipitation precipitation,
Clouds clouds,
@@ -86,11 +86,11 @@ namespace BlackMisc
//! Get base
BlackMisc::Aviation::CAltitude getBase() const { return m_base; }
//! Set ceiling
void setCeiling(BlackMisc::Aviation::CAltitude ceiling) { m_ceiling = ceiling; }
//! Set layer top
void setTop(BlackMisc::Aviation::CAltitude top) { m_top = top; }
//! Get ceiling
BlackMisc::Aviation::CAltitude getCeiling() const { return m_ceiling; }
//! Get layer top
BlackMisc::Aviation::CAltitude getTop() const { return m_top; }
//! Set precipitation rate
void setPrecipitationRate(int rate) { m_precipitationRate = rate; }
@@ -134,7 +134,7 @@ namespace BlackMisc
private:
BLACK_ENABLE_TUPLE_CONVERSION(CCloudLayer)
BlackMisc::Aviation::CAltitude m_base;
BlackMisc::Aviation::CAltitude m_ceiling;
BlackMisc::Aviation::CAltitude m_top;
int m_precipitationRate = 0;
Precipitation m_precipitation = NoPrecipitation;
Clouds m_clouds = NoClouds;
@@ -148,7 +148,7 @@ Q_DECLARE_METATYPE(BlackMisc::Weather::CCloudLayer)
Q_DECLARE_METATYPE(BlackMisc::Weather::CCloudLayer::Coverage)
BLACK_DECLARE_TUPLE_CONVERSION(BlackMisc::Weather::CCloudLayer, (
attr(o.m_base),
attr(o.m_ceiling),
attr(o.m_top),
attr(o.m_precipitationRate),
attr(o.m_precipitation),
attr(o.m_clouds),