zhaohuwei
/
QG4
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity
Browse Source

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

QGC4.4
DonLakeFlyer 7 years ago
parent
bf86d7fc35 aad551c2ae
commit
b9881d69af
1 changed files with 42 additions and 18 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Unified View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 60
      src/PlanView/SurveyItemEditor.qml

60
src/PlanView/SurveyItemEditor.qml
Unescape View File

@ -440,16 +440,28 @@ 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
visible: _vehicle ? _vehicle.fixedWing : false color: qgcPal.button
visible: _vehicle ? _vehicle.fixedWing : false
QGCColoredImage {
anchors.fill: parent
source: "/res/wind-rose.svg"
smooth: true
color: qgcPal.buttonText
}
onClicked: { QGCMouseArea {
windRosePie.angle = Number(gridAngleText.text) fillItem: parent
var cords = windRoseButton.mapToItem(_root, 0, 0)
windRosePie.popup(cords.x + windRoseButton.width / 2, cords.y + windRoseButton.height / 2) onClicked: {
windRosePie.angle = Number(gridAngleText.text)
var cords = windRoseButton.mapToItem(_root, 0, 0)
windRosePie.popup(cords.x + windRoseButton.width / 2, cords.y + windRoseButton.height / 2)
}
} }
} }
} }
@ -543,16 +555,28 @@ 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
onClicked: { QGCColoredImage {
var cords = manualWindRoseButton.mapToItem(_root, 0, 0) anchors.fill: parent
windRosePie.popup(cords.x + manualWindRoseButton.width / 2, cords.y + manualWindRoseButton.height / 2) source: "/res/wind-rose.svg"
smooth: true
color: qgcPal.buttonText
}
QGCMouseArea {
fillItem: parent
onClicked: {
windRosePie.angle = Number(gridAngleText.text)
var cords = manualWindRoseButton.mapToItem(_root, 0, 0)
windRosePie.popup(cords.x + manualWindRoseButton.width / 2, cords.y + manualWindRoseButton.height / 2)
}
} }
} }
} }

Write Preview
Loading…
Cancel
Save