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

changed a couple more INetwork method names for consistency

Browse Source
This commit is contained in:
Mathew Sutcliffe
2014-01-25 02:19:48 +00:00
parent ff3010931f
commit 7316fb8398
9 changed files with 39 additions and 39 deletions
Download Patch File Download Diff File Expand all files Collapse all files

24
samples/cli_client/client.cpp
View File

@@ -20,12 +20,12 @@ Client::Client(BlackMisc::IContext &ctx)
connect(m_net, &INetwork::serverReplyReceived, this, &Client::serverReplyReceived);
connect(m_net, &INetwork::atcReplyReceived, this, &Client::atcReplyReceived);
connect(m_net, &INetwork::atisReplyReceived, this, &Client::atisReplyReceived);
connect(m_net, &INetwork::nameReplyReceived, this, &Client::nameReplyReceived);
connect(m_net, &INetwork::realNameReplyReceived, this, &Client::realNameReplyReceived);
connect(m_net, &INetwork::capabilitiesReplyReceived, this, &Client::capabilitiesReplyReceived);
connect(m_net, &INetwork::kicked, this, &Client::kicked);
connect(m_net, &INetwork::metarReplyReceived, this, &Client::metarReplyReceived);
connect(m_net, &INetwork::pilotDisconnected, this, &Client::pilotDisconnected);
connect(m_net, &INetwork::aircraftInfoReplyReceived, this, &Client::aircraftInfoReplyReceived);
connect(m_net, &INetwork::icaoCodesReplyReceived, this, &Client::icaoCodesReplyReceived);
connect(m_net, &INetwork::pongReceived, this, &Client::pongReceived);
connect(m_net, &INetwork::textMessagesReceived, this, &Client::textMessagesReceived);
@@ -41,9 +41,9 @@ Client::Client(BlackMisc::IContext &ctx)
connect(this, &Client::sendServerQuery, m_net, &INetwork::sendServerQuery);
connect(this, &Client::sendAtcQuery, m_net, &INetwork::sendAtcQuery);
connect(this, &Client::sendAtisQuery, m_net, &INetwork::sendAtisQuery);
connect(this, &Client::sendNameQuery, m_net, &INetwork::sendNameQuery);
connect(this, &Client::sendRealNameQuery, m_net, &INetwork::sendRealNameQuery);
connect(this, &Client::sendCapabilitiesQuery, m_net, &INetwork::sendCapabilitiesQuery);
connect(this, &Client::sendAircraftInfoQuery, m_net, &INetwork::sendAircraftInfoQuery);
connect(this, &Client::sendIcaoCodesQuery, m_net, &INetwork::sendIcaoCodesQuery);
connect(this, &Client::setOwnAircraft, m_net, &INetwork::setOwnAircraft);
connect(this, &Client::setOwnAircraftPosition, m_net, &INetwork::setOwnAircraftPosition);
connect(this, &Client::setOwnAircraftSituation, m_net, &INetwork::setOwnAircraftSituation);
@@ -69,9 +69,9 @@ Client::Client(BlackMisc::IContext &ctx)
m_commands["server"] = std::bind(&Client::sendServerQueryCmd, this, _1);
m_commands["atc"] = std::bind(&Client::sendAtcQueryCmd, this, _1);
m_commands["atis"] = std::bind(&Client::sendAtisQueryCmd, this, _1);
m_commands["name"] = std::bind(&Client::sendNameQueryCmd, this, _1);
m_commands["name"] = std::bind(&Client::sendRealNameQueryCmd, this, _1);
m_commands["caps"] = std::bind(&Client::sendCapabilitiesQueryCmd, this, _1);
m_commands["aircraftinfo"] = std::bind(&Client::sendAircraftInfoQueryCmd, this, _1);
m_commands["icao"] = std::bind(&Client::sendIcaoCodesQueryCmd, this, _1);
m_commands["setaircraft"] = std::bind(&Client::setOwnAircraftCmd, this, _1);
m_commands["setposition"] = std::bind(&Client::setOwnAircraftPositionCmd, this, _1);
m_commands["setsituation"] = std::bind(&Client::setOwnAircraftSituationCmd, this, _1);
@@ -229,11 +229,11 @@ void Client::sendAtisQueryCmd(QTextStream &args)
emit sendAtisQuery(callsign);
}
void Client::sendNameQueryCmd(QTextStream &args)
void Client::sendRealNameQueryCmd(QTextStream &args)
{
QString callsign;
args >> callsign;
emit sendNameQuery(callsign);
emit sendRealNameQuery(callsign);
}
void Client::sendCapabilitiesQueryCmd(QTextStream &args)
@@ -243,11 +243,11 @@ void Client::sendCapabilitiesQueryCmd(QTextStream &args)
emit sendCapabilitiesQuery(callsign);
}
void Client::sendAircraftInfoQueryCmd(QTextStream &args)
void Client::sendIcaoCodesQueryCmd(QTextStream &args)
{
QString callsign;
args >> callsign;
emit sendAircraftInfoQuery(callsign);
emit sendIcaoCodesQuery(callsign);
}
void Client::setOwnAircraftCmd(QTextStream &args)
@@ -401,7 +401,7 @@ void Client::atisReplyReceived(const BlackMisc::Aviation::CCallsign &callsign, c
std::cout << "ATIS_REPLY " << callsign << " " << atis << std::endl;
}
void Client::nameReplyReceived(const BlackMisc::Aviation::CCallsign &callsign, const QString &realname)
void Client::realNameReplyReceived(const BlackMisc::Aviation::CCallsign &callsign, const QString &realname)
{
std::cout << "NAME_REPLY " << callsign << " " << realname.toStdString() << std::endl;
}
@@ -426,7 +426,7 @@ void Client::pilotDisconnected(const BlackMisc::Aviation::CCallsign &callsign)
std::cout << "PILOT_DISCONNECTED " << callsign << std::endl;
}
void Client::aircraftInfoReplyReceived(const BlackMisc::Aviation::CCallsign &callsign, const BlackMisc::Aviation::CAircraftIcao &icaoData)
void Client::icaoCodesReplyReceived(const BlackMisc::Aviation::CCallsign &callsign, const BlackMisc::Aviation::CAircraftIcao &icaoData)
{
std::cout << "PLANE_INFO_REPLY " << callsign << " " << icaoData.toStdString();
}

