flightsimulatorplatfrom/pilotclient
1
0
Fork 0
mirror of https://github.com/swift-project/pilotclient.git synced 2026-03-30 20:15:35 +08:00
Code Issues Packages Projects Releases Wiki Activity

Ref T189, formatting

Browse Source
This commit is contained in:
Klaus Basan
2017-11-13 01:49:24 +01:00
parent bc2b40dcd8
commit c2eeff6193
6 changed files with 70 additions and 82 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -25,6 +25,15 @@ namespace BlackMisc
{
namespace Network
{
CTextMessage::CTextMessage(const QString &message, const CFrequency &frequency, const CCallsign &senderCallsign)
: m_message(message), m_senderCallsign(senderCallsign), m_frequency(frequency)
{
m_frequency.switchUnit(PhysicalQuantities::CFrequencyUnit::MHz());
}
CTextMessage::CTextMessage(const QString &message, const CCallsign &senderCallsign, const CCallsign &recipientCallsign)
: m_message(message), m_senderCallsign(senderCallsign), m_recipientCallsign(recipientCallsign), m_frequency(0, nullptr)
{}
QString CTextMessage::convertToQString(bool i18n) const
{
@@ -51,11 +60,6 @@ namespace BlackMisc
return m_senderCallsign.isSupervisorCallsign();
}
bool CTextMessage::wasSent() const
{
return m_wasSent;
}
void CTextMessage::markAsSent()
{
m_wasSent = true;
@@ -152,7 +156,6 @@ namespace BlackMisc
if (!s.isEmpty()) s.append(separator);
s.append(m_frequency.valueRoundedWithUnit(3, true));
}
}
} // to
@@ -164,7 +167,7 @@ namespace BlackMisc
CStatusMessage CTextMessage::asStatusMessage(bool withSender, bool withRecipient, const QString &separator) const
{
QString m = this->asString(withSender, withRecipient, separator);
const QString m = this->asString(withSender, withRecipient, separator);
return { this, CStatusMessage::SeverityInfo, m };
}

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

@@ -53,15 +53,10 @@ namespace BlackMisc
CTextMessage() {}
//! Constructor, radio message
CTextMessage(const QString &message, const PhysicalQuantities::CFrequency &frequency, const Aviation::CCallsign &senderCallsign = {})
: m_message(message), m_senderCallsign(senderCallsign), m_frequency(frequency)
{
m_frequency.switchUnit(PhysicalQuantities::CFrequencyUnit::MHz());
}
CTextMessage(const QString &message, const PhysicalQuantities::CFrequency &frequency, const Aviation::CCallsign &senderCallsign = {});
//! Constructor, private message
CTextMessage(const QString &message, const Aviation::CCallsign &senderCallsign, const Aviation::CCallsign &recipientCallsign = {})
: m_message(message), m_senderCallsign(senderCallsign), m_recipientCallsign(recipientCallsign), m_frequency(0, nullptr) {}
CTextMessage(const QString &message, const Aviation::CCallsign &senderCallsign, const Aviation::CCallsign &recipientCallsign = {});
//! Get callsign (from)
const Aviation::CCallsign &getSenderCallsign() const { return m_senderCallsign; }
@@ -111,33 +106,24 @@ namespace BlackMisc
//! Initial message of server?
bool isServerMessage() const;
/*!
* Whole message as formatted string.
* Used to display message in a console window.
* \param withSender include sender information in string?
* \param withRecipient include recipient information in string?
* \param separator values separated by given value
* \return
*/
//! Whole message as formatted string. Used to display message in a console window.
//! \param withSender include sender information in string?
//! \param withRecipient include recipient information in string?
//! \param separator values separated by given value
QString asString(bool withSender, bool withRecipient, const QString &separator = ", ") const;
/*!
* Whole message as BlackMisc::CStatusMessage.
* Used to display message in logs, or any other situation where a CStatusMessage is required.
* \param withSender include sender information in string?
* \param withRecipient include recipient information in string?
* \param separator values separated by given value
* \return
*/
//! Whole message as BlackMisc::CStatusMessage.
//! Used to display message in logs, or any other situation where a CStatusMessage is required.
//! \param withSender include sender information in string?
//! \param withRecipient include recipient information in string?
//! \param separator values separated by given value
CStatusMessage asStatusMessage(bool withSender, bool withRecipient, const QString &separator = ", ") const;
//! Toggle sender receiver, can be used to ping my own message
void toggleSenderRecipient();
/*!
* Is this a text message encapsulating a SELCAL
* \see http://forums.vatsim.net/viewtopic.php?f=8&t=63467
*/
//! Is this a text message encapsulating a SELCAL
//! \see http://forums.vatsim.net/viewtopic.php?f=8&t=63467
bool isSelcalMessage() const;
//! Is this a text message encapsulating a SELCAL for given code?
@@ -147,7 +133,7 @@ namespace BlackMisc
bool isSupervisorMessage() const;
//! Was sent?
bool wasSent() const;
bool wasSent() const { return m_wasSent; }
//! Mark as sent
//! \remark also sets current timestamp if there is no valid timestamp