flightsimulatorplatfrom/pilotclient
1
0
Fork 0
mirror of https://github.com/swift-project/pilotclient.git synced 2026-03-22 14:55:36 +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

2
samples/blackmisc/samplesjson.cpp
View File

@@ -58,7 +58,7 @@ namespace BlackMiscTest
aircraft.setCom1System(CComSystem::getCom1System(122.8, 118.75));
aircraft.setCom2System(CComSystem::getCom2System(123.8, 124.00));
aircraft.setTransponder(CTransponder::getStandardTransponder(7000, CTransponder::ModeC));
aircraft.setIcaoInfo(CAircraftIcao("B737", "L2J", "DLH", "FREIGHT", "CCDDFF"));
aircraft.setIcaoInfo(CAircraftIcaoData("B737", "L2J", "DLH", "FREIGHT", "CCDDFF"));
json = aircraft.toJson();
doc = QJsonDocument(json);

6
samples/blackmiscquantities/samplesaviation.cpp
View File

@@ -15,8 +15,8 @@
#include "blackmisc/aviation/transponder.h"
#include "blackmisc/aviation/atcstationlist.h"
#include "blackmisc/aviation/flightplan.h"
#include "blackmisc/aviation/aircrafticao.h"
#include "blackmisc/aviation/airporticao.h"
#include "blackmisc/aviation/aircrafticaodata.h"
#include "blackmisc/aviation/airporticaocode.h"
#include <QDebug>
@@ -99,7 +99,7 @@ namespace BlackMiscTest
altMsl.toMeanSeaLevel();
out << alt << " " << altMsl << endl;
CAirportIcao frankfurt("eddf");
CAirportIcaoCode frankfurt("eddf");
out << frankfurt << endl;
out << "-----------------------------------------------" << endl;

2
samples/blackmiscsim/samplesmodelmapping.cpp
View File

@@ -57,7 +57,7 @@ namespace BlackSimTest
int afterSync = mapper.synchronize();
streamOut << "After synchronizing definitions: " << afterSync << endl;
CAircraftIcao icao("C172");
CAircraftIcaoData icao("C172");
streamOut << "Searching for " << icao << endl;
streamOut << mapper.getAircraftMappingList().findByIcaoCodeExact(icao) << endl;

4
samples/cli_client/client.cpp
View File

@@ -165,7 +165,7 @@ void Client::presetIcaoCodesCmd(QTextStream &args)
QString livery;
QString color;
args >> acTypeICAO >> descriptionICAO >> airlineICAO >> livery >> color;
emit presetIcaoCodes(BlackMisc::Aviation::CAircraftIcao(acTypeICAO, descriptionICAO, airlineICAO, livery, color));
emit presetIcaoCodes(BlackMisc::Aviation::CAircraftIcaoData(acTypeICAO, descriptionICAO, airlineICAO, livery, color));
}
void Client::presetLoginModeCmd(QTextStream &args)
@@ -527,7 +527,7 @@ void Client::pilotDisconnected(const BlackMisc::Aviation::CCallsign &callsign)
std::cout << "PILOT_DISCONNECTED " << callsign << std::endl;
}
void Client::icaoCodesReplyReceived(const BlackMisc::Aviation::CCallsign &callsign, const BlackMisc::Aviation::CAircraftIcao &icaoData)
void Client::icaoCodesReplyReceived(const BlackMisc::Aviation::CCallsign &callsign, const BlackMisc::Aviation::CAircraftIcaoData &icaoData)
{
std::cout << "PLANE_INFO_REPLY " << callsign << " " << icaoData.toStdString();
}

4
samples/cli_client/client.h
View File

@@ -69,7 +69,7 @@ signals: //to send to INetwork
void presetServer(const BlackMisc::Network::CServer &server);
void presetCallsign(const BlackMisc::Aviation::CCallsign &callsign);
void presetRealName(const QString &name);
void presetIcaoCodes(const BlackMisc::Aviation::CAircraftIcao &icao);
void presetIcaoCodes(const BlackMisc::Aviation::CAircraftIcaoData &icao);
void presetLoginMode(BlackCore::INetwork::LoginMode mode);
void initiateConnection();
void terminateConnection();
@@ -108,7 +108,7 @@ public slots: //to receive from INetwork
void metarReplyReceived(const QString &data);
void flightPlanReplyReceived(const BlackMisc::Aviation::CCallsign &callsign, const BlackMisc::Aviation::CFlightPlan &flightPlan);
void pilotDisconnected(const BlackMisc::Aviation::CCallsign &callsign);
void icaoCodesReplyReceived(const BlackMisc::Aviation::CCallsign &callsign, const BlackMisc::Aviation::CAircraftIcao &icaoData);
void icaoCodesReplyReceived(const BlackMisc::Aviation::CCallsign &callsign, const BlackMisc::Aviation::CAircraftIcaoData &icaoData);
void pongReceived(const BlackMisc::Aviation::CCallsign &callsign, const BlackMisc::PhysicalQuantities::CTime &elapsedTime);
void textMessagesReceived(const BlackMisc::Network::CTextMessageList &messages);
void customPacketReceived(const BlackMisc::Aviation::CCallsign &callsign, const QString &packetId, const QStringList &data);

10
src/blackcore/airspace_monitor.cpp
View File