12
samples/cli_client/client.h
View File

@@ -43,9 +43,9 @@ private: //commands
void sendServerQueryCmd(QTextStream &args);
void sendAtcQueryCmd(QTextStream &args);
void sendAtisQueryCmd(QTextStream &args);
void sendNameQueryCmd(QTextStream &args);
void sendRealNameQueryCmd(QTextStream &args);
void sendCapabilitiesQueryCmd(QTextStream &args);
void sendAircraftInfoQueryCmd(QTextStream &args);
void sendIcaoCodesQueryCmd(QTextStream &args);
void setOwnAircraftCmd(QTextStream &args);
void setOwnAircraftPositionCmd(QTextStream &args);
void setOwnAircraftSituationCmd(QTextStream &args);
@@ -69,9 +69,9 @@ signals: //to send to INetwork
void sendServerQuery(const BlackMisc::Aviation::CCallsign &callsign);
void sendAtcQuery(const BlackMisc::Aviation::CCallsign &callsign);
void sendAtisQuery(const BlackMisc::Aviation::CCallsign &callsign);
void sendNameQuery(const BlackMisc::Aviation::CCallsign &callsign);
void sendRealNameQuery(const BlackMisc::Aviation::CCallsign &callsign);
void sendCapabilitiesQuery(const BlackMisc::Aviation::CCallsign &callsign);
void sendAircraftInfoQuery(const BlackMisc::Aviation::CCallsign &callsign);
void sendIcaoCodesQuery(const BlackMisc::Aviation::CCallsign &callsign);
void setOwnAircraft(const BlackMisc::Aviation::CAircraft &aircraft);
void setOwnAircraftPosition(const BlackMisc::Geo::CCoordinateGeodetic &position, const BlackMisc::Aviation::CAltitude &altitude);
void setOwnAircraftSituation(const BlackMisc::Aviation::CAircraftSituation &situation);
@@ -91,12 +91,12 @@ public slots: //to receive from INetwork
void serverReplyReceived(const BlackMisc::Aviation::CCallsign &callsign, const QString &hostname);
void atcReplyReceived(const BlackMisc::Aviation::CCallsign &callsign, bool isATC);
void atisReplyReceived(const BlackMisc::Aviation::CCallsign &callsign, const BlackMisc::Aviation::CInformationMessage &atis);
void nameReplyReceived(const BlackMisc::Aviation::CCallsign &callsign, const QString &realname);
void realNameReplyReceived(const BlackMisc::Aviation::CCallsign &callsign, const QString &realname);
void capabilitiesReplyReceived(const BlackMisc::Aviation::CCallsign &callsign, quint32 flags);
void kicked(const QString &msg);
void metarReplyReceived(const QString &data);
void pilotDisconnected(const BlackMisc::Aviation::CCallsign &callsign);
void aircraftInfoReplyReceived(const BlackMisc::Aviation::CCallsign &callsign, const BlackMisc::Aviation::CAircraftIcao &icaoData);
void icaoCodesReplyReceived(const BlackMisc::Aviation::CCallsign &callsign, const BlackMisc::Aviation::CAircraftIcao &icaoData);
void pongReceived(const BlackMisc::Aviation::CCallsign &callsign, const BlackMisc::PhysicalQuantities::CTime &elapsedTime);
void textMessagesReceived(const BlackMisc::Network::CTextMessageList &messages);

