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

Ref T129, SELCAL class improvements

Browse Source 
* unify string to also allow strings like AB-FG as input
* removed static variables, replaced by "our normal static const &" style
This commit is contained in:
Klaus Basan
2017-10-06 17:49:13 +02:00
committed by Mathew Sutcliffe
parent 6fbf601aea
commit 686cb03170
2 changed files with 51 additions and 39 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
src/blackmisc/aviation/selcal.h
View File

@@ -40,13 +40,10 @@ namespace BlackMisc
CSelcal() = default;
//! Constructor.
CSelcal(const QString &code) : m_code(code.trimmed().toUpper()) {}
CSelcal(const QString &code) : m_code(unifyCode(code)) {}
/*!
* Constructor.
* Needed to disambiguate implicit conversion from string literal.
*/
CSelcal(const char *code) : m_code(QString(code).trimmed().toUpper()) {}
//! Constructor needed to disambiguate implicit conversion from string literal.
CSelcal(const char *code) : m_code(unifyCode(code)) {}
//! Is valid?
bool isValid() const { return isValidCode(m_code); }
@@ -76,14 +73,17 @@ namespace BlackMisc
//! Audio frequency for character
static const PhysicalQuantities::CFrequency &audioFrequencyEquivalent(QChar c);
//! All audio frequencies
static const QList<PhysicalQuantities::CFrequency> &audioFrequencyEquivalents();
//! All valid code pairs: AB, AC, AD ...
static const QStringList &codePairs();
//! Unify SELCAL code by removing illegal characters
static QString unifyCode(const QString &selcalCandidate);
private:
QString m_code;
static QList<BlackMisc::PhysicalQuantities::CFrequency> frequencyEquivalents;
static QStringList allCodePairs;
BLACK_METACLASS(
CSelcal,