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

Ref T298, better string handling/messages

Browse Source
This commit is contained in:
Klaus Basan
2018-08-07 19:45:30 +02:00
parent d310c9c843
commit 68607a3cb8
5 changed files with 51 additions and 50 deletions
Download Patch File Download Diff File Expand all files Collapse all files

76
src/blackcore/aircraftmatcher.cpp
View File

@@ -112,13 +112,13 @@ namespace BlackCore
{ {
// the user did a manual mapping "by hand", so he really should know what he is doing // the user did a manual mapping "by hand", so he really should know what he is doing
// no matching // no matching
CMatchingUtils::addLogDetailsToList(log, remoteAircraft, "Manually set model " + remoteAircraft.getModelString(), getLogCategories()); CMatchingUtils::addLogDetailsToList(log, remoteAircraft, QStringLiteral("Manually set model ") % remoteAircraft.getModelString(), getLogCategories());
matchedModel = remoteAircraft.getModel(); matchedModel = remoteAircraft.getModel();
resolvedInPrephase = true; resolvedInPrephase = true;
} }
else if (modelSet.isEmpty()) else if (modelSet.isEmpty())
{ {
CMatchingUtils::addLogDetailsToList(log, remoteAircraft, "No models for matching, using default", getLogCategories(), CStatusMessage::SeverityError); CMatchingUtils::addLogDetailsToList(log, remoteAircraft, QStringLiteral("No models for matching, using default"), getLogCategories(), CStatusMessage::SeverityError);
matchedModel = this->getDefaultModel(); matchedModel = this->getDefaultModel();
resolvedInPrephase = true; resolvedInPrephase = true;
} }
@@ -130,7 +130,7 @@ namespace BlackCore
matchedModel = matchByExactModelString(remoteAircraft, modelSet, log); matchedModel = matchByExactModelString(remoteAircraft, modelSet, log);
if (matchedModel.hasModelString()) if (matchedModel.hasModelString())
{ {
CMatchingUtils::addLogDetailsToList(log, remoteAircraft, "Exact match by model string '" + matchedModel.getModelStringAndDbKey() + "'", getLogCategories(), CStatusMessage::SeverityError); CMatchingUtils::addLogDetailsToList(log, remoteAircraft, QStringLiteral("Exact match by model string '") % matchedModel.getModelStringAndDbKey() % QStringLiteral("'"), getLogCategories(), CStatusMessage::SeverityError);
resolvedInPrephase = true; resolvedInPrephase = true;
} }
} }
@@ -155,7 +155,8 @@ namespace BlackCore
const QDateTime endTime = QDateTime::currentDateTimeUtc(); const QDateTime endTime = QDateTime::currentDateTimeUtc();
const qint64 matchingTime = startTime.msecsTo(endTime); const qint64 matchingTime = startTime.msecsTo(endTime);
CMatchingUtils::addLogDetailsToList(log, remoteAircraft, QString("--- Matching end: UTC %1, time %2ms ---").arg(endTime.toString(format)).arg(matchingTime)); static const QString em("--- Matching end: UTC %1, time %2ms ---");
CMatchingUtils::addLogDetailsToList(log, remoteAircraft, em.arg(endTime.toString(format)).arg(matchingTime));
return matchedModel; return matchedModel;
} }
@@ -641,7 +642,7 @@ namespace BlackCore
else else
{ {
matchedModel = matchedModels.front(); matchedModel = matchedModels.front();
CMatchingUtils::addLogDetailsToList(log, remoteAircraft, "Using first of " + QString::number(matchedModels.size()) + " models", getLogCategories()); CMatchingUtils::addLogDetailsToList(log, remoteAircraft, "Using first of " % QString::number(matchedModels.size()) % " models", getLogCategories());
} }
return matchedModel; return matchedModel;
} }
@@ -737,19 +738,19 @@ namespace BlackCore
return this->getDefaultModel(); return this->getDefaultModel();
} }
CMatchingUtils::addLogDetailsToList(log, remoteAircraft, "Searching by combined type with color livery '" + combinedType + "'", getLogCategories()); CMatchingUtils::addLogDetailsToList(log, remoteAircraft, "Searching by combined type with color livery '" % combinedType % "'", getLogCategories());
CAircraftModelList matchedModels = modelSet.findByCombinedTypeWithColorLivery(combinedType); CAircraftModelList matchedModels = modelSet.findByCombinedTypeWithColorLivery(combinedType);
if (!matchedModels.isEmpty()) if (!matchedModels.isEmpty())
{ {
CMatchingUtils::addLogDetailsToList(log, remoteAircraft, "Found " + QString::number(matchedModels.size()) + " by combined type w/color livery '" + combinedType + "'", getLogCategories()); CMatchingUtils::addLogDetailsToList(log, remoteAircraft, "Found " % QString::number(matchedModels.size()) % " by combined type w/color livery '" % combinedType % "'", getLogCategories());
} }
else else
{ {
CMatchingUtils::addLogDetailsToList(log, remoteAircraft, "Searching by combined type '" + combinedType + "'", getLogCategories()); CMatchingUtils::addLogDetailsToList(log, remoteAircraft, "Searching by combined type '" % combinedType % "'", getLogCategories());
matchedModels = matchedModels.findByCombinedType(combinedType); matchedModels = matchedModels.findByCombinedType(combinedType);
if (!matchedModels.isEmpty()) if (!matchedModels.isEmpty())
{ {
CMatchingUtils::addLogDetailsToList(log, remoteAircraft, "Found " + QString::number(matchedModels.size()) + " by combined '" + combinedType + "'", getLogCategories()); CMatchingUtils::addLogDetailsToList(log, remoteAircraft, "Found " % QString::number(matchedModels.size()) % " by combined '" % combinedType % "'", getLogCategories());
} }
} }
@@ -808,7 +809,7 @@ namespace BlackCore
if (byLivery.isEmpty()) if (byLivery.isEmpty())
{ {
if (log) { CMatchingUtils::addLogDetailsToList(log, remoteAircraft, "Not found by livery code " + remoteAircraft.getLivery().getCombinedCode(), getLogCategories()); } if (log) { CMatchingUtils::addLogDetailsToList(log, remoteAircraft, "Not found by livery code " % remoteAircraft.getLivery().getCombinedCode(), getLogCategories()); }
return inList; return inList;
} }
reduced = true; reduced = true;
@@ -873,24 +874,24 @@ namespace BlackCore
reduced = true; reduced = true;
if (family.isEmpty()) if (family.isEmpty())
{ {
if (log) { CMatchingUtils::addLogDetailsToList(log, remoteAircraft, "No family, skipping step (" + hint + ")", getLogCategories()); } if (log) { CMatchingUtils::addLogDetailsToList(log, remoteAircraft, "No family, skipping step (" % hint % ")", getLogCategories()); }
return inList; return inList;
} }
if (inList.isEmpty()) if (inList.isEmpty())
{ {
if (log) { CMatchingUtils::addLogDetailsToList(log, remoteAircraft, "No models for family match (" + hint + ")", getLogCategories()); } if (log) { CMatchingUtils::addLogDetailsToList(log, remoteAircraft, "No models for family match (" % hint % ")", getLogCategories()); }
return inList; return inList;
} }
CAircraftModelList found(inList.findByFamily(family)); CAircraftModelList found(inList.findByFamily(family));
if (found.isEmpty()) if (found.isEmpty())
{ {
if (log) { CMatchingUtils::addLogDetailsToList(log, remoteAircraft, "Not found by family " + family + " (" + hint + ")"); } if (log) { CMatchingUtils::addLogDetailsToList(log, remoteAircraft, "Not found by family " % family % " (" % hint % ")"); }
return inList; return inList;
} }
reduced = true; reduced = true;
CMatchingUtils::addLogDetailsToList(log, remoteAircraft, "Found by family " + family + " (" + hint + ") size " + QString::number(found.size()), getLogCategories()); CMatchingUtils::addLogDetailsToList(log, remoteAircraft, "Found by family " % family % " (" % hint % ") size " % QString::number(found.size()), getLogCategories());
return found; return found;
} }
@@ -899,25 +900,25 @@ namespace BlackCore
reduced = false; reduced = false;
if (inList.isEmpty()) if (inList.isEmpty())
{ {
if (log) { CMatchingUtils::addLogDetailsToList(log, remoteAircraft, info + " " + "Empty input list, cannot reduce", getLogCategories()); } if (log) { CMatchingUtils::addLogDetailsToList(log, remoteAircraft, info % " " % "Empty input list, cannot reduce", getLogCategories()); }
return inList; return inList;
} }
const QString m = remoteAircraft.getAircraftIcaoCode().getManufacturer(); const QString m = remoteAircraft.getAircraftIcaoCode().getManufacturer();
if (m.isEmpty()) if (m.isEmpty())
{ {
if (log) { CMatchingUtils::addLogDetailsToList(log, remoteAircraft, info + " No manufacturer, cannot reduce " + QString::number(inList.size()) + " entries", getLogCategories()); } if (log) { CMatchingUtils::addLogDetailsToList(log, remoteAircraft, info % " No manufacturer, cannot reduce " % QString::number(inList.size()) % " entries", getLogCategories()); }
return inList; return inList;
} }
const CAircraftModelList outList(inList.findByManufacturer(m)); const CAircraftModelList outList(inList.findByManufacturer(m));
if (outList.isEmpty()) if (outList.isEmpty())
{ {
if (log) { CMatchingUtils::addLogDetailsToList(log, remoteAircraft, info + " Not found " + m + ", cannot reduce", getLogCategories()); } if (log) { CMatchingUtils::addLogDetailsToList(log, remoteAircraft, info % " Not found " % m % ", cannot reduce", getLogCategories()); }
return inList; return inList;
} }
if (log) { CMatchingUtils::addLogDetailsToList(log, remoteAircraft, info + " Reduced by " + m + " results: " + QString::number(outList.size()), getLogCategories()); } if (log) { CMatchingUtils::addLogDetailsToList(log, remoteAircraft, info % " Reduced by " % m % " results: " % QString::number(outList.size()), getLogCategories()); }
reduced = true; reduced = true;
return outList; return outList;
} }
@@ -927,25 +928,25 @@ namespace BlackCore
reduced = false; reduced = false;
if (inList.isEmpty()) if (inList.isEmpty())
{ {
if (log) { CMatchingUtils::addLogDetailsToList(log, logCallsign, info + " " + "Empty input list, cannot reduce", getLogCategories()); } if (log) { CMatchingUtils::addLogDetailsToList(log, logCallsign, info % " Empty input list, cannot reduce", getLogCategories()); }
return inList; return inList;
} }
const QString m = icaoCode.getManufacturer(); const QString m = icaoCode.getManufacturer();
if (m.isEmpty()) if (m.isEmpty())
{ {
if (log) { CMatchingUtils::addLogDetailsToList(log, logCallsign, info + " No manufacturer, cannot reduce " + QString::number(inList.size()) + " entries", getLogCategories()); } if (log) { CMatchingUtils::addLogDetailsToList(log, logCallsign, info % " No manufacturer, cannot reduce " % QString::number(inList.size()) % " entries", getLogCategories()); }
return inList; return inList;
} }
const CAircraftIcaoCodeList outList(inList.findByManufacturer(m)); const CAircraftIcaoCodeList outList(inList.findByManufacturer(m));
if (outList.isEmpty()) if (outList.isEmpty())
{ {
if (log) { CMatchingUtils::addLogDetailsToList(log, logCallsign, info + " Not found " + m + ", cannot reduce", getLogCategories()); } if (log) { CMatchingUtils::addLogDetailsToList(log, logCallsign, info % " Not found " % m % ", cannot reduce", getLogCategories()); }
return inList; return inList;
} }
if (log) { CMatchingUtils::addLogDetailsToList(log, logCallsign, info + " Reduced by " + m + " results: " + QString::number(outList.size()), getLogCategories()); } if (log) { CMatchingUtils::addLogDetailsToList(log, logCallsign, info % " Reduced by " % m % " results: " % QString::number(outList.size()), getLogCategories()); }
reduced = true; reduced = true;
return outList; return outList;
} }
@@ -955,24 +956,24 @@ namespace BlackCore
reduced = false; reduced = false;
if (inList.isEmpty()) if (inList.isEmpty())
{ {
if (log) { CMatchingUtils::addLogDetailsToList(log, remoteAircraft, info + " " + "Empty input list, cannot reduce", getLogCategories()); } if (log) { CMatchingUtils::addLogDetailsToList(log, remoteAircraft, info % " Empty input list, cannot reduce", getLogCategories()); }
return inList; return inList;
} }
if (!remoteAircraft.hasAirlineDesignator()) if (!remoteAircraft.hasAirlineDesignator())
{ {
if (log) { CMatchingUtils::addLogDetailsToList(log, remoteAircraft, info + " " + "No airline, cannot reduce " + QString::number(inList.size()) + " entries", getLogCategories()); } if (log) { CMatchingUtils::addLogDetailsToList(log, remoteAircraft, info % " No airline designator, cannot reduce " % QString::number(inList.size()) % " entries", getLogCategories()); }
return inList; return inList;
} }
const CAircraftModelList outList(inList.findByIcaoDesignators(CAircraftIcaoCode(), remoteAircraft.getAirlineIcaoCode())); const CAircraftModelList outList(inList.findByIcaoDesignators(CAircraftIcaoCode(), remoteAircraft.getAirlineIcaoCode()));
if (outList.isEmpty()) if (outList.isEmpty())
{ {
if (log) { CMatchingUtils::addLogDetailsToList(log, remoteAircraft, info + " Cannot reduce by " + remoteAircraft.getAirlineIcaoCodeDesignator() + " results: " + QString::number(outList.size()), getLogCategories()); } if (log) { CMatchingUtils::addLogDetailsToList(log, remoteAircraft, info % " Cannot reduce by '" % remoteAircraft.getAirlineIcaoCodeDesignator() % "' results: " % QString::number(outList.size()), getLogCategories()); }
return inList; return inList;
} }
if (log) { CMatchingUtils::addLogDetailsToList(log, remoteAircraft, info + " Reduced reduce by " + remoteAircraft.getAirlineIcaoCodeDesignator() + " to " + QString::number(outList.size()), getLogCategories()); } if (log) { CMatchingUtils::addLogDetailsToList(log, remoteAircraft, info % " Reduced reduce by '" % remoteAircraft.getAirlineIcaoCodeDesignator() % "' to " % QString::number(outList.size()), getLogCategories()); }
reduced = true; reduced = true;
return outList; return outList;
} }
@@ -990,11 +991,11 @@ namespace BlackCore
CAircraftModelList byCombinedCode(inList.findByCombinedType(cc)); CAircraftModelList byCombinedCode(inList.findByCombinedType(cc));
if (byCombinedCode.isEmpty()) if (byCombinedCode.isEmpty())
{ {
if (log) { CMatchingUtils::addLogDetailsToList(log, remoteAircraft, "Not found by combined code " + cc, getLogCategories()); } if (log) { CMatchingUtils::addLogDetailsToList(log, remoteAircraft, "Not found by combined code " % cc, getLogCategories()); }
return inList; return inList;
} }
if (log) { CMatchingUtils::addLogDetailsToList(log, remoteAircraft, "Found by combined code " + cc + ", possible " + QString::number(byCombinedCode.size()), getLogCategories()); } if (log) { CMatchingUtils::addLogDetailsToList(log, remoteAircraft, "Found by combined code " % cc % ", possible " % QString::number(byCombinedCode.size()), getLogCategories()); }
if (byCombinedCode.size() > 1) if (byCombinedCode.size() > 1)
{ {
byCombinedCode = ifPossibleReduceByAirline(remoteAircraft, byCombinedCode, "Combined code", reduced, log); byCombinedCode = ifPossibleReduceByAirline(remoteAircraft, byCombinedCode, "Combined code", reduced, log);
@@ -1012,7 +1013,7 @@ namespace BlackCore
const QString mil(military ? "military" : "civilian"); const QString mil(military ? "military" : "civilian");
if (byMilitaryFlag.isEmpty()) if (byMilitaryFlag.isEmpty())
{ {
if (log) { CMatchingUtils::addLogDetailsToList(log, remoteAircraft, "Models not found by " + mil, getLogCategories()); } if (log) { CMatchingUtils::addLogDetailsToList(log, remoteAircraft, "Models not found by " % mil, getLogCategories()); }
return inList; return inList;
} }
@@ -1020,11 +1021,11 @@ namespace BlackCore
{ {
if (inList.size() > byMilitaryFlag.size()) if (inList.size() > byMilitaryFlag.size())
{ {
CMatchingUtils::addLogDetailsToList(log, remoteAircraft, "Models reduced to " + mil + " aircraft, size " + QString::number(byMilitaryFlag.size()), getLogCategories()); CMatchingUtils::addLogDetailsToList(log, remoteAircraft, "Models reduced to " % mil % " aircraft, size " % QString::number(byMilitaryFlag.size()), getLogCategories());
} }
else else
{ {
CMatchingUtils::addLogDetailsToList(log, remoteAircraft, "Models not reduced by " + mil + ", size " + QString::number(byMilitaryFlag.size()), getLogCategories()); CMatchingUtils::addLogDetailsToList(log, remoteAircraft, "Models not reduced by " % mil % ", size " % QString::number(byMilitaryFlag.size()), getLogCategories());
} }
} }
return byMilitaryFlag; return byMilitaryFlag;
@@ -1041,18 +1042,15 @@ namespace BlackCore
{ {
i.previous(); i.previous();
const CAircraftModel m(i.value()); const CAircraftModel m(i.value());
if (!str.isEmpty()) if (!str.isEmpty()) { str += '\n'; }
{
str += '\n';
}
str += QString::number(c) % str += QString::number(c) %
QLatin1String(": score: ") % QStringLiteral(": score: ") %
QString::number(i.key()) % QString::number(i.key()) %
QLatin1String(" model: '") % QStringLiteral(" model: '") %
m.getModelString() % m.getModelString() %
QLatin1String("' aircraft: '") % QStringLiteral("' aircraft: '") %
m.getAircraftIcaoCodeDesignator() % m.getAircraftIcaoCodeDesignator() %
QLatin1String("' livery: '") % QStringLiteral("' livery: '") %
m.getLivery().getCombinedCodePlusInfo() % m.getLivery().getCombinedCodePlusInfo() %
QLatin1Char('\''); QLatin1Char('\'');
} }

8
src/blackcore/airspacemonitor.cpp
View File

@@ -482,7 +482,9 @@ namespace BlackCore
if (trial < 5 && !complete) if (trial < 5 && !complete)
{ {
this->addReverseLookupMessage(callsign, "Wait for further data"); static const QString ws("Wait for further data, trial %1 ts %2");
static const QString format("hh:mm:ss.zzz");
this->addReverseLookupMessage(callsign, ws.arg(trial).arg(QDateTime::currentDateTimeUtc().toString(format)));
const QPointer<CAirspaceMonitor> myself(this); const QPointer<CAirspaceMonitor> myself(this);
QTimer::singleShot(1500, this, [ = ]() QTimer::singleShot(1500, this, [ = ]()
{ {
@@ -744,8 +746,8 @@ namespace BlackCore
if (foundIcao.isLoadedFromDb()) { aircraftIcao = foundIcao; } if (foundIcao.isLoadedFromDb()) { aircraftIcao = foundIcao; }
} }
CMatchingUtils::addLogDetailsToList(log, callsign, QString("Quality of aircraft ICAO: %1").arg(aircraftIcao.toQString(true)), CAirspaceMonitor::getLogCategories()); CMatchingUtils::addLogDetailsToList(log, callsign, QString("Used aircraft ICAO: '%1'").arg(aircraftIcao.toQString(true)), CAirspaceMonitor::getLogCategories());
CMatchingUtils::addLogDetailsToList(log, callsign, QString("Quality of airline ICAO: %1").arg(airlineIcao.toQString(true)), CAirspaceMonitor::getLogCategories()); CMatchingUtils::addLogDetailsToList(log, callsign, QString("Used airline ICAO: '%1'").arg(airlineIcao.toQString(true)), CAirspaceMonitor::getLogCategories());
return CAircraftMatcher::reverseLookupModel(callsign, aircraftIcao, airlineIcao, livery, modelString, type, log); return CAircraftMatcher::reverseLookupModel(callsign, aircraftIcao, airlineIcao, livery, modelString, type, log);
} }

2
src/blackmisc/aviation/aircrafticaocode.cpp
View File

@@ -83,7 +83,7 @@ namespace BlackMisc
{ {
Q_UNUSED(i18n); Q_UNUSED(i18n);
static const QString s("%1 %2 %3"); static const QString s("%1 %2 %3");
return s.arg(this->getDesignatorDbKey(), this->getCombinedType(), this->getWtc()); return s.arg(this->getDesignatorDbKey(), this->getCombinedType(), this->getWtc()).trimmed();
} }
void CAircraftIcaoCode::updateMissingParts(const CAircraftIcaoCode &otherIcaoCode) void CAircraftIcaoCode::updateMissingParts(const CAircraftIcaoCode &otherIcaoCode)

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

@@ -90,10 +90,9 @@ namespace BlackMisc
QString CAirlineIcaoCode::getDesignatorNameCountry() const QString CAirlineIcaoCode::getDesignatorNameCountry() const
{ {
QString s(this->getDesignator()); return this->getDesignator() %
if (this->hasName()) { s = s.append(" ").append(this->getName()); } (this->hasName() ? (QStringLiteral(" ") % this->getName()) : QStringLiteral("")) %
if (this->hasValidCountry()) { s = s.append(" ").append(this->getCountryIso()); } (this->hasValidCountry() ? (QStringLiteral(" ") % this->getCountryIso()) : QStringLiteral(""));
return s.trimmed();
} }
QString CAirlineIcaoCode::getSimplifiedName() const QString CAirlineIcaoCode::getSimplifiedName() const

8
src/blackmisc/simulation/aircraftmodellist.cpp
View File

@@ -863,10 +863,12 @@ namespace BlackMisc
const int score = model.calculateScore(remoteModel, preferColorLiveries, log ? &subMsgs : nullptr); const int score = model.calculateScore(remoteModel, preferColorLiveries, log ? &subMsgs : nullptr);
if (ignoreZeroScores && score < 1) { continue; } if (ignoreZeroScores && score < 1) { continue; }
CMatchingUtils::addLogDetailsToList(log, remoteModel.getCallsign(), QString("--- Calculating #%1 '%2'---").arg(c++).arg(model.getModelStringAndDbKey())); static const QString bMsg("--- Calculating #%1 '%2'---");
static const QString eMsg("--- End calculating #%1 ---");
CMatchingUtils::addLogDetailsToList(log, remoteModel.getCallsign(), bMsg.arg(c).arg(model.getModelStringAndDbKey()));
if (log) { log->push_back(subMsgs); } if (log) { log->push_back(subMsgs); }
CMatchingUtils::addLogDetailsToList(log, remoteModel.getCallsign(), QString("--- End calculating #%1 ---").arg(c)); CMatchingUtils::addLogDetailsToList(log, remoteModel.getCallsign(), eMsg.arg(c));
c++;
scoreMap.insertMulti(score, model); scoreMap.insertMulti(score, model);
} }
CMatchingUtils::addLogDetailsToList(log, remoteModel.getCallsign(), QStringLiteral("--- End scoring ---")); CMatchingUtils::addLogDetailsToList(log, remoteModel.getCallsign(), QStringLiteral("--- End scoring ---"));