Skip to content

Q
qgroundcontrol
Commit f1e3b187 authored by Don Gagne's avatar Don Gagne
Browse files
Options

parent fe691f5c
Show whitespace changes
Inline Side-by-side
Showing with 209 additions and 240 deletions
src/PlanView/GeoFenceEditor.qml
View file @ f1e3b187
...@@ -10,13 +10,9 @@ import QGroundControl.FactControls 1.0 ...@@ -10,13 +10,9 @@ import QGroundControl.FactControls 1.0
QGCFlickable { QGCFlickable {
id: root id: root
width: availableWidth contentHeight: geoFenceEditorRect.height
height: availableHeight
contentHeight: editorColumn.height
clip: true clip: true
property real availableWidth
property real availableHeight
property var myGeoFenceController property var myGeoFenceController
property var flightMap property var flightMap
...@@ -24,14 +20,10 @@ QGCFlickable { ...@@ -24,14 +20,10 @@ QGCFlickable {
readonly property real _margin: ScreenTools.defaultFontPixelWidth / 2 readonly property real _margin: ScreenTools.defaultFontPixelWidth / 2
readonly property real _radius: ScreenTools.defaultFontPixelWidth / 2 readonly property real _radius: ScreenTools.defaultFontPixelWidth / 2
Column {
id: editorColumn
anchors.left: parent.left
anchors.right: parent.right
Rectangle { Rectangle {
id: geoFenceEditorRect id: geoFenceEditorRect
width: parent.width anchors.left: parent.left
anchors.right: parent.right
height: geoFenceItems.y + geoFenceItems.height + (_margin * 2) height: geoFenceItems.y + geoFenceItems.height + (_margin * 2)
radius: _radius radius: _radius
color: qgcPal.missionItemEditor color: qgcPal.missionItemEditor
...@@ -213,21 +205,10 @@ QGCFlickable { ...@@ -213,21 +205,10 @@ QGCFlickable {
Repeater { Repeater {
model: myGeoFenceController.polygons model: myGeoFenceController.polygons
QGCColoredImage { QGCButton {
width: ScreenTools.defaultFontPixelHeight text: qsTr("Del")
height: width
sourceSize.height: width
source: "/res/XDelete.svg"
fillMode: Image.PreserveAspectFit
color: qgcPal.text
Layout.alignment: Qt.AlignHCenter Layout.alignment: Qt.AlignHCenter
onClicked: myGeoFenceController.deletePolygon(index)
property int _polygonIndex: index
QGCMouseArea {
fillItem: parent
onClicked: myGeoFenceController.deletePolygon(parent._polygonIndex)
}
} }
} }
} // GridLayout } // GridLayout
...@@ -314,21 +295,10 @@ QGCFlickable { ...@@ -314,21 +295,10 @@ QGCFlickable {
Repeater { Repeater {
model: myGeoFenceController.circles model: myGeoFenceController.circles
QGCColoredImage { QGCButton {
width: ScreenTools.defaultFontPixelHeight text: qsTr("Del")
height: width
sourceSize.height: width
source: "/res/XDelete.svg"
fillMode: Image.PreserveAspectFit
color: qgcPal.text
Layout.alignment: Qt.AlignHCenter Layout.alignment: Qt.AlignHCenter
onClicked: myGeoFenceController.deleteCircle(index)
property int _circleIndex: index
QGCMouseArea {
fillItem: parent
onClicked: myGeoFenceController.deleteCircle(parent._polygonIndex)
}
} }
} }
} // GridLayout } // GridLayout
...@@ -336,5 +306,4 @@ QGCFlickable { ...@@ -336,5 +306,4 @@ QGCFlickable {
} }
} }
} // Rectangle } // Rectangle
}
} }
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