Commit 5040a42d authored by Patrick José Pereira's avatar Patrick José Pereira

Add wind rose in survey pattern editor

Signed-off-by: 's avatarPatrick José Pereira <patrickelectric@gmail.com>
parent 2e3a5199
...@@ -193,6 +193,8 @@ ...@@ -193,6 +193,8 @@
<file alias="takeoff.svg">resources/takeoff.svg</file> <file alias="takeoff.svg">resources/takeoff.svg</file>
<file alias="TrashDelete.svg">resources/TrashDelete.svg</file> <file alias="TrashDelete.svg">resources/TrashDelete.svg</file>
<file alias="waves.svg">resources/waves.svg</file> <file alias="waves.svg">resources/waves.svg</file>
<file alias="wind-rose.svg">resources/wind-rose.svg</file>
<file alias="wind-rose-arrows.svg">resources/wind-rose-arrows.svg</file>
<file alias="XDelete.svg">resources/XDelete.svg</file> <file alias="XDelete.svg">resources/XDelete.svg</file>
<file alias="XDeleteBlack.svg">resources/XDeleteBlack.svg</file> <file alias="XDeleteBlack.svg">resources/XDeleteBlack.svg</file>
<file>resources/icons/qgroundcontrol.ico</file> <file>resources/icons/qgroundcontrol.ico</file>
......
This diff is collapsed.
This diff is collapsed.
import QtQuick 2.3 import QtQuick 2.3
import QtQuick.Controls 1.2 import QtQuick.Controls 1.2
import QtQuick.Controls.Styles 1.4
import QtQuick.Dialogs 1.2 import QtQuick.Dialogs 1.2
import QtQuick.Extras 1.4
import QtQuick.Layouts 1.2 import QtQuick.Layouts 1.2
import QGroundControl 1.0 import QGroundControl 1.0
...@@ -398,10 +400,38 @@ Rectangle { ...@@ -398,10 +400,38 @@ Rectangle {
columns: 2 columns: 2
visible: gridHeader.checked visible: gridHeader.checked
QGCLabel { text: qsTr("Angle") } GridLayout {
anchors.left: parent.left
anchors.right: parent.right
columnSpacing: _margin
rowSpacing: _margin
columns: 3
visible: gridHeader.checked
QGCLabel {
id: angleText
text: qsTr("Angle")
}
Item { Layout.fillWidth: true }
ToolButton {
id: windRoseButton
anchors.verticalCenter: angleText.verticalCenter
iconSource: "/res/wind-rose.svg"
onClicked: {
var cords = windRoseButton.mapToItem(_root, 0, 0)
windRose.popup(cords.x + windRoseButton.width/2, cords.y + windRoseButton.height/2);
}
}
}
FactTextField { FactTextField {
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") }
...@@ -516,4 +546,84 @@ Rectangle { ...@@ -516,4 +546,84 @@ Rectangle {
} }
} }
} }
PieMenu {
id: windRose
triggerMode: TriggerMode.TriggerOnPress
height: 2.75*windRoseButton.height
width: 2.75*windRoseButton.width
onVisibleChanged: {
windRoseSvg.visible = visible
}
style: PieMenuStyle {
cancelRadius: windRoseButton.height*0.5
shadowRadius: 0
startAngle: -22.5
endAngle: 337.5
}
MenuItem {
onTriggered: {
gridAngleText.text = "-90";
gridAngleText.editingFinished();
}
}
MenuItem {
onTriggered: {
gridAngleText.text = "-45";
gridAngleText.editingFinished();
}
}
MenuItem {
onTriggered: {
gridAngleText.text = "0";
gridAngleText.editingFinished();
}
}
MenuItem {
onTriggered: {
gridAngleText.text = "45";
gridAngleText.editingFinished();
}
}
MenuItem {
onTriggered: {
gridAngleText.text = "90";
gridAngleText.editingFinished();
}
}
MenuItem {
onTriggered: {
gridAngleText.text = "135";
gridAngleText.editingFinished();
}
}
MenuItem {
onTriggered: {
gridAngleText.text = "180";
gridAngleText.editingFinished();
}
}
MenuItem {
onTriggered: {
gridAngleText.text = "-135";
gridAngleText.editingFinished();
}
}
}
Image {
id: windRoseSvg
source: "/res/wind-rose-arrows.svg"
visible: false
width: windRose.width
height: windRose.height
x: windRose.x;
y: windRose.y;
z: windRose.z;
}
} }
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