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

refs #283 Dedicated displayTextMessage for text messages instead of using displayStatusMessage for both.

Browse Source 
The simulator can use this to display text messages in a different colour, for example.
This commit is contained in:
Mathew Sutcliffe
2014-08-18 20:36:36 +01:00
parent 4fc78adab9
commit d25eac66b1
8 changed files with 31 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/blackcore/context_simulator_impl.cpp
View File

@@ -299,7 +299,7 @@ namespace BlackCore
if (!this->m_simulator) return;
foreach(CTextMessage tm, textMessages)
{
this->m_simulator->displayStatusMessage(tm.asStatusMessage(true, true));
this->m_simulator->displayTextMessage(tm);
}
}

4
src/blackcore/simulator.h
View File

@@ -11,6 +11,7 @@
#include "blackmisc/avaircraft.h"
#include "blackmisc/avairportlist.h"
#include "blackmisc/nwaircraftmodel.h"
#include "blackmisc/nwtextmessage.h"
#include <QObject>
namespace BlackCore
@@ -77,6 +78,9 @@ namespace BlackCore
//! Display a status message in the simulator
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
virtual BlackMisc::Network::CAircraftModel getAircraftModel() const = 0;

5
src/plugins/simulator/fs9/simulator_fs9.cpp
View File

@@ -217,6 +217,11 @@ namespace BlackSimPlugin
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
{
return this->m_airportsInRange;

3
src/plugins/simulator/fs9/simulator_fs9.h
View File

@@ -93,6 +93,9 @@ namespace BlackSimPlugin
//! \copydoc ISimulator::displayStatusMessage()
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()
virtual BlackMisc::Network::CAircraftModel getAircraftModel() const override { return m_aircraftModel; }

5
src/plugins/simulator/fsx/simulator_fsx.cpp
View File

@@ -279,6 +279,11 @@ namespace BlackSimPlugin
Q_UNUSED(hr);
}
void CSimulatorFsx::displayTextMessage(const BlackMisc::Network::CTextMessage &message) const
{
this->displayStatusMessage(message.asStatusMessage(true, true));
}
CAirportList CSimulatorFsx::getAirportsInRange() const
{
return this->m_airportsInRange;

3
src/plugins/simulator/fsx/simulator_fsx.h
View File

@@ -127,6 +127,9 @@ namespace BlackSimPlugin
//! \copydoc ISimulator::displayStatusMessage
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()
virtual BlackMisc::Network::CAircraftModel getAircraftModel() const override { return m_aircraftModel; }

7
src/plugins/simulator/xplane/simulator_xplane.cpp
View File

@@ -204,6 +204,13 @@ namespace BlackSimPlugin
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
{
if (! isConnected()) { return {}; }

3
src/plugins/simulator/xplane/simulator_xplane.h
View File

@@ -71,6 +71,9 @@ namespace BlackSimPlugin
//! \copydoc BlackCore::ISimulator::displayStatusMessage
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
virtual BlackMisc::Network::CAircraftModel getAircraftModel() const override;