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

refs #535 completer for airline name

Browse Source 
* common base class for airline completers
* changed dependend classes
This commit is contained in:
Klaus Basan
2015-12-14 03:18:55 +01:00
parent 2c84c51a93
commit 92f930b068
13 changed files with 545 additions and 211 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
src/blackmisc/aviation/airlineicaocode.cpp
View File

@@ -210,6 +210,19 @@ namespace BlackMisc
return s.append(" ").append(getDbKeyAsStringInParentheses());
}
QString CAirlineIcaoCode::getNameWithKey() const
{
if (!hasValidDbKey()) { return getName(); }
if (hasName())
{
return QString(getName()).append(" ").append(getDbKeyAsStringInParentheses());
}
else
{
return getDbKeyAsStringInParentheses();
}
}
void CAirlineIcaoCode::updateMissingParts(const CAirlineIcaoCode &otherIcaoCode)
{
if (!this->hasValidDesignator()) { this->setDesignator(otherIcaoCode.getDesignator()); }

3
src/blackmisc/aviation/airlineicaocode.h
View File

@@ -76,6 +76,9 @@ namespace BlackMisc
//! Get name, e.g. "Lufthansa"
const QString &getName() const { return this->m_name; }
//! Name plus key, e.g. "Lufthansa (3421)"
QString getNameWithKey() const;
//! Set name
void setName(const QString &name) { this->m_name = name.trimmed(); }

18
src/blackmisc/aviation/airlineicaocodelist.cpp
View File

@@ -60,16 +60,30 @@ namespace BlackMisc
return codes;
}
QStringList CAirlineIcaoCodeList::toCompleterStrings() const
QStringList CAirlineIcaoCodeList::toIcaoDesignatorCompleterStrings() const
{
QStringList c;
for (const CAirlineIcaoCode &icao : *this)
{
QString cs(icao.getCombinedStringWithKey());
if (!icao.hasValidDbKey()) { continue; }
const QString cs(icao.getCombinedStringWithKey());
if (cs.isEmpty()) { continue; }
c.append(cs);
}
return c;
}
QStringList CAirlineIcaoCodeList::toNameCompleterStrings() const
{
QStringList c;
for (const CAirlineIcaoCode &icao : *this)
{
if (!icao.hasValidDbKey()) { continue; }
const QString cs(icao.getNameWithKey());
if (cs.isEmpty()) { continue; }
c.append(cs);
}
return c;
}
} // namespace
} // namespace

7
src/blackmisc/aviation/airlineicaocodelist.h
View File

@@ -49,8 +49,11 @@ namespace BlackMisc
//! Find by v-designator, this should be unique
CAirlineIcaoCode findByVDesignator(const QString &designator);
//! String list for completion
QStringList toCompleterStrings() const;
//! String list for completion by ICAO designator
QStringList toIcaoDesignatorCompleterStrings() const;
//! String list for completion by name
QStringList toNameCompleterStrings() const;
//! From our DB JSON
static CAirlineIcaoCodeList fromDatabaseJson(const QJsonArray &array, bool ignoreIncomplete = true);