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
14db071c
Commit
14db071c
authored
Aug 23, 2010
by
lm
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Added menu for multiple map sources
parent
e0085289
Changes
2
Expand all
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
220 additions
and
59 deletions
+220
-59
MapWidget.cc
src/ui/MapWidget.cc
+200
-51
MapWidget.h
src/ui/MapWidget.h
+20
-8
No files found.
src/ui/MapWidget.cc
View file @
14db071c
This diff is collapsed.
Click to expand it.
src/ui/MapWidget.h
View file @
14db071c
...
...
@@ -38,6 +38,8 @@ This file is part of the QGROUNDCONTROL project
#include "qmapcontrol.h"
#include "UASInterface.h"
class
QMenu
;
namespace
Ui
{
class
MapWidget
;
}
...
...
@@ -61,20 +63,29 @@ protected:
void
keyPressEvent
(
QKeyEvent
*
event
);
void
resizeEvent
(
QResizeEvent
*
event
);
QAction
*
osmAction
;
QAction
*
yahooActionMap
;
QAction
*
yahooActionSatellite
;
QAction
*
yahooActionOverlay
;
QAction
*
googleActionMap
;
QAction
*
googleSatAction
;
QPushButton
*
followgps
;
QPushButton
*
createPath
;
QLabel
*
gpsposition
;
MapControl
*
mc
;
QMenu
*
mapMenu
;
QPushButton
*
mapButton
;
MapControl
*
mc
;
///< QMapControl widget
MapAdapter
*
mapadapter
;
///< Adapter to load the map data
qmapcontrol
::
Layer
*
l
;
///< Current map layer (background)
qmapcontrol
::
Layer
*
overlay
;
///< Street overlay (foreground)
qmapcontrol
::
GeometryLayer
*
geomLayer
;
///< Layer for waypoints
int
zoomLevel
;
int
detailZoom
;
///< Steps zoomed in further than qMapControl allows
int
detailZoom
;
///< Steps zoomed in further than qMapControl allows
static
const
int
scrollStep
=
40
;
///< Scroll n pixels per keypress
static
const
int
maxZoom
=
50
;
TileMapAdapter
*
osmAdapter
;
GoogleSatMapAdapter
*
gSatAdapter
;
Layer
*
osmLayer
;
Layer
*
geomLayer
;
static
const
int
maxZoom
=
50
;
///< Maximum zoom level
//Layer* gSatLayer;
...
...
@@ -87,6 +98,7 @@ protected:
void
captureMapClick
(
const
QMouseEvent
*
event
,
const
QPointF
coordinate
);
void
createPathButtonClicked
();
void
captureGeometryClick
(
Geometry
*
,
QPoint
);
void
mapproviderSelected
(
QAction
*
action
);
private:
Ui
::
MapWidget
*
m_ui
;
QList
<
Point
*>
wps
;
...
...
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