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

Unified "simplification" to ASCII only for text messages

Browse Source 
Based on the codepage discussion of text messages

* in text message value object still store the unicode string
* the text is only "cleaned" up and Qt "simplified" (do not confuse with conversion to ASCII)
* only place where we simplify to ASCII only is
** in VATLIB
** or the utility
This commit is contained in:
Klaus Basan
2018-12-30 10:50:53 +01:00
committed by Mat Sutcliffe
parent 1e35519a0d
commit cb084427ec
5 changed files with 25 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/blackcore/context/contextnetworkimpl.cpp
View File

@@ -415,7 +415,7 @@ namespace BlackCore
if (parser.countParts() < 2) { return false; }
if (!m_network) { return false; }
if (!this->isConnected()) { return false; }
const QString wallopMsg = simplifyAccents(parser.part(1).simplified().trimmed());
const QString wallopMsg = parser.part(1).simplified().trimmed();
m_network->sendWallopMessage(wallopMsg);
return true;
}

8
src/blackcore/vatsim/networkvatlib.cpp
View File

@@ -574,7 +574,7 @@ namespace BlackCore
if (message.isEmpty()) {return; }
BLACK_VERIFY_X(this->isConnected(), Q_FUNC_INFO, "Sending wallop, but not connected");
if (!this->isConnected()) { return; }
Vat_SendWallop(m_net.data(), toFSDnoColon(simplifyAccents(message)));
Vat_SendWallop(m_net.data(), toFSDnoColon(simplifyTextMessage(message)));
}
void CNetworkVatlib::sendCustomPacket(const CCallsign &callsign, const QString &packetId, const QStringList &data)
@@ -1528,6 +1528,12 @@ namespace BlackCore
CLogMessage(static_cast<CNetworkVatlib *>(nullptr)).error(errorMessage);
}
QString CNetworkVatlib::simplifyTextMessage(const QString &msg)
{
if (msg.isEmpty()) { return {}; }
return asciiOnlyString(simplifyAccents(msg.simplified().trimmed()));
}
const QJsonObject &CNetworkVatlib::JsonPackets::aircraftConfigRequest()
{
static const QJsonObject jsonObject{ { "request", "full" } };

1
src/blackcore/vatsim/networkvatlib.h
View File

@@ -190,6 +190,7 @@ namespace BlackCore
static QString convertToUnicodeEscaped(const QString &str);
static VatSimType convertToSimType(BlackMisc::Simulation::CSimulatorPluginInfo &simInfo);
static void networkLogHandler(VatSeverityLevel severity, const char *context, const char *message);
static QString simplifyTextMessage(const QString &msg);
void sendCustomPacket(const BlackMisc::Aviation::CCallsign &callsign, const QString &packetId, const QStringList &data);
//! Default model string

17
src/blackmisc/network/textmessage.cpp
View File

@@ -27,14 +27,17 @@ namespace BlackMisc
namespace Network
{
CTextMessage::CTextMessage(const QString &message, const CFrequency &frequency, const CCallsign &senderCallsign)
: m_message(message.trimmed().simplified()), m_senderCallsign(senderCallsign), m_frequency(frequency)
: m_senderCallsign(senderCallsign), m_frequency(frequency)
{
this->setMessage(message); // single place to modify message
m_frequency.switchUnit(PhysicalQuantities::CFrequencyUnit::MHz());
}
CTextMessage::CTextMessage(const QString &message, const CCallsign &senderCallsign, const CCallsign &recipientCallsign)
: m_message(message.trimmed().simplified()), m_senderCallsign(senderCallsign), m_recipientCallsign(recipientCallsign), m_frequency(0, nullptr)
{}
: m_senderCallsign(senderCallsign), m_recipientCallsign(recipientCallsign), m_frequency(0, nullptr)
{
this->setMessage(message); // single place to modify message
}
QString CTextMessage::convertToQString(bool i18n) const
{
@@ -115,9 +118,15 @@ namespace BlackMisc
return CComSystem::isValidCivilAviationFrequency(m_frequency);
}
QString CTextMessage::getAsciiOnlyMessage() const
{
if (m_message.isEmpty()) { return {}; }
return asciiOnlyString(simplifyAccents(m_message));
}
void CTextMessage::setMessage(const QString &message)
{
m_message = asciiOnlyString(simplifyAccents(message.simplified().trimmed()));
m_message = message.simplified().trimmed();
}
bool CTextMessage::isRadioMessage() const

3
src/blackmisc/network/textmessage.h
View File

@@ -85,6 +85,9 @@ namespace BlackMisc
//! Get message
const QString &getMessage() const { return m_message; }
//! Get ASCII only message
QString getAsciiOnlyMessage() const;
//! Empty message
bool isEmpty() const { return m_message.isEmpty(); }