Skip to content
GitLab
Explore
Sign in
Primary navigation
Search or go to…
Project
Q
qgroundcontrol
Manage
Activity
Members
Labels
Plan
Issues
Issue boards
Milestones
Wiki
Code
Merge requests
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Snippets
Build
Pipelines
Jobs
Pipeline schedules
Artifacts
Deploy
Releases
Model registry
Operate
Environments
Monitor
Incidents
Analyze
Value stream analytics
Contributor analytics
CI/CD analytics
Repository analytics
Model experiments
Help
Help
Support
GitLab documentation
Compare GitLab plans
GitLab community forum
Contribute to GitLab
Provide feedback
Keyboard shortcuts
?
Snippets
Groups
Projects
Show more breadcrumbs
Valentin Platzgummer
qgroundcontrol
Commits
6bf85ada
Commit
6bf85ada
authored
8 years ago
by
Don Gagne
Browse files
Options
Downloads
Patches
Plain Diff
Use ToolStrip on fly view
parent
e36b3dd2
Branches
Branches containing commit
No related tags found
No related merge requests found
Changes
1
Show whitespace changes
Inline
Side-by-side
Showing
1 changed file
src/FlightDisplay/FlightDisplayViewMap.qml
+78
-123
78 additions, 123 deletions
src/FlightDisplay/FlightDisplayViewMap.qml
with
78 additions
and
123 deletions
src/FlightDisplay/FlightDisplayViewMap.qml
+
78
−
123
View file @
6bf85ada
...
...
@@ -71,83 +71,88 @@ FlightMap {
Component.onCompleted
:
start
(
false
/* editMode */
)
}
QGCMapLabel
{
id
:
flyLabel
map
:
flightMap
text
:
qsTr
(
"
Fly
"
)
visible
:
!
ScreenTools
.
isShortScreen
anchors.topMargin
:
_toolButtonTopMargin
anchors.horizontalCenter
:
centerMapDropButton
.
horizontalCenter
anchors.top
:
parent
.
top
}
//-- Vertical Tool Buttons
ExclusiveGroup
{
id
:
drop
ButtonsExclusiveGroup
id
:
_mapType
ButtonsExclusiveGroup
}
ExclusiveGroup
{
id
:
mapTypeButtonsExclusiveGroup
ToolStrip
{
id
:
toolStrip
anchors.leftMargin
:
ScreenTools
.
defaultFontPixelWidth
anchors.left
:
parent
.
left
anchors.topMargin
:
_toolButtonTopMargin
anchors.top
:
parent
.
top
color
:
qgcPal
.
window
title
:
qsTr
(
"
Fly
"
)
z
:
QGroundControl
.
zOrderWidgets
buttonVisible
:
[
true
,
true
,
_showZoom
,
_showZoom
]
property
bool
_showZoom
:
!
ScreenTools
.
isShortScreen
model
:
[
{
name
:
"
Center
"
,
iconSource
:
"
/qmlimages/MapCenter.svg
"
,
dropPanelComponent
:
centerMapDropPanel
},
{
name
:
"
Map
"
,
iconSource
:
"
/qmlimages/MapType.svg
"
,
dropPanelComponent
:
mapTypeDropPanel
},
{
name
:
"
In
"
,
iconSource
:
"
/qmlimages/ZoomPlus.svg
"
},
{
name
:
"
Out
"
,
iconSource
:
"
/qmlimages/ZoomMinus.svg
"
}
]
//-- Dismiss Drop Down (if any)
MouseArea
{
anchors.fill
:
parent
enabled
:
dropButtonsExclusiveGroup
.
current
!=
null
onClicked
:
{
if
(
dropButtonsExclusiveGroup
.
current
)
{
dropButtonsExclusiveGroup
.
current
.
checked
=
false
switch
(
index
)
{
case
2
:
_flightMap
.
zoomLevel
+=
0.5
break
case
3
:
_flightMap
.
zoomLevel
-=
0.5
break
}
dropButtonsExclusiveGroup
.
current
=
null
}
}
// IMPORTANT NOTE: Drop Buttons must be parented directly to the map. If they are placed in a Column for example the drop control positioning
// will not work correctly.
// Toolstrip drop panel compomnents
//-- Map Center Control
CenterMapDropButton
{
id
:
centerMapDropButton
anchors.topMargin
:
flyLabel
.
visible
?
ScreenTools
.
defaultFontPixelHeight
/
2
:
_toolButtonTopMargin
anchors.leftMargin
:
ScreenTools
.
defaultFontPixelHeight
anchors.left
:
parent
.
left
anchors.top
:
flyLabel
.
visible
?
flyLabel
.
bottom
:
parent
.
top
z
:
QGroundControl
.
zOrderWidgets
exclusiveGroup
:
dropButtonsExclusiveGroup
MapFitFunctions
{
id
:
mapFitFunctions
map
:
_flightMap
mapFitViewport
:
Qt
.
rect
(
leftToolWidth
,
_toolButtonTopMargin
,
flightMap
.
width
-
leftToolWidth
-
rightPanelWidth
,
flightMap
.
height
-
_toolButtonTopMargin
)
usePlannedHomePosition
:
false
geoFenceController
:
geoFenceController
missionController
:
missionController
rallyPointController
:
rallyPointController
showFollowVehicle
:
true
followVehicle
:
_followVehicle
onFollowVehicleChanged
:
_followVehicle
=
followVehicle
property
real
leftToolWidth
:
centerMapDropButton
.
x
+
centerMapDropButton
.
width
}
//-- Map Type Control
DropButton
{
id
:
mapTypeButton
anchors.topMargin
:
ScreenTools
.
defaultFontPixelHeight
anchors.top
:
centerMapDropButton
.
bottom
anchors.left
:
centerMapDropButton
.
left
dropDirection
:
dropRight
buttonImage
:
"
/qmlimages/MapType.svg
"
viewportMargins
:
ScreenTools
.
defaultFontPixelWidth
/
2
exclusiveGroup
:
dropButtonsExclusiveGroup
z
:
QGroundControl
.
zOrderWidgets
lightBorders
:
isSatelliteMap
mapMissionController
:
missionController
mapGeoFenceController
:
geoFenceController
mapRallyPointController
:
rallyPointController
property
real
leftToolWidth
:
toolStrip
.
x
+
toolStrip
.
width
}
Component
{
id
:
centerMapDropPanel
CenterMapDropPanel
{
map
:
_flightMap
fitFunctions
:
mapFitFunctions
}
}
Component
{
id
:
mapTypeDropPanel
dropDownComponent
:
Component
{
Column
{
spacing
:
ScreenTools
.
defaultFontPixel
Width
spacing
:
ScreenTools
.
defaultFontPixel
Height
/
2
QGCLabel
{
text
:
qsTr
(
"
Map type:
"
)
}
Row
{
spacing
:
ScreenTools
.
defaultFontPixelWidth
Repeater
{
model
:
QGroundControl
.
flightMapSettings
.
mapTypes
...
...
@@ -155,65 +160,15 @@ FlightMap {
checkable
:
true
checked
:
QGroundControl
.
flightMapSettings
.
mapType
===
text
text
:
modelData
width
:
clearButton
.
width
exclusiveGroup
:
mapTypeButtonsExclusiveGroup
exclusiveGroup
:
_mapTypeButtonsExclusiveGroup
onClicked
:
{
QGroundControl
.
flightMapSettings
.
mapType
=
text
checked
=
true
dropButtonsExclusiveGroup
.
current
=
null
}
}
}
}
QGCButton
{
id
:
clearButton
text
:
qsTr
(
"
Clear Flight Trails
"
)
enabled
:
QGroundControl
.
multiVehicleManager
.
activeVehicle
onClicked
:
{
QGroundControl
.
multiVehicleManager
.
activeVehicle
.
clearTrajectoryPoints
()
dropButtonsExclusiveGroup
.
current
=
null
dropPanel
.
hide
()
}
}
}
}
}
//-- Zoom Map In
RoundButton
{
id
:
mapZoomPlus
anchors.topMargin
:
ScreenTools
.
defaultFontPixelHeight
anchors.top
:
mapTypeButton
.
bottom
anchors.left
:
mapTypeButton
.
left
visible
:
!
ScreenTools
.
isTinyScreen
&&
_mainIsMap
buttonImage
:
"
/qmlimages/ZoomPlus.svg
"
exclusiveGroup
:
dropButtonsExclusiveGroup
z
:
QGroundControl
.
zOrderWidgets
lightBorders
:
isSatelliteMap
onClicked
:
{
if
(
_flightMap
)
_flightMap
.
zoomLevel
+=
0.5
checked
=
false
}
}
//-- Zoom Map Out
RoundButton
{
id
:
mapZoomMinus
anchors.topMargin
:
ScreenTools
.
defaultFontPixelHeight
anchors.top
:
mapZoomPlus
.
bottom
anchors.left
:
mapZoomPlus
.
left
visible
:
!
ScreenTools
.
isTinyScreen
&&
_mainIsMap
buttonImage
:
"
/qmlimages/ZoomMinus.svg
"
exclusiveGroup
:
dropButtonsExclusiveGroup
z
:
QGroundControl
.
zOrderWidgets
lightBorders
:
isSatelliteMap
onClicked
:
{
if
(
_flightMap
)
_flightMap
.
zoomLevel
-=
0.5
checked
=
false
}
}
// Add trajectory points to the map
...
...
This diff is collapsed.
Click to expand it.
Preview
0%
Loading
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Save comment
Cancel
Please
register
or
sign in
to comment