From e497b43e064ff4bb8628016a76b938d81c932e58 Mon Sep 17 00:00:00 2001
From: Klaus Basan <klaus.basan@klausbasan.de>
Date: Wed, 13 Jul 2016 02:53:00 +0200
Subject: [PATCH] refs #706, model string and DB key utility function

---
 src/blackmisc/simulation/aircraftmodel.cpp | 19 +++++++++++++++++++
 src/blackmisc/simulation/aircraftmodel.h   |  3 +++
 2 files changed, 22 insertions(+)

diff --git a/src/blackmisc/simulation/aircraftmodel.cpp b/src/blackmisc/simulation/aircraftmodel.cpp
index 2d00d8bb8..7976660ad 100644
--- a/src/blackmisc/simulation/aircraftmodel.cpp
+++ b/src/blackmisc/simulation/aircraftmodel.cpp
@@ -111,6 +111,25 @@ namespace BlackMisc
             return nw;
         }
 
+        QString CAircraftModel::getModelStringAndDbKey() const
+        {
+            if (this->hasValidDbKey())
+            {
+                if (this->hasModelString())
+                {
+                    return QString(this->getModelString()).append(" ").append(this->getDbKeyAsStringInParentheses());
+                }
+                else
+                {
+                    return this->getDbKeyAsString();
+                }
+            }
+            else
+            {
+                return this->getModelString();
+            }
+        }
+
         CVariant CAircraftModel::propertyByIndex(const BlackMisc::CPropertyIndex &index) const
         {
             if (index.isMyself()) { return CVariant::from(*this); }
diff --git a/src/blackmisc/simulation/aircraftmodel.h b/src/blackmisc/simulation/aircraftmodel.h
index 9c0120306..7b446e296 100644
--- a/src/blackmisc/simulation/aircraftmodel.h
+++ b/src/blackmisc/simulation/aircraftmodel.h
@@ -147,6 +147,9 @@ namespace BlackMisc
             //! Model key, either queried or loaded from simulator model
             const QString &getModelString() const { return this->m_modelString; }
 
+            //! Model string and DB key (if available)
+            QString getModelStringAndDbKey() const;
+
             //! Model string
             void setModelString(const QString &modelString) { this->m_modelString = modelString.trimmed().toUpper(); }