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

refs #452, MS review

Browse Source 
https://dev.vatsim-germany.org/issues/452#note-5
This commit is contained in:
Klaus Basan
2015-09-28 22:46:42 +02:00
committed by Mathew Sutcliffe
parent e033cfacfd
commit 3ed2068ff5
11 changed files with 20 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
samples/cli_client/client.cpp
View File

@@ -531,7 +531,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 QString aircraftIcaoDesignator, const QString &airlineIcaoDesignator, const QString &livery)
void Client::icaoCodesReplyReceived(const BlackMisc::Aviation::CCallsign &callsign, const QString &aircraftIcaoDesignator, const QString &airlineIcaoDesignator, const QString &livery)
{
std::cout << "PLANE_INFO_REPLY " << callsign << " " << aircraftIcaoDesignator.toStdString() << " " << airlineIcaoDesignator.toStdString() << " " << livery.toStdString();
}

2
samples/cli_client/client.h
View File

@@ -112,7 +112,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 QString aircraftIcaoDesignator, const QString &airlineIcaoDesignator, const QString &livery);
void icaoCodesReplyReceived(const BlackMisc::Aviation::CCallsign &callsign, const QString &aircraftIcaoDesignator, const QString &airlineIcaoDesignator, const QString &livery);
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);

2
src/blackcore/airspace_monitor.cpp
View File

