Browse Source

Fix home position change signalling

QGC4.4
DonLakeFlyer 4 years ago committed by Don Gagne
parent
commit
ecf0af8631
  1. 5
      src/MissionManager/ComplexMissionItem.cc
  2. 2
      src/MissionManager/LandingComplexItem.cc
  3. 3
      src/MissionManager/SimpleMissionItem.cc
  4. 3
      src/MissionManager/StructureScanComplexItem.cc
  5. 5
      src/MissionManager/TransectStyleComplexItem.cc

5
src/MissionManager/ComplexMissionItem.cc

@ -27,7 +27,10 @@ ComplexMissionItem::ComplexMissionItem(PlanMasterController* masterController, b
, _toolbox (qgcApp()->toolbox()) , _toolbox (qgcApp()->toolbox())
, _settingsManager (_toolbox->settingsManager()) , _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) const ComplexMissionItem& ComplexMissionItem::operator=(const ComplexMissionItem& other)

2
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::_amslEntryAltChanged);
connect(this, &LandingComplexItem::altitudesAreRelativeChanged, this, &LandingComplexItem::_amslExitAltChanged); 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(finalApproachAltitude(), &Fact::valueChanged, this, &LandingComplexItem::_amslEntryAltChanged);
connect(landingAltitude(), &Fact::valueChanged, this, &LandingComplexItem::_amslExitAltChanged); connect(landingAltitude(), &Fact::valueChanged, this, &LandingComplexItem::_amslExitAltChanged);
connect(this, &LandingComplexItem::amslEntryAltChanged, this, &LandingComplexItem::maxAMSLAltitudeChanged); connect(this, &LandingComplexItem::amslEntryAltChanged, this, &LandingComplexItem::maxAMSLAltitudeChanged);

3
src/MissionManager/SimpleMissionItem.cc

@ -206,6 +206,9 @@ void SimpleMissionItem::_connectSignals(void)
// Propogate signals from MissionItem up to SimpleMissionItem // Propogate signals from MissionItem up to SimpleMissionItem
connect(&_missionItem, &MissionItem::sequenceNumberChanged, this, &SimpleMissionItem::sequenceNumberChanged); connect(&_missionItem, &MissionItem::sequenceNumberChanged, this, &SimpleMissionItem::sequenceNumberChanged);
connect(&_missionItem, &MissionItem::specifiedFlightSpeedChanged, this, &SimpleMissionItem::specifiedFlightSpeedChanged); 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) void SimpleMissionItem::_setupMetaData(void)

3
src/MissionManager/StructureScanComplexItem.cc

@ -95,12 +95,9 @@ StructureScanComplexItem::StructureScanComplexItem(PlanMasterController* masterC
connect(this, &StructureScanComplexItem::wizardModeChanged, this, &StructureScanComplexItem::readyForSaveStateChanged); connect(this, &StructureScanComplexItem::wizardModeChanged, this, &StructureScanComplexItem::readyForSaveStateChanged);
connect(_missionController, &MissionController::plannedHomePositionChanged, this, &StructureScanComplexItem::_amslEntryAltChanged);
connect(&_entranceAltFact, &Fact::valueChanged, this, &StructureScanComplexItem::_amslEntryAltChanged); connect(&_entranceAltFact, &Fact::valueChanged, this, &StructureScanComplexItem::_amslEntryAltChanged);
connect(this, &StructureScanComplexItem::amslEntryAltChanged, this, &StructureScanComplexItem::amslExitAltChanged); 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::minAMSLAltitudeChanged);
connect(this, &StructureScanComplexItem::topFlightAltChanged, this, &StructureScanComplexItem::maxAMSLAltitudeChanged); connect(this, &StructureScanComplexItem::topFlightAltChanged, this, &StructureScanComplexItem::maxAMSLAltitudeChanged);
connect(this, &StructureScanComplexItem::bottomFlightAltChanged, this, &StructureScanComplexItem::minAMSLAltitudeChanged); connect(this, &StructureScanComplexItem::bottomFlightAltChanged, this, &StructureScanComplexItem::minAMSLAltitudeChanged);

5
src/MissionManager/TransectStyleComplexItem.cc

@ -115,11 +115,6 @@ TransectStyleComplexItem::TransectStyleComplexItem(PlanMasterController* masterC
connect(this, &TransectStyleComplexItem::followTerrainChanged, this, &TransectStyleComplexItem::_followTerrainChanged); connect(this, &TransectStyleComplexItem::followTerrainChanged, this, &TransectStyleComplexItem::_followTerrainChanged);
connect(this, &TransectStyleComplexItem::wizardModeChanged, this, &TransectStyleComplexItem::readyForSaveStateChanged); 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::minAMSLAltitudeChanged);
connect(_cameraCalc.distanceToSurface(), &Fact::rawValueChanged, this, &TransectStyleComplexItem::maxAMSLAltitudeChanged); connect(_cameraCalc.distanceToSurface(), &Fact::rawValueChanged, this, &TransectStyleComplexItem::maxAMSLAltitudeChanged);
connect(&_cameraCalc, &CameraCalc::distanceToSurfaceRelativeChanged, this, &TransectStyleComplexItem::minAMSLAltitudeChanged); connect(&_cameraCalc, &CameraCalc::distanceToSurfaceRelativeChanged, this, &TransectStyleComplexItem::minAMSLAltitudeChanged);

Loading…
Cancel
Save