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

refs #369, smaller changes

Browse Source 
* rendered attribute in CSimulatedAircraft
* Formatting
* contains in CPropertyIndex
* CAircraftModel, new type
This commit is contained in:
Klaus Basan
2015-02-05 23:50:44 +01:00
parent 366721d9ad
commit 89424647aa
7 changed files with 45 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
src/blackmisc/simulation/simulatedaircraft.h
View File

@@ -30,7 +30,8 @@ namespace BlackMisc
{
IndexModel = BlackMisc::CPropertyIndex::GlobalIndexCSimulatedAircraft,
IndexClient,
IndexEnabled
IndexEnabled,
IndexRendered
};
//! Default constructor.
@@ -50,6 +51,9 @@ namespace BlackMisc
//! Get model
const BlackMisc::Simulation::CAircraftModel &getModel() const { return m_model; }
//! Get model string
QString getModelString() const { return m_model.getModelString(); }
//! Set model
void setModel(const BlackMisc::Simulation::CAircraftModel &model);
@@ -74,9 +78,15 @@ namespace BlackMisc
//! Enabled?
bool isEnabled() const { return m_enabled; }
//! Enabled
//! Enabled / disabled
void setEnabled(bool enabled) { m_enabled = enabled; }
//! Rendered?
bool isRendered() const { return m_rendered; }
//! Rendered?
void setRendered(bool rendered) { m_rendered = rendered; }
//! Update from aviation aircraft
void setAircraft(const BlackMisc::Aviation::CAircraft &aircraft);
@@ -88,7 +98,8 @@ namespace BlackMisc
BLACK_ENABLE_TUPLE_CONVERSION(CSimulatedAircraft)
BlackMisc::Simulation::CAircraftModel m_model;
BlackMisc::Network::CClient m_client;
bool m_enabled = true;
bool m_enabled = true; // to be displayed in sim
bool m_rendered = false; // really shown in sim
void init();
};
@@ -98,7 +109,8 @@ namespace BlackMisc
BLACK_DECLARE_TUPLE_CONVERSION(BlackMisc::Simulation::CSimulatedAircraft, (
attr(o.m_model),
attr(o.m_client),
attr(o.m_enabled)
attr(o.m_enabled),
attr(o.m_rendered)
))
Q_DECLARE_METATYPE(BlackMisc::Simulation::CSimulatedAircraft)