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

Remove colour in dbus call for addTextMessage for FG

Browse Source
This commit is contained in:
Lars Toenning
2019-02-21 21:57:57 +01:00
committed by Mat Sutcliffe
parent 8bae56a36c
commit ce9e29f0e8
3 changed files with 5 additions and 20 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/plugins/simulator/flightgear/fgswiftbusserviceproxy.cpp
View File

@@ -67,9 +67,9 @@ namespace BlackSimPlugin
m_dbusInterface->callDBusAsync(QLatin1String("getOwnAircraftSituationData"), callback);
}
void CXSwiftBusServiceProxy::addTextMessage(const QString &text, double red, double green, double blue)
void CXSwiftBusServiceProxy::addTextMessage(const QString &text)
{
m_dbusInterface->callDBus(QLatin1String("addTextMessage"), text, red, green, blue);
m_dbusInterface->callDBus(QLatin1String("addTextMessage"), text);
}
void CXSwiftBusServiceProxy::updateAirportsInRange()

2
src/plugins/simulator/flightgear/fgswiftbusserviceproxy.h
View File

@@ -105,7 +105,7 @@ namespace BlackSimPlugin
void getOwnAircraftSituationData(BlackSimPlugin::XPlane::XPlaneData *o_xplaneData);
//! \copydoc XSwiftBus::CService::addTextMessage
void addTextMessage(const QString &text, double red, double green, double blue);
void addTextMessage(const QString &text);
//! \copydoc XSwiftBus::CService::updateAirportsInRange
void updateAirportsInRange();

19
src/plugins/simulator/flightgear/simulatorflightgear.cpp
View File

@@ -420,16 +420,7 @@ namespace BlackSimPlugin
if (isInFunction) { return; }
isInFunction = true;
QColor color = "cyan";
/* switch (message.getSeverity())
{
case CStatusMessage::SeverityDebug: color = "teal"; break;
case CStatusMessage::SeverityInfo: color = "cyan"; break;
case CStatusMessage::SeverityWarning: color = "orange"; break;
case CStatusMessage::SeverityError: color = "red"; break;
} */
m_serviceProxy->addTextMessage("swift: " + message.getMessage(), color.redF(), color.greenF(), color.blueF());
m_serviceProxy->addTextMessage("swift: " + message.getMessage());
isInFunction = false;
}
@@ -437,13 +428,7 @@ namespace BlackSimPlugin
{
Q_ASSERT(isConnected());
QColor color;
if (message.isServerMessage()) { color = "orchid"; }
else if (message.isSupervisorMessage()) { color = "yellow"; }
else if (message.isPrivateMessage()) { color = "magenta"; }
else { color = "lime"; }
m_serviceProxy->addTextMessage(message.getSenderCallsign().toQString() + ": " + message.getMessage(), color.redF(), color.greenF(), color.blueF());
m_serviceProxy->addTextMessage(message.getSenderCallsign().toQString() + ": " + message.getMessage());
}
void CSimulatorXPlane::setAirportsInRange(const QStringList &icaos, const QStringList &names, const CSequence<double> &lats, const CSequence<double> &lons, const CSequence<double> &alts)