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

Ref T118, allow to just provide an id (from backend) and set the entity on swift side

Browse Source 
* added getDistributorForDbKey
* added fillInMissingAircraftAndLiveryEntities
* fromDbJson function adjusted
This commit is contained in:
Klaus Basan
2017-10-25 17:05:11 +02:00
parent 585d82f84b
commit 4166982954
8 changed files with 95 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

33
src/blackmisc/simulation/aircraftmodel.cpp
View File

@@ -712,9 +712,36 @@ namespace BlackMisc
const QString modelMode(json.value(prefix + "mode").toString());
const CSimulatorInfo simInfo = CSimulatorInfo::fromDatabaseJson(json, prefix);
const CAircraftIcaoCode aircraftIcao(CAircraftIcaoCode::fromDatabaseJson(json, "ac_"));
const CLivery livery(CLivery::fromDatabaseJson(json, "liv_"));
const CDistributor distributor(CDistributor::fromDatabaseJson(json, "dist_"));
CDistributor distributor(CDistributor::fromDatabaseJson(json, "dist_"));
CAircraftIcaoCode aircraftIcao(CAircraftIcaoCode::fromDatabaseJson(json, "ac_"));
CLivery livery(CLivery::fromDatabaseJson(json, "liv_"));
if (!aircraftIcao.isLoadedFromDb())
{
const int idAircraftIcao = json.value(prefix + "idaircrafticao").toInt(-1);
if (idAircraftIcao >= 0)
{
aircraftIcao.setDbKey(idAircraftIcao);
}
}
if (!livery.isLoadedFromDb())
{
const int idLivery = json.value(prefix + "idlivery").toInt(-1);
if (idLivery >= 0)
{
livery.setDbKey(idLivery);
}
}
if (!distributor.isLoadedFromDb())
{
const QString idDistributor = json.value(prefix + "iddistributor").toString();
if (!idDistributor.isEmpty())
{
distributor.setDbKey(idDistributor);
}
}
CAircraftModel model(
modelString, CAircraftModel::TypeDatabaseEntry, simInfo, modelName, modelDescription, aircraftIcao, livery