Skip to content

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

Merge branch 'Stable_V3.3' of https://github.com/mavlink/qgroundcontrol into StableMerge

parents bf86d7fc aad551c2
Show whitespace changes
Inline Side-by-side
Showing with 42 additions and 18 deletions
src/PlanView/SurveyItemEditor.qml
View file @ b9881d69
...@@ -440,12 +440,23 @@ Rectangle { ...@@ -440,12 +440,23 @@ Rectangle {
Layout.fillWidth: true Layout.fillWidth: true
} }
ToolButton { Rectangle {
id: windRoseButton id: windRoseButton
anchors.verticalCenter: angleText.verticalCenter width: ScreenTools.implicitTextFieldHeight
iconSource: qgcPal.globalTheme === QGCPalette.Light ? "/res/wind-roseBlack.svg" : "/res/wind-rose.svg" height: width
color: qgcPal.button
visible: _vehicle ? _vehicle.fixedWing : false visible: _vehicle ? _vehicle.fixedWing : false
QGCColoredImage {
anchors.fill: parent
source: "/res/wind-rose.svg"
smooth: true
color: qgcPal.buttonText
}
QGCMouseArea {
fillItem: parent
onClicked: { onClicked: {
windRosePie.angle = Number(gridAngleText.text) windRosePie.angle = Number(gridAngleText.text)
var cords = windRoseButton.mapToItem(_root, 0, 0) var cords = windRoseButton.mapToItem(_root, 0, 0)
...@@ -453,6 +464,7 @@ Rectangle { ...@@ -453,6 +464,7 @@ Rectangle {
} }
} }
} }
}
FactTextField { FactTextField {
id: gridAngleText id: gridAngleText
...@@ -543,19 +555,31 @@ Rectangle { ...@@ -543,19 +555,31 @@ Rectangle {
Layout.fillWidth: true Layout.fillWidth: true
} }
ToolButton { Rectangle {
id: manualWindRoseButton id: manualWindRoseButton
anchors.verticalCenter: manualAngleText.verticalCenter width: ScreenTools.implicitTextFieldHeight
Layout.columnSpan: 1 height: width
iconSource: qgcPal.globalTheme === QGCPalette.Light ? "/res/wind-roseBlack.svg" : "/res/wind-rose.svg" color: qgcPal.button
visible: _vehicle ? _vehicle.fixedWing : false visible: _vehicle ? _vehicle.fixedWing : false
QGCColoredImage {
anchors.fill: parent
source: "/res/wind-rose.svg"
smooth: true
color: qgcPal.buttonText
}
QGCMouseArea {
fillItem: parent
onClicked: { onClicked: {
windRosePie.angle = Number(gridAngleText.text)
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
......
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