From 67f69b8569e1bb446d6e316f0e323260592ca749 Mon Sep 17 00:00:00 2001 From: DonLakeFlyer Date: Sat, 17 Mar 2018 10:02:05 -0700 Subject: [PATCH] Fix item generation --- src/MissionManager/CorridorScanComplexItem.cc | 2 ++ src/MissionManager/TransectStyleComplexItem.cc | 5 +++++ 2 files changed, 7 insertions(+) diff --git a/src/MissionManager/CorridorScanComplexItem.cc b/src/MissionManager/CorridorScanComplexItem.cc index 2da7239fe..174c6f570 100644 --- a/src/MissionManager/CorridorScanComplexItem.cc +++ b/src/MissionManager/CorridorScanComplexItem.cc @@ -380,9 +380,11 @@ void CorridorScanComplexItem::_rebuildTransectsPhase1(void) // Extend the transect ends for turnaround double azimuth = transect[0].azimuthTo(transect[1]); extensionCoord = transect[0].atDistanceAndAzimuth(-_turnAroundDistanceFact.rawValue().toDouble(), azimuth); + extensionCoord.setAltitude(qQNaN()); transect.prepend(extensionCoord); azimuth = transect.last().azimuthTo(transect[transect.count() - 2]); extensionCoord = transect.last().atDistanceAndAzimuth(-_turnAroundDistanceFact.rawValue().toDouble(), azimuth); + extensionCoord.setAltitude(qQNaN()); transect.append(extensionCoord); } diff --git a/src/MissionManager/TransectStyleComplexItem.cc b/src/MissionManager/TransectStyleComplexItem.cc index e95abe728..abc2f8ab2 100644 --- a/src/MissionManager/TransectStyleComplexItem.cc +++ b/src/MissionManager/TransectStyleComplexItem.cc @@ -388,11 +388,16 @@ void TransectStyleComplexItem::_adjustTransectPointsForTerrain(void) // Take care of last point QGeoCoordinate transectPoint = _transectPoints.last().value(); + bool surveyEdgeIndicator = transectPoint.altitude() == _surveyEdgeIndicator; if (_followTerrain){ transectPoint.setAltitude(_transectsPathHeightInfo.last().rgHeight.last() + altitude); } else { transectPoint.setAltitude(altitude); } + if (surveyEdgeIndicator) { + // Use to indicate survey edge + transectPoint.setAltitude(-transectPoint.altitude()); + } _transectPoints[_transectPoints.count() - 1] = QVariant::fromValue(transectPoint); } -- 2.22.0