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

refs #140, changed CValueObject classes to tupel concept

Browse Source 
Remarks: Changes looking like an added file result from the shift of namespace voice -> audio
This commit is contained in:
Klaus Basan
2014-03-10 14:48:56 +01:00
parent 8f6a22e833
commit 34320ad3e1
43 changed files with 1293 additions and 768 deletions
Download Patch File Download Diff File Expand all files Collapse all files

58
src/blackmisc/aviocomsystem.h
View File

@@ -6,13 +6,13 @@
#ifndef BLACKMISC_AVIOCOMSYSTEM_H
#define BLACKMISC_AVIOCOMSYSTEM_H
#include "blackmisc/aviomodulator.h"
#include "blackmisc/blackmiscfreefunctions.h"
#include <stdexcept>
namespace BlackMisc
{
namespace Aviation
{
/*!
* \brief COM system (aka "radio")
*/
@@ -30,6 +30,7 @@ namespace BlackMisc
};
private:
BLACK_ENABLE_TUPLE_CONVERSION(CComSystem)
ChannelSpacing m_channelSpacing;
/*!
@@ -54,9 +55,7 @@ namespace BlackMisc
static double channelSpacingToFrequencyKHz(ChannelSpacing channelSpacing);
protected:
/*!
* \copydoc CAvionicsBase::validValues
*/
//! \copydoc CAvionicsBase::validValues
virtual bool validValues() const override;
/*!
@@ -68,52 +67,32 @@ namespace BlackMisc
*/
bool validate(bool strict = true) const;
/*!
* \copydoc CValueObject::marshallFromDbus()
*/
//! \copydoc CValueObject::marshallFromDbus()
virtual void marshallToDbus(QDBusArgument &argument) const override;
/*!
* \copydoc CValueObject::unmarshallFromDbus()
*/
//! \copydoc CValueObject::unmarshallFromDbus()
virtual void unmarshallFromDbus(const QDBusArgument &argument) override;
//! \copydoc CValueObject::compareImpl
virtual int compareImpl(const CValueObject &other) const override;
public:
/*!
* Default constructor
*/
//! \brief Default constructor
CComSystem() : CModulator(), m_channelSpacing(ChannelSpacing25KHz) {}
/*!
* \brief Constructor
*/
//! \brief Constructor
CComSystem(const QString &name, const BlackMisc::PhysicalQuantities::CFrequency &activeFrequency, const BlackMisc::PhysicalQuantities::CFrequency &standbyFrequency = CModulator::FrequencyNotSet(), int digits = 3):
CModulator(name, activeFrequency, standbyFrequency == CModulator::FrequencyNotSet() ? activeFrequency : standbyFrequency, digits), m_channelSpacing(ChannelSpacing25KHz)
{
this->validate(true);
}
/*!
* \brief Copy constructor
*/
CComSystem(const CComSystem &other) : CModulator(other), m_channelSpacing(other.m_channelSpacing) {}
/*!
* \copydoc CValueObject::toQVariant
*/
//! \copydoc CValueObject::toQVariant
virtual QVariant toQVariant() const override
{
return QVariant::fromValue(*this);
}
/*!
* \copydoc CValueObject::getValueHash
*/
virtual uint getValueHash() const override
{
return CModulator::getValueHash();
}
/*!
* \brief Set active frequency
* \remarks will be rounded to channel spacing
@@ -161,21 +140,18 @@ namespace BlackMisc
this->setFrequencyActive(BlackMisc::PhysicalQuantities::CPhysicalQuantitiesConstants::FrequencyInternationalAirDistress());
}
//! \copydoc CValueObject::getValueHash
virtual uint getValueHash() const override;
/*!
* \brief operator ==
*/
bool operator ==(const CComSystem &other) const
{
return this->CModulator::operator ==(other);
}
bool operator ==(const CComSystem &other) const;
/*!
* \brief operator !=
*/
bool operator !=(const CComSystem &other) const
{
return this->CModulator::operator !=(other);
}
bool operator !=(const CComSystem &other) const;
/*!
* Try to get a COM unit with given name and frequency. Returns true in case an object
@@ -383,6 +359,8 @@ namespace BlackMisc
} // namespace
} // namespace
BLACK_DBUS_ENUM_MARSHALLING(BlackMisc::Aviation::CComSystem::ChannelSpacing)
BLACK_DECLARE_TUPLE_CONVERSION(BlackMisc::Aviation::CComSystem, (o.m_channelSpacing))
Q_DECLARE_METATYPE(BlackMisc::Aviation::CComSystem)
#endif // include guard