From a4d70fc8bd027ba3b4096bc51273b069e36daf09 Mon Sep 17 00:00:00 2001 From: Klaus Basan Date: Sat, 10 Sep 2016 01:41:02 +0200 Subject: [PATCH] refs #763, set ATC parking code as (raw) airline ICAO code --- .../simulation/fscommon/aircraftcfgentries.cpp | 14 +++++++++++--- 1 file changed, 11 insertions(+), 3 deletions(-) diff --git a/src/blackmisc/simulation/fscommon/aircraftcfgentries.cpp b/src/blackmisc/simulation/fscommon/aircraftcfgentries.cpp index 0995efd6e..7b93c956c 100644 --- a/src/blackmisc/simulation/fscommon/aircraftcfgentries.cpp +++ b/src/blackmisc/simulation/fscommon/aircraftcfgentries.cpp @@ -122,6 +122,7 @@ namespace BlackMisc CAircraftModel CAircraftCfgEntries::toAircraftModel() const { + // creates raw, unconsolidated data CAircraftModel model(this->getTitle(), CAircraftModel::TypeOwnSimulatorModel); model.setDescription(this->getUiCombinedDescription()); // Manufacturer and type model.setFileName(this->getFileName()); @@ -129,7 +130,7 @@ namespace BlackMisc model.setUtcTimestamp(this->getUtcTimestamp()); // aircraft.cfg file last modified model.setIconPath(this->getThumbnailFileNameChecked()); - const QString designator(CAircraftIcaoCode::normalizeDesignator(getAtcModel())); + const QString designator(CAircraftIcaoCode::normalizeDesignator(this->getAtcModel())); CAircraftIcaoCode aircraft( CAircraftIcaoCode::isValidDesignator(designator) ? designator : @@ -137,16 +138,23 @@ namespace BlackMisc aircraft.setManufacturer(this->getUiManufacturer()); model.setAircraftIcaoCode(aircraft); + // livery CLivery livery; livery.setCombinedCode(this->getTexture()); + CAirlineIcaoCode airline; - airline.setName(this->getAtcAirline()); + airline.setName(this->getAtcAirline()); // descriptive name like "BATAVIA" + const QString airlineDesignator(this->getAtcParkingCode()); + if (CAirlineIcaoCode::isValidAirlineDesignator(airlineDesignator)) + { + airline.setDesignator(airlineDesignator); + } livery.setAirlineIcaoCode(airline); model.setLivery(livery); + // distributor const CDistributor distributor(this->getCreatedBy()); model.setDistributor(distributor); - return model; }