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

refs #763, set ATC parking code as (raw) airline ICAO code

Browse Source
This commit is contained in:
Klaus Basan
2016-09-10 01:41:02 +02:00
committed by Roland Winklmeier
parent ccb14b4d19
commit a4d70fc8bd
1 changed files with 11 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
src/blackmisc/simulation/fscommon/aircraftcfgentries.cpp
View File

@@ -122,6 +122,7 @@ namespace BlackMisc
CAircraftModel CAircraftCfgEntries::toAircraftModel() const CAircraftModel CAircraftCfgEntries::toAircraftModel() const
{ {
// creates raw, unconsolidated data
CAircraftModel model(this->getTitle(), CAircraftModel::TypeOwnSimulatorModel); CAircraftModel model(this->getTitle(), CAircraftModel::TypeOwnSimulatorModel);
model.setDescription(this->getUiCombinedDescription()); // Manufacturer and type model.setDescription(this->getUiCombinedDescription()); // Manufacturer and type
model.setFileName(this->getFileName()); model.setFileName(this->getFileName());
@@ -129,7 +130,7 @@ namespace BlackMisc
model.setUtcTimestamp(this->getUtcTimestamp()); // aircraft.cfg file last modified model.setUtcTimestamp(this->getUtcTimestamp()); // aircraft.cfg file last modified
model.setIconPath(this->getThumbnailFileNameChecked()); model.setIconPath(this->getThumbnailFileNameChecked());
const QString designator(CAircraftIcaoCode::normalizeDesignator(getAtcModel())); const QString designator(CAircraftIcaoCode::normalizeDesignator(this->getAtcModel()));
CAircraftIcaoCode aircraft( CAircraftIcaoCode aircraft(
CAircraftIcaoCode::isValidDesignator(designator) ? CAircraftIcaoCode::isValidDesignator(designator) ?
designator : designator :
@@ -137,16 +138,23 @@ namespace BlackMisc
aircraft.setManufacturer(this->getUiManufacturer()); aircraft.setManufacturer(this->getUiManufacturer());
model.setAircraftIcaoCode(aircraft); model.setAircraftIcaoCode(aircraft);
// livery
CLivery livery; CLivery livery;
livery.setCombinedCode(this->getTexture()); livery.setCombinedCode(this->getTexture());
CAirlineIcaoCode airline; 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); livery.setAirlineIcaoCode(airline);
model.setLivery(livery); model.setLivery(livery);
// distributor
const CDistributor distributor(this->getCreatedBy()); const CDistributor distributor(this->getCreatedBy());
model.setDistributor(distributor); model.setDistributor(distributor);
return model; return model;
} }