6
src/blackcore/context_network.cpp
View File

@@ -46,8 +46,8 @@ namespace BlackCore
this->connect(this->m_network, &INetwork::atisVoiceRoomReplyReceived, this, &CContextNetwork::psFsdAtisVoiceRoomQueryReceived);
this->connect(this->m_network, &INetwork::atisLogoffTimeReplyReceived, this, &CContextNetwork::psFsdAtisLogoffTimeQueryReceived);
this->connect(this->m_network, &INetwork::metarReplyReceived, this, &CContextNetwork::psFsdMetarReceived);
this->connect(this->m_network, &INetwork::nameReplyReceived, this, &CContextNetwork::psFsdNameQueryReplyReceived);
this->connect(this->m_network, &INetwork::aircraftInfoReplyReceived, this, &CContextNetwork::psFsdAircraftInfoReceived);
this->connect(this->m_network, &INetwork::realNameReplyReceived, this, &CContextNetwork::psFsdRealNameReplyReceived);
this->connect(this->m_network, &INetwork::icaoCodesReplyReceived, this, &CContextNetwork::psFsdIcaoCodesReceived);
this->connect(this->m_network, &INetwork::pilotDisconnected, this, &CContextNetwork::psFsdPilotDisconnected);
this->connect(this->m_network, &INetwork::aircraftPositionUpdate, this, &CContextNetwork::psFsdAircraftPositionUpdate);
this->connect(this->m_network, &INetwork::frequencyReplyReceived, this, &CContextNetwork::psFsdFrequencyReceived);
@@ -261,7 +261,7 @@ namespace BlackCore
/*
* Name query
*/
void CContextNetwork::psFsdNameQueryReplyReceived(const CCallsign &callsign, const QString &realname)
void CContextNetwork::psFsdRealNameReplyReceived(const CCallsign &callsign, const QString &realname)
{
// this->log(Q_FUNC_INFO, callsign.toQString(), realname);
if (realname.isEmpty()) return;

6
src/blackcore/context_network.h
View File

@@ -279,14 +279,14 @@ namespace BlackCore
* \param callsign
* \param realname
*/
void psFsdNameQueryReplyReceived(const BlackMisc::Aviation::CCallsign &callsign, const QString &realname);
void psFsdRealNameReplyReceived(const BlackMisc::Aviation::CCallsign &callsign, const QString &realname);
/*!
* \brief Plane info received
* \brief Plane ICAO codes received
* \param callsign
* \param icaoData
*/
void psFsdAircraftInfoReceived(const BlackMisc::Aviation::CCallsign &callsign, const BlackMisc::Aviation::CAircraftIcao &icaoData);
void psFsdIcaoCodesReceived(const BlackMisc::Aviation::CCallsign &callsign, const BlackMisc::Aviation::CAircraftIcao &icaoData);
/*!
* \brief Aircraft position update

8
src/blackcore/context_network_aircraft.cpp
View File

@@ -19,7 +19,7 @@ namespace BlackCore
/*
* Aircraft info received
*/
void CContextNetwork::psFsdAircraftInfoReceived(const CCallsign &callsign, const CAircraftIcao &icaoData)
void CContextNetwork::psFsdIcaoCodesReceived(const CCallsign &callsign, const CAircraftIcao &icaoData)
{
// this->log(Q_FUNC_INFO, callsign.toQString(), icaoData.toQString());
CAircraftList aircraftsWithCallsign = this->m_aircraftsInRange.findByCallsign(callsign);
@@ -32,7 +32,7 @@ namespace BlackCore
aircraft.calculcateDistanceToPlane(this->m_ownAircraft.getPosition());
this->m_aircraftsInRange.push_back(aircraft);
emit this->m_network->sendFrequencyQuery(callsign);
emit this->m_network->sendNameQuery(callsign);
emit this->m_network->sendRealNameQuery(callsign);
emit this->changedAircraftsInRange();
}
else
@@ -61,8 +61,8 @@ namespace BlackCore
aircraft.calculcateDistanceToPlane(this->m_ownAircraft.getPosition());
this->m_aircraftsInRange.push_back(aircraft);
emit this->m_network->sendFrequencyQuery(callsign);
emit this->m_network->sendNameQuery(callsign);
emit this->m_network->sendAircraftInfoQuery(callsign);
emit this->m_network->sendRealNameQuery(callsign);
emit this->m_network->sendIcaoCodesQuery(callsign);
emit this->changedAircraftsInRange();
}
else

