From d1940918b8f02663e74fa7a48e1b5330ba63370d Mon Sep 17 00:00:00 2001 From: Don Gagne Date: Sun, 8 Sep 2019 14:30:08 -0700 Subject: [PATCH] Handle cross fact update internally --- src/MissionManager/TransectStyleComplexItem.cc | 10 ++++++++++ src/MissionManager/TransectStyleComplexItem.h | 1 + 2 files changed, 11 insertions(+) diff --git a/src/MissionManager/TransectStyleComplexItem.cc b/src/MissionManager/TransectStyleComplexItem.cc index 3941016ba..d80fae820 100644 --- a/src/MissionManager/TransectStyleComplexItem.cc +++ b/src/MissionManager/TransectStyleComplexItem.cc @@ -102,6 +102,8 @@ TransectStyleComplexItem::TransectStyleComplexItem(Vehicle* vehicle, bool flyVie connect(&_cameraCalc, &CameraCalc::distanceToSurfaceRelativeChanged, this, &TransectStyleComplexItem::coordinateHasRelativeAltitudeChanged); connect(&_cameraCalc, &CameraCalc::distanceToSurfaceRelativeChanged, this, &TransectStyleComplexItem::exitCoordinateHasRelativeAltitudeChanged); + connect(&_hoverAndCaptureFact, &Fact::rawValueChanged, this, &TransectStyleComplexItem::_handleHoverAndCaptureEnabled); + connect(this, &TransectStyleComplexItem::visualTransectPointsChanged, this, &TransectStyleComplexItem::complexDistanceChanged); connect(this, &TransectStyleComplexItem::visualTransectPointsChanged, this, &TransectStyleComplexItem::greatestDistanceToChanged); @@ -769,3 +771,11 @@ void TransectStyleComplexItem::_followTerrainChanged(bool followTerrain) _hoverAndCaptureFact.setRawValue(false); } } + +void TransectStyleComplexItem::_handleHoverAndCaptureEnabled(QVariant enabled) +{ + if (enabled.toBool() && _cameraTriggerInTurnAroundFact.rawValue().toBool()) { + qDebug() << "_handleHoverAndCaptureEnabled"; + _cameraTriggerInTurnAroundFact.setRawValue(false); + } +} diff --git a/src/MissionManager/TransectStyleComplexItem.h b/src/MissionManager/TransectStyleComplexItem.h index 6e82ac134..12871f71e 100644 --- a/src/MissionManager/TransectStyleComplexItem.h +++ b/src/MissionManager/TransectStyleComplexItem.h @@ -205,6 +205,7 @@ protected: private slots: void _reallyQueryTransectsPathHeightInfo(void); void _followTerrainChanged (bool followTerrain); + void _handleHoverAndCaptureEnabled (QVariant enabled); private: void _queryTransectsPathHeightInfo (void); -- 2.22.0