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

14
src/blackmisc/simulation/aircraftmodel.h
View File

@@ -14,7 +14,7 @@
#include "blackmisc/blackmiscexport.h"
#include "blackmisc/aviation/aircraft.h"
#include "blackmisc/aviation/aircrafticao.h"
#include "blackmisc/aviation/aircrafticaodata.h"
#include "blackmisc/network/user.h"
#include "blackmisc/propertyindex.h"
@@ -59,7 +59,7 @@ namespace BlackMisc
CAircraftModel(const QString &model, ModelType type) : m_modelString(model), m_modelType(type) {}
//! Constructor.
CAircraftModel(const QString &model, ModelType type, const QString &description, const BlackMisc::Aviation::CAircraftIcao &icao) :
CAircraftModel(const QString &model, ModelType type, const QString &description, const BlackMisc::Aviation::CAircraftIcaoData &icao) :
m_icao(icao), m_modelString(model), m_description(description), m_modelType(type) {}
//! Constructor
@@ -96,15 +96,15 @@ namespace BlackMisc
void setQueriedModelString(const QString &model) { this->m_modelString = model; this->m_modelType = TypeQueriedFromNetwork; }
//! ICAO code
BlackMisc::Aviation::CAircraftIcao getIcao() const { return this->m_icao; }
BlackMisc::Aviation::CAircraftIcaoData getIcao() const { return this->m_icao; }
//! Set ICAO info
void setIcao(const BlackMisc::Aviation::CAircraftIcao &icao) { this->m_icao = icao; }
void setIcao(const BlackMisc::Aviation::CAircraftIcaoData &icao) { this->m_icao = icao; }
//! \copydoc CAircraftIcao::hasAircraftAndAirlineDesignator
//! \copydoc CAircraftIcaoData::hasAircraftAndAirlineDesignator
bool hasAircraftAndAirlineDesignator() const { return this->m_icao.hasAircraftAndAirlineDesignator(); }
//! \copydoc CAircraftIcao::hasAircraftDesignator
//! \copydoc CAircraftIcaoData::hasAircraftDesignator
bool hasAircraftDesignator() const { return this->m_icao.hasAircraftDesignator(); }
//! Model type
@@ -146,7 +146,7 @@ namespace BlackMisc
private:
BLACK_ENABLE_TUPLE_CONVERSION(CAircraftModel)
BlackMisc::Aviation::CCallsign m_callsign; //!< aircraft's callsign
BlackMisc::Aviation::CAircraftIcao m_icao; //!< ICAO data if available
BlackMisc::Aviation::CAircraftIcaoData m_icao; //!< ICAO data if available
QString m_modelString; //!< Simulator model string
QString m_description; //!< descriptive text
QString m_fileName; //!< file name

10
src/blackmisc/simulation/fscommon/aircraftmapper.cpp
View File

@@ -62,11 +62,11 @@ namespace BlackMisc
return m_init;
}
CAircraftIcao CAircraftMapper::getIcaoForModelString(const QString &modelString) const
CAircraftIcaoData CAircraftMapper::getIcaoForModelString(const QString &modelString) const
{
if (modelString.isEmpty() || !this->isInitialized()) { return CAircraftIcao(); }
if (modelString.isEmpty() || !this->isInitialized()) { return CAircraftIcaoData(); }
CAircraftMappingList mappings = this->m_mappings->getMappingList().findByModelString(modelString);
if (mappings.isEmpty()) { return CAircraftIcao(); }
if (mappings.isEmpty()) { return CAircraftIcaoData(); }
return mappings.front().getIcao();
}
@@ -80,7 +80,7 @@ namespace BlackMisc
CAircraftCfgEntriesList el = this->m_entries.findByTitle(title, caseSensitivity);
if (el.isEmpty()) { return CAircraftModel(); }
CAircraftModel model = el.front().toAircraftModel();
CAircraftIcao icao = this->getIcaoForModelString(model.getModelString());
CAircraftIcaoData icao = this->getIcaoForModelString(model.getModelString());
model.setIcao(icao);
return model;
}
@@ -111,7 +111,7 @@ namespace BlackMisc
"Boeing 737-800 Paint1",
CAircraftModel::TypeModelMatchingDefaultModel,
"B737-800 default model",
CAircraftIcao("B738", "L2J", "", "", "FFFFFF")
CAircraftIcaoData("B738", "L2J", "", "", "FFFFFF")
);
return aircraftModel;
}

2
src/blackmisc/simulation/fscommon/aircraftmapper.h
View File