2
src/blackcore/context_network_atc.cpp
View File

@@ -122,7 +122,7 @@ namespace BlackCore
this->m_atcStationsOnline.push_back(station);
emit this->changedAtcStationsOnline();
emit this->m_network->sendAtisQuery(callsign); // request ATIS
emit this->m_network->sendNameQuery(callsign);
emit this->m_network->sendRealNameQuery(callsign);
emit this->m_network->sendServerQuery(callsign);
}
else

8
src/blackcore/network.h
View File

@@ -106,7 +106,7 @@ namespace BlackCore
virtual void terminateConnection() = 0;
virtual void sendPing(const BlackMisc::Aviation::CCallsign &callsign) = 0;
virtual void sendNameQuery(const BlackMisc::Aviation::CCallsign &callsign) = 0;
virtual void sendRealNameQuery(const BlackMisc::Aviation::CCallsign &callsign) = 0;
virtual void sendIpQuery() = 0;
virtual void sendServerQuery(const BlackMisc::Aviation::CCallsign &callsign) = 0;
@@ -119,7 +119,7 @@ namespace BlackCore
// Aircraft
virtual void sendCapabilitiesQuery(const BlackMisc::Aviation::CCallsign &callsign) = 0;
virtual void sendAircraftInfoQuery(const BlackMisc::Aviation::CCallsign &callsign) = 0;
virtual void sendIcaoCodesQuery(const BlackMisc::Aviation::CCallsign &callsign) = 0;
virtual void sendFrequencyQuery(const BlackMisc::Aviation::CCallsign &callsign) = 0;
virtual void setOwnAircraft(const BlackMisc::Aviation::CAircraft &aircraft) = 0;
virtual void setOwnAircraftPosition(const BlackMisc::Geo::CCoordinateGeodetic &position, const BlackMisc::Aviation::CAltitude &altitude) = 0;
@@ -145,7 +145,7 @@ namespace BlackCore
// Aircraft
void pilotDisconnected(const BlackMisc::Aviation::CCallsign &callsign);
void aircraftInfoReplyReceived(const BlackMisc::Aviation::CCallsign &callsign, const BlackMisc::Aviation::CAircraftIcao &icao);
void icaoCodesReplyReceived(const BlackMisc::Aviation::CCallsign &callsign, const BlackMisc::Aviation::CAircraftIcao &icao);
void aircraftPositionUpdate(const BlackMisc::Aviation::CCallsign &callsign, const BlackMisc::Aviation::CAircraftSituation &situation,
const BlackMisc::Aviation::CTransponder &transponder);
// TODO void aircraftInterimPositionUpdate(...);
@@ -159,8 +159,8 @@ namespace BlackCore
void capabilitiesReplyReceived(const BlackMisc::Aviation::CCallsign &callsign, quint32 flags);
void ipReplyReceived(const QString &ip);
void serverReplyReceived(const BlackMisc::Aviation::CCallsign &callsign, const QString &hostname);
void nameReplyReceived(const BlackMisc::Aviation::CCallsign &callsign, const QString &realname);
void realNameReplyReceived(const BlackMisc::Aviation::CCallsign &callsign, const QString &realname);
// Text messages
void textMessagesReceived(const BlackMisc::Network::CTextMessageList &messages);

