Skip to content

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

Wind Rose fixes 

* Fix positioning
* Fix visibility
parent c7a9943c
Hide whitespace changes
Inline Side-by-side
Showing with 46 additions and 44 deletions
src/PlanView/SurveyItemEditor.qml
View file @ 2156c17e
...@@ -405,22 +405,20 @@ Rectangle { ...@@ -405,22 +405,20 @@ Rectangle {
anchors.right: parent.right anchors.right: parent.right
columnSpacing: _margin columnSpacing: _margin
rowSpacing: _margin rowSpacing: _margin
columns: 3 columns: 2
visible: gridHeader.checked visible: gridHeader.checked
QGCLabel { QGCLabel {
id: angleText id: angleText
text: qsTr("Angle") text: qsTr("Angle")
Layout.fillWidth: true
} }
Item { Layout.fillWidth: true }
property var activeVehicle: QGroundControl.multiVehicleManager.activeVehicle
ToolButton { ToolButton {
id: windRoseButton id: windRoseButton
anchors.verticalCenter: angleText.verticalCenter anchors.verticalCenter: angleText.verticalCenter
iconSource: qgcPal.globalTheme === QGCPalette.Light ? "/res/wind-roseBlack.svg" : "/res/wind-rose.svg" iconSource: qgcPal.globalTheme === QGCPalette.Light ? "/res/wind-roseBlack.svg" : "/res/wind-rose.svg"
visible: _activeVehicle ? _activeVehicle.fixedWing : true visible: _vehicle.fixedWing
onClicked: { onClicked: {
var cords = windRoseButton.mapToItem(_root, 0, 0) var cords = windRoseButton.mapToItem(_root, 0, 0)
...@@ -433,7 +431,6 @@ Rectangle { ...@@ -433,7 +431,6 @@ Rectangle {
id: gridAngleText id: gridAngleText
fact: missionItem.gridAngle fact: missionItem.gridAngle
Layout.fillWidth: true Layout.fillWidth: true
Layout.columnSpan: 1
} }
QGCLabel { text: qsTr("Turnaround dist") } QGCLabel { text: qsTr("Turnaround dist") }
...@@ -443,10 +440,10 @@ Rectangle { ...@@ -443,10 +440,10 @@ Rectangle {
} }
QGCCheckBox { QGCCheckBox {
text: qsTr("Refly at 90 degree offset") text: qsTr("Refly at 90 degree offset")
checked: missionItem.refly90Degrees checked: missionItem.refly90Degrees
onClicked: missionItem.refly90Degrees = checked onClicked: missionItem.refly90Degrees = checked
Layout.columnSpan: 2 Layout.columnSpan: 2
} }
QGCLabel { QGCLabel {
...@@ -493,67 +490,72 @@ Rectangle { ...@@ -493,67 +490,72 @@ Rectangle {
visible: gridTypeCombo.currentIndex == _gridTypeManual visible: gridTypeCombo.currentIndex == _gridTypeManual
} }
Column { GridLayout {
anchors.left: parent.left anchors.left: parent.left
anchors.right: parent.right anchors.right: parent.right
spacing: _margin columnSpacing: _margin
rowSpacing: _margin
columns: 2
visible: manualGridHeader.visible && manualGridHeader.checked visible: manualGridHeader.visible && manualGridHeader.checked
GridLayout { RowLayout {
anchors.left: parent.left spacing: _margin
anchors.right: parent.right
columnSpacing: _margin
rowSpacing: _margin
columns: 4
visible: gridHeader.checked
QGCLabel { QGCLabel {
id: manualAngleText id: manualAngleText
text: qsTr("Angle") text: qsTr("Angle")
Layout.columnSpan: 1
Layout.fillWidth: true Layout.fillWidth: true
} }
property var activeVehicle: QGroundControl.multiVehicleManager.activeVehicle
ToolButton { ToolButton {
id: manualWindRoseButton id: manualWindRoseButton
anchors.verticalCenter: manualAngleText.verticalCenter anchors.verticalCenter: manualAngleText.verticalCenter
Layout.columnSpan: 1 Layout.columnSpan: 1
iconSource: qgcPal.globalTheme === QGCPalette.Light ? "/res/wind-roseBlack.svg" : "/res/wind-rose.svg" iconSource: qgcPal.globalTheme === QGCPalette.Light ? "/res/wind-roseBlack.svg" : "/res/wind-rose.svg"
visible: _activeVehicle ? _activeVehicle.fixedWing : true visible: _vehicle.fixedWing
onClicked: { onClicked: {
var cords = manualWindRoseButton.mapToItem(_root, 0, 0) var cords = manualWindRoseButton.mapToItem(_root, 0, 0)
windRosePie.popup(cords.x + manualWindRoseButton.width / 2, cords.y + manualWindRoseButton.height / 2); windRosePie.popup(cords.x + manualWindRoseButton.width / 2, cords.y + manualWindRoseButton.height / 2);
} }
} }
}
FactTextField { FactTextField {
id: manualGridAngleText id: manualGridAngleText
fact: missionItem.gridAngle fact: missionItem.gridAngle
Layout.columnSpan: 2 Layout.fillWidth: true
}
} }
FactTextFieldGrid { QGCLabel { text: qsTr("Spacing") }
anchors.left: parent.left FactTextField {
anchors.right: parent.right fact: missionItem.gridSpacing
columnSpacing: ScreenTools.defaultFontPixelWidth Layout.fillWidth: true
rowSpacing: _margin }
factList: [ missionItem.gridSpacing, missionItem.gridAltitude, missionItem.turnaroundDist ]
factLabels: [ qsTr("Spacing"), qsTr("Altitude"), qsTr("Turnaround dist")] QGCLabel { text: qsTr("Altitude") }
FactTextField {
fact: missionItem.gridAltitude
Layout.fillWidth: true
}
QGCLabel { text: qsTr("Turnaround dist") }
FactTextField {
fact: missionItem.turnaroundDist
Layout.fillWidth: true
} }
QGCCheckBox { QGCCheckBox {
text: qsTr("Refly at 90 degree offset") text: qsTr("Refly at 90 degree offset")
checked: missionItem.refly90Degrees checked: missionItem.refly90Degrees
onClicked: missionItem.refly90Degrees = checked onClicked: missionItem.refly90Degrees = checked
Layout.columnSpan: 2
} }
FactCheckBox { FactCheckBox {
anchors.left: parent.left anchors.left: parent.left
text: qsTr("Relative altitude") text: qsTr("Relative altitude")
fact: missionItem.gridAltitudeRelative fact: missionItem.gridAltitudeRelative
Layout.columnSpan: 2
} }
} }
......
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