Commit 7dd9e3c1 authored by Don Gagne's avatar Don Gagne Committed by GitHub

Merge pull request #4795 from DonLakeFlyer/ComplexItemBugs

Plan: Fix various complex item bugs
parents e782e675 22c66439
...@@ -144,6 +144,16 @@ Rectangle { ...@@ -144,6 +144,16 @@ Rectangle {
} }
} }
Connections {
target: missionItem
onCameraValueChanged: {
if (gridTypeCombo.currentIndex >= _gridTypeCustomCamera && !_noCameraValueRecalc) {
recalcFromCameraValues()
}
}
}
QGCPalette { id: qgcPal; colorGroupEnabled: true } QGCPalette { id: qgcPal; colorGroupEnabled: true }
ExclusiveGroup { ExclusiveGroup {
......
...@@ -339,6 +339,7 @@ void FixedWingLandingComplexItem::_recalcFromRadiusChange(void) ...@@ -339,6 +339,7 @@ void FixedWingLandingComplexItem::_recalcFromRadiusChange(void)
_ignoreRecalcSignals = true; _ignoreRecalcSignals = true;
emit loiterCoordinateChanged(_loiterCoordinate); emit loiterCoordinateChanged(_loiterCoordinate);
emit coordinateChanged(_loiterCoordinate);
_ignoreRecalcSignals = false; _ignoreRecalcSignals = false;
} }
} }
...@@ -376,6 +377,7 @@ void FixedWingLandingComplexItem::_recalcFromHeadingAndDistanceChange(void) ...@@ -376,6 +377,7 @@ void FixedWingLandingComplexItem::_recalcFromHeadingAndDistanceChange(void)
_ignoreRecalcSignals = true; _ignoreRecalcSignals = true;
emit loiterTangentCoordinateChanged(_loiterTangentCoordinate); emit loiterTangentCoordinateChanged(_loiterTangentCoordinate);
emit loiterCoordinateChanged(_loiterCoordinate); emit loiterCoordinateChanged(_loiterCoordinate);
emit coordinateChanged(_loiterCoordinate);
_ignoreRecalcSignals = false; _ignoreRecalcSignals = false;
} }
} }
......
...@@ -125,7 +125,10 @@ void MissionController::_newMissionItemsAvailableFromVehicle(void) ...@@ -125,7 +125,10 @@ void MissionController::_newMissionItemsAvailableFromVehicle(void)
_missionItemsRequested = false; _missionItemsRequested = false;
if (_editMode) {
// Scan for mission settings
MissionSettingsComplexItem::scanForMissionSettings(_visualItems, _activeVehicle); MissionSettingsComplexItem::scanForMissionSettings(_visualItems, _activeVehicle);
}
_initAllVisualItems(); _initAllVisualItems();
emit newItemsFromVehicle(); emit newItemsFromVehicle();
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment