mirror of
https://github.com/swift-project/pilotclient.git
synced 2026-04-25 02:05:43 +08:00
refs #283 Dedicated displayTextMessage for text messages instead of using displayStatusMessage for both.
The simulator can use this to display text messages in a different colour, for example.
This commit is contained in:
@@ -299,7 +299,7 @@ namespace BlackCore
|
|||||||
if (!this->m_simulator) return;
|
if (!this->m_simulator) return;
|
||||||
foreach(CTextMessage tm, textMessages)
|
foreach(CTextMessage tm, textMessages)
|
||||||
{
|
{
|
||||||
this->m_simulator->displayStatusMessage(tm.asStatusMessage(true, true));
|
this->m_simulator->displayTextMessage(tm);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
@@ -11,6 +11,7 @@
|
|||||||
#include "blackmisc/avaircraft.h"
|
#include "blackmisc/avaircraft.h"
|
||||||
#include "blackmisc/avairportlist.h"
|
#include "blackmisc/avairportlist.h"
|
||||||
#include "blackmisc/nwaircraftmodel.h"
|
#include "blackmisc/nwaircraftmodel.h"
|
||||||
|
#include "blackmisc/nwtextmessage.h"
|
||||||
#include <QObject>
|
#include <QObject>
|
||||||
|
|
||||||
namespace BlackCore
|
namespace BlackCore
|
||||||
@@ -77,6 +78,9 @@ namespace BlackCore
|
|||||||
//! Display a status message in the simulator
|
//! Display a status message in the simulator
|
||||||
virtual void displayStatusMessage(const BlackMisc::CStatusMessage &message) const = 0;
|
virtual void displayStatusMessage(const BlackMisc::CStatusMessage &message) const = 0;
|
||||||
|
|
||||||
|
//! Display a text message
|
||||||
|
virtual void displayTextMessage(const BlackMisc::Network::CTextMessage &message) const = 0;
|
||||||
|
|
||||||
//! Aircraft Model
|
//! Aircraft Model
|
||||||
virtual BlackMisc::Network::CAircraftModel getAircraftModel() const = 0;
|
virtual BlackMisc::Network::CAircraftModel getAircraftModel() const = 0;
|
||||||
|
|
||||||
|
|||||||
@@ -217,6 +217,11 @@ namespace BlackSimPlugin
|
|||||||
QMetaObject::invokeMethod(m_fs9Host, "sendTextMessage", Q_ARG(QString, message.toQString()));
|
QMetaObject::invokeMethod(m_fs9Host, "sendTextMessage", Q_ARG(QString, message.toQString()));
|
||||||
}
|
}
|
||||||
|
|
||||||
|
void CSimulatorFs9::displayTextMessage(const BlackMisc::Network::CTextMessage &message) const
|
||||||
|
{
|
||||||
|
this->displayStatusMessage(message.asStatusMessage(true, true));
|
||||||
|
}
|
||||||
|
|
||||||
CAirportList CSimulatorFs9::getAirportsInRange() const
|
CAirportList CSimulatorFs9::getAirportsInRange() const
|
||||||
{
|
{
|
||||||
return this->m_airportsInRange;
|
return this->m_airportsInRange;
|
||||||
|
|||||||
@@ -93,6 +93,9 @@ namespace BlackSimPlugin
|
|||||||
//! \copydoc ISimulator::displayStatusMessage()
|
//! \copydoc ISimulator::displayStatusMessage()
|
||||||
virtual void displayStatusMessage(const BlackMisc::CStatusMessage &message) const override;
|
virtual void displayStatusMessage(const BlackMisc::CStatusMessage &message) const override;
|
||||||
|
|
||||||
|
//! \copydoc ISimulator::displayTextMessage()
|
||||||
|
virtual void displayTextMessage(const BlackMisc::Network::CTextMessage &message) const override;
|
||||||
|
|
||||||
//! \copydoc ISimulator::getAircraftModel()
|
//! \copydoc ISimulator::getAircraftModel()
|
||||||
virtual BlackMisc::Network::CAircraftModel getAircraftModel() const override { return m_aircraftModel; }
|
virtual BlackMisc::Network::CAircraftModel getAircraftModel() const override { return m_aircraftModel; }
|
||||||
|
|
||||||
|
|||||||
@@ -279,6 +279,11 @@ namespace BlackSimPlugin
|
|||||||
Q_UNUSED(hr);
|
Q_UNUSED(hr);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
void CSimulatorFsx::displayTextMessage(const BlackMisc::Network::CTextMessage &message) const
|
||||||
|
{
|
||||||
|
this->displayStatusMessage(message.asStatusMessage(true, true));
|
||||||
|
}
|
||||||
|
|
||||||
CAirportList CSimulatorFsx::getAirportsInRange() const
|
CAirportList CSimulatorFsx::getAirportsInRange() const
|
||||||
{
|
{
|
||||||
return this->m_airportsInRange;
|
return this->m_airportsInRange;
|
||||||
|
|||||||
@@ -127,6 +127,9 @@ namespace BlackSimPlugin
|
|||||||
//! \copydoc ISimulator::displayStatusMessage
|
//! \copydoc ISimulator::displayStatusMessage
|
||||||
virtual void displayStatusMessage(const BlackMisc::CStatusMessage &message) const override;
|
virtual void displayStatusMessage(const BlackMisc::CStatusMessage &message) const override;
|
||||||
|
|
||||||
|
//! \copydoc ISimulator::displayTextMessage()
|
||||||
|
virtual void displayTextMessage(const BlackMisc::Network::CTextMessage &message) const override;
|
||||||
|
|
||||||
//! \copydoc ISimulator::getAircraftModel()
|
//! \copydoc ISimulator::getAircraftModel()
|
||||||
virtual BlackMisc::Network::CAircraftModel getAircraftModel() const override { return m_aircraftModel; }
|
virtual BlackMisc::Network::CAircraftModel getAircraftModel() const override { return m_aircraftModel; }
|
||||||
|
|
||||||
|
|||||||
@@ -204,6 +204,13 @@ namespace BlackSimPlugin
|
|||||||
Q_UNUSED(message);
|
Q_UNUSED(message);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
void CSimulatorXPlane::displayTextMessage(const BlackMisc::Network::CTextMessage &message) const
|
||||||
|
{
|
||||||
|
if (! isConnected()) { return; }
|
||||||
|
// TODO
|
||||||
|
Q_UNUSED(message);
|
||||||
|
}
|
||||||
|
|
||||||
BlackMisc::Network::CAircraftModel CSimulatorXPlane::getAircraftModel() const
|
BlackMisc::Network::CAircraftModel CSimulatorXPlane::getAircraftModel() const
|
||||||
{
|
{
|
||||||
if (! isConnected()) { return {}; }
|
if (! isConnected()) { return {}; }
|
||||||
|
|||||||
@@ -71,6 +71,9 @@ namespace BlackSimPlugin
|
|||||||
//! \copydoc BlackCore::ISimulator::displayStatusMessage
|
//! \copydoc BlackCore::ISimulator::displayStatusMessage
|
||||||
virtual void displayStatusMessage(const BlackMisc::CStatusMessage &message) const override;
|
virtual void displayStatusMessage(const BlackMisc::CStatusMessage &message) const override;
|
||||||
|
|
||||||
|
//! \copydoc ISimulator::displayTextMessage
|
||||||
|
virtual void displayTextMessage(const BlackMisc::Network::CTextMessage &message) const override;
|
||||||
|
|
||||||
//! \copydoc BlackCore::ISimulator::getAircraftModel
|
//! \copydoc BlackCore::ISimulator::getAircraftModel
|
||||||
virtual BlackMisc::Network::CAircraftModel getAircraftModel() const override;
|
virtual BlackMisc::Network::CAircraftModel getAircraftModel() const override;
|
||||||
|
|
||||||
|
|||||||
Reference in New Issue
Block a user