From ecf0af863198c274772973d81252bb504b0996ee Mon Sep 17 00:00:00 2001 From: DonLakeFlyer Date: Thu, 18 Mar 2021 12:12:03 -0700 Subject: [PATCH] Fix home position change signalling --- src/MissionManager/ComplexMissionItem.cc | 5 ++++- src/MissionManager/LandingComplexItem.cc | 2 -- src/MissionManager/SimpleMissionItem.cc | 3 +++ src/MissionManager/StructureScanComplexItem.cc | 3 --- src/MissionManager/TransectStyleComplexItem.cc | 5 ----- 5 files changed, 7 insertions(+), 11 deletions(-) diff --git a/src/MissionManager/ComplexMissionItem.cc b/src/MissionManager/ComplexMissionItem.cc index 2b22a3e..ac6ef43 100644 --- a/src/MissionManager/ComplexMissionItem.cc +++ b/src/MissionManager/ComplexMissionItem.cc @@ -27,7 +27,10 @@ ComplexMissionItem::ComplexMissionItem(PlanMasterController* masterController, b , _toolbox (qgcApp()->toolbox()) , _settingsManager (_toolbox->settingsManager()) { - + connect(_missionController, &MissionController::plannedHomePositionChanged, this, &ComplexMissionItem::_amslEntryAltChanged); + connect(_missionController, &MissionController::plannedHomePositionChanged, this, &ComplexMissionItem::_amslExitAltChanged); + connect(_missionController, &MissionController::plannedHomePositionChanged, this, &ComplexMissionItem::minAMSLAltitudeChanged); + connect(_missionController, &MissionController::plannedHomePositionChanged, this, &ComplexMissionItem::maxAMSLAltitudeChanged); } const ComplexMissionItem& ComplexMissionItem::operator=(const ComplexMissionItem& other) diff --git a/src/MissionManager/LandingComplexItem.cc b/src/MissionManager/LandingComplexItem.cc index 9457922..5c3973c 100644 --- a/src/MissionManager/LandingComplexItem.cc +++ b/src/MissionManager/LandingComplexItem.cc @@ -96,8 +96,6 @@ void LandingComplexItem::_init(void) connect(this, &LandingComplexItem::altitudesAreRelativeChanged, this, &LandingComplexItem::_amslEntryAltChanged); connect(this, &LandingComplexItem::altitudesAreRelativeChanged, this, &LandingComplexItem::_amslExitAltChanged); - connect(_missionController, &MissionController::plannedHomePositionChanged, this, &LandingComplexItem::_amslEntryAltChanged); - connect(_missionController, &MissionController::plannedHomePositionChanged, this, &LandingComplexItem::_amslExitAltChanged); connect(finalApproachAltitude(), &Fact::valueChanged, this, &LandingComplexItem::_amslEntryAltChanged); connect(landingAltitude(), &Fact::valueChanged, this, &LandingComplexItem::_amslExitAltChanged); connect(this, &LandingComplexItem::amslEntryAltChanged, this, &LandingComplexItem::maxAMSLAltitudeChanged); diff --git a/src/MissionManager/SimpleMissionItem.cc b/src/MissionManager/SimpleMissionItem.cc index 3adebab..dbef301 100644 --- a/src/MissionManager/SimpleMissionItem.cc +++ b/src/MissionManager/SimpleMissionItem.cc @@ -206,6 +206,9 @@ void SimpleMissionItem::_connectSignals(void) // Propogate signals from MissionItem up to SimpleMissionItem connect(&_missionItem, &MissionItem::sequenceNumberChanged, this, &SimpleMissionItem::sequenceNumberChanged); connect(&_missionItem, &MissionItem::specifiedFlightSpeedChanged, this, &SimpleMissionItem::specifiedFlightSpeedChanged); + + connect(_missionController, &MissionController::plannedHomePositionChanged, this, &SimpleMissionItem::_amslEntryAltChanged); + connect(_missionController, &MissionController::plannedHomePositionChanged, this, &SimpleMissionItem::_amslExitAltChanged); } void SimpleMissionItem::_setupMetaData(void) diff --git a/src/MissionManager/StructureScanComplexItem.cc b/src/MissionManager/StructureScanComplexItem.cc index dde31ad..fdacd3b 100644 --- a/src/MissionManager/StructureScanComplexItem.cc +++ b/src/MissionManager/StructureScanComplexItem.cc @@ -95,12 +95,9 @@ StructureScanComplexItem::StructureScanComplexItem(PlanMasterController* masterC connect(this, &StructureScanComplexItem::wizardModeChanged, this, &StructureScanComplexItem::readyForSaveStateChanged); - connect(_missionController, &MissionController::plannedHomePositionChanged, this, &StructureScanComplexItem::_amslEntryAltChanged); connect(&_entranceAltFact, &Fact::valueChanged, this, &StructureScanComplexItem::_amslEntryAltChanged); connect(this, &StructureScanComplexItem::amslEntryAltChanged, this, &StructureScanComplexItem::amslExitAltChanged); - connect(_missionController, &MissionController::plannedHomePositionChanged, this, &StructureScanComplexItem::minAMSLAltitudeChanged); - connect(_missionController, &MissionController::plannedHomePositionChanged, this, &StructureScanComplexItem::maxAMSLAltitudeChanged); connect(this, &StructureScanComplexItem::topFlightAltChanged, this, &StructureScanComplexItem::minAMSLAltitudeChanged); connect(this, &StructureScanComplexItem::topFlightAltChanged, this, &StructureScanComplexItem::maxAMSLAltitudeChanged); connect(this, &StructureScanComplexItem::bottomFlightAltChanged, this, &StructureScanComplexItem::minAMSLAltitudeChanged); diff --git a/src/MissionManager/TransectStyleComplexItem.cc b/src/MissionManager/TransectStyleComplexItem.cc index b54ee3a..5a30355 100644 --- a/src/MissionManager/TransectStyleComplexItem.cc +++ b/src/MissionManager/TransectStyleComplexItem.cc @@ -115,11 +115,6 @@ TransectStyleComplexItem::TransectStyleComplexItem(PlanMasterController* masterC connect(this, &TransectStyleComplexItem::followTerrainChanged, this, &TransectStyleComplexItem::_followTerrainChanged); connect(this, &TransectStyleComplexItem::wizardModeChanged, this, &TransectStyleComplexItem::readyForSaveStateChanged); - connect(_missionController, &MissionController::plannedHomePositionChanged, this, &TransectStyleComplexItem::_amslEntryAltChanged); - connect(_missionController, &MissionController::plannedHomePositionChanged, this, &TransectStyleComplexItem::_amslExitAltChanged); - - connect(_missionController, &MissionController::plannedHomePositionChanged, this, &TransectStyleComplexItem::minAMSLAltitudeChanged); - connect(_missionController, &MissionController::plannedHomePositionChanged, this, &TransectStyleComplexItem::maxAMSLAltitudeChanged); connect(_cameraCalc.distanceToSurface(), &Fact::rawValueChanged, this, &TransectStyleComplexItem::minAMSLAltitudeChanged); connect(_cameraCalc.distanceToSurface(), &Fact::rawValueChanged, this, &TransectStyleComplexItem::maxAMSLAltitudeChanged); connect(&_cameraCalc, &CameraCalc::distanceToSurfaceRelativeChanged, this, &TransectStyleComplexItem::minAMSLAltitudeChanged);