flightsimulatorplatfrom/pilotclient
1
0
Fork 0
mirror of https://github.com/swift-project/pilotclient.git synced 2026-03-31 12:55:33 +08:00
Code Issues Packages Projects Releases Wiki Activity

refs #649, refs #656, adjusted flags

Browse Source 
* removed now outdated enums
* sorted enums (better debugging)
* utility functions
This commit is contained in:
Klaus Basan
2016-05-24 00:28:03 +02:00
parent 0be85cf4fe
commit e5f8a5108f
4 changed files with 92 additions and 47 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -12,6 +12,7 @@
#include <QStringList>
#include <QtGlobal>
#include <bitset>
namespace BlackMisc
{
@@ -21,18 +22,20 @@ namespace BlackMisc
{
switch (flag)
{
case NoEntity: return "no data";
case BookingEntity: return "VATSIM bookings";
case VatsimDataFile: return "VATSIM data file";
case AircraftIcaoEntity: return "Aircraft ICAO";
case AirlineIcaoEntity: return "Airline ICAO";
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 InfoObjectEntity: return "Info objects";
case LiveryEntity: return "Livery";
case ModelEntity: return "Model";
case AllIcaoEntities: return "All ICAO";
case AllIcaoAndCountries: return "All ICAO + country";
case AllEntities: return "All";
case NoEntity: return "no data";
case VatsimDataFile: return "VATSIM data file";
case VatsimStatusFile: return "VATSIM status file";
default:
BLACK_VERIFY_X(false, Q_FUNC_INFO, "wrong flags");
return "wrong flags";
@@ -42,18 +45,31 @@ namespace BlackMisc
QString CEntityFlags::flagToString(BlackMisc::Network::CEntityFlags::Entity flag)
{
QStringList list;
if (flag.testFlag(NoEntity)) list << "no data";
if (flag.testFlag(BookingEntity)) list << "VATSIM bookings";
if (flag.testFlag(VatsimDataFile)) list << "VATSIM data file";
if (flag.testFlag(AircraftIcaoEntity)) list << "Aircraft ICAO";
if (flag.testFlag(AirlineIcaoEntity)) list << "Airline ICAO";
if (flag.testFlag(BookingEntity)) list << "VATSIM bookings";
if (flag.testFlag(CountryEntity)) list << "Country";
if (flag.testFlag(DistributorEntity)) list << "Distributor";
if (flag.testFlag(InfoObjectEntity)) list << "Info objects";
if (flag.testFlag(LiveryEntity)) list << "Livery";
if (flag.testFlag(ModelEntity)) list << "Model";
if (flag.testFlag(NoEntity)) list << "no data";
if (flag.testFlag(VatsimDataFile)) list << "VATSIM data file";
if (flag.testFlag(VatsimStatusFile)) list << "VATSIM status file";
return list.join(',');
}
bool CEntityFlags::isSingleEntity(BlackMisc::Network::CEntityFlags::Entity flag)
{
return numberOfEntities(flag) == 1;
}
int CEntityFlags::numberOfEntities(BlackMisc::Network::CEntityFlags::Entity flag)
{
const int c = std::bitset<sizeof(flag)>(flag).count();
return c;
}
QString CEntityFlags::flagToString(CEntityFlags::ReadState flag)
{
switch (flag)
@@ -84,6 +100,22 @@ namespace BlackMisc
}
}
CEntityFlags::EntityFlag CEntityFlags::entityToEntityFlag(Entity entity)
{
return static_cast<EntityFlag>(static_cast<int>(entity));
}
CEntityFlags::Entity CEntityFlags::iterateDbEntities(Entity &entities)
{
if (entities == NoEntity || entities == InfoObjectEntity) { return NoEntity; }
if (entities.testFlag(AircraftIcaoEntity)) { entities &= ~AircraftIcaoEntity; return AircraftIcaoEntity; }
if (entities.testFlag(AirlineIcaoEntity)) { entities &= ~AirlineIcaoEntity; return AirlineIcaoEntity; }
if (entities.testFlag(LiveryEntity)) { entities &= ~LiveryEntity; return LiveryEntity; }
if (entities.testFlag(CountryEntity)) { entities &= ~CountryEntity; return CountryEntity; }
if (entities.testFlag(ModelEntity)) { entities &= ~ModelEntity; return ModelEntity; }
return NoEntity;
}
bool CEntityFlags::isWarningOrAbove(CEntityFlags::ReadState state)
{
CStatusMessage::StatusSeverity s = flagToSeverity(state);
@@ -97,6 +129,14 @@ namespace BlackMisc
}
}
bool CEntityFlags::anySwiftDbEntity(Entity entities)
{
return
entities.testFlag(AircraftIcaoEntity) || entities.testFlag(AirlineIcaoEntity) ||
entities.testFlag(CountryEntity) ||
entities.testFlag(ModelEntity) || entities.testFlag(LiveryEntity);
}
void CEntityFlags::registerMetadata()
{
// this is no value class and I register enums here,

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

@@ -32,22 +32,23 @@ namespace BlackMisc
//! Which data to read, requires corresponding readers
enum EntityFlag
{
NoEntity = 0, //!< no data at all
BookingEntity = 1 << 0, //!< bookings
MetarEntity = 1 << 1, //!< METAR
AircraftIcaoEntity = 1 << 2, //!< ICAO codes for aircraft
AirlineIcaoEntity = 1 << 3, //!< ICAO codes for airlines
CountryEntity = 1 << 4, //!< country codes
DistributorEntity = 1 << 5, //!< distributors
LiveryEntity = 1 << 6, //!< liveries
ModelEntity = 1 << 7, //!< models
VatsimDataFile = 1 << 8, //!< the VATSIM data file (multiple data entities)
VatsimStatusFile = 1 << 9, //!< the VATSIM status file (URLs for data files etc.)
AllEntities = ((1<<10)-1), //!< everything
AllIcaoEntities = AircraftIcaoEntity | AirlineIcaoEntity, //!< all ICAO codes
AllIcaoAndCountries = AircraftIcaoEntity | AirlineIcaoEntity | CountryEntity, //!< all ICAO codes and countries
DistributorLiveryModel = DistributorEntity | LiveryEntity | ModelEntity, //!< Combinded
AllDbEntities = AllIcaoEntities | DistributorLiveryModel, //!< All DB stuff
NoEntity = 0, //!< no data at all
InfoObjectEntity = 1 << 0, //!< info about DB data (kinf of metadata)
AircraftIcaoEntity = 1 << 1, //!< ICAO codes for aircraft
AirlineIcaoEntity = 1 << 2, //!< ICAO codes for airlines
CountryEntity = 1 << 3, //!< country codes
DistributorEntity = 1 << 4, //!< distributors
LiveryEntity = 1 << 5, //!< liveries
ModelEntity = 1 << 6, //!< models
BookingEntity = 1 << 7, //!< bookings
MetarEntity = 1 << 8, //!< METAR
VatsimDataFile = 1 << 9, //!< the VATSIM data file (multiple data entities)
VatsimStatusFile = 1 << 10, //!< the VATSIM status file (URLs for data files etc.)
AllEntities = ((1 << 11) - 1), //!< everything
AllIcaoEntities = AircraftIcaoEntity | AirlineIcaoEntity, //!< all ICAO codes
AllIcaoAndCountries = AircraftIcaoEntity | AirlineIcaoEntity | CountryEntity, //!< all ICAO codes and countries
DistributorLiveryModel = DistributorEntity | LiveryEntity | ModelEntity, //!< Combinded
AllDbEntities = AllIcaoEntities | DistributorLiveryModel | InfoObjectEntity //!< All DB stuff
};
Q_DECLARE_FLAGS(Entity, EntityFlag)
@@ -66,15 +67,30 @@ namespace BlackMisc
//! Convert to string
static QString flagToString(BlackMisc::Network::CEntityFlags::Entity flag);
//! Representing single entity?
static bool isSingleEntity(BlackMisc::Network::CEntityFlags::Entity flag);
//! Represented number of entities
static int numberOfEntities(BlackMisc::Network::CEntityFlags::Entity flag);
//! Convert to string
static QString flagToString(ReadState flag);
//! Flag to severity
static BlackMisc::CStatusMessage::StatusSeverity flagToSeverity(ReadState state);
//! To flag
static EntityFlag entityToEntityFlag(Entity entity);
//! Return single entity and remove it from entities
static Entity iterateDbEntities(Entity &entities);
//! Read state representing warning or above?
static bool isWarningOrAbove(ReadState state);
//! Representing at least one DB entity
static bool anySwiftDbEntity(Entity entities);
//! Register metadata
static void registerMetadata();
};