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
c40fc59e
Commit
c40fc59e
authored
Dec 09, 2018
by
Gus Grubba
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Handle warnings
parent
848fc0a4
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
6 additions
and
6 deletions
+6
-6
FlightDisplayViewMap.qml
src/FlightDisplay/FlightDisplayViewMap.qml
+2
-2
QGCMapCircleVisuals.qml
src/MissionManager/QGCMapCircleVisuals.qml
+4
-4
No files found.
src/FlightDisplay/FlightDisplayViewMap.qml
View file @
c40fc59e
...
@@ -357,7 +357,7 @@ FlightMap {
...
@@ -357,7 +357,7 @@ FlightMap {
// Used to show orbit status telemetry from the vehicle
// Used to show orbit status telemetry from the vehicle
QGCMapCircleVisuals
{
QGCMapCircleVisuals
{
mapControl
:
parent
mapControl
:
parent
mapCircle
:
_activeVehicle
.
orbitMapCircle
mapCircle
:
_activeVehicle
?
_activeVehicle
.
orbitMapCircle
:
null
visible
:
_activeVehicle
?
_activeVehicle
.
orbitActive
:
false
visible
:
_activeVehicle
?
_activeVehicle
.
orbitActive
:
false
}
}
...
@@ -396,7 +396,7 @@ FlightMap {
...
@@ -396,7 +396,7 @@ FlightMap {
onClicked
:
{
onClicked
:
{
if
(
guidedActionsController
.
guidedUIVisible
||
(
!
guidedActionsController
.
showGotoLocation
&&
!
guidedActionsController
.
showOrbit
))
{
if
(
guidedActionsController
.
guidedUIVisible
||
(
!
guidedActionsController
.
showGotoLocation
&&
!
guidedActionsController
.
showOrbit
))
{
return
return
}
}
orbitMapCircle
.
hide
()
orbitMapCircle
.
hide
()
gotoLocationItem
.
hide
()
gotoLocationItem
.
hide
()
var
clickCoord
=
flightMap
.
toCoordinate
(
Qt
.
point
(
mouse
.
x
,
mouse
.
y
),
false
/* clipToViewPort */
)
var
clickCoord
=
flightMap
.
toCoordinate
(
Qt
.
point
(
mouse
.
x
,
mouse
.
y
),
false
/* clipToViewPort */
)
...
...
src/MissionManager/QGCMapCircleVisuals.qml
View file @
c40fc59e
...
@@ -22,9 +22,9 @@ import QGroundControl.FlightMap 1.0
...
@@ -22,9 +22,9 @@ import QGroundControl.FlightMap 1.0
Item
{
Item
{
id
:
_root
id
:
_root
property
var
mapControl
///< Map control to place item in
property
var
mapControl
///< Map control to place item in
property
var
mapCircle
///< QGCMapCircle object
property
var
mapCircle
///< QGCMapCircle object
property
bool
interactive
:
mapCircle
.
interactive
/// true: user can manipulate polygon
property
bool
interactive
:
mapCircle
?
mapCircle
.
interactive
:
0
/// true: user can manipulate polygon
property
color
interiorColor
:
"
transparent
"
property
color
interiorColor
:
"
transparent
"
property
real
interiorOpacity
:
1
property
real
interiorOpacity
:
1
property
int
borderWidth
:
2
property
int
borderWidth
:
2
...
@@ -34,7 +34,7 @@ Item {
...
@@ -34,7 +34,7 @@ Item {
property
var
_topRotationIndicatorComponent
property
var
_topRotationIndicatorComponent
property
var
_bottomRotationIndicatorComponent
property
var
_bottomRotationIndicatorComponent
property
var
_dragHandlesComponent
property
var
_dragHandlesComponent
property
real
_radius
:
mapCircle
.
radius
.
rawValue
property
real
_radius
:
mapCircle
?
mapCircle
.
radius
.
rawValue
:
0
function
addVisuals
()
{
function
addVisuals
()
{
if
(
!
_circleComponent
)
{
if
(
!
_circleComponent
)
{
...
...
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