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

refs #358, consolidated mapping and model classes

Browse Source 
* removed redundant classes in blacksim
* more detailed attributes for mapping
* more finder functions in mapping list
* aircraft model extended as simulator independent description for models
This commit is contained in:
Klaus Basan
2014-12-15 00:26:19 +01:00
parent def17124db
commit bdcb031591
15 changed files with 269 additions and 504 deletions
Download Patch File Download Diff File Expand all files Collapse all files

24
src/blackmisc/nwaircraftmapping.h
View File

@@ -20,15 +20,9 @@ namespace BlackMisc
{
namespace Network
{
/*!
* Mapping
*/
//! Mapping
class CAircraftMapping : public CValueObjectStdTuple<CAircraftMapping>
{
private:
BLACK_ENABLE_TUPLE_CONVERSION(CAircraftMapping)
BlackMisc::Aviation::CAircraftIcao m_icao; //!< ICAO code
BlackMisc::Network::CAircraftModel m_model; //!< aircraft model
protected:
//! \copydoc CValueObject::convertToQString
@@ -39,14 +33,16 @@ namespace BlackMisc
enum ColumnIndex
{
IndexModel,
IndexIcaoCode
IndexIcao,
IndexPackageName,
IndexSource
};
//! Default constructor
CAircraftMapping() = default;
//! Constructor
CAircraftMapping(const QString &aircraftDesignator, const QString &airlineDesignator, const QString &model);
CAircraftMapping(const QString &source, const QString &packageName, const QString &aircraftDesignator, const QString &airlineDesignator, const QString &model);
//! \copydoc CValueObject::propertyByIndex
CVariant propertyByIndex(const BlackMisc::CPropertyIndex &index) const override;
@@ -71,6 +67,16 @@ namespace BlackMisc
//! Matches wildcard icao object
bool matchesWildcardIcao(const BlackMisc::Aviation::CAircraftIcao &otherIcao) const { return m_icao.matchesWildcardIcao(otherIcao); }
private:
BLACK_ENABLE_TUPLE_CONVERSION(CAircraftMapping)
QString m_source; //!< source, e.g. database, vPilot
QString m_packageName; //!< something like WoA, ..
BlackMisc::Aviation::CAircraftIcao m_icao; //!< ICAO code
BlackMisc::Network::CAircraftModel m_model; //!< aircraft model
// BlackSim::CSimulatorInfo m_simulatorInfo; //!< Mapping is for simulator
};
}
}