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

[FSD], use consolidateTextMessage again

Browse Source
This commit is contained in:
Klaus Basan
2019-10-19 02:44:11 +02:00
parent 1105fff696
commit 4f4474336d
3 changed files with 14 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -874,8 +874,7 @@ namespace BlackCore
CTextMessage tm(textMessage.m_message, sender, receiver); CTextMessage tm(textMessage.m_message, sender, receiver);
tm.setCurrentUtcTime(); tm.setCurrentUtcTime();
this->consolidateTextMessage(tm); this->consolidateTextMessage(tm); // emit textMessagesReceived({ tm });
// emit textMessagesReceived({ tm });
} }
else if (textMessage.m_type == TextMessage::RadioMessage) else if (textMessage.m_type == TextMessage::RadioMessage)
{ {
@@ -1529,8 +1528,7 @@ namespace BlackCore
const QString atisMessage(pendingQuery.m_atisMessage.join(QChar::LineFeed)); const QString atisMessage(pendingQuery.m_atisMessage.join(QChar::LineFeed));
CTextMessage tm(atisMessage, sender, receiver); CTextMessage tm(atisMessage, sender, receiver);
tm.setCurrentUtcTime(); tm.setCurrentUtcTime();
// emit textMessagesReceived(tm); this->consolidateTextMessage(tm); // emit textMessagesReceived(tm);
this->consolidateTextMessage(tm);
m_pendingAtisQueries.remove(sender); m_pendingAtisQueries.remove(sender);
return; return;
} }

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

@@ -351,8 +351,8 @@ namespace BlackCore
QString m_hostApplication; QString m_hostApplication;
int m_versionMajor = 0; int m_versionMajor = 0;
int m_versionMinor = 0; int m_versionMinor = 0;
ServerType m_serverType = ServerType::LegacyFsd;
int m_protocolRevision = 0; int m_protocolRevision = 0;
ServerType m_serverType = ServerType::LegacyFsd;
Capabilities m_capabilities = Capabilities::None; Capabilities m_capabilities = Capabilities::None;
vatsim_auth *clientAuth = nullptr; vatsim_auth *clientAuth = nullptr;
@@ -360,29 +360,27 @@ namespace BlackCore
QString m_lastServerAuthChallenge; QString m_lastServerAuthChallenge;
// User data // User data
BlackMisc::Network::CServer m_server; BlackMisc::Network::CServer m_server;
BlackMisc::Network::CLoginMode m_loginMode; BlackMisc::Network::CLoginMode m_loginMode;
SimType m_simType = SimType::Unknown; SimType m_simType = SimType::Unknown;
PilotRating m_pilotRating = PilotRating::Unknown; PilotRating m_pilotRating = PilotRating::Unknown;
AtcRating m_atcRating = AtcRating::Unknown; AtcRating m_atcRating = AtcRating::Unknown;
QString m_com1Frequency; QString m_com1Frequency;
// Parser // Parser
QHash<QString, MessageType> m_messageTypeMapping; QHash<QString, MessageType> m_messageTypeMapping;
QTcpSocket m_socket; QTcpSocket m_socket;
bool m_unitTestMode = false; bool m_unitTestMode = false;
bool m_printToConsole = false; bool m_printToConsole = false;
BlackMisc::Network::CConnectionStatus m_connectionStatus; BlackMisc::Network::CConnectionStatus m_connectionStatus;
BlackMisc::Aviation::CAircraftParts m_sentAircraftConfig; //!< aircraft parts sent
BlackMisc::Aviation::CAircraftParts m_sentAircraftConfig; //!< aircraft parts sent BlackMisc::CTokenBucket m_tokenBucket; //!< used with aircraft parts messages
BlackMisc::CTokenBucket m_tokenBucket; //!< used with aircraft parts messages BlackMisc::Aviation::CCallsignSet m_interimPositionReceivers; //!< all aircraft receiving interim positions
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, 500, 10 };
BlackMisc::Network::CTextMessageList m_textMessagesToConsolidate;
//! ATIS message //! ATIS message
struct AtisMessage struct AtisMessage

1
tests/blackcore/fsd/testfsdclient/testfsdclient.cpp
View File

@@ -183,6 +183,7 @@ namespace BlackFsdTest
{ {
QSignalSpy spy(client, &CFSDClient::textMessagesReceived); QSignalSpy spy(client, &CFSDClient::textMessagesReceived);
client->sendFsdMessage("#TMEDMM_CTR:BER721:Hey how are you doing?\r\n"); client->sendFsdMessage("#TMEDMM_CTR:BER721:Hey how are you doing?\r\n");
spy.wait(2000); // message consolidation
QCOMPARE(spy.count(), 1); QCOMPARE(spy.count(), 1);
QList<QVariant> arguments = spy.takeFirst(); QList<QVariant> arguments = spy.takeFirst();