@@ -762,7 +762,7 @@ namespace BlackCore
}
}
void CAirspaceMonitor::ps_icaoCodesReceived(const BlackMisc::Aviation::CCallsign &callsign, const QString aircraftIcaoDesignator, const QString &airlineIcaoDesignator, const QString &livery)
void CAirspaceMonitor::ps_icaoCodesReceived(const BlackMisc::Aviation::CCallsign &callsign, const QString &aircraftIcaoDesignator, const QString &airlineIcaoDesignator, const QString &livery)
{
Q_ASSERT_X(BlackCore::isCurrentThreadObjectThread(this), Q_FUNC_INFO, "not in main thread");
Q_ASSERT_X(!callsign.isEmpty(), Q_FUNC_INFO, "no callsign");

14
src/blackcore/airspace_monitor.h
View File

@@ -37,7 +37,7 @@ namespace BlackCore
class BLACKCORE_EXPORT CAirspaceMonitor :
public QObject,
public BlackMisc::Simulation::IRemoteAircraftProvider, // those data will be provided from the class CAirspaceMonitor
public BlackMisc::Simulation::COwnAircraftAware, // used to obtain in memory infomation about own aircraft
public BlackMisc::Simulation::COwnAircraftAware, // used to obtain in memory information about own aircraft
public BlackMisc::Network::CWebDataServicesAware // used to get web service data
{
Q_OBJECT
@@ -219,11 +219,11 @@ namespace BlackCore
QMap<BlackMisc::Aviation::CCallsign, BlackMisc::Aviation::CFlightPlan> m_flightPlanCache;
QMap<BlackMisc::Aviation::CCallsign, BlackMisc::Simulation::CAircraftModel> m_modelCache;
INetwork *m_network = nullptr;
CAirspaceAnalyzer *m_analyzer = nullptr; //!< owned analyzer
bool m_serverSupportsNameQuery = false; //!< not all servers support name query
bool m_connected = false; //!< retrieve data
bool m_sendInterimPositions = false;
INetwork *m_network = nullptr;
CAirspaceAnalyzer *m_analyzer = nullptr; //!< owned analyzer
bool m_serverSupportsNameQuery = false; //!< not all servers support name query
bool m_connected = false; //!< retrieve data
bool m_sendInterimPositions = false;
QTimer m_interimPositionUpdateTimer;
// locks
@@ -275,7 +275,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 QString aircraftIcaoDesignator, const QString &airlineIcaoDesignator, const QString &livery);
void ps_icaoCodesReceived(const BlackMisc::Aviation::CCallsign &callsign, const QString &aircraftIcaoDesignator, const QString &airlineIcaoDesignator, const QString &livery);
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/network.h
View File

@@ -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 QString aircraftIcaoDesignator, const QString &airlineIcaoDesignator, const QString &livery);
void icaoCodesReplyReceived(const BlackMisc::Aviation::CCallsign &callsign, const QString &aircraftIcaoDesignator, const QString &airlineIcaoDesignator, const QString &livery);
/*!
* We received a notification of the state of another aircraft on the network.

6
src/blackcore/network_vatlib.cpp
View File

@@ -1030,9 +1030,9 @@ namespace BlackCore
{
emit cbvar_cast(cbvar)->icaoCodesReplyReceived(
cbvar_cast(cbvar)->fromFSD(callsign),
QString(aircraftInfo->aircraftType).trimmed().toUpper(),
QString(aircraftInfo->airline).trimmed().toUpper(),
QString(aircraftInfo->livery).trimmed().toUpper()
cbvar_cast(cbvar)->fromFSD(aircraftInfo->aircraftType).trimmed().toUpper(),
cbvar_cast(cbvar)->fromFSD(aircraftInfo->airline).trimmed().toUpper(),
cbvar_cast(cbvar)->fromFSD(aircraftInfo->livery).trimmed().toUpper()
);
}

2
src/blackmisc/aviation/airlineicaocode.cpp
View File

@@ -155,7 +155,7 @@ namespace BlackMisc
CStatusMessageList CAirlineIcaoCode::validate() const
{
static const CLogCategoryList cats( { CLogCategory(this->getClassName()), CLogCategory::validation()});
static const CLogCategoryList cats(CLogCategoryList(this).join({ CLogCategory::validation() }));
CStatusMessageList msgs;
if (!hasValidDesignator()) { msgs.push_back(CStatusMessage(cats, CStatusMessage::SeverityError, "Airline: missing designator")); }
if (!hasValidCountry()) { msgs.push_back(CStatusMessage(cats, CStatusMessage::SeverityError, "Airline: missing country")); }

2
src/blackmisc/aviation/livery.cpp
View File

@@ -98,7 +98,7 @@ namespace BlackMisc
CStatusMessageList CLivery::validate() const
{
static const CLogCategoryList cats( { CLogCategory(this->getClassName()), CLogCategory::validation()});
static const CLogCategoryList cats(CLogCategoryList(this).join({ CLogCategory::validation() }));
CStatusMessageList msg;
if (!hasCombinedCode()) { msg.push_back(CStatusMessage(cats, CStatusMessage::SeverityError, "Livery: missing livery code")); }
if (!hasColorFuselage()) { msg.push_back(CStatusMessage(cats, CStatusMessage::SeverityWarning, "Livery: no fuselage color")); }

3
src/blackmisc/blackmiscfreefunctions.cpp
View File

@@ -381,7 +381,8 @@ QString BlackMisc::bytesToHexString(const QByteArray &bytes)
QString h;
for (int i = 0; i < bytes.size(); i++)
{
h.append(static_cast<int>(bytes.at(i)));
int b = static_cast<int>(bytes.at(i));
h.append(intToHex(b, 2));
}
return h;
}

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

@@ -218,7 +218,7 @@ namespace BlackMisc
CStatusMessageList CAircraftModel::validate(bool withNestedObjects) const
{
static const CLogCategoryList cats( { CLogCategory(this->getClassName()), CLogCategory::validation()});
static const CLogCategoryList cats(CLogCategoryList(this).join({ CLogCategory::validation() }));
CStatusMessageList msgs;
if (!hasModelString()) { msgs.push_back(CStatusMessage(cats, CStatusMessage::SeverityError, "Model: missing model string (aka key)")); }
if (!hasValidSimulator()) {msgs.push_back(CStatusMessage(cats, CStatusMessage::SeverityError, "Model: no simulator set")); }

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

@@ -87,7 +87,7 @@ namespace BlackMisc
CStatusMessageList CDistributor::validate() const
{
static const CLogCategoryList cats( { CLogCategory(this->getClassName()), CLogCategory::validation()});
static const CLogCategoryList cats(CLogCategoryList(this).join({ CLogCategory::validation() }));
CStatusMessageList msgs;
if (!hasValidDbKey()) { msgs.push_back(CStatusMessage(cats, CStatusMessage::SeverityError, "Distributor: missing id")); }
if (!hasDescription()) { msgs.push_back(CStatusMessage(cats, CStatusMessage::SeverityWarning, "Distributor: missing description")); }