Browse Source

Merge pull request #9072 from DonLakeFlyer/TerrainMinMax

TransectStyleComplexItem-Terrain: Fix min/max AMSL alt calc
QGC4.4
Don Gagne 5 years ago committed by GitHub
parent
commit
a671b14679
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
  1. 8
      src/MissionManager/TransectStyleComplexItem.cc

8
src/MissionManager/TransectStyleComplexItem.cc

@ -662,12 +662,12 @@ void TransectStyleComplexItem::_adjustTransectsForTerrain(void) @@ -662,12 +662,12 @@ void TransectStyleComplexItem::_adjustTransectsForTerrain(void)
_amslEntryAltChanged();
_amslExitAltChanged();
_minAMSLAltitude = 0;
_maxAMSLAltitude = 0;
_minAMSLAltitude = qQNaN();
_maxAMSLAltitude = qQNaN();
for (const QList<CoordInfo_t>& transect: _transects) {
for (const CoordInfo_t& coordInfo: transect) {
_minAMSLAltitude = qMin(_minAMSLAltitude, coordInfo.coord.altitude());
_maxAMSLAltitude = qMax(_maxAMSLAltitude, coordInfo.coord.altitude());
_minAMSLAltitude = std::fmin(_minAMSLAltitude, coordInfo.coord.altitude());
_maxAMSLAltitude = std::fmax(_maxAMSLAltitude, coordInfo.coord.altitude());
}
}
emit minAMSLAltitudeChanged(_minAMSLAltitude);

Loading…
Cancel
Save