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

[FSD] Style

Browse Source
This commit is contained in:
Klaus Basan
2019-11-10 19:13:57 +01:00
committed by Mat Sutcliffe
parent 123387f1a7
commit 911b23e29d
4 changed files with 32 additions and 33 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
src/blackcore/airspacemonitor.cpp
View File

@@ -295,9 +295,8 @@ namespace BlackCore
CAtcStation CAirspaceMonitor::getAtcStationForComUnit(const CComSystem &comSystem) const
{
CAtcStation station;
CAtcStationList stations = m_atcStationsOnline.findIfComUnitTunedInChannelSpacing(comSystem);
if (stations.isEmpty()) { return station; }
if (stations.isEmpty()) { return {}; }
stations.sortByDistanceToReferencePosition();
return stations.front();
}
@@ -431,7 +430,7 @@ namespace BlackCore
{
const CSimulatedAircraftList aircraft = this->getAircraftInRange();
CRemoteAircraftProvider::removeAllAircraft();
this->asyncAddNewAircraftInRange(aircraft, true);
this->asyncReInitializeAllAircraft(aircraft, true);
return aircraft.size();
}
@@ -1027,7 +1026,7 @@ namespace BlackCore
return added;
}
void CAirspaceMonitor::asyncAddNewAircraftInRange(const CSimulatedAircraftList &aircraft, bool readyForModelMatching)
void CAirspaceMonitor::asyncReInitializeAllAircraft(const CSimulatedAircraftList &aircraft, bool readyForModelMatching)
{
if (aircraft.isEmpty()) { return; }
if (!sApp || sApp->isShuttingDown()) { return; }

2
src/blackcore/airspacemonitor.h
View File

@@ -332,7 +332,7 @@ namespace BlackCore
//! Asynchronously add aircraft
//! \threadsafe
//! \sa addNewAircraftInRange
void asyncAddNewAircraftInRange(const BlackMisc::Simulation::CSimulatedAircraftList &aircraft, bool readyForModelMatching);
void asyncReInitializeAllAircraft(const BlackMisc::Simulation::CSimulatedAircraftList &aircraft, bool readyForModelMatching);
//! Update online stations by callsign
int updateOnlineStation(const BlackMisc::Aviation::CCallsign &callsign, const BlackMisc::CPropertyIndexVariantMap &vm, bool skipEqualValues = true, bool sendSignal = true);

50
src/blackcore/fsd/fsdclient.cpp
View File

@@ -90,9 +90,9 @@ namespace BlackCore
{
initializeMessageTypes();
connect(&m_socket, &QTcpSocket::readyRead, this, &CFSDClient::readDataFromSocket, Qt::QueuedConnection);
connect(&m_socket, &QTcpSocket::connected, this, &CFSDClient::handleSocketConnected);
connect(&m_socket, qOverload<QAbstractSocket::SocketError>(&QTcpSocket::error), this, &CFSDClient::printSocketError, Qt::QueuedConnection);
connect(&m_socket, qOverload<QAbstractSocket::SocketError>(&QTcpSocket::error), this, &CFSDClient::handleSocketError, Qt::QueuedConnection);
connect(&m_socket, &QTcpSocket::connected, this, &CFSDClient::handleSocketConnected);
m_positionUpdateTimer.setObjectName(this->objectName().append(":m_positionUpdateTimer"));
connect(&m_positionUpdateTimer, &QTimer::timeout, this, &CFSDClient::sendPilotDataUpdate);
@@ -154,12 +154,12 @@ namespace BlackCore
void CFSDClient::setIcaoCodes(const CSimulatedAircraft &ownAircraft)
{
Q_ASSERT_X(m_connectionStatus.isDisconnected(), Q_FUNC_INFO, "Can't change ICAO codes while still connected");
m_ownAircraftIcaoCode = ownAircraft.getAircraftIcaoCode();
m_ownAirlineIcaoCode = ownAircraft.getAirlineIcaoCode();
m_ownLivery = ownAircraft.getModel().getSwiftLiveryString();
m_ownModelString = ownAircraft.getModelString();
m_sendLiveryString = true;
m_sendMModelString = true;
m_ownAircraftIcaoCode = ownAircraft.getAircraftIcaoCode();
m_ownAirlineIcaoCode = ownAircraft.getAirlineIcaoCode();
m_ownLivery = ownAircraft.getModel().getSwiftLiveryString();
m_ownModelString = ownAircraft.getModelString();
m_sendLiveryString = true;
m_sendMModelString = true;
updateOwnIcaoCodes(m_ownAircraftIcaoCode, m_ownAirlineIcaoCode);
}
@@ -251,8 +251,7 @@ namespace BlackCore
{
const QString cid = m_server.getUser().getId();
const QString password = m_server.getUser().getPassword();
const QString name = m_server.getUser().getRealNameAndHomeBase();
// const QString name = m_server.getUser().getRealName();
const QString name = m_server.getUser().getRealNameAndHomeBase(); // m_server.getUser().getRealName();
if (m_loginMode.isPilot())
{
@@ -611,8 +610,7 @@ namespace BlackCore
const CSimulatedAircraft myAircraft(getOwnAircraft());
QString modelString = m_ownModelString.isEmpty() ? myAircraft.getModelString() : m_ownModelString;
if (modelString.isEmpty()) { modelString = noModelString(); }
PlaneInformationFsinn planeInformationFsinn(m_ownCallsign.asString(), callsign.toQString(),
const PlaneInformationFsinn planeInformationFsinn(m_ownCallsign.asString(), callsign.toQString(),
myAircraft.getAirlineIcaoCodeDesignator(),
myAircraft.getAircraftIcaoCodeDesignator(),
myAircraft.getAircraftIcaoCombinedType(),
@@ -636,7 +634,7 @@ namespace BlackCore
void CFSDClient::sendAuthChallenge(const QString &challenge)
{
AuthChallenge pduAuthChallenge(m_ownCallsign.asString(), "SERVER", challenge);
const AuthChallenge pduAuthChallenge(m_ownCallsign.asString(), "SERVER", challenge);
sendMessage(pduAuthChallenge);
increaseStatisticsValue(QStringLiteral("sendAuthChallenge"));
}
@@ -650,7 +648,7 @@ namespace BlackCore
void CFSDClient::sendPong(const QString &receiver, const QString &timestamp)
{
Pong pong(m_ownCallsign.asString(), receiver, timestamp);
const Pong pong(m_ownCallsign.asString(), receiver, timestamp);
sendMessage(pong);
this->increaseStatisticsValue(QStringLiteral("sendPong"));
}
@@ -695,7 +693,8 @@ namespace BlackCore
else if (queryType == ClientQueryType::RealName)
{
// real name
responseData.push_back(m_server.getUser().getRealName());
// responseData.push_back(m_server.getUser().getRealName());
responseData.push_back(m_server.getUser().getRealNameAndHomeBase()); // getHomeBase
// sector file in use (blank if pilot)
responseData.push_back({});
// current user rating
@@ -738,7 +737,7 @@ namespace BlackCore
" LO=" % QString::number(longitude) % " AL=" % QString::number(altitude) %
" " % realName;
TextMessage textMessage(m_ownCallsign.asString(), receiver, userInfo);
const TextMessage textMessage(m_ownCallsign.asString(), receiver, userInfo);
sendMessage(textMessage);
}
else if (queryType == ClientQueryType::FP)
@@ -758,7 +757,7 @@ namespace BlackCore
{
std::array<char, 50> sysuid = {};
vatsim_get_system_unique_id(sysuid.data());
QString cid = m_server.getUser().getId();
const QString cid = m_server.getUser().getId();
const ClientIdentification clientIdentification(m_ownCallsign.asString(), vatsim_auth_get_client_id(clientAuth), m_clientName, m_versionMajor, m_versionMinor, cid, sysuid.data(), fsdChallenge);
this->sendMessage(clientIdentification);
this->sendLogin();
@@ -831,7 +830,7 @@ namespace BlackCore
void CFSDClient::handleAuthChallenge(const QStringList &tokens)
{
AuthChallenge authChallenge = AuthChallenge::fromTokens(tokens);
const AuthChallenge authChallenge = AuthChallenge::fromTokens(tokens);
char response[33];
vatsim_auth_generate_response(clientAuth, qPrintable(authChallenge.m_challengeKey), response);
sendAuthResponse(QString(response));
@@ -844,7 +843,7 @@ namespace BlackCore
void CFSDClient::handleAuthResponse(const QStringList &tokens)
{
AuthResponse authResponse = AuthResponse::fromTokens(tokens);
const AuthResponse authResponse = AuthResponse::fromTokens(tokens);
char expectedResponse[33];
vatsim_auth_generate_response(serverAuth, qPrintable(m_lastServerAuthChallenge), expectedResponse);
@@ -919,7 +918,7 @@ namespace BlackCore
void CFSDClient::handlePilotDataUpdate(const QStringList &tokens)
{
PilotDataUpdate dataUpdate = PilotDataUpdate::fromTokens(tokens);
const PilotDataUpdate dataUpdate = PilotDataUpdate::fromTokens(tokens);
const CCallsign callsign(dataUpdate.sender(), CCallsign::Aircraft);
CAircraftSituation situation(
@@ -1145,9 +1144,9 @@ namespace BlackCore
void CFSDClient::handleClientReponse(const QStringList &tokens)
{
ClientResponse clientResponse = ClientResponse::fromTokens(tokens);
const ClientResponse clientResponse = ClientResponse::fromTokens(tokens);
if (clientResponse.isUnknownQuery()) { return; }
QString sender = clientResponse.sender();
const QString sender = clientResponse.sender();
QString responseData1;
QString responseData2;
@@ -1296,7 +1295,7 @@ namespace BlackCore
}
else if (tokens.size() > 4 && tokens.at(3) == "GEN")
{
PlaneInformation planeInformation = PlaneInformation::fromTokens(tokens);
const PlaneInformation planeInformation = PlaneInformation::fromTokens(tokens);
emit planeInformationReceived(planeInformation.sender(), planeInformation.m_aircraft, planeInformation.m_airline, planeInformation.m_livery);
}
}
@@ -1309,7 +1308,7 @@ namespace BlackCore
// swift's updated interim pilot update.
if (!isInterimPositionReceivingEnabledForServer()) { return; }
InterimPilotDataUpdate interimPilotDataUpdate = InterimPilotDataUpdate::fromTokens(tokens);
const InterimPilotDataUpdate interimPilotDataUpdate = InterimPilotDataUpdate::fromTokens(tokens);
const CCallsign callsign(interimPilotDataUpdate.sender(), CCallsign::Aircraft);
CAircraftSituation situation(
@@ -1719,6 +1718,7 @@ namespace BlackCore
while (m_socket.canReadLine())
{
const QByteArray dataEncoded = m_socket.readLine();
if (dataEncoded.isEmpty()) { continue; }
const QString data = m_fsdTextCodec->toUnicode(dataEncoded);
this->parseMessage(data);
lines++;
@@ -1777,8 +1777,8 @@ namespace BlackCore
const QStringList tokens = payload.split(':');
switch (messageType)
{
case MessageType::AddAtc: /* ignore */ break;
case MessageType::AddPilot: /* ignore */ break;
case MessageType::AddAtc: /* ignore */ break;
case MessageType::AddPilot: /* ignore */ break;
case MessageType::AtcDataUpdate: handleAtcDataUpdate(tokens); break;
case MessageType::AuthChallenge: handleAuthChallenge(tokens); break;
case MessageType::AuthResponse: handleAuthResponse(tokens); break;

6
src/blackcore/fsd/fsdclient.h
View File

@@ -400,8 +400,8 @@ namespace BlackCore
vatsim_auth *clientAuth = nullptr;
vatsim_auth *serverAuth = nullptr;
QString m_lastServerAuthChallenge;
qint64 m_loginSince = -1; //!< when login was triggered
QString m_lastServerAuthChallenge;
qint64 m_loginSince = -1; //!< when login was triggered
static constexpr qint64 PendingConnectionTimeoutMs = 7500;
// User data
@@ -425,7 +425,7 @@ namespace BlackCore
BlackMisc::CTokenBucket m_tokenBucket; //!< used with aircraft parts messages
BlackMisc::Aviation::CCallsignSet m_interimPositionReceivers; //!< all aircraft receiving interim positions
BlackMisc::Network::CTextMessageList m_textMessagesToConsolidate; //!< waiting for new messages
BlackMisc::CDigestSignal m_dsSendTextMessage { this, &CFSDClient::emitConsolidatedTextMessages, 250, 10 };
BlackMisc::CDigestSignal m_dsSendTextMessage { this, &CFSDClient::emitConsolidatedTextMessages, 250, 10 };
//! ATIS message
struct AtisMessage