@@ -312,7 +312,7 @@ namespace BlackCore
return m_otherClients;
}
BlackMisc::Aviation::CInformationMessage CAirspaceMonitor::getMetar(const BlackMisc::Aviation::CAirportIcao &airportIcaoCode)
BlackMisc::Aviation::CInformationMessage CAirspaceMonitor::getMetar(const BlackMisc::Aviation::CAirportIcaoCode &airportIcaoCode)
{
CInformationMessage metar;
if (airportIcaoCode.isEmpty()) return metar;
@@ -513,7 +513,7 @@ namespace BlackCore
// ICAO response from custom data
if (!aircraftDesignator.isEmpty())
{
CAircraftIcao icao(aircraftDesignator, combinedAircraftType, airlineIcao, "", ""); // from custom packet
CAircraftIcaoData icao(aircraftDesignator, combinedAircraftType, airlineIcao, "", ""); // from custom packet
if (aircraftContainsCallsign)
{
// we have that aircraft, set straight away
@@ -802,7 +802,7 @@ namespace BlackCore
}
}
void CAirspaceMonitor::ps_icaoCodesReceived(const CCallsign &callsign, const CAircraftIcao &icaoData)
void CAirspaceMonitor::ps_icaoCodesReceived(const CCallsign &callsign, const CAircraftIcaoData &icaoData)
{
Q_ASSERT(BlackCore::isCurrentThreadCreatingThread(this));
Q_ASSERT(!callsign.isEmpty());
@@ -814,7 +814,7 @@ namespace BlackCore
{
// empty so far, try to fetch from data file
CLogMessage(this).warning("Empty ICAO info for %1 %2") << callsign.toQString() << icaoData.toQString();
CAircraftIcao icaoDataFromDataFile = this->m_vatsimDataFileReader->getIcaoInfo(callsign);
CAircraftIcaoData icaoDataFromDataFile = this->m_vatsimDataFileReader->getIcaoInfo(callsign);
if (!icaoDataFromDataFile.hasAircraftDesignator()) { return; } // give up!
vm = CPropertyIndexVariantMap(CAircraft::IndexIcao, icaoDataFromDataFile.toCVariant());
}
@@ -862,7 +862,7 @@ namespace BlackCore
bool setIcao = false;
if (this->m_icaoCodeCache.contains(callsign))
{
CAircraftIcao icao = this->m_icaoCodeCache.value(callsign);
CAircraftIcaoData icao = this->m_icaoCodeCache.value(callsign);
this->m_icaoCodeCache.remove(callsign);
aircraft.setIcaoInfo(icao);
setIcao = true;

8
src/blackcore/airspace_monitor.h
View File

@@ -117,7 +117,7 @@ namespace BlackCore
BlackMisc::Network::CClientList getOtherClientsForCallsigns(const BlackMisc::Aviation::CCallsignSet &callsigns) const;
//! Returns a METAR for the given airport, if available
BlackMisc::Aviation::CInformationMessage getMetar(const BlackMisc::Aviation::CAirportIcao &airportIcaoCode);
BlackMisc::Aviation::CInformationMessage getMetar(const BlackMisc::Aviation::CAirportIcaoCode &airportIcaoCode);
//! Returns the current online ATC stations
BlackMisc::Aviation::CAtcStationList getAtcStationsOnline() const { return m_atcStationsOnline; }
@@ -211,9 +211,9 @@ namespace BlackCore
CPartsPerCallsign m_partsByCallsign; //!< parts, for performance reasons per callsign
BlackMisc::Aviation::CCallsignSet m_aircraftSupportingParts; //!< aircraft supporting parts
QMap<BlackMisc::Aviation::CAirportIcao, BlackMisc::Aviation::CInformationMessage> m_metarCache;
QMap<BlackMisc::Aviation::CAirportIcaoCode, BlackMisc::Aviation::CInformationMessage> m_metarCache;
QMap<BlackMisc::Aviation::CCallsign, BlackMisc::Aviation::CFlightPlan> m_flightPlanCache;
QMap<BlackMisc::Aviation::CCallsign, BlackMisc::Aviation::CAircraftIcao> m_icaoCodeCache;
QMap<BlackMisc::Aviation::CCallsign, BlackMisc::Aviation::CAircraftIcaoData> m_icaoCodeCache;
INetwork *m_network = nullptr;
CVatsimBookingReader *m_vatsimBookingReader = nullptr;
@@ -273,7 +273,7 @@ namespace BlackCore
void ps_atisReceived(const BlackMisc::Aviation::CCallsign &callsign, const BlackMisc::Aviation::CInformationMessage &atisMessage);
void ps_atisVoiceRoomReceived(const BlackMisc::Aviation::CCallsign &callsign, const QString &url);
void ps_atisLogoffTimeReceived(const BlackMisc::Aviation::CCallsign &callsign, const QString &zuluTime);
void ps_icaoCodesReceived(const BlackMisc::Aviation::CCallsign &callsign, const BlackMisc::Aviation::CAircraftIcao &icaoData);
void ps_icaoCodesReceived(const BlackMisc::Aviation::CCallsign &callsign, const BlackMisc::Aviation::CAircraftIcaoData &icaoData);
void ps_pilotDisconnected(const BlackMisc::Aviation::CCallsign &callsign);
void ps_frequencyReceived(const BlackMisc::Aviation::CCallsign &callsign, const BlackMisc::PhysicalQuantities::CFrequency &frequency);
void ps_receivedBookings(const BlackMisc::Aviation::CAtcStationList &bookedStations);

2
src/blackcore/context_network.h
View File

@@ -221,7 +221,7 @@ namespace BlackCore
virtual bool parseCommandLine(const QString &commandLine, const QString &originator) = 0;
//! Get METAR, if not available request it (code such as EDDF, KLAX)
virtual BlackMisc::Aviation::CInformationMessage getMetar(const BlackMisc::Aviation::CAirportIcao &airportIcaoCode) = 0;
virtual BlackMisc::Aviation::CInformationMessage getMetar(const BlackMisc::Aviation::CAirportIcaoCode &airportIcaoCode) = 0;
//! Use the selected COM1/2 frequencies, and get the corresponding voice room for it
virtual BlackMisc::Audio::CVoiceRoomList getSelectedVoiceRooms() const = 0;

2
src/blackcore/context_network_empty.h
View File

@@ -134,7 +134,7 @@ namespace BlackCore
}
//! \copydoc IContextNetwork::getMetar
virtual BlackMisc::Aviation::CInformationMessage getMetar(const BlackMisc::Aviation::CAirportIcao &airportIcaoCode) override
virtual BlackMisc::Aviation::CInformationMessage getMetar(const BlackMisc::Aviation::CAirportIcaoCode &airportIcaoCode) override
{
Q_UNUSED(airportIcaoCode);
logEmptyContextWarning(Q_FUNC_INFO);

2
src/blackcore/context_network_impl.cpp
View File

@@ -662,7 +662,7 @@ namespace BlackCore
this->m_airspace->testAddAircraftParts(parts, incremental);
}
BlackMisc::Aviation::CInformationMessage CContextNetwork::getMetar(const BlackMisc::Aviation::CAirportIcao &airportIcaoCode)
BlackMisc::Aviation::CInformationMessage CContextNetwork::getMetar(const BlackMisc::Aviation::CAirportIcaoCode &airportIcaoCode)
{
if (this->isDebugEnabled()) { CLogMessage(this, CLogCategory::contextSlot()).debug() << Q_FUNC_INFO << airportIcaoCode; }
return m_airspace->getMetar(airportIcaoCode);

2
src/blackcore/context_network_impl.h
View File

@@ -173,7 +173,7 @@ namespace BlackCore
virtual BlackMisc::Aviation::CFlightPlan loadFlightPlanFromNetwork(const BlackMisc::Aviation::CCallsign &callsign) const override;
//! \copydoc IContextNetwork::getMetar
virtual BlackMisc::Aviation::CInformationMessage getMetar(const BlackMisc::Aviation::CAirportIcao &airportIcaoCode) override;
virtual BlackMisc::Aviation::CInformationMessage getMetar(const BlackMisc::Aviation::CAirportIcaoCode &airportIcaoCode) override;
//! \copydoc IContextNetwork::getSelectedVoiceRooms()
virtual BlackMisc::Audio::CVoiceRoomList getSelectedVoiceRooms() const override;

2
src/blackcore/context_network_proxy.cpp
View File

@@ -268,7 +268,7 @@ namespace BlackCore
return this->m_dBusInterface->callDBusRet<BlackMisc::Aviation::CFlightPlan>(QLatin1Literal("loadFlightPlanFromNetwork"), callsign);
}
CInformationMessage CContextNetworkProxy::getMetar(const CAirportIcao &airportIcaoCode)
CInformationMessage CContextNetworkProxy::getMetar(const CAirportIcaoCode &airportIcaoCode)
{
return this->m_dBusInterface->callDBusRet<BlackMisc::Aviation::CInformationMessage>(QLatin1Literal("getMetar"), airportIcaoCode);
}

2
src/blackcore/context_network_proxy.h
View File

@@ -100,7 +100,7 @@ namespace BlackCore
virtual BlackMisc::Aviation::CFlightPlan loadFlightPlanFromNetwork(const BlackMisc::Aviation::CCallsign &callsign) const override;
//! \copydoc IContextNetwork::getMetar
virtual BlackMisc::Aviation::CInformationMessage getMetar(const BlackMisc::Aviation::CAirportIcao &airportIcaoCode) override;
virtual BlackMisc::Aviation::CInformationMessage getMetar(const BlackMisc::Aviation::CAirportIcaoCode &airportIcaoCode) override;
//! \copydoc IContextNetwork::getSelectedVoiceRooms()
virtual BlackMisc::Audio::CVoiceRoomList getSelectedVoiceRooms() const override;

6
src/blackcore/context_ownaircraft.h
View File

@@ -15,7 +15,7 @@
#include "blackcoreexport.h"
#include "blackcore/context.h"
#include "blackmisc/simulation/simulatedaircraft.h"
#include "blackmisc/aviation/aircrafticao.h"
#include "blackmisc/aviation/aircrafticaodata.h"
#include "blackmisc/audio/voiceroomlist.h"
#include "blackmisc/aviation/selcal.h"
@@ -75,7 +75,7 @@ namespace BlackCore
void changedCallsign(const BlackMisc::Aviation::CCallsign &callsign);
//! Own ICAO was changed
void changedIcaoData(const BlackMisc::Aviation::CAircraftIcao &icao);
void changedIcaoData(const BlackMisc::Aviation::CAircraftIcaoData &icao);
//! own pilot (aka the swift user) changed
void changedPilot(const BlackMisc::Network::CUser &pilot);
@@ -98,7 +98,7 @@ namespace BlackCore
virtual bool updateOwnAircraftPilot(const BlackMisc::Network::CUser &pilot) = 0;
//! Set ICAO data
virtual bool updateOwnIcaoData(const BlackMisc::Aviation::CAircraftIcao &icaoData) = 0;
virtual bool updateOwnIcaoData(const BlackMisc::Aviation::CAircraftIcaoData &icaoData) = 0;
//! Set callsign
virtual bool updateOwnCallsign(const BlackMisc::Aviation::CCallsign &callsign) = 0;

6
src/blackcore/context_ownaircraft_impl.cpp
View File

@@ -92,7 +92,7 @@ namespace BlackCore
// TODO: This would need to come from somewhere (mappings)
// Own callsign, plane ICAO status, model used
this->m_ownAircraft.setIcaoInfo(CAircraftIcao("C172", "L1P", "GA", "GA", "0000ff"));
this->m_ownAircraft.setIcaoInfo(CAircraftIcaoData("C172", "L1P", "GA", "GA", "0000ff"));
}
// voice rooms, if network is already available
@@ -229,7 +229,7 @@ namespace BlackCore
return true;
}
bool CContextOwnAircraft::updateOwnIcaoData(const CAircraftIcao &icaoData)
bool CContextOwnAircraft::updateOwnIcaoData(const CAircraftIcaoData &icaoData)
{
{
QWriteLocker l(&m_lockAircraft);
@@ -270,7 +270,7 @@ namespace BlackCore
{
QWriteLocker l(&m_lockAircraft);
this->m_ownAircraft.setModel(ownAircraft.getModel());
CAircraftIcao icao(ownAircraft.getIcaoInfo());
CAircraftIcaoData icao(ownAircraft.getIcaoInfo());
if (icao.hasAircraftDesignator())
{
// if the model knows its ICAO, cool

2
src/blackcore/context_ownaircraft_impl.h
View File

@@ -78,7 +78,7 @@ namespace BlackCore
//! \copydoc IContextOwnAircraft::updateOwnIcaoData
//! \ingroup ownaircraftprovider
virtual bool updateOwnIcaoData(const BlackMisc::Aviation::CAircraftIcao &icaoData) override;
virtual bool updateOwnIcaoData(const BlackMisc::Aviation::CAircraftIcaoData &icaoData) override;
//! \copydoc IContextOwnAircraft::updatePosition
virtual bool updateOwnPosition(const BlackMisc::Geo::CCoordinateGeodetic &position, const BlackMisc::Aviation::CAltitude &altitude) override;

2
src/blackcore/context_ownaircraft_proxy.cpp
View File

@@ -70,7 +70,7 @@ namespace BlackCore
return this->m_dBusInterface->callDBusRet<bool>(QLatin1Literal("updateOwnCallsign"), callsign);
}
bool CContextOwnAircraftProxy::updateOwnIcaoData(const CAircraftIcao &icaoData)
bool CContextOwnAircraftProxy::updateOwnIcaoData(const CAircraftIcaoData &icaoData)
{
return this->m_dBusInterface->callDBusRet<bool>(QLatin1Literal("updateOwnIcaoData"), icaoData);
}

4
src/blackcore/context_ownaircraft_proxy.h
View File

@@ -15,7 +15,7 @@
#include "blackcoreexport.h"
#include "blackcore/context_ownaircraft.h"
#include "blackmisc/genericdbusinterface.h"
#include "blackmisc/aviation/aircrafticao.h"
#include "blackmisc/aviation/aircrafticaodata.h"
#include "blackmisc/simulation/simulatedaircraft.h"
namespace BlackCore
@@ -57,7 +57,7 @@ namespace BlackCore
virtual bool updateOwnCallsign(const BlackMisc::Aviation::CCallsign &callsign) override;
//! \copydoc IContextOwnAircraft::updateOwnIcaoData
virtual bool updateOwnIcaoData(const BlackMisc::Aviation::CAircraftIcao &icaoData) override;
virtual bool updateOwnIcaoData(const BlackMisc::Aviation::CAircraftIcaoData &icaoData) override;
//! \copydoc IContextOwnAircraft::setAudioOutputVolumes
virtual void setAudioOutputVolume(int outputVolume) override;

2
src/blackcore/context_simulator.h
View File

@@ -129,7 +129,7 @@ namespace BlackCore
virtual BlackMisc::Simulation::CAircraftModelList getInstalledModelsStartingWith(const QString modelString) const = 0;
//! ICAO data for model string
virtual BlackMisc::Aviation::CAircraftIcao getIcaoForModelString(const QString &modelString) const = 0;
virtual BlackMisc::Aviation::CAircraftIcaoData getIcaoForModelString(const QString &modelString) const = 0;
//! Set time synchronization between simulator and user's computer time
//! \remarks not all drivers implement this, e.g. if it is an intrinsic simulator feature

4
src/blackcore/context_simulator_impl.cpp
View File

@@ -202,10 +202,10 @@ namespace BlackCore
m_simulatorPlugin->simulator->reloadInstalledModels();
}
CAircraftIcao CContextSimulator::getIcaoForModelString(const QString &modelString) const
CAircraftIcaoData CContextSimulator::getIcaoForModelString(const QString &modelString) const
{
if (m_debugEnabled) { CLogMessage(this, CLogCategory::contextSlot()).debug() << Q_FUNC_INFO << modelString; }
if (!m_simulatorPlugin) { return CAircraftIcao(); }
if (!m_simulatorPlugin) { return CAircraftIcaoData(); }
Q_ASSERT(m_simulatorPlugin->simulator);
return m_simulatorPlugin->simulator->getIcaoForModelString(modelString);

2
src/blackcore/context_simulator_impl.h
View File

@@ -86,7 +86,7 @@ namespace BlackCore
virtual void reloadInstalledModels() override;
//! \copydoc IContextSimulator::getIcaoForModelString
virtual BlackMisc::Aviation::CAircraftIcao getIcaoForModelString(const QString &modelString) const override;
virtual BlackMisc::Aviation::CAircraftIcaoData getIcaoForModelString(const QString &modelString) const override;
//! \copydoc IContextSimulator::setTimeSynchronization
virtual bool setTimeSynchronization(bool enable, BlackMisc::PhysicalQuantities::CTime offset) override;

4
src/blackcore/context_simulator_proxy.cpp
View File

@@ -105,9 +105,9 @@ namespace BlackCore
m_dBusInterface->callDBus(QLatin1Literal("reloadInstalledModels"));
}
CAircraftIcao CContextSimulatorProxy::getIcaoForModelString(const QString &modelString) const
CAircraftIcaoData CContextSimulatorProxy::getIcaoForModelString(const QString &modelString) const
{
return m_dBusInterface->callDBusRet<CAircraftIcao>(QLatin1Literal("getIcaoForModelString"), modelString);
return m_dBusInterface->callDBusRet<CAircraftIcaoData>(QLatin1Literal("getIcaoForModelString"), modelString);
}
BlackMisc::Simulation::CSimulatorPluginInfo CContextSimulatorProxy::getSimulatorPluginInfo() const

2
src/blackcore/context_simulator_proxy.h
View File

@@ -76,7 +76,7 @@ namespace BlackCore
virtual void reloadInstalledModels() override;
//! \copydoc IContextSimulator::getIcaoForModelString
virtual BlackMisc::Aviation::CAircraftIcao getIcaoForModelString(const QString &modelString) const override;
virtual BlackMisc::Aviation::CAircraftIcaoData getIcaoForModelString(const QString &modelString) const override;
//! \copydoc IContextSimulator::getSimulatorPluginInfo
virtual BlackMisc::Simulation::CSimulatorPluginInfo getSimulatorPluginInfo() const override;

8
src/blackcore/network.h
View File

@@ -175,7 +175,7 @@ namespace BlackCore
* Set our own aircraft ICAO codes before connecting.
* \pre Network must be disconnected when calling this function.
*/
virtual void presetIcaoCodes(const BlackMisc::Aviation::CAircraftIcao &icao) = 0;
virtual void presetIcaoCodes(const BlackMisc::Aviation::CAircraftIcaoData &icao) = 0;
/*!
* Select a login mode before connecting.
@@ -362,7 +362,7 @@ namespace BlackCore
* \pre Network must be connected when calling this function.
* \sa metarReplyReceived
*/
virtual void sendMetarQuery(const BlackMisc::Aviation::CAirportIcao &airportIcao) = 0;
virtual void sendMetarQuery(const BlackMisc::Aviation::CAirportIcaoCode &airportIcao) = 0;
/*!
* Send a message querying the weather data for the airport with a specific ICAO code.
@@ -371,7 +371,7 @@ namespace BlackCore
* \sa windDataReplyReceived
* \sa cloudDataReplyReceived
*/
virtual void sendWeatherDataQuery(const BlackMisc::Aviation::CAirportIcao &airportIcao) = 0;
virtual void sendWeatherDataQuery(const BlackMisc::Aviation::CAirportIcaoCode &airportIcao) = 0;
signals:
//! @}
@@ -436,7 +436,7 @@ namespace BlackCore
* We received a reply to one of our queries.
* \sa sendIcaoCodesQuery
*/
void icaoCodesReplyReceived(const BlackMisc::Aviation::CCallsign &callsign, const BlackMisc::Aviation::CAircraftIcao &icao);
void icaoCodesReplyReceived(const BlackMisc::Aviation::CCallsign &callsign, const BlackMisc::Aviation::CAircraftIcaoData &icao);
/*!
* We received a notification of the state of another aircraft on the network.

12
src/blackcore/network_vatlib.cpp
View File

@@ -299,7 +299,7 @@ namespace BlackCore
updateOwnCallsign(callsign);
}
void CNetworkVatlib::presetIcaoCodes(const BlackMisc::Aviation::CAircraftIcao &icao)
void CNetworkVatlib::presetIcaoCodes(const BlackMisc::Aviation::CAircraftIcaoData &icao)
{
Q_ASSERT_X(isDisconnected(), "CNetworkVatlib", "Can't change ICAO codes while still connected");
m_icaoCode = icao;
@@ -591,13 +591,13 @@ namespace BlackCore
Vat_SendPing(m_net.data(), toFSD(callsign));
}
void CNetworkVatlib::sendMetarQuery(const BlackMisc::Aviation::CAirportIcao &airportIcao)
void CNetworkVatlib::sendMetarQuery(const BlackMisc::Aviation::CAirportIcaoCode &airportIcao)
{
Q_ASSERT_X(isConnected(), "CNetworkVatlib", "Can't send to server when disconnected");
Vat_RequestMetar(m_net.data(), toFSD(airportIcao.asString()));
}
void CNetworkVatlib::sendWeatherDataQuery(const BlackMisc::Aviation::CAirportIcao &airportIcao)
void CNetworkVatlib::sendWeatherDataQuery(const BlackMisc::Aviation::CAirportIcaoCode &airportIcao)
{
Q_ASSERT_X(isConnected(), "CNetworkVatlib", "Can't send to server when disconnected");
Vat_RequestWeather(m_net.data(), toFSD(airportIcao.asString()));
@@ -607,7 +607,7 @@ namespace BlackCore
{
Q_ASSERT_X(isConnected(), "CNetworkVatlib", "Can't send to server when disconnected");
CSimulatedAircraft myAircraft(getOwnAircraft());
CAircraftIcao icao = myAircraft.getIcaoInfo();
CAircraftIcaoData icao = myAircraft.getIcaoInfo();
QString modelString = myAircraft.getModel().getModelString();
if (modelString.isEmpty()) { modelString = defaultModelString(); }
@@ -621,7 +621,7 @@ namespace BlackCore
{
Q_ASSERT_X(isConnected(), "CNetworkVatlib", "Can't send to server when disconnected");
CSimulatedAircraft myAircraft(getOwnAircraft());
CAircraftIcao icao = myAircraft.getIcaoInfo();
CAircraftIcaoData icao = myAircraft.getIcaoInfo();
QString modelString = myAircraft.getModel().getModelString();
if (modelString.isEmpty()) { modelString = defaultModelString(); }
@@ -1023,7 +1023,7 @@ namespace BlackCore
void CNetworkVatlib::onPilotInfoReceived(VatSessionID, const char *callsign, const VatAircraftInfo *aircraftInfo, void *cbvar)
{
BlackMisc::Aviation::CAircraftIcao icao;
BlackMisc::Aviation::CAircraftIcaoData icao;
icao.setAircraftDesignator(aircraftInfo->aircraftType);
icao.setAirlineDesignator(aircraftInfo->airline);
icao.setLivery(aircraftInfo->livery);

8
src/blackcore/network_vatlib.h
View File

@@ -47,7 +47,7 @@ namespace BlackCore
virtual void presetLoginMode(LoginMode mode) override;
virtual void presetServer(const BlackMisc::Network::CServer &server) override;
virtual void presetCallsign(const BlackMisc::Aviation::CCallsign &callsign) override;
virtual void presetIcaoCodes(const BlackMisc::Aviation::CAircraftIcao &icao) override;
virtual void presetIcaoCodes(const BlackMisc::Aviation::CAircraftIcaoData &icao) override;
virtual void presetSimulatorInfo(const BlackMisc::Simulation::CSimulatorPluginInfo &simInfo) override;
virtual void initiateConnection() override;
virtual void terminateConnection() override;
@@ -87,8 +87,8 @@ namespace BlackCore
//! \name Weather functions
//! @{
virtual void sendMetarQuery(const BlackMisc::Aviation::CAirportIcao &airportIcao) override;
virtual void sendWeatherDataQuery(const BlackMisc::Aviation::CAirportIcao &airportIcao) override;
virtual void sendMetarQuery(const BlackMisc::Aviation::CAirportIcaoCode &airportIcao) override;
virtual void sendWeatherDataQuery(const BlackMisc::Aviation::CAirportIcaoCode &airportIcao) override;
//! @}
private slots:
@@ -174,7 +174,7 @@ namespace BlackCore
BlackMisc::Network::CServer m_server;
BlackMisc::Simulation::CSimulatorPluginInfo m_simulatorInfo;
BlackMisc::Aviation::CCallsign m_callsign; //!< "buffered callsign", as this must not change when connected
BlackMisc::Aviation::CAircraftIcao m_icaoCode; //!< "buffered icao", as this must not change when connected
BlackMisc::Aviation::CAircraftIcaoData m_icaoCode; //!< "buffered icao", as this must not change when connected
QTimer m_processingTimer;
QTimer m_positionUpdateTimer;

2
src/blackcore/simulator.h
View File

@@ -100,7 +100,7 @@ namespace BlackCore
virtual bool updateOwnSimulatorCockpit(const BlackMisc::Aviation::CAircraft &aircraft, const QString &originator) = 0;
//! ICAO data for model string
virtual BlackMisc::Aviation::CAircraftIcao getIcaoForModelString(const QString &modelString) const = 0;
virtual BlackMisc::Aviation::CAircraftIcaoData getIcaoForModelString(const QString &modelString) const = 0;
//! Display a status message in the simulator
virtual void displayStatusMessage(const BlackMisc::CStatusMessage &message) const = 0;

6
src/blackcore/vatsimdatafilereader.cpp
View File

@@ -79,7 +79,7 @@ namespace BlackCore
return this->getPilotsForCallsigns(callsigns);
}
CAircraftIcao CVatsimDataFileReader::getIcaoInfo(const CCallsign &callsign)
CAircraftIcaoData CVatsimDataFileReader::getIcaoInfo(const CCallsign &callsign)
{
CAircraft aircraft = this->getAircraft().findFirstByCallsign(callsign);
return aircraft.getIcaoInfo();
@@ -267,9 +267,9 @@ namespace BlackCore
// we expect something like H/B772/F B773 B773/F
static const QRegularExpression reg("/.");
icaoCode = icaoCode.replace(reg, "").trimmed().toUpper();
if (CAircraftIcao::isValidDesignator(icaoCode))
if (CAircraftIcaoData::isValidDesignator(icaoCode))
{
currentAircraft.setIcaoInfo(CAircraftIcao(icaoCode));
currentAircraft.setIcaoInfo(CAircraftIcaoData(icaoCode));
}
else
{

2
src/blackcore/vatsimdatafilereader.h
View File

@@ -87,7 +87,7 @@ namespace BlackCore
//! ICAO info for callsign
//! \threadsafe
BlackMisc::Aviation::CAircraftIcao getIcaoInfo(const BlackMisc::Aviation::CCallsign &callsign);
BlackMisc::Aviation::CAircraftIcaoData getIcaoInfo(const BlackMisc::Aviation::CCallsign &callsign);
//! Voice capability for callsign
//! \threadsafe

2
src/blackgui/components/flightplancomponent.cpp
View File

@@ -76,7 +76,7 @@ namespace BlackGui
{
this->ui->le_Callsign->setText(ownAircraft.getCallsign().asString());
}
if (CAircraftIcao::isValidDesignator(ownAircraft.getIcaoInfo().getAircraftDesignator()))
if (CAircraftIcaoData::isValidDesignator(ownAircraft.getIcaoInfo().getAircraftDesignator()))
{
this->ui->le_AircraftType->setText(ownAircraft.getIcaoInfo().getAircraftDesignator());
}

26
src/blackgui/components/logincomponent.cpp
View File

@@ -16,7 +16,7 @@
#include "blackcore/context_simulator.h"
#include "blackcore/network.h"
#include "blackmisc/logmessage.h"
#include "blackmisc/aviation/aircrafticao.h"
#include "blackmisc/aviation/aircrafticaodata.h"
#include "../uppercasevalidator.h"
#include <QIntValidator>
@@ -177,7 +177,7 @@ namespace BlackGui
CGuiAircraftValues aircraftValues = this->getAircraftValuesFromGui();
CAircraft ownAircraft = this->getIContextOwnAircraft()->getOwnAircraft();
CAircraftIcao icao = ownAircraft.getIcaoInfo();
CAircraftIcaoData icao = ownAircraft.getIcaoInfo();
icao.setAircraftDesignator(aircraftValues.ownAircraftIcaoTypeDesignator);
icao.setAirlineDesignator(aircraftValues.ownAircraftIcaoAirline);
icao.setAircraftCombinedType(aircraftValues.ownAircraftCombinedType);
@@ -252,7 +252,7 @@ namespace BlackGui
void CLoginComponent::setGuiValuesFromAircraft(const CAircraft &ownAircraft)
{
CAircraftIcao icao = ownAircraft.getIcaoInfo();
CAircraftIcaoData icao = ownAircraft.getIcaoInfo();
this->ui->le_Callsign->setText(ownAircraft.getCallsignAsString());
this->ui->le_AircraftIcaoDesignator->setText(icao.getAircraftDesignator());
this->ui->le_AircraftIcaoAirline->setText(icao.getAirlineDesignator());
@@ -280,10 +280,10 @@ namespace BlackGui
return values;
}
void CLoginComponent::mergeGuiIcaoValues(CAircraftIcao &icao) const
void CLoginComponent::mergeGuiIcaoValues(CAircraftIcaoData &icao) const
{
CGuiAircraftValues values = getAircraftValuesFromGui();
CAircraftIcao guiIcao(values.ownAircraftIcaoTypeDesignator, values.ownAircraftCombinedType, values.ownAircraftIcaoAirline, "", "");
CAircraftIcaoData guiIcao(values.ownAircraftIcaoTypeDesignator, values.ownAircraftCombinedType, values.ownAircraftIcaoAirline, "", "");
icao.updateMissingParts(guiIcao);
}
@@ -346,8 +346,8 @@ namespace BlackGui
Q_ASSERT(this->getIContextOwnAircraft());
Q_ASSERT(this->getIContextSimulator());
static const CAircraftIcao defaultIcao("C172", "L1P", "", "", ""); // default values
CAircraftIcao icao;
static const CAircraftIcaoData defaultIcao("C172", "L1P", "", "", ""); // default values
CAircraftIcaoData icao;
bool simConnected = this->getIContextSimulator() && this->getIContextSimulator()->isSimulating();
if (simConnected)
@@ -378,7 +378,7 @@ namespace BlackGui
}
void CLoginComponent::setGuiIcaoValues(const CAircraftIcao &icao, bool onlyIfEmpty)
void CLoginComponent::setGuiIcaoValues(const CAircraftIcaoData &icao, bool onlyIfEmpty)
{
if (!onlyIfEmpty || this->ui->le_AircraftIcaoDesignator->text().trimmed().isEmpty())
{
@@ -399,13 +399,13 @@ namespace BlackGui
{
CGuiAircraftValues values = getAircraftValuesFromGui();
bool validCombinedType = CAircraftIcao::isValidCombinedType(values.ownAircraftCombinedType);
bool validCombinedType = CAircraftIcaoData::isValidCombinedType(values.ownAircraftCombinedType);
this->ui->lblp_AircraftCombinedType->setTicked(validCombinedType);
bool validAirlineDesignator = values.ownAircraftIcaoAirline.isEmpty() || CAircraftIcao::isValidAirlineDesignator(values.ownAircraftIcaoAirline);
bool validAirlineDesignator = values.ownAircraftIcaoAirline.isEmpty() || CAircraftIcaoData::isValidAirlineDesignator(values.ownAircraftIcaoAirline);
this->ui->lblp_AircraftIcaoAirline->setTicked(validAirlineDesignator);
bool validIcaoDesignator = CAircraftIcao::isValidDesignator(values.ownAircraftIcaoTypeDesignator);
bool validIcaoDesignator = CAircraftIcaoData::isValidDesignator(values.ownAircraftIcaoTypeDesignator);
this->ui->lblp_AircraftIcaoDesignator->setTicked(validIcaoDesignator);
bool validCallsign = CCallsign::isValidCallsign(values.ownCallsign);
@@ -425,7 +425,7 @@ namespace BlackGui
bool validVatsimId = CUser::isValidVatsimId(values.vatsimId);
this->ui->lblp_VatsimId->setTicked(validVatsimId);
bool validHomeAirport = values.vatsimHomeAirport.isEmpty() || CAirportIcao::isValidIcaoDesignator(values.vatsimHomeAirport);
bool validHomeAirport = values.vatsimHomeAirport.isEmpty() || CAirportIcaoCode::isValidIcaoDesignator(values.vatsimHomeAirport);
this->ui->lblp_VatsimHomeAirport->setTicked(validHomeAirport);
bool validVatsimPassword = !values.vatsimPassword.isEmpty();
@@ -463,7 +463,7 @@ namespace BlackGui
Q_ASSERT(getIContextSimulator());
CAircraftModel model(this->getIContextOwnAircraft()->getOwnAircraft().getModel());
CAircraftIcao icao = this->getIContextSimulator()->getIcaoForModelString(model.getModelString());
CAircraftIcaoData icao = this->getIContextSimulator()->getIcaoForModelString(model.getModelString());
if (icao.hasAircraftDesignator())
{
CLogMessage(this).validationInfo("Reverse lookup for %1") << model.getModelString();

4
src/blackgui/components/logincomponent.h
View File

@@ -141,10 +141,10 @@ namespace BlackGui
void setOwnModel();
//! Set ICAO values
void setGuiIcaoValues(const BlackMisc::Aviation::CAircraftIcao &icao, bool onlyIfEmpty);
void setGuiIcaoValues(const BlackMisc::Aviation::CAircraftIcaoData &icao, bool onlyIfEmpty);
//! Merge with GUI icao values
void mergeGuiIcaoValues(BlackMisc::Aviation::CAircraftIcao &icao) const;
void mergeGuiIcaoValues(BlackMisc::Aviation::CAircraftIcaoData &icao) const;
bool m_visible = false; //!< is this component selected?
QScopedPointer<Ui::CLoginComponent> ui;

2
src/blackgui/components/settingscomponent.h
View File

@@ -15,7 +15,7 @@
#include "blackgui/blackguiexport.h"
#include "blackgui/components/enableforruntime.h"
#include "blackmisc/network/server.h"
#include "blackmisc/aviation/aircrafticao.h"
#include "blackmisc/aviation/aircrafticaodata.h"
#include <QTabWidget>
#include <QModelIndex>
#include <QTimer>

8
src/blackgui/models/aircraftmodellistmodel.cpp
View File

@@ -8,7 +8,7 @@
*/
#include "aircraftmodellistmodel.h"
#include "blackmisc/aviation/aircrafticao.h"
#include "blackmisc/aviation/aircrafticaodata.h"
#include "blackmisc/icons.h"
#include "blackmisc/blackmiscfreefunctions.h"
@@ -55,9 +55,9 @@ namespace BlackGui
case MappedModel:
this->m_columns.addColumn(CColumn::standardValueObject("call", "callsign", CAircraftModel::IndexCallsign));
this->m_columns.addColumn(CColumn::standardString("model", CAircraftModel::IndexModelString));
this->m_columns.addColumn(CColumn::standardString("ac", "aircraft ICAO", { CAircraftModel::IndexIcao, CAircraftIcao::IndexAircraftDesignator}));
this->m_columns.addColumn(CColumn::standardString("al", "airline ICAO", { CAircraftModel::IndexIcao, CAircraftIcao::IndexAirlineDesignator}));
// this->m_columns.addColumn(CColumn::standardString("ct", "combined type", { CAircraftModel::IndexIcao, CAircraftIcao::IndexCombinedAircraftType}));
this->m_columns.addColumn(CColumn::standardString("ac", "aircraft ICAO", { CAircraftModel::IndexIcao, CAircraftIcaoData::IndexAircraftDesignator}));
this->m_columns.addColumn(CColumn::standardString("al", "airline ICAO", { CAircraftModel::IndexIcao, CAircraftIcaoData::IndexAirlineDesignator}));
// this->m_columns.addColumn(CColumn::standardString("ct", "combined type", { CAircraftModel::IndexIcao, CAircraftIcaoData::IndexCombinedAircraftType}));
this->m_columns.addColumn(CColumn("q.?", "queried", CAircraftModel::IndexHasQueriedModelString,
new CBoolIconFormatter(CIcons::StandardIconTick16, CIcons::StandardIconCross16, "queried", "not queried")));
this->m_columns.addColumn(CColumn::standardString("description", CAircraftModel::IndexDescription));

4
src/blackgui/models/simulatedaircraftlistmodel.cpp
View File

@@ -56,7 +56,7 @@ namespace BlackGui
this->m_columns.addColumn(CColumn("dist.", "distance", CSimulatedAircraft::IndexDistanceToOwnAircraft, new CAirspaceDistanceFormatter()));
this->m_columns.addColumn(CColumn("altitude", { CSimulatedAircraft::IndexSituation, CAircraftSituation::IndexAltitude }, new CAltitudeFormatter()));
this->m_columns.addColumn(CColumn("gs.", { CSimulatedAircraft::IndexSituation, CAircraftSituation::IndexGroundspeed }, new CAircraftSpeedFormatter()));
this->m_columns.addColumn(CColumn::standardString("icao", { CSimulatedAircraft::IndexIcao, CAircraftIcao::IndexAsString}));
this->m_columns.addColumn(CColumn::standardString("icao", { CSimulatedAircraft::IndexIcao, CAircraftIcaoData::IndexAsString}));
this->m_columns.addColumn(CColumn("frequency", { CSimulatedAircraft::IndexCom1System, CComSystem::IndexActiveFrequency }, new CComFrequencyFormatter()));
this->m_columns.addColumn(CColumn::standardString("transponder", { CSimulatedAircraft::IndexTransponder, CTransponder::IndexTransponderCodeAndModeFormatted }));
this->m_columns.addColumn(CColumn("latitude", { CSimulatedAircraft::IndexSituation, CAircraftSituation::IndexLatitude }, new CLatLonFormatter()));
@@ -77,7 +77,7 @@ namespace BlackGui
this->m_columns.addColumn(CColumn("p.", "parts", CSimulatedAircraft::IndexPartsSynchronized, new CBoolIconFormatter("parts", "no parts"), true));
this->m_columns.addColumn(CColumn("fp.", "fast position updates", CSimulatedAircraft::IndexFastPositionUpdates, new CBoolIconFormatter("enabled", "disabled"), true));
this->m_columns.addColumn(CColumn::standardString("realname", "pilot's real name", { CSimulatedAircraft::IndexPilot, CUser::IndexRealName }));
this->m_columns.addColumn(CColumn::standardString("icao", { CSimulatedAircraft::IndexIcao, CAircraftIcao::IndexAsString}));
this->m_columns.addColumn(CColumn::standardString("icao", { CSimulatedAircraft::IndexIcao, CAircraftIcaoData::IndexAsString}));
this->m_columns.addColumn(CColumn::standardString("model", { CSimulatedAircraft::IndexModel, CAircraftModel::IndexModelString}));
this->m_columns.addColumn(CColumn::standardString("desc.", "description", { CSimulatedAircraft::IndexModel, CAircraftModel::IndexDescription}));
this->m_columns.addColumn(CColumn::standardString("type", { CSimulatedAircraft::IndexModel, CAircraftModel::IndexModelTypeAsString}));

2
src/blackgui/models/userlistmodel.cpp
View File

@@ -50,7 +50,7 @@ namespace BlackGui
this->m_columns.addColumn(CColumn(CUser::IndexIcon));
this->m_columns.addColumn(CColumn::standardString("realname", CUser::IndexRealName));
this->m_columns.addColumn(CColumn::standardValueObject("callsign", { CUser::IndexCallsign, CCallsign::IndexCallsignString }));
this->m_columns.addColumn(CColumn::standardValueObject("hb.", "homebase", { CUser::IndexHomebase, CAirportIcao::IndexString }));
this->m_columns.addColumn(CColumn::standardValueObject("hb.", "homebase", { CUser::IndexHomebase, CAirportIcaoCode::IndexString }));
this->m_columns.addColumn(CColumn::standardString("userid", CUser::IndexId));
// default sort order

8
src/blackmisc/aviation/aircraft.h
View File

@@ -15,7 +15,7 @@
#include "blackmisc/blackmiscexport.h"
#include "blackmisc/network/user.h"
#include "blackmisc/aviation/aircraftsituation.h"
#include "blackmisc/aviation/aircrafticao.h"
#include "blackmisc/aviation/aircrafticaodata.h"
#include "blackmisc/aviation/callsign.h"
#include "blackmisc/aviation/selcal.h"
#include "blackmisc/aviation/transponder.h"
@@ -88,10 +88,10 @@ namespace BlackMisc
virtual void setPilot(const BlackMisc::Network::CUser &user);
//! Get ICAO info
const CAircraftIcao &getIcaoInfo() const { return m_icao; }
const CAircraftIcaoData &getIcaoInfo() const { return m_icao; }
//! Set ICAO info
virtual void setIcaoInfo(const CAircraftIcao &icao) { m_icao = icao; }
virtual void setIcaoInfo(const CAircraftIcaoData &icao) { m_icao = icao; }
//! Has valid realname?
bool hasValidRealName() const { return this->m_pilot.hasValidRealName(); }
@@ -285,7 +285,7 @@ namespace BlackMisc
CTransponder m_transponder;
CAircraftParts m_parts;
CSelcal m_selcal;
CAircraftIcao m_icao;
CAircraftIcaoData m_icao;
};
} // namespace
} // namespace

