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

refs #452 updated tests/samples to reflect previous changes

Browse Source
This commit is contained in:
Klaus Basan
2015-09-23 19:45:23 +02:00
committed by Mathew Sutcliffe
parent c80f352710
commit 3e1e1070c1
15 changed files with 66 additions and 61 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
samples/cli_client/client.cpp
View File

@@ -165,10 +165,10 @@ void Client::presetIcaoCodesCmd(QTextStream &args)
QString combinedIcaoType; // e.g. "L2J"
QString airlineICAO;
args >> acTypeICAO >> combinedIcaoType >> airlineICAO;
BlackMisc::Aviation::CAircraftIcaoData icaoData(
CAircraftIcaoCode(acTypeICAO, combinedIcaoType),
CAirlineIcaoCode(airlineICAO));
emit presetIcaoCodes(icaoData);
CSimulatedAircraft aircraft;
aircraft.setIcaoCodes(CAircraftIcaoCode(acTypeICAO, combinedIcaoType), CAirlineIcaoCode(airlineICAO));
emit presetIcaoCodes(aircraft);
}
void Client::presetLoginModeCmd(QTextStream &args)
@@ -323,7 +323,7 @@ void Client::setOwnAircraftCmd(QTextStream &args)
int xpdrCode;
QString xpdrMode;
args >> lat >> lon >> alt >> hdg >> pitch >> bank >> gs >> com1 >> com2 >> xpdrCode >> xpdrMode;
BlackMisc::Aviation::CAircraft aircraft("", BlackMisc::Network::CUser(), BlackMisc::Aviation::CAircraftSituation(
BlackMisc::Simulation::CSimulatedAircraft aircraft("", BlackMisc::Network::CUser(), BlackMisc::Aviation::CAircraftSituation(
BlackMisc::Geo::CCoordinateGeodetic(lat, lon, 0),
BlackMisc::Aviation::CAltitude(alt, BlackMisc::Aviation::CAltitude::MeanSeaLevel, BlackMisc::PhysicalQuantities::CLengthUnit::ft()),
BlackMisc::Aviation::CHeading(hdg, BlackMisc::Aviation::CHeading::True, BlackMisc::PhysicalQuantities::CAngleUnit::deg()),
@@ -531,9 +531,9 @@ 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::CAircraftIcaoData &icaoData)
void Client::icaoCodesReplyReceived(const BlackMisc::Aviation::CCallsign &callsign, const QString aircraftIcaoDesignator, const QString &airlineIcaoDesignator, const QString &livery)
{
std::cout << "PLANE_INFO_REPLY " << callsign << " " << icaoData.toStdString();
std::cout << "PLANE_INFO_REPLY " << callsign << " " << aircraftIcaoDesignator.toStdString() << " " << airlineIcaoDesignator.toStdString() << " " << livery.toStdString();
}
void Client::pongReceived(const BlackMisc::Aviation::CCallsign &callsign, const BlackMisc::PhysicalQuantities::CTime &elapsedTime)

4
samples/cli_client/client.h
View File

@@ -73,7 +73,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::CAircraftIcaoData &icao);
void presetIcaoCodes(const BlackMisc::Simulation::CSimulatedAircraft &aircraft);
void presetLoginMode(BlackCore::INetwork::LoginMode mode);
void initiateConnection();
void terminateConnection();
@@ -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 BlackMisc::Aviation::CAircraftIcaoData &icaoData);
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);