From 5eb3dee829fa96b6b132487e4397034494c6c4db Mon Sep 17 00:00:00 2001 From: Klaus Basan Date: Fri, 27 Sep 2019 23:24:36 +0200 Subject: [PATCH] Ref T730, FSD callsign string function, addressing the "*EDDF_TWR" issue --- src/blackmisc/aviation/callsign.cpp | 7 +++++++ src/blackmisc/aviation/callsign.h | 3 +++ 2 files changed, 10 insertions(+) diff --git a/src/blackmisc/aviation/callsign.cpp b/src/blackmisc/aviation/callsign.cpp index c4ebda6df..2508dd4c9 100644 --- a/src/blackmisc/aviation/callsign.cpp +++ b/src/blackmisc/aviation/callsign.cpp @@ -139,6 +139,13 @@ namespace BlackMisc m_callsign.at(m_callsign.size() - 1) >= 'A' && m_callsign.at(m_callsign.size() - 1) <= 'Z'; } + QString CCallsign::getFsdCallsignString() const + { + // mainly used to fix the cross coupled callsigns such as *EDDF_TWR + if (m_callsignAsSet.startsWith('*')) { return this->getStringAsSet(); } + return this->asString(); + } + bool CCallsign::isSameAsSet() const { return m_callsign == m_callsignAsSet; diff --git a/src/blackmisc/aviation/callsign.h b/src/blackmisc/aviation/callsign.h index 9da2a8637..c6fee5d51 100644 --- a/src/blackmisc/aviation/callsign.h +++ b/src/blackmisc/aviation/callsign.h @@ -89,6 +89,9 @@ namespace BlackMisc //! Get callsign. const QString &getStringAsSet() const { return m_callsignAsSet; } + //! The callsign string used with FSD + QString getFsdCallsignString() const; + //! Same as set callsign? bool isSameAsSet() const;