30
src/blackmisc/aviation/aircrafticao.cpp → src/blackmisc/aviation/aircrafticaodata.cpp
View File

@@ -7,7 +7,7 @@
* contained in the LICENSE file.
*/
#include "blackmisc/aviation/aircrafticao.h"
#include "blackmisc/aviation/aircrafticaodata.h"
#include "blackmisc/propertyindex.h"
#include "blackmisc/blackmiscfreefunctions.h"
#include "blackmisc/variant.h"
@@ -20,11 +20,11 @@ namespace BlackMisc
namespace Aviation
{
CAircraftIcao::CAircraftIcao(const QString &icao, const QString &airline)
CAircraftIcaoData::CAircraftIcaoData(const QString &icao, const QString &airline)
: m_aircraftDesignator(icao.trimmed().toUpper()), m_airlineDesignator(airline.trimmed().toUpper())
{}
QString CAircraftIcao::convertToQString(bool i18n) const
QString CAircraftIcaoData::convertToQString(bool i18n) const
{
Q_UNUSED(i18n);
QString s(this->m_aircraftDesignator);
@@ -35,23 +35,23 @@ namespace BlackMisc
return s;
}
bool CAircraftIcao::hasAircraftDesignator() const
bool CAircraftIcaoData::hasAircraftDesignator() const
{
return !this->m_aircraftDesignator.isEmpty();
}
bool CAircraftIcao::hasKnownAircraftDesignator() const
bool CAircraftIcaoData::hasKnownAircraftDesignator() const
{
return (this->hasAircraftDesignator() && this->getAircraftDesignator() != "ZZZZ");
}
QString CAircraftIcao::getEngineType() const
QString CAircraftIcaoData::getEngineType() const
{
if (this->m_aircraftCombinedType.length() != 3) return "";
return this->m_aircraftCombinedType.right(1);
}
QString CAircraftIcao::asString() const
QString CAircraftIcaoData::asString() const
{
if (this->m_aircraftDesignator.isEmpty()) { return ""; }
QString s(this->m_aircraftDesignator);
@@ -68,7 +68,7 @@ namespace BlackMisc
return s;
}
void CAircraftIcao::updateMissingParts(const CAircraftIcao &icao)
void CAircraftIcaoData::updateMissingParts(const CAircraftIcaoData &icao)
{
if (this->m_aircraftDesignator.isEmpty()) { this->setAircraftDesignator(icao.getAircraftDesignator()); }
if (this->m_airlineDesignator.isEmpty()) { this->setAirlineDesignator(icao.getAirlineDesignator()); }
@@ -77,7 +77,7 @@ namespace BlackMisc
if (this->m_livery.isEmpty()) { this->setLivery(icao.getLivery()); }
}
bool CAircraftIcao::matchesWildcardIcao(const CAircraftIcao &otherIcao) const
bool CAircraftIcaoData::matchesWildcardIcao(const CAircraftIcaoData &otherIcao) const
{
if ((*this) == otherIcao) return true;
if (otherIcao.hasAircraftDesignator() && otherIcao.getAircraftDesignator() != this->getAircraftDesignator()) { return false; }
@@ -88,7 +88,7 @@ namespace BlackMisc
return true;
}
bool CAircraftIcao::isVtol() const
bool CAircraftIcaoData::isVtol() const
{
// special designators
if (
@@ -109,7 +109,7 @@ namespace BlackMisc
return false;
}
CVariant CAircraftIcao::propertyByIndex(const BlackMisc::CPropertyIndex &index) const
CVariant CAircraftIcaoData::propertyByIndex(const BlackMisc::CPropertyIndex &index) const
{
if (index.isMyself()) { return this->toCVariant(); }
ColumnIndex i = index.frontCasted<ColumnIndex>();
@@ -132,7 +132,7 @@ namespace BlackMisc
}
}
void CAircraftIcao::setPropertyByIndex(const CVariant &variant, const BlackMisc::CPropertyIndex &index)
void CAircraftIcaoData::setPropertyByIndex(const CVariant &variant, const BlackMisc::CPropertyIndex &index)
{
if (index.isMyself())
{
@@ -161,21 +161,21 @@ namespace BlackMisc
}
}
bool CAircraftIcao::isValidDesignator(const QString &designator)
bool CAircraftIcaoData::isValidDesignator(const QString &designator)
{
static QRegularExpression regexp("^[A-Z]+[A-Z0-9]*$");
if (designator.length() < 2 || designator.length() > 5) { return false; }
return (regexp.match(designator).hasMatch());
}
bool CAircraftIcao::isValidCombinedType(const QString &combinedType)
bool CAircraftIcaoData::isValidCombinedType(const QString &combinedType)
{
static QRegularExpression regexp("^[A-Z][0-9][A-Z]$");
if (combinedType.length() != 3) return false;
return (regexp.match(combinedType).hasMatch());
}
bool CAircraftIcao::isValidAirlineDesignator(const QString &airline)
bool CAircraftIcaoData::isValidAirlineDesignator(const QString &airline)
{
static QRegularExpression regexp("^[A-Z]+[A-Z0-9]*$");
if (airline.length() < 2 || airline.length() > 5) return false;

26
src/blackmisc/aviation/aircrafticao.h → src/blackmisc/aviation/aircrafticaodata.h
View File

@@ -9,8 +9,8 @@
//! \file
#ifndef BLACKMISC_AVIATION_AIRCRAFTICAO_H
#define BLACKMISC_AVIATION_AIRCRAFTICAO_H
#ifndef BLACKMISC_AVIATION_AIRCRAFTICAODATA_H
#define BLACKMISC_AVIATION_AIRCRAFTICAODATA_H
#include "blackmisc/blackmiscexport.h"
#include "blackmisc/valueobject.h"
@@ -22,13 +22,13 @@ namespace BlackMisc
namespace Aviation
{
//! Value object for ICAO classification
class BLACKMISC_EXPORT CAircraftIcao : public CValueObject<CAircraftIcao>
class BLACKMISC_EXPORT CAircraftIcaoData : public CValueObject<CAircraftIcaoData>
{
public:
//! Properties by index
enum ColumnIndex
{
IndexAircraftDesignator = BlackMisc::CPropertyIndex::GlobalIndexCAircraftIcao,
IndexAircraftDesignator = BlackMisc::CPropertyIndex::GlobalIndexCAircraftIcaoData,
IndexCombinedAircraftType,
IndexAirlineDesignator,
IndexAircraftColor,
@@ -37,15 +37,15 @@ namespace BlackMisc
};
//! Default constructor.
CAircraftIcao() = default;
CAircraftIcaoData() = default;
//! Constructor.
explicit CAircraftIcao(const QString &icao) : m_aircraftDesignator(icao.trimmed().toUpper()) {}
explicit CAircraftIcaoData(const QString &icao) : m_aircraftDesignator(icao.trimmed().toUpper()) {}
//! Constructor.
//! \param icao "B737"
//! \param airline "DLH"
CAircraftIcao(const QString &icao, const QString &airline);
CAircraftIcaoData(const QString &icao, const QString &airline);
/*!
* Constructor.
@@ -55,7 +55,7 @@ namespace BlackMisc
* \param livery "FREIGHT"
* \param color "CCFFDD" (RGB)
*/
CAircraftIcao(const QString &icao, const QString &combinedType, const QString &airline, const QString &livery, const QString &color)
CAircraftIcaoData(const QString &icao, const QString &combinedType, const QString &airline, const QString &livery, const QString &color)
: m_aircraftDesignator(icao.trimmed().toUpper()), m_aircraftCombinedType(combinedType.trimmed().toUpper()), m_airlineDesignator(airline.trimmed().toUpper()),
m_livery(livery.trimmed().toUpper()), m_aircraftColor(color.trimmed().toUpper()) {}
@@ -121,10 +121,10 @@ namespace BlackMisc
void setAircraftCombinedType(const QString &type) { this->m_aircraftCombinedType = type.trimmed().toUpper(); }
//! Missing parts from another ICAO object
void updateMissingParts(const CAircraftIcao &icao);
void updateMissingParts(const CAircraftIcaoData &icao);
//! Matches wildcard icao object
bool matchesWildcardIcao(const CAircraftIcao &otherIcao) const;
bool matchesWildcardIcao(const CAircraftIcaoData &otherIcao) const;
//! Is VTOL aircraft
bool isVtol() const;
@@ -148,7 +148,7 @@ namespace BlackMisc
QString convertToQString(bool i18n = false) const;
private:
BLACK_ENABLE_TUPLE_CONVERSION(CAircraftIcao)
BLACK_ENABLE_TUPLE_CONVERSION(CAircraftIcaoData)
QString m_aircraftDesignator; //!< "B737"
QString m_aircraftCombinedType; //!< "L2J"
QString m_airlineDesignator; //!< "DLH"
@@ -158,8 +158,8 @@ namespace BlackMisc
} // namespace
} // namespace
Q_DECLARE_METATYPE(BlackMisc::Aviation::CAircraftIcao)
BLACK_DECLARE_TUPLE_CONVERSION(BlackMisc::Aviation::CAircraftIcao, (
Q_DECLARE_METATYPE(BlackMisc::Aviation::CAircraftIcaoData)
BLACK_DECLARE_TUPLE_CONVERSION(BlackMisc::Aviation::CAircraftIcaoData, (
o.m_aircraftDesignator,
o.m_aircraftCombinedType,
o.m_airlineDesignator,

4
src/blackmisc/aviation/aircraftlist.cpp
View File

@@ -56,8 +56,8 @@ namespace BlackMisc
if (!aircraftToBeUpdated.hasValidId()) user.setId(currentDataFileAircraft.getPilotId());
aircraftToBeUpdated.setPilot(user);
CAircraftIcao icao = aircraftToBeUpdated.getIcaoInfo();
CAircraftIcao dataFileIcao = currentDataFileAircraft.getIcaoInfo();
CAircraftIcaoData icao = aircraftToBeUpdated.getIcaoInfo();
CAircraftIcaoData dataFileIcao = currentDataFileAircraft.getIcaoInfo();
if (!icao.hasAircraftDesignator()) icao.setAircraftDesignator(dataFileIcao.getAircraftDesignator());
if (!icao.hasAirlineDesignator()) icao.setAirlineDesignator(dataFileIcao.getAirlineDesignator());
if (!icao.hasAircraftCombinedType()) icao.setAircraftCombinedType(dataFileIcao.getAircraftCombinedType());

4
src/blackmisc/aviation/airport.cpp
View File

@@ -27,11 +27,11 @@ namespace BlackMisc
m_icao(icao)
{ }
CAirport::CAirport(const CAirportIcao &icao, const BlackMisc::Geo::CCoordinateGeodetic &position) :
CAirport::CAirport(const CAirportIcaoCode &icao, const BlackMisc::Geo::CCoordinateGeodetic &position) :
m_icao(icao), m_position(position)
{ }
CAirport::CAirport(const CAirportIcao &icao, const BlackMisc::Geo::CCoordinateGeodetic &position, const QString &descriptiveName) :
CAirport::CAirport(const CAirportIcaoCode &icao, const BlackMisc::Geo::CCoordinateGeodetic &position, const QString &descriptiveName) :
m_icao(icao), m_descriptiveName(descriptiveName), m_position(position)
{ }

12
src/blackmisc/aviation/airport.h
View File

@@ -13,7 +13,7 @@
#define BLACKMISC_AVIATION_AIRPORT_H
#include "blackmisc/blackmiscexport.h"
#include "blackmisc/aviation/airporticao.h"
#include "blackmisc/aviation/airporticaocode.h"
#include "blackmisc/geo/coordinategeodetic.h"
#include "blackmisc/propertyindex.h"
@@ -43,19 +43,19 @@ namespace BlackMisc
CAirport(const QString &icao);
//! ATC station constructor
CAirport(const CAirportIcao &icao, const BlackMisc::Geo::CCoordinateGeodetic &position);
CAirport(const CAirportIcaoCode &icao, const BlackMisc::Geo::CCoordinateGeodetic &position);
//! ATC station constructor
CAirport(const CAirportIcao &icao, const BlackMisc::Geo::CCoordinateGeodetic &position, const QString &descriptiveName);
CAirport(const CAirportIcaoCode &icao, const BlackMisc::Geo::CCoordinateGeodetic &position, const QString &descriptiveName);
//! Get ICAO code.
const CAirportIcao &getIcao() const { return m_icao; }
const CAirportIcaoCode &getIcao() const { return m_icao; }
//! Get ICAO code as string.
QString getIcaoAsString() const { return m_icao.asString(); }
//! Set ICAO code.
void setIcao(const CAirportIcao &icao) { m_icao = icao; }
void setIcao(const CAirportIcaoCode &icao) { m_icao = icao; }
//! Get descriptive name
QString getDescriptiveName() const { return m_descriptiveName; }
@@ -107,7 +107,7 @@ namespace BlackMisc
private:
BLACK_ENABLE_TUPLE_CONVERSION(CAirport)
CAirportIcao m_icao;
CAirportIcaoCode m_icao;
QString m_descriptiveName;
BlackMisc::Geo::CCoordinateGeodetic m_position;
};

12
src/blackmisc/aviation/airporticao.cpp → src/blackmisc/aviation/airporticaocode.cpp
View File

@@ -1,22 +1,22 @@
#include "blackmisc/aviation/airporticao.h"
#include "blackmisc/aviation/airporticaocode.h"
namespace BlackMisc
{
namespace Aviation
{
QString CAirportIcao::convertToQString(bool /** i18n **/) const
QString CAirportIcaoCode::convertToQString(bool /** i18n **/) const
{
return this->m_icaoCode;
}
bool CAirportIcao::equalsString(const QString &icaoCode) const
bool CAirportIcaoCode::equalsString(const QString &icaoCode) const
{
CAirportIcao other(icaoCode);
CAirportIcaoCode other(icaoCode);
return other == (*this);
}
QString CAirportIcao::unifyAirportCode(const QString &icaoCode)
QString CAirportIcaoCode::unifyAirportCode(const QString &icaoCode)
{
QString code = icaoCode.trimmed().toUpper();
if (code.length() != 4) return "";
@@ -24,7 +24,7 @@ namespace BlackMisc
return (reg.exactMatch(code)) ? code : "";
}
bool CAirportIcao::isValidIcaoDesignator(const QString &icaoCode)
bool CAirportIcaoCode::isValidIcaoDesignator(const QString &icaoCode)
{
QString icao = unifyAirportCode(icaoCode);
return icao.length() == 4;

18
src/blackmisc/aviation/airporticao.h → src/blackmisc/aviation/airporticaocode.h
View File

@@ -9,8 +9,8 @@
//! \file
#ifndef BLACKMISC_AVIATION_AIRPORTICAO_H
#define BLACKMISC_AVIATION_AIRPORTICAO_H
#ifndef BLACKMISC_AVIATION_AIRPORTICAOCODE_H
#define BLACKMISC_AVIATION_AIRPORTICAOCODE_H
#include "blackmisc/blackmiscexport.h"
#include "blackmisc/valueobject.h"
@@ -21,17 +21,17 @@ namespace BlackMisc
namespace Aviation
{
//! Value object encapsulating information of airport ICAO data.
class BLACKMISC_EXPORT CAirportIcao : public CValueObject<CAirportIcao>
class BLACKMISC_EXPORT CAirportIcaoCode : public CValueObject<CAirportIcaoCode>
{
public:
//! Default constructor.
CAirportIcao() = default;
CAirportIcaoCode() = default;
//! Constructor
CAirportIcao(const QString &icaoCode) : m_icaoCode(CAirportIcao::unifyAirportCode(icaoCode)) {}
CAirportIcaoCode(const QString &icaoCode) : m_icaoCode(CAirportIcaoCode::unifyAirportCode(icaoCode)) {}
//! Constructor, needed to disambiguate implicit conversion from string literal.
CAirportIcao(const char *icaoCode) : m_icaoCode(CAirportIcao::unifyAirportCode(icaoCode)) {}
CAirportIcaoCode(const char *icaoCode) : m_icaoCode(CAirportIcaoCode::unifyAirportCode(icaoCode)) {}
//! Is empty?
bool isEmpty() const { return this->m_icaoCode.isEmpty(); }
@@ -55,15 +55,15 @@ namespace BlackMisc
QString convertToQString(bool i18n = false) const;
private:
BLACK_ENABLE_TUPLE_CONVERSION(CAirportIcao)
BLACK_ENABLE_TUPLE_CONVERSION(CAirportIcaoCode)
QString m_icaoCode;
};
} // namespace
} // namespace
BLACK_DECLARE_TUPLE_CONVERSION(BlackMisc::Aviation::CAirportIcao, (
BLACK_DECLARE_TUPLE_CONVERSION(BlackMisc::Aviation::CAirportIcaoCode, (
attr(o.m_icaoCode, flags<CaseInsensitiveComparison>())
))
Q_DECLARE_METATYPE(BlackMisc::Aviation::CAirportIcao)
Q_DECLARE_METATYPE(BlackMisc::Aviation::CAirportIcaoCode)
#endif // guard

4
src/blackmisc/aviation/airportlist.cpp
View File

@@ -30,7 +30,7 @@ namespace BlackMisc
registerMetaValueType<CAirportList>();
}
CAirportList CAirportList::findByIcao(const CAirportIcao &icao) const
CAirportList CAirportList::findByIcao(const CAirportIcaoCode &icao) const
{
return this->findBy(&CAirport::getIcao, icao);
}
@@ -41,7 +41,7 @@ namespace BlackMisc
this->replaceOrAdd(&CAirport::getIcao, addedOrReplacedAirport.getIcao(), addedOrReplacedAirport);
}
CAirport CAirportList::findFirstByIcao(const CAirportIcao &icao, const CAirport &ifNotFound) const
CAirport CAirportList::findFirstByIcao(const CAirportIcaoCode &icao, const CAirport &ifNotFound) const
{
return this->findByIcao(icao).frontOrDefault(ifNotFound);
}

4
src/blackmisc/aviation/airportlist.h
View File

@@ -39,13 +39,13 @@ namespace BlackMisc
CAirportList(const CSequence<CAirport> &other);
//! Find 0..n airports by ICAO code
CAirportList findByIcao(const CAirportIcao &icao) const;
CAirportList findByIcao(const CAirportIcaoCode &icao) const;
//! Replace or add based on same ICAO code
void replaceOrAddByIcao(const CAirport &addedOrReplacedAirport);
//! Find first station by callsign, if not return given value / default
CAirport findFirstByIcao(const CAirportIcao &icao, const CAirport &ifNotFound = CAirport()) const;
CAirport findFirstByIcao(const CAirportIcaoCode &icao, const CAirport &ifNotFound = CAirport()) const;
//! \copydoc CValueObject::toQVariant
QVariant toQVariant() const { return QVariant::fromValue(*this); }

5
src/blackmisc/aviation/aviation.h
View File

@@ -22,10 +22,15 @@
#include "blackmisc/aviation/callsignset.h"
#include "blackmisc/aviation/atcstation.h"
#include "blackmisc/aviation/atcstationlist.h"
#include "blackmisc/aviation/aircrafticaocode.h"
#include "blackmisc/aviation/aircrafticaocodelist.h"
#include "blackmisc/aviation/aircraftlist.h"
#include "blackmisc/aviation/aircraftsituation.h"
#include "blackmisc/aviation/aircraftsituationlist.h"
#include "blackmisc/aviation/airlineicaocode.h"
#include "blackmisc/aviation/airlineicaocodelist.h"
#include "blackmisc/aviation/airport.h"
#include "blackmisc/aviation/airporticaocode.h"
#include "blackmisc/aviation/airportlist.h"
#include "blackmisc/aviation/informationmessage.h"
#include "blackmisc/aviation/selcal.h"

6
src/blackmisc/aviation/blackmiscfreefunctions_avmeta.cpp
View File

@@ -36,8 +36,10 @@ void BlackMisc::Aviation::registerMetadata()
CAirportList::registerMetadata();
CAircraftSituation::registerMetadata();
CAircraftSituationList::registerMetadata();
CAircraftIcao::registerMetadata();
CAirportIcao::registerMetadata();
CAircraftIcaoCode::registerMetadata();
CAircraftIcaoData::registerMetadata();
CAirlineIcaoCode::registerMetadata();
CAirportIcaoCode::registerMetadata();
CSelcal::registerMetadata();
CFlightPlan::registerMetadata();
CAircraftEngine::registerMetadata();

22
src/blackmisc/aviation/flightplan.h
View File

@@ -15,7 +15,7 @@
#include "blackmisc/blackmiscexport.h"
#include "blackmisc/valueobject.h"
#include "blackmisc/aviation/altitude.h"
#include "blackmisc/aviation/airporticao.h"
#include "blackmisc/aviation/airporticaocode.h"
#include "blackmisc/pq/time.h"
#include "blackmisc/pq/speed.h"
#include <QDateTime>
@@ -44,7 +44,7 @@ namespace BlackMisc
CFlightPlan() = default;
//! Constructor
CFlightPlan(const QString &equipmentIcao, const CAirportIcao &originAirportIcao, const CAirportIcao &destinationAirportIcao, const CAirportIcao &alternateAirportIcao,
CFlightPlan(const QString &equipmentIcao, const CAirportIcaoCode &originAirportIcao, const CAirportIcaoCode &destinationAirportIcao, const CAirportIcaoCode &alternateAirportIcao,
QDateTime takeoffTimePlanned, QDateTime takeoffTimeActual, const PhysicalQuantities::CTime &enrouteTime, const PhysicalQuantities::CTime &fuelTime,
const CAltitude &cruiseAltitude, const PhysicalQuantities::CSpeed &cruiseTrueAirspeed, FlightRules flightRules, const QString &route, const QString &remarks)
: m_equipmentIcao(equipmentIcao), m_originAirportIcao(originAirportIcao), m_destinationAirportIcao(destinationAirportIcao), m_alternateAirportIcao(alternateAirportIcao),
@@ -63,19 +63,19 @@ namespace BlackMisc
void setOriginAirportIcao(const QString &originAirportIcao) { m_originAirportIcao = originAirportIcao; }
//! Set origin airport ICAO code
void setOriginAirportIcao(const CAirportIcao &originAirportIcao) { m_originAirportIcao = originAirportIcao; }
void setOriginAirportIcao(const CAirportIcaoCode &originAirportIcao) { m_originAirportIcao = originAirportIcao; }
//! Set destination airport ICAO code
void setDestinationAirportIcao(const QString &destinationAirportIcao) { m_destinationAirportIcao = destinationAirportIcao; }
//! Set destination airport ICAO code
void setDestinationAirportIcao(const CAirportIcao &destinationAirportIcao) { m_destinationAirportIcao = destinationAirportIcao; }
void setDestinationAirportIcao(const CAirportIcaoCode &destinationAirportIcao) { m_destinationAirportIcao = destinationAirportIcao; }
//! Set alternate destination airport ICAO code
void setAlternateAirportIcao(const QString &alternateAirportIcao) { m_alternateAirportIcao = alternateAirportIcao; }
//! Set alternate destination airport ICAO code
void setAlternateAirportIcao(const CAirportIcao &alternateAirportIcao) { m_alternateAirportIcao = alternateAirportIcao; }
void setAlternateAirportIcao(const CAirportIcaoCode &alternateAirportIcao) { m_alternateAirportIcao = alternateAirportIcao; }
//! Set planned takeoff time
void setTakeoffTimePlanned(QDateTime takeoffTimePlanned) { m_takeoffTimePlanned = takeoffTimePlanned; }
@@ -120,13 +120,13 @@ namespace BlackMisc
const QString &getEquipmentIcao() const { return m_equipmentIcao; }
//! Get origin airport ICAO code
const CAirportIcao &getOriginAirportIcao() const { return m_originAirportIcao; }
const CAirportIcaoCode &getOriginAirportIcao() const { return m_originAirportIcao; }
//! Get destination airport ICAO code
const CAirportIcao &getDestinationAirportIcao() const { return m_destinationAirportIcao; }
const CAirportIcaoCode &getDestinationAirportIcao() const { return m_destinationAirportIcao; }
//! Get alternate destination airport ICAO code
const CAirportIcao &getAlternateAirportIcao() const { return m_alternateAirportIcao; }
const CAirportIcaoCode &getAlternateAirportIcao() const { return m_alternateAirportIcao; }
//! Get planned takeoff time (planned)
const QDateTime &getTakeoffTimePlanned() const { return m_takeoffTimePlanned; }
@@ -188,9 +188,9 @@ namespace BlackMisc
private:
BLACK_ENABLE_TUPLE_CONVERSION(CFlightPlan)
QString m_equipmentIcao;
CAirportIcao m_originAirportIcao;
CAirportIcao m_destinationAirportIcao;
CAirportIcao m_alternateAirportIcao;
CAirportIcaoCode m_originAirportIcao;
CAirportIcaoCode m_destinationAirportIcao;
CAirportIcaoCode m_alternateAirportIcao;
QDateTime m_takeoffTimePlanned;
QDateTime m_takeoffTimeActual;
PhysicalQuantities::CTime m_enrouteTime;

10
src/blackmisc/network/aircraftmapping.h
View File

@@ -13,7 +13,7 @@
#define BLACKMISC_NETWORK_AIRCRAFTMAPPING_H
#include "blackmisc/blackmiscexport.h"
#include "blackmisc/aviation/aircrafticao.h"
#include "blackmisc/aviation/aircrafticaodata.h"
#include "blackmisc/simulation/aircraftmodel.h"
#include "blackmisc/valueobject.h"
@@ -51,10 +51,10 @@ namespace BlackMisc
void setPropertyByIndex(const CVariant &variant, const BlackMisc::CPropertyIndex &index);
//! ICAO
void setIcao(const BlackMisc::Aviation::CAircraftIcao &icao) { this->m_icao = icao; }
void setIcao(const BlackMisc::Aviation::CAircraftIcaoData &icao) { this->m_icao = icao; }
//! ICAO
const BlackMisc::Aviation::CAircraftIcao &getIcao() const { return this->m_icao; }
const BlackMisc::Aviation::CAircraftIcaoData &getIcao() const { return this->m_icao; }
//! Model
void setModel(const BlackMisc::Simulation::CAircraftModel &model) { this->m_model = model; }
@@ -66,14 +66,14 @@ namespace BlackMisc
bool matchesModelString(const QString &modelString, Qt::CaseSensitivity sensitivity) const;
//! Matches wildcard icao object
bool matchesWildcardIcao(const BlackMisc::Aviation::CAircraftIcao &otherIcao) const { return m_icao.matchesWildcardIcao(otherIcao); }
bool matchesWildcardIcao(const BlackMisc::Aviation::CAircraftIcaoData &otherIcao) const { return m_icao.matchesWildcardIcao(otherIcao); }
private:
BLACK_ENABLE_TUPLE_CONVERSION(CAircraftMapping)
QString m_source; //!< source, e.g. database, vPilot
QString m_packageName; //!< something like WoA, ..
BlackMisc::Aviation::CAircraftIcao m_icao; //!< ICAO code
BlackMisc::Aviation::CAircraftIcaoData m_icao; //!< ICAO code
BlackMisc::Simulation::CAircraftModel m_model; //!< aircraft model
// BlackMisc::Simulation::CSimulatorPluginInfo m_simulatorInfo; //!< Mapping is for simulator

10
src/blackmisc/network/aircraftmappinglist.cpp
View File

@@ -23,7 +23,7 @@ namespace BlackMisc
CSequence<CAircraftMapping>(other)
{ }
CAircraftMappingList CAircraftMappingList::findByIcaoCodeWildcard(const CAircraftIcao &searchIcao) const
CAircraftMappingList CAircraftMappingList::findByIcaoCodeWildcard(const CAircraftIcaoData &searchIcao) const
{
return this->findBy([ = ](const CAircraftMapping & mapping)
{
@@ -31,7 +31,7 @@ namespace BlackMisc
});
}
CAircraftMappingList CAircraftMappingList::findByIcaoAircraftDesignator(const CAircraftIcao &searchIcao) const
CAircraftMappingList CAircraftMappingList::findByIcaoAircraftDesignator(const CAircraftIcaoData &searchIcao) const
{
const QString aircraftIcao = searchIcao.getAircraftDesignator();
if (aircraftIcao.isEmpty()) { return CAircraftMappingList(); }
@@ -41,7 +41,7 @@ namespace BlackMisc
});
}
CAircraftMappingList CAircraftMappingList::findByIcaoAirlineDesignator(const CAircraftIcao &searchIcao) const
CAircraftMappingList CAircraftMappingList::findByIcaoAirlineDesignator(const CAircraftIcaoData &searchIcao) const
{
const QString airlineIcao = searchIcao.getAircraftDesignator();
if (airlineIcao.isEmpty()) { return CAircraftMappingList(); }
@@ -51,7 +51,7 @@ namespace BlackMisc
});
}
CAircraftMappingList CAircraftMappingList::findByIcaoAircraftAndAirlineDesignator(const CAircraftIcao &searchIcao, bool allowRelaxedAirline) const
CAircraftMappingList CAircraftMappingList::findByIcaoAircraftAndAirlineDesignator(const CAircraftIcaoData &searchIcao, bool allowRelaxedAirline) const
{
CAircraftMappingList aircraftSearch = findByIcaoAircraftDesignator(searchIcao);
if (aircraftSearch.isEmpty()) { return aircraftSearch; }
@@ -61,7 +61,7 @@ namespace BlackMisc
return allowRelaxedAirline ? aircraftSearch : aircraftAndAirlineSearch;
}
CAircraftMappingList CAircraftMappingList::findByIcaoCodeExact(const CAircraftIcao &searchIcao) const
CAircraftMappingList CAircraftMappingList::findByIcaoCodeExact(const CAircraftIcaoData &searchIcao) const
{
return this->findBy(&CAircraftMapping::getIcao, searchIcao);
}

10
src/blackmisc/network/aircraftmappinglist.h
View File

@@ -35,19 +35,19 @@ namespace BlackMisc
CAircraftMappingList(const CSequence<CAircraftMapping> &other);
//! Find by ICAO code, empty fields treated as wildcards
CAircraftMappingList findByIcaoCodeWildcard(const BlackMisc::Aviation::CAircraftIcao &searchIcao) const;
CAircraftMappingList findByIcaoCodeWildcard(const BlackMisc::Aviation::CAircraftIcaoData &searchIcao) const;
//! Find by ICAO aircraft designator
CAircraftMappingList findByIcaoAircraftDesignator(const BlackMisc::Aviation::CAircraftIcao &searchIcao) const;
CAircraftMappingList findByIcaoAircraftDesignator(const BlackMisc::Aviation::CAircraftIcaoData &searchIcao) const;
//! Find by ICAO airline designator
CAircraftMappingList findByIcaoAirlineDesignator(const BlackMisc::Aviation::CAircraftIcao &searchIcao) const;
CAircraftMappingList findByIcaoAirlineDesignator(const BlackMisc::Aviation::CAircraftIcaoData &searchIcao) const;
//! Find by ICAO aircraft and airline designator
CAircraftMappingList findByIcaoAircraftAndAirlineDesignator(const BlackMisc::Aviation::CAircraftIcao &searchIcao, bool allowRelaxedAirline) const;
CAircraftMappingList findByIcaoAircraftAndAirlineDesignator(const BlackMisc::Aviation::CAircraftIcaoData &searchIcao, bool allowRelaxedAirline) const;
//! Find by ICAO code, empty fields treated literally
CAircraftMappingList findByIcaoCodeExact(const BlackMisc::Aviation::CAircraftIcao &searchIcao) const;
CAircraftMappingList findByIcaoCodeExact(const BlackMisc::Aviation::CAircraftIcaoData &searchIcao) const;
//! Find by model string
CAircraftMappingList findByModelString(const QString &modelString, Qt::CaseSensitivity sensitivity = Qt::CaseInsensitive) const;

4
src/blackmisc/network/user.cpp
View File

@@ -8,7 +8,7 @@
*/
#include "blackmisc/network/user.h"
#include "blackmisc/aviation/airporticao.h"
#include "blackmisc/aviation/airporticaocode.h"
#include "blackmisc/icon.h"
#include "blackmisc/blackmiscfreefunctions.h"
#include "blackmisc/propertyindex.h"
@@ -86,7 +86,7 @@ namespace BlackMisc
int pos = match.capturedStart(0);
QString icao = match.captured(0).trimmed().right(4);
rn = rn.left(pos).trimmed();
this->setHomebase(CAirportIcao(icao));
this->setHomebase(CAirportIcaoCode(icao));
}
}

8
src/blackmisc/network/user.h
View File

@@ -14,7 +14,7 @@
#include "blackmisc/blackmiscexport.h"
#include "blackmisc/aviation/callsign.h"
#include "blackmisc/aviation/airporticao.h"
#include "blackmisc/aviation/airporticaocode.h"
#include "blackmisc/propertyindex.h"
#include "blackmisc/statusmessagelist.h"
@@ -104,10 +104,10 @@ namespace BlackMisc
void setId(const QString &id) { m_id = id.trimmed(); }
//! Homebase
const BlackMisc::Aviation::CAirportIcao &getHomebase() const { return this->m_homebase; }
const BlackMisc::Aviation::CAirportIcaoCode &getHomebase() const { return this->m_homebase; }
//! Set homebase
void setHomebase(const BlackMisc::Aviation::CAirportIcao &homebase) { this->m_homebase = homebase; }
void setHomebase(const BlackMisc::Aviation::CAirportIcaoCode &homebase) { this->m_homebase = homebase; }
//! Get associated callsign.
const BlackMisc::Aviation::CCallsign &getCallsign() const { return m_callsign; }
@@ -150,7 +150,7 @@ namespace BlackMisc
QString m_email;
QString m_password;
BlackMisc::Aviation::CCallsign m_callsign;
BlackMisc::Aviation::CAirportIcao m_homebase;
BlackMisc::Aviation::CAirportIcaoCode m_homebase;
};
} // namespace
} // namespace

