Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
Q
qgroundcontrol
Project
Project
Details
Activity
Releases
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Boards
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
Valentin Platzgummer
qgroundcontrol
Commits
beff8561
Unverified
Commit
beff8561
authored
Jun 19, 2018
by
Don Gagne
Committed by
GitHub
Jun 19, 2018
Browse files
Options
Browse Files
Download
Plain Diff
Merge pull request #6609 from DonLakeFlyer/CircleRadiusDrag
QGCMapCircle: Support for dragging to change radius
parents
38a2246e
920969bb
Changes
1
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
36 additions
and
9 deletions
+36
-9
QGCMapCircleVisuals.qml
src/MissionManager/QGCMapCircleVisuals.qml
+36
-9
No files found.
src/MissionManager/QGCMapCircleVisuals.qml
View file @
beff8561
...
...
@@ -112,7 +112,15 @@ Item {
id
:
centerDragAreaComponent
MissionItemIndicatorDrag
{
onItemCoordinateChanged
:
mapCircle
.
center
=
itemCoordinate
onItemCoordinateChanged
:
mapCircle
.
center
=
itemCoordinate
}
}
Component
{
id
:
radiusDragAreaComponent
MissionItemIndicatorDrag
{
onItemCoordinateChanged
:
mapCircle
.
radius
.
rawValue
=
mapCircle
.
center
.
distanceTo
(
itemCoordinate
)
}
}
...
...
@@ -120,19 +128,38 @@ Item {
id
:
centerDragHandleComponent
Item
{
property
var
dragHandle
property
var
dragArea
property
var
centerDragHandle
property
var
centerDragArea
property
var
radiusDragHandle
property
var
radiusDragArea
property
var
radiusDragCoord
:
QtPositioning
.
coordinate
()
property
var
circleCenterCoord
:
mapCircle
.
center
property
real
circleRadius
:
mapCircle
.
radius
.
rawValue
function
calcRadiusDragCoord
()
{
radiusDragCoord
=
mapCircle
.
center
.
atDistanceAndAzimuth
(
circleRadius
,
90
)
}
onCircleCenterCoordChanged
:
calcRadiusDragCoord
()
onCircleRadiusChanged
:
calcRadiusDragCoord
()
Component.onCompleted
:
{
dragHandle
=
dragHandleComponent
.
createObject
(
mapControl
)
dragHandle
.
coordinate
=
Qt
.
binding
(
function
()
{
return
mapCircle
.
center
})
mapControl
.
addMapItem
(
dragHandle
)
dragArea
=
centerDragAreaComponent
.
createObject
(
mapControl
,
{
"
itemIndicator
"
:
dragHandle
,
"
itemCoordinate
"
:
mapCircle
.
center
})
calcRadiusDragCoord
()
radiusDragHandle
=
dragHandleComponent
.
createObject
(
mapControl
)
radiusDragHandle
.
coordinate
=
Qt
.
binding
(
function
()
{
return
radiusDragCoord
})
mapControl
.
addMapItem
(
radiusDragHandle
)
radiusDragArea
=
radiusDragAreaComponent
.
createObject
(
mapControl
,
{
"
itemIndicator
"
:
radiusDragHandle
,
"
itemCoordinate
"
:
radiusDragCoord
})
centerDragHandle
=
dragHandleComponent
.
createObject
(
mapControl
)
centerDragHandle
.
coordinate
=
Qt
.
binding
(
function
()
{
return
circleCenterCoord
})
mapControl
.
addMapItem
(
centerDragHandle
)
centerDragArea
=
centerDragAreaComponent
.
createObject
(
mapControl
,
{
"
itemIndicator
"
:
centerDragHandle
,
"
itemCoordinate
"
:
circleCenterCoord
})
}
Component.onDestruction
:
{
dragHandle
.
destroy
()
dragArea
.
destroy
()
centerDragHandle
.
destroy
()
centerDragArea
.
destroy
()
radiusDragHandle
.
destroy
()
radiusDragArea
.
destroy
()
}
}
}
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment