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

refs #748, fixed airport entity and reader resolution

Browse Source
This commit is contained in:
Klaus Basan
2016-10-20 03:37:41 +02:00
parent 14469f2d4e
commit 35283d8887
3 changed files with 10 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
src/blackcore/webdataservices.cpp
View File

@@ -708,6 +708,9 @@ namespace BlackCore
{ {
case CWebReaderFlags::IcaoDataReader: return this->m_icaoDataReader; case CWebReaderFlags::IcaoDataReader: return this->m_icaoDataReader;
case CWebReaderFlags::ModelReader: return this->m_modelDataReader; case CWebReaderFlags::ModelReader: return this->m_modelDataReader;
case CWebReaderFlags::AirportReader: return this->m_airportDataReader;
default:
break;
} }
return nullptr; return nullptr;
} }

5
src/blackcore/webreaderflags.cpp
View File

@@ -26,6 +26,11 @@ namespace BlackCore
f |= ModelReader; f |= ModelReader;
} }
if (entity.testFlag(CEntityFlags::AirportEntity))
{
f |= AirportReader;
}
if (entity.testFlag(CEntityFlags::InfoObjectEntity)) { f |= InfoDataReader; } if (entity.testFlag(CEntityFlags::InfoObjectEntity)) { f |= InfoDataReader; }
if (entity.testFlag(CEntityFlags::BookingEntity)) { f |= VatsimBookingReader; } if (entity.testFlag(CEntityFlags::BookingEntity)) { f |= VatsimBookingReader; }
if (entity.testFlag(CEntityFlags::VatsimDataFile)) { f |= VatsimDataReader; } if (entity.testFlag(CEntityFlags::VatsimDataFile)) { f |= VatsimDataReader; }

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

@@ -135,6 +135,7 @@ namespace BlackMisc
bool CEntityFlags::anySwiftDbEntity(Entity entities) bool CEntityFlags::anySwiftDbEntity(Entity entities)
{ {
return return
entities.testFlag(AirportEntity) ||
entities.testFlag(AircraftIcaoEntity) || entities.testFlag(AirlineIcaoEntity) || entities.testFlag(AircraftIcaoEntity) || entities.testFlag(AirlineIcaoEntity) ||
entities.testFlag(CountryEntity) || entities.testFlag(DistributorEntity) || entities.testFlag(CountryEntity) || entities.testFlag(DistributorEntity) ||
entities.testFlag(ModelEntity) || entities.testFlag(LiveryEntity); entities.testFlag(ModelEntity) || entities.testFlag(LiveryEntity);
@@ -144,6 +145,7 @@ namespace BlackMisc
{ {
if (name.contains("aircraft", Qt::CaseInsensitive)) { return AircraftIcaoEntity; } if (name.contains("aircraft", Qt::CaseInsensitive)) { return AircraftIcaoEntity; }
if (name.contains("airline", Qt::CaseInsensitive)) { return AirlineIcaoEntity; } if (name.contains("airline", Qt::CaseInsensitive)) { return AirlineIcaoEntity; }
if (name.contains("airport", Qt::CaseInsensitive)) { return AirportEntity; }
if (name.contains("distributor", Qt::CaseInsensitive)) { return DistributorEntity; } if (name.contains("distributor", Qt::CaseInsensitive)) { return DistributorEntity; }
if (name.contains("countr", Qt::CaseInsensitive)) { return CountryEntity; } if (name.contains("countr", Qt::CaseInsensitive)) { return CountryEntity; }
if (name.contains("model", Qt::CaseInsensitive)) { return ModelEntity; } if (name.contains("model", Qt::CaseInsensitive)) { return ModelEntity; }