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 #345 Second wave of value classes using the CValueObjectStdTuple CRTP class template, with inheritance.

Browse Source
This commit is contained in:
Mathew Sutcliffe
2014-11-07 23:56:53 +00:00
parent 79e401887c
commit 40362e706a
10 changed files with 18 additions and 445 deletions
Download Patch File Download Diff File Expand all files Collapse all files

54
src/blackmisc/aviotransponder.h
View File

@@ -21,7 +21,7 @@ namespace BlackMisc
/*!
* Transponder
*/
class CTransponder : public CAvionicsBase
class CTransponder : public CValueObjectStdTuple<CTransponder, CAvionicsBase>
{
public:
//! Transponder codes
@@ -46,23 +46,23 @@ namespace BlackMisc
};
//! Default constructor
CTransponder() : CAvionicsBase("transponder"), m_transponderCode(0), m_transponderMode(StateStandby) {}
CTransponder() : CValueObjectStdTuple("transponder"), m_transponderCode(0), m_transponderMode(StateStandby) {}
//! Constructor
CTransponder(const QString &name, qint32 transponderCode, TransponderMode transponderMode) :
CAvionicsBase(name), m_transponderCode(transponderCode), m_transponderMode(transponderMode)
CValueObjectStdTuple(name), m_transponderCode(transponderCode), m_transponderMode(transponderMode)
{ }
//! Constructor with transponder mode as string
CTransponder(const QString &name, qint32 transponderCode, QString transponderMode) :
CAvionicsBase(name), m_transponderCode(transponderCode), m_transponderMode(StateStandby)
CValueObjectStdTuple(name), m_transponderCode(transponderCode), m_transponderMode(StateStandby)
{
this->setModeAsString(transponderMode);
}
//! Constructor, code as string
CTransponder(const QString &name, QString transponderCode, TransponderMode transponderMode) :
CAvionicsBase(name), m_transponderCode(0), m_transponderMode(transponderMode)
CValueObjectStdTuple(name), m_transponderCode(0), m_transponderMode(transponderMode)
{
bool ok = false;
this->m_transponderCode = transponderCode.toUInt(&ok);
@@ -71,7 +71,7 @@ namespace BlackMisc
//! Constructor
CTransponder(const QString &name, QString transponderCode, QString transponderMode) :
CAvionicsBase(name), m_transponderCode(0), m_transponderMode(StateStandby)
CValueObjectStdTuple(name), m_transponderCode(0), m_transponderMode(StateStandby)
{
bool ok = false;
this->m_transponderCode = transponderCode.toUInt(&ok);
@@ -136,57 +136,24 @@ namespace BlackMisc
//! Set IFR
void setIFR() { this->m_transponderCode = 2000; }
//! operator ==
bool operator ==(const CTransponder &other) const
{
return
this->m_transponderCode == other.m_transponderCode &&
this->getTransponderMode() == other.getTransponderMode() &&
this->CAvionicsBase::operator ==(other);
}
//! operator !=
bool operator !=(const CTransponder &other) const { return !((*this) == other); }
//! Transponder unit
static CTransponder getStandardTransponder(qint32 transponderCode, TransponderMode mode)
{
return CTransponder("Transponder", transponderCode, mode);
}
//! \copydoc CValueObject::getValueHash()
virtual uint getValueHash() const override;
//! \copydoc CValueObject::toJson
virtual QJsonObject toJson() const override;
//! \copydoc CValueObject::convertFromJson
virtual void convertFromJson(const QJsonObject &json) override;
//! \copydoc CValueObject::toQVariant
virtual QVariant toQVariant() const override { return QVariant::fromValue(*this); }
//! \copydoc CValueObject::convertFromQVariant
virtual void convertFromQVariant(const QVariant &variant) override { BlackMisc::setFromQVariant(this, variant); }
//! \copydoc CValueObject::propertyByIndex
virtual QVariant propertyByIndex(const BlackMisc::CPropertyIndex &index) const override;
//! \copydoc CValueObject::setPropertyByIndex(variant, index)
virtual void setPropertyByIndex(const QVariant &variant, const BlackMisc::CPropertyIndex &index) override;
//! JSON member names
static const QStringList &jsonMembers();
//! Is valid transponder code?
static bool isValidTransponderCode(const QString &transponderCode);
//! Is valid transponder code?
static bool isValidTransponderCode(qint32 transponderMode);
//! Register metadata
static void registerMetadata();
protected:
//! Default value?
virtual bool isDefaultValue() const { return this->m_transponderCode == 0; }
@@ -194,15 +161,6 @@ namespace BlackMisc
//! \copydoc CValueObject::convertToQString
virtual QString convertToQString(bool i18n = false) const override;
//! \copydoc CValueObject::marshallFromDbus()
virtual void marshallToDbus(QDBusArgument &argument) const override;
//! \copydoc CValueObject::unmarshallFromDbus()
virtual void unmarshallFromDbus(const QDBusArgument &argument) override;
//! \copydoc CValueObject::compareImpl
virtual int compareImpl(const CValueObject &other) const override;
private:
BLACK_ENABLE_TUPLE_CONVERSION(CTransponder)
qint32 m_transponderCode; //!< Transponder code