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
c55bcd87
Commit
c55bcd87
authored
Oct 23, 2019
by
Gus Grubba
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Handle ROI visibility from actual state given by the vehicle.
parent
88ae35fd
Changes
1
Show whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
2 additions
and
16 deletions
+2
-16
FlightDisplayViewMap.qml
src/FlightDisplay/FlightDisplayViewMap.qml
+2
-16
No files found.
src/FlightDisplay/FlightDisplayViewMap.qml
View file @
c55bcd87
...
...
@@ -44,7 +44,6 @@ FlightMap {
property
var
_geoFenceController
:
missionController
.
geoFenceController
property
var
_rallyPointController
:
missionController
.
rallyPointController
property
var
activeVehicle
:
QGroundControl
.
multiVehicleManager
.
activeVehicle
property
var
_activeVehicleCoordinate
:
activeVehicle
?
activeVehicle
.
coordinate
:
QtPositioning
.
coordinate
()
property
real
_toolButtonTopMargin
:
parent
.
height
-
mainWindow
.
height
+
(
ScreenTools
.
defaultFontPixelHeight
/
2
)
property
bool
_airspaceEnabled
:
QGroundControl
.
airmapSupported
?
(
QGroundControl
.
settingsManager
.
airMapSettings
.
enableAirMap
.
rawValue
&&
QGroundControl
.
airspaceManager
.
connected
):
false
...
...
@@ -404,7 +403,7 @@ FlightMap {
// ROI Location visuals
MapQuickItem
{
id
:
roiLocationItem
visible
:
false
visible
:
activeVehicle
&&
activeVehicle
.
isROIEnabled
z
:
QGroundControl
.
zOrderMapItems
anchorPoint.x
:
sourceItem
.
anchorPointX
anchorPoint.y
:
sourceItem
.
anchorPointY
...
...
@@ -414,30 +413,18 @@ FlightMap {
label
:
qsTr
(
"
ROI here
"
,
"
Make this a Region Of Interest
"
)
}
Connections
{
target
:
mainWindow
onActiveVehicleChanged
:
{
if
(
!
activeVehicle
)
{
roiLocationItem
.
visible
=
false
}
}
}
//-- Visibilty controlled by actual state
function
show
(
coord
)
{
roiLocationItem
.
coordinate
=
coord
roiLocationItem
.
visible
=
true
}
function
hide
()
{
roiLocationItem
.
visible
=
false
}
function
actionConfirmed
()
{
hide
()
}
function
actionCancelled
()
{
hide
()
}
}
...
...
@@ -496,7 +483,6 @@ FlightMap {
onTriggered
:
{
roiLocationItem
.
show
(
clickMenu
.
coord
)
gotoLocationItem
.
hide
()
guidedActionsController
.
confirmAction
(
guidedActionsController
.
actionROI
,
clickMenu
.
coord
,
orbitMapCircle
)
}
}
...
...
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