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

Ref T489, Ref T484, string improvements

Browse Source
This commit is contained in:
Klaus Basan
2018-12-28 19:45:14 +01:00
committed by Mat Sutcliffe
parent c0337b531a
commit 788f827110
4 changed files with 51 additions and 43 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
src/blackcore/webdataservices.cpp
View File

@@ -1306,16 +1306,16 @@ namespace BlackCore
const CStatusMessage::StatusSeverity severity = CEntityFlags::flagToSeverity(state); const CStatusMessage::StatusSeverity severity = CEntityFlags::flagToSeverity(state);
if (severity == CStatusMessage::SeverityWarning) 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 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 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; m_swiftDbEntitiesRead |= entities;

2
src/blackgui/components/dbmodelcomponent.cpp
View File

@@ -98,7 +98,7 @@ namespace BlackGui
} }
else else
{ {
this->showOverlayHTMLMessage(u"Currently " % CEntityFlags::flagToString(readState)); this->showOverlayHTMLMessage(u"Current state: " % CEntityFlags::stateToString(readState), 25000);
} }
} }

84
src/blackmisc/network/entityflags.cpp
View File

@@ -22,22 +22,22 @@ namespace BlackMisc
{ {
switch (flag) switch (flag)
{ {
case AircraftIcaoEntity: return "Aircraft ICAO"; case AircraftIcaoEntity: return QStringLiteral("Aircraft ICAO");
case AirlineIcaoEntity: return "Airline ICAO"; case AirlineIcaoEntity: return QStringLiteral("Airline ICAO");
case AirportEntity: return "Airport"; case AirportEntity: return QStringLiteral("Airport");
case AllEntities: return "All"; case AllEntities: return QStringLiteral("All");
case AllIcaoAndCountries: return "All ICAO + country"; case AllIcaoAndCountries: return QStringLiteral("All ICAO + country");
case AllIcaoEntities: return "All ICAO"; case AllIcaoEntities: return QStringLiteral("All ICAO");
case BookingEntity: return "VATSIM bookings"; case BookingEntity: return QStringLiteral("VATSIM bookings");
case CountryEntity: return "Country"; case CountryEntity: return QStringLiteral("Country");
case DistributorEntity: return "Distributor"; case DistributorEntity: return QStringLiteral("Distributor");
case DbInfoObjectEntity: return "Info objects (DB)"; case DbInfoObjectEntity: return QStringLiteral("Info objects (DB)");
case SharedInfoObjectEntity: return "Info objects (shared)"; case SharedInfoObjectEntity: return QStringLiteral("Info objects (shared)");
case LiveryEntity: return "Livery"; case LiveryEntity: return QStringLiteral("Livery");
case ModelEntity: return "Model"; case ModelEntity: return QStringLiteral("Model");
case NoEntity: return "no data"; case NoEntity: return QStringLiteral("no data");
case VatsimDataFile: return "VATSIM data file"; case VatsimDataFile: return QStringLiteral("VATSIM data file");
case VatsimStatusFile: return "VATSIM status file"; case VatsimStatusFile: return QStringLiteral("VATSIM status file");
default: default:
BLACK_VERIFY_X(false, Q_FUNC_INFO, "wrong flags"); BLACK_VERIFY_X(false, Q_FUNC_INFO, "wrong flags");
return "wrong flags"; return "wrong flags";
@@ -52,19 +52,19 @@ namespace BlackMisc
QStringList CEntityFlags::entitiesToStringList(CEntityFlags::Entity entities) QStringList CEntityFlags::entitiesToStringList(CEntityFlags::Entity entities)
{ {
QStringList list; QStringList list;
if (entities.testFlag(AircraftIcaoEntity)) list << "Aircraft ICAO"; if (entities.testFlag(AircraftIcaoEntity)) list << QStringLiteral("Aircraft ICAO");
if (entities.testFlag(AirlineIcaoEntity)) list << "Airline ICAO"; if (entities.testFlag(AirlineIcaoEntity)) list << QStringLiteral("Airline ICAO");
if (entities.testFlag(AirportEntity)) list << "Airport"; if (entities.testFlag(AirportEntity)) list << QStringLiteral("Airport");
if (entities.testFlag(BookingEntity)) list << "VATSIM bookings"; if (entities.testFlag(BookingEntity)) list << QStringLiteral("VATSIM bookings");
if (entities.testFlag(CountryEntity)) list << "Country"; if (entities.testFlag(CountryEntity)) list << QStringLiteral("Country");
if (entities.testFlag(DistributorEntity)) list << "Distributor"; if (entities.testFlag(DistributorEntity)) list << QStringLiteral("Distributor");
if (entities.testFlag(DbInfoObjectEntity)) list << "Info objects (DB)"; if (entities.testFlag(DbInfoObjectEntity)) list << QStringLiteral("Info objects (DB)");
if (entities.testFlag(SharedInfoObjectEntity)) list << "Info objects (shared)"; if (entities.testFlag(SharedInfoObjectEntity)) list << QStringLiteral("Info objects (shared)");
if (entities.testFlag(LiveryEntity)) list << "Livery"; if (entities.testFlag(LiveryEntity)) list << QStringLiteral("Livery");
if (entities.testFlag(ModelEntity)) list << "Model"; if (entities.testFlag(ModelEntity)) list << QStringLiteral("Model");
if (entities.testFlag(NoEntity)) list << "no data"; if (entities.testFlag(NoEntity)) list << QStringLiteral("no data");
if (entities.testFlag(VatsimDataFile)) list << "VATSIM data file"; if (entities.testFlag(VatsimDataFile)) list << QStringLiteral("VATSIM data file");
if (entities.testFlag(VatsimStatusFile)) list << "VATSIM status file"; if (entities.testFlag(VatsimStatusFile)) list << QStringLiteral("VATSIM status file");
return list; return list;
} }
@@ -89,19 +89,27 @@ namespace BlackMisc
return c; 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) switch (flag)
{ {
case ReadFinished: return "finished"; case ReadFinished: return f;
case ReadFinishedRestricted: return "finished (restricted)"; case ReadFinishedRestricted: return fr;
case ReadParsing: return "parsing"; case ReadParsing: return p;
case ReadFailed: return "failed"; case ReadFailed: return fa;
case ReadSkipped: return "skipped"; case ReadSkipped: return s;
case ReadStarted: return "read started"; case ReadStarted: return st;
default: default:
BLACK_VERIFY_X(false, Q_FUNC_INFO, "wrong flags"); BLACK_VERIFY_X(false, Q_FUNC_INFO, "wrong flags");
return "wrong flags"; return x;
} }
} }
@@ -114,7 +122,7 @@ namespace BlackMisc
case ReadParsing: case ReadParsing:
case ReadStarted: return CStatusMessage::SeverityInfo; case ReadStarted: return CStatusMessage::SeverityInfo;
case ReadSkipped: return CStatusMessage::SeverityWarning; case ReadSkipped: return CStatusMessage::SeverityWarning;
case ReadFailed: return CStatusMessage::SeverityError; case ReadFailed: return CStatusMessage::SeverityError;
default: default:
Q_ASSERT_X(false, Q_FUNC_INFO, "Missing state"); Q_ASSERT_X(false, Q_FUNC_INFO, "Missing state");
return CStatusMessage::SeverityInfo; return CStatusMessage::SeverityInfo;

2
src/blackmisc/network/entityflags.h
View File

@@ -94,7 +94,7 @@ namespace BlackMisc
static int numberOfEntities(CEntityFlags::Entity entities); static int numberOfEntities(CEntityFlags::Entity entities);
//! Convert to string //! Convert to string
static QString flagToString(ReadState flag); static const QString &stateToString(ReadState flag);
//! Flag to severity //! Flag to severity
static CStatusMessage::StatusSeverity flagToSeverity(ReadState state); static CStatusMessage::StatusSeverity flagToSeverity(ReadState state);