flightsimulatorplatfrom/pilotclient
1
0
Fork 0
mirror of https://github.com/swift-project/pilotclient.git synced 2026-04-27 02:55:44 +08:00
Code Issues Packages Projects Releases Wiki Activity

Ref T470, detect NULL cg

Browse Source
This commit is contained in:
Klaus Basan
2018-12-13 18:44:15 +01:00
parent f841d57448
commit 40ae7174a7
1 changed files with 6 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
src/plugins/simulator/xplane/simulatorxplane.cpp
View File

@@ -62,6 +62,7 @@
#include <QTimer> #include <QTimer>
#include <QtGlobal> #include <QtGlobal>
#include <QPointer> #include <QPointer>
#include <math.h>
using namespace BlackConfig; using namespace BlackConfig;
using namespace BlackMisc; using namespace BlackMisc;
@@ -938,9 +939,12 @@ namespace BlackSimPlugin
if (!m_xplaneAircraftObjects.contains(cs)) { continue; } if (!m_xplaneAircraftObjects.contains(cs)) { continue; }
const CXPlaneMPAircraft xpAircraft = m_xplaneAircraftObjects[cs]; const CXPlaneMPAircraft xpAircraft = m_xplaneAircraftObjects[cs];
const double cgValue = verticalOffsetsMeters[i]; // XP offset is swift CG
const CAltitude elevationAlt(elevationsMeters[i], CLengthUnit::m(), CLengthUnit::ft()); const CAltitude elevationAlt(elevationsMeters[i], CLengthUnit::m(), CLengthUnit::ft());
const CElevationPlane elevation(CLatitude(latitudesDeg[i], CAngleUnit::deg()), CLongitude(longitudesDeg[i], CAngleUnit::deg()), elevationAlt, CElevationPlane::singlePointRadius()); const CElevationPlane elevation(CLatitude(latitudesDeg[i], CAngleUnit::deg()), CLongitude(longitudesDeg[i], CAngleUnit::deg()), elevationAlt, CElevationPlane::singlePointRadius());
const CLength cg(verticalOffsetsMeters[i], CLengthUnit::m(), CLengthUnit::ft()); const CLength cg = std::isnan(cgValue) ?
CLength::null() :
CLength(cgValue, CLengthUnit::m(), CLengthUnit::ft());
this->rememberElevationAndCG(cs, xpAircraft.getAircraftModelString(), elevation, cg); this->rememberElevationAndCG(cs, xpAircraft.getAircraftModelString(), elevation, cg);
// loopback // loopback
@@ -1215,7 +1219,7 @@ namespace BlackSimPlugin
return; return;
} }
if(! traffic.initialize()) if (!traffic.initialize())
{ {
CLogMessage(this).error("Connection to XSwiftBus successful, but could not initialize XSwiftBus. Check X-Plane Log.txt."); CLogMessage(this).error("Connection to XSwiftBus successful, but could not initialize XSwiftBus. Check X-Plane Log.txt.");
return; return;