Browse Source

Merge pull request #4795 from DonLakeFlyer/ComplexItemBugs

Plan: Fix various complex item bugs
QGC4.4
Don Gagne 8 years ago committed by GitHub
parent
commit
7dd9e3c101
  1. 10
      src/MissionEditor/SurveyItemEditor.qml
  2. 2
      src/MissionManager/FixedWingLandingComplexItem.cc
  3. 3
      src/MissionManager/MissionController.cc

10
src/MissionEditor/SurveyItemEditor.qml

@ -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 }
ExclusiveGroup {

2
src/MissionManager/FixedWingLandingComplexItem.cc

@ -339,6 +339,7 @@ void FixedWingLandingComplexItem::_recalcFromRadiusChange(void) @@ -339,6 +339,7 @@ void FixedWingLandingComplexItem::_recalcFromRadiusChange(void)
_ignoreRecalcSignals = true;
emit loiterCoordinateChanged(_loiterCoordinate);
emit coordinateChanged(_loiterCoordinate);
_ignoreRecalcSignals = false;
}
}
@ -376,6 +377,7 @@ void FixedWingLandingComplexItem::_recalcFromHeadingAndDistanceChange(void) @@ -376,6 +377,7 @@ void FixedWingLandingComplexItem::_recalcFromHeadingAndDistanceChange(void)
_ignoreRecalcSignals = true;
emit loiterTangentCoordinateChanged(_loiterTangentCoordinate);
emit loiterCoordinateChanged(_loiterCoordinate);
emit coordinateChanged(_loiterCoordinate);
_ignoreRecalcSignals = false;
}
}

3
src/MissionManager/MissionController.cc

@ -125,7 +125,10 @@ void MissionController::_newMissionItemsAvailableFromVehicle(void) @@ -125,7 +125,10 @@ void MissionController::_newMissionItemsAvailableFromVehicle(void)
_missionItemsRequested = false;
if (_editMode) {
// Scan for mission settings
MissionSettingsComplexItem::scanForMissionSettings(_visualItems, _activeVehicle);
}
_initAllVisualItems();
emit newItemsFromVehicle();

Loading…
Cancel
Save