Skip to content

Q
qgroundcontrol
Commit fe70b116 authored by DonLakeFlyer's avatar DonLakeFlyer
Browse files
Options

Fix radios, fix initial load setup

parent 37b638b8
Hide whitespace changes
Inline Side-by-side
Showing with 8 additions and 5 deletions
src/MissionEditor/SurveyItemEditor.qml
View file @ fe70b116
...@@ -48,12 +48,15 @@ Rectangle { ...@@ -48,12 +48,15 @@ Rectangle {
break; break;
} }
} }
missionItem.cameraOrientationFixed = false
if (index == -1) { if (index == -1) {
gridTypeCombo.currentIndex = _gridTypeManual gridTypeCombo.currentIndex = _gridTypeManual
} else { } else {
var listIndex = index - _gridTypeCamera
gridTypeCombo.currentIndex = index gridTypeCombo.currentIndex = index
missionItem.cameraOrientationFixed = _vehicleCameraList[listIndex].fixedOrientation if (index != 1) {
// Specific camera is selected
missionItem.cameraOrientationFixed = _vehicleCameraList[index - _gridTypeCamera].fixedOrientation
}
} }
} }
} }
...@@ -228,7 +231,7 @@ Rectangle { ...@@ -228,7 +231,7 @@ Rectangle {
QGCRadioButton { QGCRadioButton {
width: _editFieldWidth width: _editFieldWidth
text: "Landscape" text: "Landscape"
checked: missionItem.cameraOrientationLandscape.value == 1 checked: !!missionItem.cameraOrientationLandscape.value
exclusiveGroup: cameraOrientationGroup exclusiveGroup: cameraOrientationGroup
onClicked: missionItem.cameraOrientationLandscape.value = 1 onClicked: missionItem.cameraOrientationLandscape.value = 1
} }
...@@ -236,7 +239,7 @@ Rectangle { ...@@ -236,7 +239,7 @@ Rectangle {
QGCRadioButton { QGCRadioButton {
id: cameraOrientationPortrait id: cameraOrientationPortrait
text: "Portrait" text: "Portrait"
checked: missionItem.cameraOrientationLandscape.value == 0 checked: !missionItem.cameraOrientationLandscape.value
exclusiveGroup: cameraOrientationGroup exclusiveGroup: cameraOrientationGroup
onClicked: missionItem.cameraOrientationLandscape.value = 0 onClicked: missionItem.cameraOrientationLandscape.value = 0
} }
...@@ -372,7 +375,7 @@ Rectangle { ...@@ -372,7 +375,7 @@ Rectangle {
QGCRadioButton { QGCRadioButton {
id: fixedAltitudeRadio id: fixedAltitudeRadio
text: qsTr("Altitude") text: qsTr("Altitude")
checked: missionItem.fixedValueIsAltitude.value checked: !!missionItem.fixedValueIsAltitude.value
exclusiveGroup: fixedValueGroup exclusiveGroup: fixedValueGroup
onClicked: missionItem.fixedValueIsAltitude.value = 1 onClicked: missionItem.fixedValueIsAltitude.value = 1
} }
......
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