refs #411, some more DBus tests and some minor adjustments found in course of action

This commit is contained in:
Klaus Basan
2015-04-27 12:09:53 +02:00
committed by Mathew Sutcliffe
parent 1b9878fdd3
commit 4aa5f8069e
8 changed files with 212 additions and 269 deletions

View File

@@ -23,12 +23,6 @@ namespace BlackMisc
namespace Aviation
{
template <class AVIO>
bool CModulator<AVIO>::isDefaultValue() const
{
return (this->m_frequencyActive == FrequencyNotSet());
}
template <class AVIO>
void CModulator<AVIO>::toggleActiveStandby()
{
@@ -37,66 +31,6 @@ namespace BlackMisc
this->m_frequencyStandby = a;
}
template <class AVIO>
BlackMisc::PhysicalQuantities::CFrequency CModulator<AVIO>::getFrequencyActive() const
{
return this->m_frequencyActive;
}
template <class AVIO>
BlackMisc::PhysicalQuantities::CFrequency CModulator<AVIO>::getFrequencyStandby() const
{
return this->m_frequencyStandby;
}
template <class AVIO>
void CModulator<AVIO>::setFrequencyActive(const BlackMisc::PhysicalQuantities::CFrequency &frequency)
{
this->m_frequencyActive = frequency;
}
template <class AVIO>
void CModulator<AVIO>::setFrequencyStandby(const BlackMisc::PhysicalQuantities::CFrequency &frequency)
{
this->m_frequencyStandby = frequency;
}
template <class AVIO>
qint32 CModulator<AVIO>::getVolumeOutput() const
{
return this->m_volumeOutput;
}
template <class AVIO>
qint32 CModulator<AVIO>::getVolumeInput() const
{
return this->m_volumeInput;
}
template <class AVIO>
void CModulator<AVIO>::setVolumeOutput(qint32 volume)
{
this->m_volumeOutput = volume;
}
template <class AVIO>
void CModulator<AVIO>::setVolumeInput(qint32 volume)
{
this->m_volumeInput = volume;
}
template <class AVIO>
bool CModulator<AVIO>::isEnabled() const
{
return this->m_enabled;
}
template <class AVIO>
void CModulator<AVIO>::setEnabled(bool enable)
{
this->m_enabled = enable;
}
template <class AVIO>
CVariant CModulator<AVIO>::propertyByIndex(const CPropertyIndex &index) const
{
@@ -151,14 +85,6 @@ namespace BlackMisc
}
}
template <class AVIO>
CModulator<AVIO>::CModulator() :
CModulator::CValueObject("default") {}
template <class AVIO>
CModulator<AVIO>::CModulator(const QString &name, const BlackMisc::PhysicalQuantities::CFrequency &activeFrequency, const BlackMisc::PhysicalQuantities::CFrequency &standbyFrequency) :
CModulator::CValueObject(name), m_frequencyActive(activeFrequency), m_frequencyStandby(standbyFrequency) {}
template <class AVIO>
QString CModulator<AVIO>::convertToQString(bool i18n) const
{
@@ -168,108 +94,6 @@ namespace BlackMisc
return s;
}
template <class AVIO>
void CModulator<AVIO>::setFrequencyActiveKHz(double frequencyKHz)
{
this->m_frequencyActive = BlackMisc::PhysicalQuantities::CFrequency(frequencyKHz, BlackMisc::PhysicalQuantities::CFrequencyUnit::kHz());
}
template <class AVIO>
void CModulator<AVIO>::setFrequencyStandbyKHz(double frequencyKHz)
{
this->m_frequencyStandby = BlackMisc::PhysicalQuantities::CFrequency(frequencyKHz, BlackMisc::PhysicalQuantities::CFrequencyUnit::kHz());
}
template <class AVIO>
void CModulator<AVIO>::setFrequencyActiveMHz(double frequencyMHz)
{
frequencyMHz = Math::CMathUtils::round(frequencyMHz, 3);
this->m_frequencyActive = BlackMisc::PhysicalQuantities::CFrequency(frequencyMHz, BlackMisc::PhysicalQuantities::CFrequencyUnit::MHz());
}
template <class AVIO>
void CModulator<AVIO>::setFrequencyStandbyMHz(double frequencyMHz)
{
frequencyMHz = Math::CMathUtils::round(frequencyMHz, 3);
this->m_frequencyStandby = BlackMisc::PhysicalQuantities::CFrequency(frequencyMHz, BlackMisc::PhysicalQuantities::CFrequencyUnit::MHz());
}
template <class AVIO>
const QString &CModulator<AVIO>::NameCom1()
{
static QString n("COM1");
return n;
}
template <class AVIO>
const QString &CModulator<AVIO>::NameCom2()
{
static QString n("COM2");
return n;
}
template <class AVIO>
const QString &CModulator<AVIO>::NameCom3()
{
static QString n("COM3");
return n;
}
template <class AVIO>
const QString &CModulator<AVIO>::NameNav1()
{
static QString n("NAV1");
return n;
}
template <class AVIO>
const QString &CModulator<AVIO>::NameNav2()
{
static QString n("NAV2");
return n;
}
template <class AVIO>
const QString &CModulator<AVIO>::NameNav3()
{
static QString n("NAV3");
return n;
}
template <class AVIO>
const QString &CModulator<AVIO>::NameAdf1()
{
static QString n("ADF1");
return n;
}
template <class AVIO>
const QString &CModulator<AVIO>::NameAdf2()
{
static QString n("ADF2");
return n;
}
template <class AVIO>
const BlackMisc::PhysicalQuantities::CFrequency &CModulator<AVIO>::FrequencyNotSet()
{
static BlackMisc::PhysicalQuantities::CFrequency f;
return f;
}
template <class AVIO>
AVIO const *CModulator<AVIO>::derived() const
{
return static_cast<AVIO const *>(this);
}
template <class AVIO>
AVIO *CModulator<AVIO>::derived()
{
return static_cast<AVIO *>(this);
}
// see here for the reason of thess forward instantiations
// http://www.parashift.com/c++-faq/separate-template-class-defn-from-decl.html
template class CModulator<CComSystem>;