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

refs #403 workaround different extern template behaviour with MinGW

Browse Source
This commit is contained in:
Roland Winklmeier
2015-04-19 22:25:31 +02:00
parent a089d3641d
commit d0302c275a
10 changed files with 555 additions and 281 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
src/blackmisc/aviation/callsignobjectlist.h
View File

@@ -108,12 +108,12 @@ namespace BlackMisc
CONTAINER &container();
};
extern template class ICallsignObjectList<BlackMisc::Aviation::CAtcStation, BlackMisc::Aviation::CAtcStationList>;
extern template class ICallsignObjectList<BlackMisc::Aviation::CAircraft, BlackMisc::Aviation::CAircraftList>;
extern template class ICallsignObjectList<BlackMisc::Aviation::CAircraftSituation, BlackMisc::Aviation::CAircraftSituationList>;
extern template class ICallsignObjectList<BlackMisc::Aviation::CAircraftParts, BlackMisc::Aviation::CAircraftPartsList>;
extern template class ICallsignObjectList<BlackMisc::Simulation::CSimulatedAircraft, BlackMisc::Simulation::CSimulatedAircraftList>;
extern template class ICallsignObjectList<BlackMisc::Network::CClient, BlackMisc::Network::CClientList>;
extern template class BLACKMISC_EXPORT_TEMPLATE ICallsignObjectList<BlackMisc::Aviation::CAtcStation, BlackMisc::Aviation::CAtcStationList>;
extern template class BLACKMISC_EXPORT_TEMPLATE ICallsignObjectList<BlackMisc::Aviation::CAircraft, BlackMisc::Aviation::CAircraftList>;
extern template class BLACKMISC_EXPORT_TEMPLATE ICallsignObjectList<BlackMisc::Aviation::CAircraftSituation, BlackMisc::Aviation::CAircraftSituationList>;
extern template class BLACKMISC_EXPORT_TEMPLATE ICallsignObjectList<BlackMisc::Aviation::CAircraftParts, BlackMisc::Aviation::CAircraftPartsList>;
extern template class BLACKMISC_EXPORT_TEMPLATE ICallsignObjectList<BlackMisc::Simulation::CSimulatedAircraft, BlackMisc::Simulation::CSimulatedAircraftList>;
extern template class BLACKMISC_EXPORT_TEMPLATE ICallsignObjectList<BlackMisc::Network::CClient, BlackMisc::Network::CClientList>;
} //namespace
} // namespace

173
src/blackmisc/aviation/modulator.cpp
View File

