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

refs #452, updated vPilot reader/sets

Browse Source 
* Using ITimestampBased
* removed mapping / unsing CAircraftModel
* graceful shutdown in reader
This commit is contained in:
Klaus Basan
2015-09-23 18:10:41 +02:00
committed by Mathew Sutcliffe
parent fd8cd9a42a
commit 8dba22f7f0
6 changed files with 228 additions and 61 deletions
Download Patch File Download Diff File Expand all files Collapse all files

28
src/blackmisc/simulation/fscommon/vpilotmodelrule.h
View File

@@ -13,9 +13,10 @@
#define BLACKMISC_SIMULATION_FSCOMMON_VPILOTMODELRULE_H
#include "blackmisc/blackmiscexport.h"
#include "blackmisc/network/aircraftmapping.h"
#include "blackmisc/simulation/aircraftmodel.h"
#include "blackmisc/valueobject.h"
#include "blackmisc/datastore.h"
#include "blackmisc/timestampbased.h"
#include <QJsonObject>
namespace BlackMisc
@@ -26,7 +27,8 @@ namespace BlackMisc
{
//! Value object encapsulating information of software distributor.
class BLACKMISC_EXPORT CVPilotModelRule :
public BlackMisc::CValueObject<CVPilotModelRule>
public BlackMisc::CValueObject<CVPilotModelRule>,
public ITimestampBased
{
public:
//! Property indexes
@@ -35,9 +37,7 @@ namespace BlackMisc
IndexModelName = CPropertyIndex::GlobalIndexVPilotModelRule,
IndexFolder,
IndexTypeCode,
IndexCallsignPrefix,
IndexUpdatedTimestamp,
IndexUpdatedMsSinceEpoch
IndexCallsignPrefix
};
//! Default constructor
@@ -52,7 +52,7 @@ namespace BlackMisc
//! Get folder
const QString &getFolder() const { return this->m_folder;}
//! Distributor derived from folder
//! Distributor derived from folder (hardcoded)
const QString getDistributor() const;
//! Get type code
@@ -61,12 +61,6 @@ namespace BlackMisc
//! Get callsign prefix
const QString &getCallsignPrefix() const { return this->m_callsignPrefix;}
//! Update timestamp
QDateTime getUpdateTimestamp() const { return QDateTime::fromMSecsSinceEpoch(this->m_updatedMsSinceEpoch); }
//! Updated when
qint64 getUpdateMsSinceEpoch() const { return m_updatedMsSinceEpoch; }
//! Model name
void setModelName(const QString &name) { this->m_modelName = name.trimmed().toUpper(); }
@@ -79,12 +73,6 @@ namespace BlackMisc
//! Callsign prefix
void setCallsignPrefix(const QString &callsign) { this->m_callsignPrefix = callsign.trimmed().toUpper(); }
//! Set update timestamp
void setUpdateTimestamp(qint64 timestamp) { this->m_updatedMsSinceEpoch = timestamp; }
//! Set update timestamp
void setUpdateTimestamp(const QDateTime &timestamp) { this->m_updatedMsSinceEpoch = timestamp.toMSecsSinceEpoch(); }
//! \copydoc CValueObject::propertyByIndex
CVariant propertyByIndex(const BlackMisc::CPropertyIndex &index) const;
@@ -94,8 +82,8 @@ namespace BlackMisc
//! \copydoc CValueObject::convertToQString
QString convertToQString(bool i18n = false) const;
//! Convert to mapping
BlackMisc::Network::CAircraftMapping toMapping() const;
//! Convert into aircraft model
CAircraftModel toAircraftModel() const;
private:
BLACK_ENABLE_TUPLE_CONVERSION(CVPilotModelRule)