zhaohuwei
/
QG4
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity
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
3491c0625e aa13b5e203
commit
a671b14679
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 4 additions and 4 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Unified View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 8
      src/MissionManager/TransectStyleComplexItem.cc

8
src/MissionManager/TransectStyleComplexItem.cc
Unescape View File

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

Write Preview
Loading…
Cancel
Save