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
f0b9e8cb
Unverified
Commit
f0b9e8cb
authored
6 years ago
by
Don Gagne
Committed by
GitHub
6 years ago
Browse files
Options
Browse Files
Download
Plain Diff
Merge pull request #6327 from DonLakeFlyer/MobileTileImportExport
Allow map tile import/export on mobile
parents
e992a0d0
552d2f0d
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
34 additions
and
13 deletions
+34
-13
OfflineMap.qml
src/QtLocationPlugin/QMLControl/OfflineMap.qml
+32
-9
QGCOptions.h
src/api/QGCOptions.h
+2
-4
No files found.
src/QtLocationPlugin/QMLControl/OfflineMap.qml
View file @
f0b9e8cb
...
...
@@ -213,6 +213,31 @@ QGCView {
}
}
QGCFileDialog
{
id
:
fileDialog
qgcView
:
offlineMapView
folder
:
QGroundControl
.
settingsManager
.
appSettings
.
missionSavePath
nameFilters
:
[
"
Tile Sets (*.qgctiledb)
"
]
fileExtension
:
"
qgctiledb
"
onAcceptedForSave
:
{
if
(
QGroundControl
.
mapEngineManager
.
exportSets
(
file
))
{
rootLoader
.
sourceComponent
=
exportToDiskProgress
}
else
{
showList
()
}
close
()
}
onAcceptedForLoad
:
{
if
(
!
QGroundControl
.
mapEngineManager
.
importSets
(
file
))
{
showList
();
mainWindow
.
enableToolbar
()
}
close
()
}
}
MessageDialog
{
id
:
errorDialog
visible
:
false
...
...
@@ -1044,10 +1069,9 @@ QGCView {
width
:
_bigButtonSize
enabled
:
QGroundControl
.
mapEngineManager
.
selectedCount
>
0
onClicked
:
{
showList
();
if
(
QGroundControl
.
mapEngineManager
.
exportSets
())
{
rootLoader
.
sourceComponent
=
exportToDiskProgress
}
fileDialog
.
title
=
qsTr
(
"
Export Tile Set
"
)
fileDialog
.
selectExisting
=
false
fileDialog
.
openForSave
()
}
}
QGCButton
{
...
...
@@ -1200,11 +1224,10 @@ QGCView {
text
:
qsTr
(
"
Import
"
)
width
:
_bigButtonSize
*
1.25
onClicked
:
{
if
(
!
QGroundControl
.
mapEngineManager
.
importSets
())
{
showList
();
mainWindow
.
enableToolbar
()
rootLoader
.
sourceComponent
=
null
}
rootLoader
.
sourceComponent
=
null
fileDialog
.
title
=
qsTr
(
"
Import Tile Set
"
)
fileDialog
.
selectExisting
=
true
fileDialog
.
openForLoad
()
}
}
QGCButton
{
...
...
This diff is collapsed.
Click to expand it.
src/api/QGCOptions.h
View file @
f0b9e8cb
...
...
@@ -84,14 +84,12 @@ public:
virtual
bool
missionWaypointsOnly
()
const
{
return
false
;
}
///< true: Only allow waypoints and complex items in Plan
virtual
bool
multiVehicleEnabled
()
const
{
return
true
;
}
///< false: multi vehicle support is disabled
virtual
bool
guidedActionsRequireRCRSSI
()
const
{
return
false
;
}
///< true: Guided actions will be disabled is there is no RC RSSI
virtual
bool
showOfflineMapExport
()
const
{
return
true
;
}
virtual
bool
showOfflineMapImport
()
const
{
return
true
;
}
#if defined(__mobile__)
virtual
bool
showOfflineMapExport
()
const
{
return
false
;
}
virtual
bool
showOfflineMapImport
()
const
{
return
false
;
}
virtual
bool
useMobileFileDialog
()
const
{
return
true
;}
#else
virtual
bool
showOfflineMapExport
()
const
{
return
true
;
}
virtual
bool
showOfflineMapImport
()
const
{
return
true
;
}
virtual
bool
useMobileFileDialog
()
const
{
return
false
;}
#endif
...
...
This diff is collapsed.
Click to expand it.
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