flightsimulatorplatfrom/pilotclient
1
0
Fork 0
mirror of https://github.com/swift-project/pilotclient.git synced 2026-05-06 10:26:03 +08:00
Code Issues Packages Projects Releases Wiki Activity

Some preparation / formatting before starting

Browse Source
This commit is contained in:
Klaus Basan
2014-01-20 23:15:22 +01:00
parent 60422376bb
commit 5bf3fb2fdf
2 changed files with 29 additions and 56 deletions
Download Patch File Download Diff File Expand all files Collapse all files

83
src/blackcore/context_network.h
View File

@@ -44,10 +44,11 @@ namespace BlackCore
/*! /*!
* \brief Register myself in DBus * \brief Register myself in DBus
* \param server * \param server DBus server
*/ */
void registerWithDBus(CDBusServer *server) void registerWithDBus(CDBusServer *server)
{ {
Q_ASSERT(server);
server->addObject(IContextNetwork::ServicePath(), this); server->addObject(IContextNetwork::ServicePath(), this);
} }
@@ -62,7 +63,6 @@ namespace BlackCore
/*! /*!
* \brief Using local objects? * \brief Using local objects?
* \return
*/ */
virtual bool usingLocalObjects() const { return true; } virtual bool usingLocalObjects() const { return true; }
@@ -70,7 +70,6 @@ namespace BlackCore
/*! /*!
* \brief Read ATC bookings * \brief Read ATC bookings
* \return
*/ */
virtual void readAtcBookingsFromSource() const; virtual void readAtcBookingsFromSource() const;
@@ -110,71 +109,68 @@ namespace BlackCore
/*! /*!
* \brief Connect to Network * \brief Connect to Network
* \return * \return a message list showing the connection situation
*/ */
virtual BlackMisc::CStatusMessageList connectToNetwork(); virtual BlackMisc::CStatusMessageList connectToNetwork();
/*! /*!
* \brief Disconnect from network * \brief Disconnect from network
* \return * \return a message list showing the disconnection situation
*/ */
virtual BlackMisc::CStatusMessageList disconnectFromNetwork(); virtual BlackMisc::CStatusMessageList disconnectFromNetwork();
/*! /*!
* \brief Network connected? * \brief Network connected?
* \return
*/ */
virtual bool isConnected() const; virtual bool isConnected() const;
/*! /*!
* \brief Set own aircraft * \brief Set own aircraft
* \param aircraft * \param aircraft my own aircraft
* \return * \return
*/ */
virtual BlackMisc::CStatusMessageList setOwnAircraft(const BlackMisc::Aviation::CAircraft &aircraft); virtual BlackMisc::CStatusMessageList setOwnAircraft(const BlackMisc::Aviation::CAircraft &aircraft);
/*! /*!
* \brief Update own position * \brief Update own position
* \param position * \param position own position
* \param altitude * \param altitude own altitude
*/ */
virtual void updateOwnPosition(const BlackMisc::Geo::CCoordinateGeodetic &position, const BlackMisc::Aviation::CAltitude &altitude); virtual void updateOwnPosition(const BlackMisc::Geo::CCoordinateGeodetic &position, const BlackMisc::Aviation::CAltitude &altitude);
/*! /*!
* \brief Update own situation * \brief Update own situation
* \param situation * \param situation own situation
*/ */
virtual void updateOwnSituation(const BlackMisc::Aviation::CAircraftSituation &situation); virtual void updateOwnSituation(const BlackMisc::Aviation::CAircraftSituation &situation);
/*! /*!
* \brief Update own cockpit * \brief Update own cockpit
* \param com1 * \param com1 my COM1 unit
* \param com2 * \param com2 my COM2 unit
* \param transponder * \param transponder my transponder
*/ */
virtual void updateOwnCockpit(const BlackMisc::Aviation::CComSystem &com1, const BlackMisc::Aviation::CComSystem &com2, const BlackMisc::Aviation::CTransponder &transponder); virtual void updateOwnCockpit(const BlackMisc::Aviation::CComSystem &com1, const BlackMisc::Aviation::CComSystem &com2, const BlackMisc::Aviation::CTransponder &transponder);
/*! /*!
* \brief Get own aircraft * \brief Get own aircraft
* \return
*/ */
virtual BlackMisc::Aviation::CAircraft getOwnAircraft() const; virtual BlackMisc::Aviation::CAircraft getOwnAircraft() const;
/*! /*!
* \brief Text messages (also private chat messages) * \brief Text messages (also private chat messages)
* \param textMessage
*/ */
virtual void sendTextMessages(const BlackMisc::Network::CTextMessageList &textMessages); virtual void sendTextMessages(const BlackMisc::Network::CTextMessageList &textMessages);
/*! /*!
* \brief Request METAR * \brief Request METAR
* \param airportIcaoCode * \param airportIcaoCode e.g. EDDF, KLAX
*/ */
virtual BlackMisc::Aviation::CInformationMessage getMetar(const QString &airportIcaoCode); virtual BlackMisc::Aviation::CInformationMessage getMetar(const QString &airportIcaoCode);
/*! /*!
* \brief Selected COM1/2 frequencies as voice rooms, "" means no resolution * \brief Selected COM1/2 frequencies as voice rooms
* \return * \return COM1/2 voice rooms
*/ */
virtual BlackMisc::Voice::CVoiceRoomList getSelectedVoiceRooms() const; virtual BlackMisc::Voice::CVoiceRoomList getSelectedVoiceRooms() const;
@@ -192,20 +188,17 @@ namespace BlackCore
QDateTime m_atcBookingsUpdateTimestamp; QDateTime m_atcBookingsUpdateTimestamp;
/*! /*!
* \brief Replace value by new values, but keep object itself intact * \brief Replace value by new values
* \param newStations
*/ */
void setAtcStationsBooked(const BlackMisc::Aviation::CAtcStationList &newStations); void setAtcStationsBooked(const BlackMisc::Aviation::CAtcStationList &newStations);
/*! /*!
* \brief Replace value by new values, but keep object itself intact * \brief Replace value by new values
* \param newStations
*/ */
void setAtcStationsOnline(const BlackMisc::Aviation::CAtcStationList &newStations); void setAtcStationsOnline(const BlackMisc::Aviation::CAtcStationList &newStations);
/*! /*!
* \brief The "central" ATC list with online ATC controllers * \brief The "central" ATC list with online ATC controllers
* \return
*/ */
BlackMisc::Aviation::CAtcStationList &atcStationsOnline() BlackMisc::Aviation::CAtcStationList &atcStationsOnline()
{ {
@@ -214,7 +207,6 @@ namespace BlackCore
/*! /*!
* \brief ATC list, with booked controllers * \brief ATC list, with booked controllers
* \return
*/ */
BlackMisc::Aviation::CAtcStationList &atcStationsBooked() BlackMisc::Aviation::CAtcStationList &atcStationsBooked()
{ {
@@ -229,23 +221,19 @@ namespace BlackCore
private slots: private slots:
/*! /*!
* \brief Connection status changed * \brief Connection status changed
* \param from * \param from old status
* \param to * \param to new status
*/ */
void psFsdConnectionStatusChanged(INetwork::ConnectionStatus from, INetwork::ConnectionStatus to); void psFsdConnectionStatusChanged(INetwork::ConnectionStatus from, INetwork::ConnectionStatus to);
/*! /*!
* \brief ATC position update * \brief ATC position update
* \param callsign
* \param frequency
* \param position
* \param range
*/ */
void psFsdAtcPositionUpdate(const BlackMisc::Aviation::CCallsign &callsign, const BlackMisc::PhysicalQuantities::CFrequency &frequency, const BlackMisc::Geo::CCoordinateGeodetic &position, const BlackMisc::PhysicalQuantities::CLength &range); void psFsdAtcPositionUpdate(const BlackMisc::Aviation::CCallsign &callsign, const BlackMisc::PhysicalQuantities::CFrequency &frequency, const BlackMisc::Geo::CCoordinateGeodetic &position, const BlackMisc::PhysicalQuantities::CLength &range);
/*! /*!
* \brief Controller disconnected * \brief Controller disconnected
* \param callsign * \param callsign callsign of controller
*/ */
void psFsdAtcControllerDisconnected(const BlackMisc::Aviation::CCallsign &callsign); void psFsdAtcControllerDisconnected(const BlackMisc::Aviation::CCallsign &callsign);
@@ -256,71 +244,56 @@ namespace BlackCore
/*! /*!
* \brief ATIS received (voice room part) * \brief ATIS received (voice room part)
* \param callsign * \param callsign station callsign
* \param url * \param url voice room's URL
*/ */
void psFsdAtisVoiceRoomQueryReceived(const BlackMisc::Aviation::CCallsign &callsign, const QString &url); void psFsdAtisVoiceRoomQueryReceived(const BlackMisc::Aviation::CCallsign &callsign, const QString &url);
/*! /*!
* \brief ATIS received (logoff time part) * \brief ATIS received (logoff time part)
* \param callsign * \param callsign station callsign
* \param zuluTime * \param zuluTime UTC time, when controller will logoff
*/ */
void psFsdAtisLogoffTimeQueryReceived(const BlackMisc::Aviation::CCallsign &callsign, const QString &zuluTime); void psFsdAtisLogoffTimeQueryReceived(const BlackMisc::Aviation::CCallsign &callsign, const QString &zuluTime);
/*! /*!
* \brief METAR received * \brief METAR received
* \param metarMessage
*/ */
void psFsdMetarReceived(const QString &metarMessage); void psFsdMetarReceived(const QString &metarMessage);
/*! /*!
* \brief Realnname recevied * \brief Realname recevied
* \param callsign
* \param realname
*/ */
void psFsdNameQueryReplyReceived(const BlackMisc::Aviation::CCallsign &callsign, const QString &realname); void psFsdNameQueryReplyReceived(const BlackMisc::Aviation::CCallsign &callsign, const QString &realname);
/*! /*!
* \brief Plane info received * \brief Plane info received
* \param callsign
* \param icaoData
*/ */
void psFsdAircraftInfoReceived(const BlackMisc::Aviation::CCallsign &callsign, const BlackMisc::Aviation::CAircraftIcao &icaoData); void psFsdAircraftInfoReceived(const BlackMisc::Aviation::CCallsign &callsign, const BlackMisc::Aviation::CAircraftIcao &icaoData);
/*! /*!
* \brief Aircraft position update * \brief Aircraft position update received
* \param callsign
* \param situation
* \param transponder
*/ */
void psFsdAircraftPositionUpdate(const BlackMisc::Aviation::CCallsign &callsign, const BlackMisc::Aviation::CAircraftSituation &situation, const BlackMisc::Aviation::CTransponder &transponder); void psFsdAircraftUpdateReceived(const BlackMisc::Aviation::CCallsign &callsign, const BlackMisc::Aviation::CAircraftSituation &situation, const BlackMisc::Aviation::CTransponder &transponder);
/*! /*!
* \brief Pilot disconnected * \brief Pilot disconnected
* \param callsign
*/ */
void psFsdPilotDisconnected(const BlackMisc::Aviation::CCallsign &callsign); void psFsdPilotDisconnected(const BlackMisc::Aviation::CCallsign &callsign);
/*! /*!
* \brief Frequency received * \brief Frequency received
* \param callsign
* \param frequency
*/ */
void psFsdFrequencyReceived(const BlackMisc::Aviation::CCallsign &callsign, const BlackMisc::PhysicalQuantities::CFrequency &frequency); void psFsdFrequencyReceived(const BlackMisc::Aviation::CCallsign &callsign, const BlackMisc::PhysicalQuantities::CFrequency &frequency);
/*! /*!
* \brief Radio text message received * \brief Radio text messages received
* \param callsign
* \param message
* \param frequencies
*/ */
void psFsdTextMessageReceived(const BlackMisc::Network::CTextMessageList &messages); void psFsdTextMessageReceived(const BlackMisc::Network::CTextMessageList &messages);
/*! /*!
* \brief Bookings via XML read * \brief Bookings via XML read
* \param nwReply * \todo encapsulate reading from WWW in some class
* TODO: encapsulate reading from WWW in some class
*/ */
void psAtcBookingsRead(QNetworkReply *nwReply); void psAtcBookingsRead(QNetworkReply *nwReply);
}; };

2
src/blackcore/context_network_aircraft.cpp
View File

@@ -47,7 +47,7 @@ namespace BlackCore
/* /*
* Aircraft update received * Aircraft update received
*/ */
void CContextNetwork::psFsdAircraftPositionUpdate(const CCallsign &callsign, const CAircraftSituation &situation, const CTransponder &transponder) void CContextNetwork::psFsdAircraftUpdateReceived(const CCallsign &callsign, const CAircraftSituation &situation, const CTransponder &transponder)
{ {
// this->log(Q_FUNC_INFO, callsign.toQString(), situation.toQString(), transponder.toQString()); // this->log(Q_FUNC_INFO, callsign.toQString(), situation.toQString(), transponder.toQString());
CAircraftList list = this->m_aircraftsInRange.findByCallsign(callsign); CAircraftList list = this->m_aircraftsInRange.findByCallsign(callsign);