From 788f827110d5461ed9d3280d60d73f1263a5f1a9 Mon Sep 17 00:00:00 2001 From: Klaus Basan Date: Fri, 28 Dec 2018 19:45:14 +0100 Subject: [PATCH] Ref T489, Ref T484, string improvements --- src/blackcore/webdataservices.cpp | 6 +- src/blackgui/components/dbmodelcomponent.cpp | 2 +- src/blackmisc/network/entityflags.cpp | 84 +++++++++++--------- src/blackmisc/network/entityflags.h | 2 +- 4 files changed, 51 insertions(+), 43 deletions(-) diff --git a/src/blackcore/webdataservices.cpp b/src/blackcore/webdataservices.cpp index d26e21d95..558ae2587 100644 --- a/src/blackcore/webdataservices.cpp +++ b/src/blackcore/webdataservices.cpp @@ -1306,16 +1306,16 @@ namespace BlackCore const CStatusMessage::StatusSeverity severity = CEntityFlags::flagToSeverity(state); if (severity == CStatusMessage::SeverityWarning) { - CLogMessage(cats).warning(u"Read data '%1' entries: %2 state: %3") << CEntityFlags::flagToString(entities) << number << CEntityFlags::flagToString(state); + CLogMessage(cats).warning(u"Read data '%1' entries: %2 state: %3") << CEntityFlags::flagToString(entities) << number << CEntityFlags::stateToString(state); } else { - CLogMessage(cats).error(u"Read data '%1' entries: %2 state: %3") << CEntityFlags::flagToString(entities) << number << CEntityFlags::flagToString(state); + CLogMessage(cats).error(u"Read data '%1' entries: %2 state: %3") << CEntityFlags::flagToString(entities) << number << CEntityFlags::stateToString(state); } } else { - CLogMessage(cats).info(u"Read data '%1' entries: %2 state: %3") << CEntityFlags::flagToString(entities) << number << CEntityFlags::flagToString(state); + CLogMessage(cats).info(u"Read data '%1' entries: %2 state: %3") << CEntityFlags::flagToString(entities) << number << CEntityFlags::stateToString(state); } m_swiftDbEntitiesRead |= entities; diff --git a/src/blackgui/components/dbmodelcomponent.cpp b/src/blackgui/components/dbmodelcomponent.cpp index 297b44c27..c1b3b5d54 100644 --- a/src/blackgui/components/dbmodelcomponent.cpp +++ b/src/blackgui/components/dbmodelcomponent.cpp @@ -98,7 +98,7 @@ namespace BlackGui } else { - this->showOverlayHTMLMessage(u"Currently " % CEntityFlags::flagToString(readState)); + this->showOverlayHTMLMessage(u"Current state: " % CEntityFlags::stateToString(readState), 25000); } } diff --git a/src/blackmisc/network/entityflags.cpp b/src/blackmisc/network/entityflags.cpp index 06e50f3be..0762bbb50 100644 --- a/src/blackmisc/network/entityflags.cpp +++ b/src/blackmisc/network/entityflags.cpp @@ -22,22 +22,22 @@ namespace BlackMisc { switch (flag) { - case AircraftIcaoEntity: return "Aircraft ICAO"; - case AirlineIcaoEntity: return "Airline ICAO"; - case AirportEntity: return "Airport"; - case AllEntities: return "All"; - case AllIcaoAndCountries: return "All ICAO + country"; - case AllIcaoEntities: return "All ICAO"; - case BookingEntity: return "VATSIM bookings"; - case CountryEntity: return "Country"; - case DistributorEntity: return "Distributor"; - case DbInfoObjectEntity: return "Info objects (DB)"; - case SharedInfoObjectEntity: return "Info objects (shared)"; - case LiveryEntity: return "Livery"; - case ModelEntity: return "Model"; - case NoEntity: return "no data"; - case VatsimDataFile: return "VATSIM data file"; - case VatsimStatusFile: return "VATSIM status file"; + case AircraftIcaoEntity: return QStringLiteral("Aircraft ICAO"); + case AirlineIcaoEntity: return QStringLiteral("Airline ICAO"); + case AirportEntity: return QStringLiteral("Airport"); + case AllEntities: return QStringLiteral("All"); + case AllIcaoAndCountries: return QStringLiteral("All ICAO + country"); + case AllIcaoEntities: return QStringLiteral("All ICAO"); + case BookingEntity: return QStringLiteral("VATSIM bookings"); + case CountryEntity: return QStringLiteral("Country"); + case DistributorEntity: return QStringLiteral("Distributor"); + case DbInfoObjectEntity: return QStringLiteral("Info objects (DB)"); + case SharedInfoObjectEntity: return QStringLiteral("Info objects (shared)"); + case LiveryEntity: return QStringLiteral("Livery"); + case ModelEntity: return QStringLiteral("Model"); + case NoEntity: return QStringLiteral("no data"); + case VatsimDataFile: return QStringLiteral("VATSIM data file"); + case VatsimStatusFile: return QStringLiteral("VATSIM status file"); default: BLACK_VERIFY_X(false, Q_FUNC_INFO, "wrong flags"); return "wrong flags"; @@ -52,19 +52,19 @@ namespace BlackMisc QStringList CEntityFlags::entitiesToStringList(CEntityFlags::Entity entities) { QStringList list; - if (entities.testFlag(AircraftIcaoEntity)) list << "Aircraft ICAO"; - if (entities.testFlag(AirlineIcaoEntity)) list << "Airline ICAO"; - if (entities.testFlag(AirportEntity)) list << "Airport"; - if (entities.testFlag(BookingEntity)) list << "VATSIM bookings"; - if (entities.testFlag(CountryEntity)) list << "Country"; - if (entities.testFlag(DistributorEntity)) list << "Distributor"; - if (entities.testFlag(DbInfoObjectEntity)) list << "Info objects (DB)"; - if (entities.testFlag(SharedInfoObjectEntity)) list << "Info objects (shared)"; - if (entities.testFlag(LiveryEntity)) list << "Livery"; - if (entities.testFlag(ModelEntity)) list << "Model"; - if (entities.testFlag(NoEntity)) list << "no data"; - if (entities.testFlag(VatsimDataFile)) list << "VATSIM data file"; - if (entities.testFlag(VatsimStatusFile)) list << "VATSIM status file"; + if (entities.testFlag(AircraftIcaoEntity)) list << QStringLiteral("Aircraft ICAO"); + if (entities.testFlag(AirlineIcaoEntity)) list << QStringLiteral("Airline ICAO"); + if (entities.testFlag(AirportEntity)) list << QStringLiteral("Airport"); + if (entities.testFlag(BookingEntity)) list << QStringLiteral("VATSIM bookings"); + if (entities.testFlag(CountryEntity)) list << QStringLiteral("Country"); + if (entities.testFlag(DistributorEntity)) list << QStringLiteral("Distributor"); + if (entities.testFlag(DbInfoObjectEntity)) list << QStringLiteral("Info objects (DB)"); + if (entities.testFlag(SharedInfoObjectEntity)) list << QStringLiteral("Info objects (shared)"); + if (entities.testFlag(LiveryEntity)) list << QStringLiteral("Livery"); + if (entities.testFlag(ModelEntity)) list << QStringLiteral("Model"); + if (entities.testFlag(NoEntity)) list << QStringLiteral("no data"); + if (entities.testFlag(VatsimDataFile)) list << QStringLiteral("VATSIM data file"); + if (entities.testFlag(VatsimStatusFile)) list << QStringLiteral("VATSIM status file"); return list; } @@ -89,19 +89,27 @@ namespace BlackMisc return c; } - QString CEntityFlags::flagToString(CEntityFlags::ReadState flag) + const QString &CEntityFlags::stateToString(CEntityFlags::ReadState flag) { + static const QString f("finised"); + static const QString fr("finished (restricted)"); + static const QString p("parsing"); + static const QString fa("failed"); + static const QString s("skipped"); + static const QString st("read started"); + static const QString x("wrong flags"); + switch (flag) { - case ReadFinished: return "finished"; - case ReadFinishedRestricted: return "finished (restricted)"; - case ReadParsing: return "parsing"; - case ReadFailed: return "failed"; - case ReadSkipped: return "skipped"; - case ReadStarted: return "read started"; + case ReadFinished: return f; + case ReadFinishedRestricted: return fr; + case ReadParsing: return p; + case ReadFailed: return fa; + case ReadSkipped: return s; + case ReadStarted: return st; default: BLACK_VERIFY_X(false, Q_FUNC_INFO, "wrong flags"); - return "wrong flags"; + return x; } } @@ -114,7 +122,7 @@ namespace BlackMisc case ReadParsing: case ReadStarted: return CStatusMessage::SeverityInfo; case ReadSkipped: return CStatusMessage::SeverityWarning; - case ReadFailed: return CStatusMessage::SeverityError; + case ReadFailed: return CStatusMessage::SeverityError; default: Q_ASSERT_X(false, Q_FUNC_INFO, "Missing state"); return CStatusMessage::SeverityInfo; diff --git a/src/blackmisc/network/entityflags.h b/src/blackmisc/network/entityflags.h index ef7b9e17b..e69465c87 100644 --- a/src/blackmisc/network/entityflags.h +++ b/src/blackmisc/network/entityflags.h @@ -94,7 +94,7 @@ namespace BlackMisc static int numberOfEntities(CEntityFlags::Entity entities); //! Convert to string - static QString flagToString(ReadState flag); + static const QString &stateToString(ReadState flag); //! Flag to severity static CStatusMessage::StatusSeverity flagToSeverity(ReadState state);