@@ -78,7 +78,7 @@ namespace BlackMisc
const BlackMisc::Network::CAircraftMappingList &getAircraftMappingList() const { return m_mappings->getMappingList(); }
//! Inverse lookup
BlackMisc::Aviation::CAircraftIcao getIcaoForModelString(const QString &modelString) const;
BlackMisc::Aviation::CAircraftIcaoData getIcaoForModelString(const QString &modelString) const;
//! Number of aircraft entries
int countAircraftCfgEntries() const { return m_entries.size(); }

2
src/blackmisc/simulation/ownaircraftprovider.cpp
View File

@@ -90,7 +90,7 @@ namespace BlackMisc
return this->m_ownAircraftProvider->updateOwnCallsign(callsign);
}
bool COwnAircraftAware::updateOwnIcaoData(const CAircraftIcao &icaoData)
bool COwnAircraftAware::updateOwnIcaoData(const CAircraftIcaoData &icaoData)
{
Q_ASSERT_X(this->m_ownAircraftProvider, Q_FUNC_INFO, "No object available");
return this->m_ownAircraftProvider->updateOwnIcaoData(icaoData);

4
src/blackmisc/simulation/ownaircraftprovider.h
View File

@@ -51,7 +51,7 @@ namespace BlackMisc
//! Update ICAO data
//! \threadsafe
virtual bool updateOwnIcaoData(const BlackMisc::Aviation::CAircraftIcao &icaoData) = 0;
virtual bool updateOwnIcaoData(const BlackMisc::Aviation::CAircraftIcaoData &icaoData) = 0;
//! Update model
//! \threadsafe
@@ -114,7 +114,7 @@ namespace BlackMisc
virtual bool updateOwnCallsign(const BlackMisc::Aviation::CCallsign &callsign);
//! \copydoc IOwnAircraftProvider::updateOwnIcaoData
virtual bool updateOwnIcaoData(const BlackMisc::Aviation::CAircraftIcao &icaoData);
virtual bool updateOwnIcaoData(const BlackMisc::Aviation::CAircraftIcaoData &icaoData);
//! \copydoc IOwnAircraftProvider::updateOwnModel
virtual bool updateOwnModel(const BlackMisc::Simulation::CAircraftModel &model);

2
src/blackmisc/simulation/ownaircraftproviderdummy.cpp
View File

@@ -88,7 +88,7 @@ namespace BlackMisc
return true;
}
bool COwnAircraftProviderDummy::updateOwnIcaoData(const CAircraftIcao &icaoData)
bool COwnAircraftProviderDummy::updateOwnIcaoData(const CAircraftIcaoData &icaoData)
{
m_ownAircraft.setIcaoInfo(icaoData);
return true;

2
src/blackmisc/simulation/ownaircraftproviderdummy.h
View File

@@ -65,7 +65,7 @@ namespace BlackMisc
virtual bool updateOwnModel(const BlackMisc::Simulation::CAircraftModel &model) override;
//! \copydoc IOwnAircraftProvider::updateOwnIcaoData
virtual bool updateOwnIcaoData(const BlackMisc::Aviation::CAircraftIcao &icaoData) override;
virtual bool updateOwnIcaoData(const BlackMisc::Aviation::CAircraftIcaoData &icaoData) override;
//! \copydoc IOwnAircraftProvider::updateOwnSituation
virtual bool updateOwnSituation(const BlackMisc::Aviation::CAircraftSituation &situation) override;

4
src/blackmisc/simulation/simulatedaircraft.cpp
View File

@@ -117,10 +117,10 @@ namespace BlackMisc
this->m_client.setUserCallsign(getCallsign());
}
void CSimulatedAircraft::setIcaoInfo(const CAircraftIcao &icao)
void CSimulatedAircraft::setIcaoInfo(const CAircraftIcaoData &icao)
{
// snyc ICAO info
CAircraftIcao newIcao(icao);
CAircraftIcaoData newIcao(icao);
newIcao.updateMissingParts(this->getIcaoInfo());
newIcao.updateMissingParts(this->getModel().getIcao());

2
src/blackmisc/simulation/simulatedaircraft.h
View File

@@ -67,7 +67,7 @@ namespace BlackMisc
virtual void setCallsign(const BlackMisc::Aviation::CCallsign &callsign) override;
//! \copydoc CAircraft::setIcaoInfo
virtual void setIcaoInfo(const BlackMisc::Aviation::CAircraftIcao &icao) override;
virtual void setIcaoInfo(const BlackMisc::Aviation::CAircraftIcaoData &icao) override;
//! \copydoc CAircraft::setPilot
virtual void setPilot(const BlackMisc::Network::CUser &user) override;