2
src/blackmisc/propertyindex.h
View File

@@ -59,7 +59,7 @@ namespace BlackMisc
GlobalIndexCAircraftLights = 1600,
GlobalIndexCModulator = 2000,
GlobalIndexCTransponder = 2100,
GlobalIndexCAircraftIcao = 2500,
GlobalIndexCAircraftIcaoData = 2500,
GlobalIndexCAircraftIcaoCode = 2600,
GlobalIndexCAirlineIcaoCode = 2700,
GlobalIndexCAirportIcaoCode = 2800,

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;

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;

2
tests/blackcore/testnetwork.cpp
View File

@@ -23,7 +23,7 @@ void BlackCoreTest::CTestNetwork::networkTest(BlackCore::INetwork *net)
EXPECT_UNIT(e)
.send(&INetwork::presetServer, CServer("", "", "vatsim-germany.org", 6809, CUser("1234567", "", "", "123456")))
.send(&INetwork::presetCallsign, "SWIFT")
.send(&INetwork::presetIcaoCodes, CAircraftIcao("C172", "P1L", "YYY", "YYY", "white"))
.send(&INetwork::presetIcaoCodes, CAircraftIcaoData("C172", "P1L", "YYY", "YYY", "white"))
.send(&INetwork::initiateConnection)
.expect(&INetwork::connectionStatusChanged, [](INetwork::ConnectionStatus, INetwork::ConnectionStatus newStatus)
{

6
tests/blackmisc/testaviation.cpp
View File

@@ -8,7 +8,7 @@
#include "blackmisc/aviation/heading.h"
#include "blackmisc/aviation/informationmessage.h"
#include "blackmisc/aviation/aircraftsituation.h"
#include "blackmisc/aviation/aircrafticao.h"
#include "blackmisc/aviation/aircrafticaodata.h"
#include "blackmisc/aviation/callsignset.h"
#include "blackmisc/aviation/comsystem.h"
#include "blackmisc/aviation/navsystem.h"
@@ -159,8 +159,8 @@ namespace BlackMiscTest
CAircraftSituation situation2(situation1);
QVERIFY2(situation1 == situation2, "situations shall be equal");
CAircraftIcao icao1(CAircraftIcao("C172", "L1P", "GA", "GA", "0000ff"));
CAircraftIcao icao2(icao1);
CAircraftIcaoData icao1("C172", "L1P", "GA", "GA", "0000ff");
CAircraftIcaoData icao2(icao1);
QVERIFY2(icao1 == icao2, "ICAOs shall be equal");
CCallsign call1("EDDS_N_APP");