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

FG: Add version number check

Browse Source
This commit is contained in:
Lars Toenning
2019-04-29 23:53:37 +02:00
committed by Klaus Basan
parent a34b222c3e
commit d61814f8e9
3 changed files with 15 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -38,6 +38,11 @@ namespace BlackSimPlugin
} }
} }
QString CFGSwiftBusServiceProxy::getVersionNumber()
{
return m_dbusInterface->callDBusRet<QString>(QLatin1String("getVersionNumber"));
}
void CFGSwiftBusServiceProxy::getOwnAircraftSituationData(FlightgearData *o_flightgearData) void CFGSwiftBusServiceProxy::getOwnAircraftSituationData(FlightgearData *o_flightgearData)
{ {
QPointer<CFGSwiftBusServiceProxy> myself(this); QPointer<CFGSwiftBusServiceProxy> myself(this);

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

@@ -97,6 +97,9 @@ namespace BlackSimPlugin
void airportsInRangeUpdated(const QStringList &icaoCodes, const QStringList &names, const QList<double> &lats, const QList<double> &lons, const QList<double> &alts); void airportsInRangeUpdated(const QStringList &icaoCodes, const QStringList &names, const QList<double> &lats, const QList<double> &lons, const QList<double> &alts);
public slots: public slots:
//! Get Flightgear version number
QString getVersionNumber();
//! Get own aircraft situation data //! Get own aircraft situation data
void getOwnAircraftSituationData(FlightgearData *o_flightgearData); void getOwnAircraftSituationData(FlightgearData *o_flightgearData);

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

@@ -955,6 +955,13 @@ namespace BlackSimPlugin
bool result = service.isValid() && traffic.isValid(); bool result = service.isValid() && traffic.isValid();
if (! result) { return; } if (! result) { return; }
QString flightgearVersion = service.getVersionNumber();
QString flightgearVersionMinimum = "2019.2.0";
if(flightgearVersion < flightgearVersionMinimum){
CLogMessage(this).error(u"You are using Flightgear %1. This version of swift is only compatible with Flightgear %2 or newer. Consider upgrading!") << flightgearVersion << flightgearVersionMinimum;
return;
}
if (!traffic.initialize()) if (!traffic.initialize())
{ {
CLogMessage(this).error(u"Connection to FGSwiftBus successful, but could not initialize FGSwiftBus."); CLogMessage(this).error(u"Connection to FGSwiftBus successful, but could not initialize FGSwiftBus.");