Merge pull request #9072 from DonLakeFlyer/TerrainMinMax

TransectStyleComplexItem-Terrain: Fix min/max AMSL alt calc

Merge pull request #9072 from DonLakeFlyer/TerrainMinMax
TransectStyleComplexItem-Terrain: Fix min/max AMSL alt calc
a671b146 · Don Gagne · GitHub · 3491c062 · aa13b5e2 · a671b146
Unverified Commit a671b146 authored Sep 15, 2020 by Don Gagne Committed by GitHub Sep 15, 2020
Hide whitespace changes
Inline Side-by-side

Showing with 4 additions and 4 deletions

TransectStyleComplexItem.cc src/MissionManager/TransectStyleComplexItem.cc +4 -4

No files found.
--- a/src/MissionManager/TransectStyleComplexItem.cc
+++ b/src/MissionManager/TransectStyleComplexItem.cc
@@ -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);