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

MS & KB workshop: ICAO class renamings.

Browse Source
This commit is contained in:
Mathew Sutcliffe
2015-05-12 22:46:17 +01:00
parent c136724cd0
commit b65232b202
71 changed files with 226 additions and 219 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
src/plugins/simulator/fscommon/simulator_fscommon.cpp
View File

@@ -99,7 +99,7 @@ namespace BlackSimPlugin
if (mapperInstance() && mapperInstance()->isInitialized())
{
// reverse lookup of ICAO
CAircraftIcao icao = mapperInstance()->getIcaoForModelString(model.getModelString());
CAircraftIcaoData icao = mapperInstance()->getIcaoForModelString(model.getModelString());
icao.updateMissingParts(model.getIcao());
model.setIcao(icao); // now best ICAO info in model
}
@@ -159,7 +159,7 @@ namespace BlackSimPlugin
// ICAO to model
if (!aircraftModel.hasModelString())
{
CAircraftIcao icao = remoteAircraft.getIcaoInfo();
CAircraftIcaoData icao = remoteAircraft.getIcaoInfo();
BlackMisc::Network::CAircraftMappingList mappingList = mapperInstance()->getAircraftMappingList().findByIcaoAircraftAndAirlineDesignator(icao, true);
if (!mappingList.isEmpty())
{
@@ -209,9 +209,9 @@ namespace BlackSimPlugin
return mapperInstance()->getAircraftCfgEntriesList().toAircraftModelList();
}
CAircraftIcao CSimulatorFsCommon::getIcaoForModelString(const QString &modelString) const
CAircraftIcaoData CSimulatorFsCommon::getIcaoForModelString(const QString &modelString) const
{
if (!mapperInstance()) { return CAircraftIcao(); }
if (!mapperInstance()) { return CAircraftIcaoData(); }
return mapperInstance()->getIcaoForModelString(modelString);
}

2
src/plugins/simulator/fscommon/simulator_fscommon.h
View File

@@ -61,7 +61,7 @@ namespace BlackSimPlugin
virtual BlackMisc::Simulation::CAircraftModelList getInstalledModels() const override;
//! \copydoc ISimulator::getIcaoForModelString
virtual BlackMisc::Aviation::CAircraftIcao getIcaoForModelString(const QString &modelString) const override;
virtual BlackMisc::Aviation::CAircraftIcaoData getIcaoForModelString(const QString &modelString) const override;
//! \copydoc ISimulator::reloadInstalledModels
virtual void reloadInstalledModels() override;

4
src/plugins/simulator/fsx/simulator_fsx_simconnectproc.cpp
View File

@@ -174,9 +174,9 @@ namespace BlackSimPlugin
if (!pFacilityAirport) break;
const QString icao(pFacilityAirport->Icao);
if (icao.isEmpty()) { continue; } // airfield without ICAO code
if (!CAirportIcao::isValidIcaoDesignator(icao)) { continue; } // tiny airfields in SIM
if (!CAirportIcaoCode::isValidIcaoDesignator(icao)) { continue; } // tiny airfields in SIM
CCoordinateGeodetic pos(pFacilityAirport->Latitude, pFacilityAirport->Longitude, pFacilityAirport->Altitude);
CAirport airport(CAirportIcao(icao), pos);
CAirport airport(CAirportIcaoCode(icao), pos);
CLength d = airport.calculcateDistanceAndBearingToOwnAircraft(posAircraft);
if (d > maxDistance) { continue; }
simulatorFsx->m_airportsInRange.replaceOrAddByIcao(airport);

10
src/plugins/simulator/xplane/simulator_xplane.cpp
View File

@@ -104,7 +104,7 @@ namespace BlackSimPlugin
situation.setGroundspeed({ m_xplaneData.groundspeed, CSpeedUnit::m_s() });
// updates
updateOwnIcaoData(Aviation::CAircraftIcao { m_xplaneData.aircraftIcaoCode });
updateOwnIcaoData(Aviation::CAircraftIcaoData { m_xplaneData.aircraftIcaoCode });
updateOwnSituation(situation);
updateCockpit(
Aviation::CComSystem::getCom1System({ m_xplaneData.com1Active, CFrequencyUnit::kHz() }, { m_xplaneData.com1Standby, CFrequencyUnit::kHz() }),
@@ -235,7 +235,7 @@ namespace BlackSimPlugin
CAircraftModel model(getOwnAircraftModel());
model.setModelType(CAircraftModel::TypeOwnSimulatorModel);
model.setFileName(path + "/" + filename);
CAircraftIcao aircraftIcao(icao);
CAircraftIcaoData aircraftIcao(icao);
aircraftIcao.setLivery(livery);
// updates
@@ -359,7 +359,7 @@ namespace BlackSimPlugin
//! \todo XPlane driver set correct return value
// KB: from what I can see here all data are available
// Is there any model matching required ????
CAircraftIcao icao = newRemoteAircraft.getIcaoInfo();
CAircraftIcaoData icao = newRemoteAircraft.getIcaoInfo();
m_traffic->addPlane(newRemoteAircraft.getCallsign().asString(), icao.getAircraftDesignator(), icao.getAirlineDesignator(), icao.getLivery());
updateAircraftRendered(newRemoteAircraft.getCallsign(), true, simulatorOriginator());
CLogMessage(this).info("XP: Added aircraft %1") << newRemoteAircraft.getCallsign().toQString();
@@ -419,10 +419,10 @@ namespace BlackSimPlugin
return this->changeRemoteAircraftEnabled(aircraft, originator);
}
CAircraftIcao CSimulatorXPlane::getIcaoForModelString(const QString &modelString) const
CAircraftIcaoData CSimulatorXPlane::getIcaoForModelString(const QString &modelString) const
{
Q_UNUSED(modelString);
return CAircraftIcao();
return CAircraftIcaoData();
}
bool CSimulatorXPlane::changeRemoteAircraftEnabled(const CSimulatedAircraft &aircraft, const QString &originator)

2
src/plugins/simulator/xplane/simulator_xplane.h
View File

@@ -54,7 +54,7 @@ namespace BlackSimPlugin
virtual bool isSimulating() const override { return isConnected(); }
//! \copydoc BlackCore::ISimulator::getIcaoForModelString
virtual BlackMisc::Aviation::CAircraftIcao getIcaoForModelString(const QString &modelString) const override;
virtual BlackMisc::Aviation::CAircraftIcaoData getIcaoForModelString(const QString &modelString) const override;
//! \copydoc BlackCore::ISimulator::connectTo
virtual bool connectTo() override;