@@ -23,6 +23,12 @@ namespace BlackMisc
namespace Aviation
{
template <class AVIO>
bool CModulator<AVIO>::isDefaultValue() const
{
return (this->m_frequencyActive == FrequencyNotSet());
}
template <class AVIO>
void CModulator<AVIO>::toggleActiveStandby()
{
@@ -31,6 +37,66 @@ 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
{
@@ -85,6 +151,113 @@ 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
{
QString s(this->getName());
s.append(" Active: ").append(this->m_frequencyActive.valueRoundedWithUnit(3, i18n));
s.append(" Standby: ").append(this->m_frequencyStandby.valueRoundedWithUnit(3, i18n));
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
{

133
src/blackmisc/aviation/modulator.h
View File

@@ -41,55 +41,40 @@ namespace BlackMisc
};
//! Default value?
virtual bool isDefaultValue() const
{
return (this->m_frequencyActive == FrequencyNotSet());
}
virtual bool isDefaultValue() const;
//! Toggle active and standby frequencies
void toggleActiveStandby();
//! Active frequency
BlackMisc::PhysicalQuantities::CFrequency getFrequencyActive() const
{
return this->m_frequencyActive;
}
BlackMisc::PhysicalQuantities::CFrequency getFrequencyActive() const;
//! Standby frequency
BlackMisc::PhysicalQuantities::CFrequency getFrequencyStandby() const
{
return this->m_frequencyStandby;
}
BlackMisc::PhysicalQuantities::CFrequency getFrequencyStandby() const;
//! Set active frequency
virtual void setFrequencyActive(const BlackMisc::PhysicalQuantities::CFrequency &frequency)
{
this->m_frequencyActive = frequency;
}
virtual void setFrequencyActive(const BlackMisc::PhysicalQuantities::CFrequency &frequency);
//! Set standby frequency
virtual void setFrequencyStandby(const BlackMisc::PhysicalQuantities::CFrequency &frequency)
{
this->m_frequencyStandby = frequency;
}
virtual void setFrequencyStandby(const BlackMisc::PhysicalQuantities::CFrequency &frequency);
//! Output volume 0..100
qint32 getVolumeOutput() const { return this->m_volumeOutput; }
qint32 getVolumeOutput() const;
//! Input volume 0..100
qint32 getVolumeInput() const { return this->m_volumeInput; }
qint32 getVolumeInput() const;
//! Output volume 0.100
void setVolumeOutput(qint32 volume) { this->m_volumeOutput = volume; }
void setVolumeOutput(qint32 volume);
//! Input volume 0..100
void setVolumeInput(qint32 volume) { this->m_volumeInput = volume; }
void setVolumeInput(qint32 volume);
//! Enabled?
bool isEnabled() const { return this->m_enabled;}
bool isEnabled() const;
//! Enabled?
void setEnabled(bool enable) { this->m_enabled = enable;}
void setEnabled(bool enable);
//! \copydoc CValueObject::propertyByIndex
virtual CVariant propertyByIndex(const BlackMisc::CPropertyIndex &index) const override;
@@ -99,110 +84,52 @@ namespace BlackMisc
protected:
//! Default constructor
CModulator() :
CModulator::CValueObject("default") {}
CModulator();
//! Constructor
CModulator(const QString &name, const BlackMisc::PhysicalQuantities::CFrequency &activeFrequency, const BlackMisc::PhysicalQuantities::CFrequency &standbyFrequency) :
CModulator::CValueObject(name), m_frequencyActive(activeFrequency), m_frequencyStandby(standbyFrequency) {}
CModulator(const QString &name, const BlackMisc::PhysicalQuantities::CFrequency &activeFrequency, const BlackMisc::PhysicalQuantities::CFrequency &standbyFrequency);
//! \copydoc CValueObject::convertToQString
virtual QString convertToQString(bool i18n = false) const override
{
QString s(this->getName());
s.append(" Active: ").append(this->m_frequencyActive.valueRoundedWithUnit(3, i18n));
s.append(" Standby: ").append(this->m_frequencyStandby.valueRoundedWithUnit(3, i18n));
return s;
}
virtual QString convertToQString(bool i18n = false) const override;
//! Set active frequency
void setFrequencyActiveKHz(double frequencyKHz)
{
this->m_frequencyActive = BlackMisc::PhysicalQuantities::CFrequency(frequencyKHz, BlackMisc::PhysicalQuantities::CFrequencyUnit::kHz());
}
void setFrequencyActiveKHz(double frequencyKHz);
//! Set standby frequency
void setFrequencyStandbyKHz(double frequencyKHz)
{
this->m_frequencyStandby = BlackMisc::PhysicalQuantities::CFrequency(frequencyKHz, BlackMisc::PhysicalQuantities::CFrequencyUnit::kHz());
}
void setFrequencyStandbyKHz(double frequencyKHz);
//! Set active frequency
virtual void setFrequencyActiveMHz(double frequencyMHz)
{
frequencyMHz = Math::CMathUtils::round(frequencyMHz, 3);
this->m_frequencyActive = BlackMisc::PhysicalQuantities::CFrequency(frequencyMHz, BlackMisc::PhysicalQuantities::CFrequencyUnit::MHz());
}
virtual void setFrequencyActiveMHz(double frequencyMHz);
//! Set standby frequency
virtual void setFrequencyStandbyMHz(double frequencyMHz)
{
frequencyMHz = Math::CMathUtils::round(frequencyMHz, 3);
this->m_frequencyStandby = BlackMisc::PhysicalQuantities::CFrequency(frequencyMHz, BlackMisc::PhysicalQuantities::CFrequencyUnit::MHz());
}
virtual void setFrequencyStandbyMHz(double frequencyMHz);
//! COM1
static const QString &NameCom1()
{
static QString n("COM1");
return n;
}
static const QString &NameCom1();
//! COM2
static const QString &NameCom2()
{
static QString n("COM2");
return n;
}
static const QString &NameCom2();
//! COM3
static const QString &NameCom3()
{
static QString n("COM3");
return n;
}
static const QString &NameCom3();
//! NAV1
static const QString &NameNav1()
{
static QString n("NAV1");
return n;
}
static const QString &NameNav1();
//! NAV2
static const QString &NameNav2()
{
static QString n("NAV2");
return n;
}
static const QString &NameNav2();
//! NAV3
static const QString &NameNav3()
{
static QString n("NAV3");
return n;
}
static const QString &NameNav3();
//! ADF1
static const QString &NameAdf1()
{
static QString n("ADF1");
return n;
}
static const QString &NameAdf1();
//! ADF2
static const QString &NameAdf2()
{
static QString n("ADF2");
return n;
}
static const QString &NameAdf2();
//! Frequency not set
static const BlackMisc::PhysicalQuantities::CFrequency &FrequencyNotSet()
{
static BlackMisc::PhysicalQuantities::CFrequency f;
return f;
}
static const BlackMisc::PhysicalQuantities::CFrequency &FrequencyNotSet();
private:
BLACK_ENABLE_TUPLE_CONVERSION(CModulator)
@@ -219,9 +146,9 @@ namespace BlackMisc
AVIO *derived();
};
extern template class CModulator<CComSystem>;
extern template class CModulator<CNavSystem>;
extern template class CModulator<CAdfSystem>;
extern template class BLACKMISC_EXPORT_TEMPLATE CModulator<CComSystem>;
extern template class BLACKMISC_EXPORT_TEMPLATE CModulator<CNavSystem>;
extern template class BLACKMISC_EXPORT_TEMPLATE CModulator<CAdfSystem>;
}
}