Merge pull request #9072 from DonLakeFlyer/TerrainMinMax

TransectStyleComplexItem-Terrain: Fix min/max AMSL alt calc
mavlink · Sep 15, 2020 · a671b14 · a671b14
2 parents 3491c06 + aa13b5e
commit a671b14
Showing 1 changed file with 4 additions and 4 deletions.
diff --git 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);