8
src/blackcore/network_vatlib.cpp
View File

@@ -455,7 +455,7 @@ namespace BlackCore
catch (...) { exceptionDispatcher(Q_FUNC_INFO); }
}
void CNetworkVatlib::sendNameQuery(const BlackMisc::Aviation::CCallsign &callsign)
void CNetworkVatlib::sendRealNameQuery(const BlackMisc::Aviation::CCallsign &callsign)
{
Q_ASSERT_X(isConnected(), "CNetworkVatlib", "Can't send to server when disconnected");
@@ -496,7 +496,7 @@ namespace BlackCore
catch (...) { exceptionDispatcher(Q_FUNC_INFO); }
}
void CNetworkVatlib::sendAircraftInfoQuery(const BlackMisc::Aviation::CCallsign &callsign)
void CNetworkVatlib::sendIcaoCodesQuery(const BlackMisc::Aviation::CCallsign &callsign)
{
Q_ASSERT_X(isConnected(), "CNetworkVatlib", "Can't send to server when disconnected");
@@ -698,7 +698,7 @@ namespace BlackCore
case Cvatlib_Network::infoQuery_Freq: emit cbvar_cast(cbvar)->frequencyReplyReceived(cbvar_cast(cbvar)->fromFSD(callsign), CFrequency(cbvar_cast(cbvar)->fromFSD(data).toFloat(), CFrequencyUnit::MHz())); break;
case Cvatlib_Network::infoQuery_Server: emit cbvar_cast(cbvar)->serverReplyReceived(cbvar_cast(cbvar)->fromFSD(callsign), cbvar_cast(cbvar)->fromFSD(data)); break;
case Cvatlib_Network::infoQuery_ATC: emit cbvar_cast(cbvar)->atcReplyReceived(cbvar_cast(cbvar)->fromFSD(data2), *data == 'Y'); break;
case Cvatlib_Network::infoQuery_Name: emit cbvar_cast(cbvar)->nameReplyReceived(cbvar_cast(cbvar)->fromFSD(callsign), cbvar_cast(cbvar)->fromFSD(data)); break;
case Cvatlib_Network::infoQuery_Name: emit cbvar_cast(cbvar)->realNameReplyReceived(cbvar_cast(cbvar)->fromFSD(callsign), cbvar_cast(cbvar)->fromFSD(data)); break;
case Cvatlib_Network::infoQuery_IP: emit cbvar_cast(cbvar)->ipReplyReceived(cbvar_cast(cbvar)->fromFSD(data)); break;
}
}
@@ -834,7 +834,7 @@ namespace BlackCore
else if (key == net->acinfo_Livery) { icao.setLivery(*keysValues); }
keysValues++;
}
emit cbvar_cast(cbvar)->aircraftInfoReplyReceived(cbvar_cast(cbvar)->fromFSD(callsign), icao);
emit cbvar_cast(cbvar)->icaoCodesReplyReceived(cbvar_cast(cbvar)->fromFSD(callsign), icao);
}
} // namespace

4
src/blackcore/network_vatlib.h
View File

@@ -43,7 +43,7 @@ namespace BlackCore
virtual void terminateConnection();
virtual void sendPing(const BlackMisc::Aviation::CCallsign &callsign);
virtual void sendNameQuery(const BlackMisc::Aviation::CCallsign &callsign);
virtual void sendRealNameQuery(const BlackMisc::Aviation::CCallsign &callsign);
virtual void sendIpQuery();
virtual void sendServerQuery(const BlackMisc::Aviation::CCallsign &callsign);
@@ -56,7 +56,7 @@ namespace BlackCore
// Aircraft
virtual void sendCapabilitiesQuery(const BlackMisc::Aviation::CCallsign &callsign);
virtual void sendAircraftInfoQuery(const BlackMisc::Aviation::CCallsign &callsign);
virtual void sendIcaoCodesQuery(const BlackMisc::Aviation::CCallsign &callsign);
virtual void sendFrequencyQuery(const BlackMisc::Aviation::CCallsign &callsign);
virtual void setOwnAircraft(const BlackMisc::Aviation::CAircraft &aircraft);
virtual void setOwnAircraftPosition(const BlackMisc::Geo::CCoordinateGeodetic &position, const BlackMisc::Aviation::CAltitude &altitude);