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
812ee272
Commit
812ee272
authored
Oct 10, 2015
by
Don Gagne
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Cut over 100% to new Map/Mission code
- Delete all old map code
parent
782af62d
Changes
215
Hide whitespace changes
Inline
Side-by-side
Showing
215 changed files
with
26 additions
and
26223 deletions
+26
-26223
QGCApplication.pro
QGCApplication.pro
+0
-66
QGCExternalLibs.pri
QGCExternalLibs.pri
+0
-10
opmapcontrol.h
libs/opmapcontrol/opmapcontrol.h
+0
-1
opmapcontrol.pri
libs/opmapcontrol/opmapcontrol.pri
+0
-1
opmapcontrol.pro
libs/opmapcontrol/opmapcontrol.pro
+0
-4
opmapcontrol_external.pri
libs/opmapcontrol/opmapcontrol_external.pri
+0
-113
common.pri
libs/opmapcontrol/src/common.pri
+0
-10
accessmode.h
libs/opmapcontrol/src/core/accessmode.h
+0
-86
alllayersoftype.cpp
libs/opmapcontrol/src/core/alllayersoftype.cpp
+0
-87
alllayersoftype.h
libs/opmapcontrol/src/core/alllayersoftype.h
+0
-43
cache.cpp
libs/opmapcontrol/src/core/cache.cpp
+0
-196
cache.h
libs/opmapcontrol/src/core/cache.h
+0
-62
cacheitemqueue.cpp
libs/opmapcontrol/src/core/cacheitemqueue.cpp
+0
-79
cacheitemqueue.h
libs/opmapcontrol/src/core/cacheitemqueue.h
+0
-69
core.pro
libs/opmapcontrol/src/core/core.pro
+0
-40
debugheader.h
libs/opmapcontrol/src/core/debugheader.h
+0
-13
diagnostics.cpp
libs/opmapcontrol/src/core/diagnostics.cpp
+0
-31
diagnostics.h
libs/opmapcontrol/src/core/diagnostics.h
+0
-47
geodecoderstatus.h
libs/opmapcontrol/src/core/geodecoderstatus.h
+0
-131
kibertilecache.cpp
libs/opmapcontrol/src/core/kibertilecache.cpp
+0
-69
kibertilecache.h
libs/opmapcontrol/src/core/kibertilecache.h
+0
-58
languagetype.cpp
libs/opmapcontrol/src/core/languagetype.cpp
+0
-100
languagetype.h
libs/opmapcontrol/src/core/languagetype.h
+0
-133
maptype.h
libs/opmapcontrol/src/core/maptype.h
+0
-129
memorycache.cpp
libs/opmapcontrol/src/core/memorycache.cpp
+0
-60
memorycache.h
libs/opmapcontrol/src/core/memorycache.h
+0
-51
opmaps.cpp
libs/opmapcontrol/src/core/opmaps.cpp
+0
-286
opmaps.h
libs/opmapcontrol/src/core/opmaps.h
+0
-94
placemark.cpp
libs/opmapcontrol/src/core/placemark.cpp
+0
-28
placemark.h
libs/opmapcontrol/src/core/placemark.h
+0
-54
point.cpp
libs/opmapcontrol/src/core/point.cpp
+0
-65
point.h
libs/opmapcontrol/src/core/point.h
+0
-78
providerstrings.cpp
libs/opmapcontrol/src/core/providerstrings.cpp
+0
-88
providerstrings.h
libs/opmapcontrol/src/core/providerstrings.h
+0
-85
pureimage.cpp
libs/opmapcontrol/src/core/pureimage.cpp
+0
-46
pureimage.h
libs/opmapcontrol/src/core/pureimage.h
+0
-44
pureimagecache.cpp
libs/opmapcontrol/src/core/pureimagecache.cpp
+0
-358
pureimagecache.h
libs/opmapcontrol/src/core/pureimagecache.h
+0
-67
rawtile.cpp
libs/opmapcontrol/src/core/rawtile.cpp
+0
-76
rawtile.h
libs/opmapcontrol/src/core/rawtile.h
+0
-56
size.cpp
libs/opmapcontrol/src/core/size.cpp
+0
-33
size.h
libs/opmapcontrol/src/core/size.h
+0
-58
tilecachequeue.cpp
libs/opmapcontrol/src/core/tilecachequeue.cpp
+0
-102
tilecachequeue.h
libs/opmapcontrol/src/core/tilecachequeue.h
+0
-57
urlfactory.cpp
libs/opmapcontrol/src/core/urlfactory.cpp
+0
-707
urlfactory.h
libs/opmapcontrol/src/core/urlfactory.h
+0
-89
MouseWheelZoomType.cpp
libs/opmapcontrol/src/internals/MouseWheelZoomType.cpp
+0
-32
copyrightstrings.h
libs/opmapcontrol/src/internals/copyrightstrings.h
+0
-41
core.cpp
libs/opmapcontrol/src/internals/core.cpp
+0
-725
core.h
libs/opmapcontrol/src/internals/core.h
+0
-286
debugheader.h
libs/opmapcontrol/src/internals/debugheader.h
+0
-8
internals.pro
libs/opmapcontrol/src/internals/internals.pro
+0
-35
loadtask.cpp
libs/opmapcontrol/src/internals/loadtask.cpp
+0
-35
loadtask.h
libs/opmapcontrol/src/internals/loadtask.h
+0
-65
mousewheelzoomtype.h
libs/opmapcontrol/src/internals/mousewheelzoomtype.h
+0
-89
pointlatlng.cpp
libs/opmapcontrol/src/internals/pointlatlng.cpp
+0
-55
pointlatlng.h
libs/opmapcontrol/src/internals/pointlatlng.h
+0
-130
lks94projection.cpp
...pmapcontrol/src/internals/projections/lks94projection.cpp
+0
-799
lks94projection.h
.../opmapcontrol/src/internals/projections/lks94projection.h
+0
-72
mercatorprojection.cpp
...pcontrol/src/internals/projections/mercatorprojection.cpp
+0
-98
mercatorprojection.h
...mapcontrol/src/internals/projections/mercatorprojection.h
+0
-55
mercatorprojectionyandex.cpp
...ol/src/internals/projections/mercatorprojectionyandex.cpp
+0
-127
mercatorprojectionyandex.h
...trol/src/internals/projections/mercatorprojectionyandex.h
+0
-59
platecarreeprojection.cpp
...ntrol/src/internals/projections/platecarreeprojection.cpp
+0
-97
platecarreeprojection.h
...control/src/internals/projections/platecarreeprojection.h
+0
-56
platecarreeprojectionpergo.cpp
.../src/internals/projections/platecarreeprojectionpergo.cpp
+0
-96
platecarreeprojectionpergo.h
...ol/src/internals/projections/platecarreeprojectionpergo.h
+0
-56
pureprojection.cpp
libs/opmapcontrol/src/internals/pureprojection.cpp
+0
-233
pureprojection.h
libs/opmapcontrol/src/internals/pureprojection.h
+0
-112
rectangle.cpp
libs/opmapcontrol/src/internals/rectangle.cpp
+0
-79
rectangle.h
libs/opmapcontrol/src/internals/rectangle.h
+0
-158
rectlatlng.cpp
libs/opmapcontrol/src/internals/rectlatlng.cpp
+0
-48
rectlatlng.h
libs/opmapcontrol/src/internals/rectlatlng.h
+0
-264
sizelatlng.cpp
libs/opmapcontrol/src/internals/sizelatlng.cpp
+0
-60
sizelatlng.h
libs/opmapcontrol/src/internals/sizelatlng.h
+0
-136
tile.cpp
libs/opmapcontrol/src/internals/tile.cpp
+0
-60
tile.h
libs/opmapcontrol/src/internals/tile.h
+0
-67
tilematrix.cpp
libs/opmapcontrol/src/internals/tilematrix.cpp
+0
-145
tilematrix.h
libs/opmapcontrol/src/internals/tilematrix.h
+0
-54
configuration.cpp
libs/opmapcontrol/src/mapwidget/configuration.cpp
+0
-60
configuration.h
libs/opmapcontrol/src/mapwidget/configuration.h
+0
-186
gpsitem.cpp
libs/opmapcontrol/src/mapwidget/gpsitem.cpp
+0
-220
gpsitem.h
libs/opmapcontrol/src/mapwidget/gpsitem.h
+0
-227
homeitem.cpp
libs/opmapcontrol/src/mapwidget/homeitem.cpp
+0
-99
homeitem.h
libs/opmapcontrol/src/mapwidget/homeitem.h
+0
-77
EasystarBlue.png
libs/opmapcontrol/src/mapwidget/images/EasystarBlue.png
+0
-0
airplane.png
libs/opmapcontrol/src/mapwidget/images/airplane.png
+0
-0
airplane.svg
libs/opmapcontrol/src/mapwidget/images/airplane.svg
+0
-113
airplanepip.png
libs/opmapcontrol/src/mapwidget/images/airplanepip.png
+0
-0
bigMarkerGreen.png
libs/opmapcontrol/src/mapwidget/images/bigMarkerGreen.png
+0
-0
compas.svg
libs/opmapcontrol/src/mapwidget/images/compas.svg
+0
-248
dragons1.jpg
libs/opmapcontrol/src/mapwidget/images/dragons1.jpg
+0
-0
dragons2.jpeg
libs/opmapcontrol/src/mapwidget/images/dragons2.jpeg
+0
-0
home.png
libs/opmapcontrol/src/mapwidget/images/home.png
+0
-0
home.svg
libs/opmapcontrol/src/mapwidget/images/home.svg
+0
-126
home2.svg
libs/opmapcontrol/src/mapwidget/images/home2.svg
+0
-80
mapquad.png
libs/opmapcontrol/src/mapwidget/images/mapquad.png
+0
-0
marker.png
libs/opmapcontrol/src/mapwidget/images/marker.png
+0
-0
mapgraphicitem.cpp
libs/opmapcontrol/src/mapwidget/mapgraphicitem.cpp
+0
-604
mapgraphicitem.h
libs/opmapcontrol/src/mapwidget/mapgraphicitem.h
+0
-240
mapresources.qrc
libs/opmapcontrol/src/mapwidget/mapresources.qrc
+0
-21
mapripform.cpp
libs/opmapcontrol/src/mapwidget/mapripform.cpp
+0
-53
mapripform.h
libs/opmapcontrol/src/mapwidget/mapripform.h
+0
-51
mapripform.ui
libs/opmapcontrol/src/mapwidget/mapripform.ui
+0
-71
mapripper.cpp
libs/opmapcontrol/src/mapwidget/mapripper.cpp
+0
-134
mapripper.h
libs/opmapcontrol/src/mapwidget/mapripper.h
+0
-64
mapwidget.pro
libs/opmapcontrol/src/mapwidget/mapwidget.pro
+0
-50
opmapwidget.cpp
libs/opmapcontrol/src/mapwidget/opmapwidget.cpp
+0
-510
opmapwidget.h
libs/opmapcontrol/src/mapwidget/opmapwidget.h
+0
-533
trailitem.cpp
libs/opmapcontrol/src/mapwidget/trailitem.cpp
+0
-59
trailitem.h
libs/opmapcontrol/src/mapwidget/trailitem.h
+0
-63
traillineitem.cpp
libs/opmapcontrol/src/mapwidget/traillineitem.cpp
+0
-56
traillineitem.h
libs/opmapcontrol/src/mapwidget/traillineitem.h
+0
-62
uavitem.cpp
libs/opmapcontrol/src/mapwidget/uavitem.cpp
+0
-223
uavitem.h
libs/opmapcontrol/src/mapwidget/uavitem.h
+0
-230
uavmapfollowtype.h
libs/opmapcontrol/src/mapwidget/uavmapfollowtype.h
+0
-86
uavtrailtype.h
libs/opmapcontrol/src/mapwidget/uavtrailtype.h
+0
-90
waypointitem.cpp
libs/opmapcontrol/src/mapwidget/waypointitem.cpp
+0
-316
waypointitem.h
libs/opmapcontrol/src/mapwidget/waypointitem.h
+0
-220
waypointlineitem.cpp
libs/opmapcontrol/src/mapwidget/waypointlineitem.cpp
+0
-91
waypointlineitem.h
libs/opmapcontrol/src/mapwidget/waypointlineitem.h
+0
-43
src.pro
libs/opmapcontrol/src/src.pro
+0
-6
qgroundcontrol.qrc
qgroundcontrol.qrc
+0
-3
style-dark.css
resources/styles/style-dark.css
+0
-18
style-light.css
resources/styles/style-light.css
+0
-16
qmldir
src/FlightMap/qmldir
+0
-2
MissionItemTest.cc
src/MissionItemTest.cc
+1
-0
MissionItemTest.h
src/MissionItemTest.h
+2
-0
MissionManagerTest.h
src/MissionManager/MissionManagerTest.h
+2
-0
QGCApplication.cc
src/QGCApplication.cc
+0
-9
QGCApplication.h
src/QGCApplication.h
+0
-3
MultiVehicleManager.cc
src/Vehicle/MultiVehicleManager.cc
+0
-13
MultiVehicleManager.h
src/Vehicle/MultiVehicleManager.h
+0
-5
Vehicle.cc
src/Vehicle/Vehicle.cc
+1
-39
Vehicle.h
src/Vehicle/Vehicle.h
+0
-3
MAVLinkProtocol.cc
src/comm/MAVLinkProtocol.cc
+0
-1
QGCFlightGearLink.cc
src/comm/QGCFlightGearLink.cc
+1
-0
main.cc
src/main.cc
+0
-1
FileManager.h
src/uas/FileManager.h
+1
-0
UAS.cc
src/uas/UAS.cc
+1
-160
UAS.h
src/uas/UAS.h
+0
-7
UASInterface.h
src/uas/UASInterface.h
+0
-4
UASWaypointManager.cc
src/uas/UASWaypointManager.cc
+0
-1218
UASWaypointManager.h
src/uas/UASWaypointManager.h
+0
-200
MainWindow.cc
src/ui/MainWindow.cc
+11
-50
MainWindow.h
src/ui/MainWindow.h
+2
-8
MainWindow.ui
src/ui/MainWindow.ui
+0
-12
QGCWaypointListMulti.cc
src/ui/QGCWaypointListMulti.cc
+0
-82
QGCWaypointListMulti.h
src/ui/QGCWaypointListMulti.h
+0
-39
QGCWaypointListMulti.ui
src/ui/QGCWaypointListMulti.ui
+0
-27
WaypointEditableView.cc
src/ui/WaypointEditableView.cc
+0
-623
WaypointEditableView.h
src/ui/WaypointEditableView.h
+0
-141
WaypointEditableView.ui
src/ui/WaypointEditableView.ui
+0
-290
WaypointList.cc
src/ui/WaypointList.cc
+0
-702
WaypointList.h
src/ui/WaypointList.h
+0
-155
WaypointList.ui
src/ui/WaypointList.ui
+0
-388
WaypointViewOnlyView.cc
src/ui/WaypointViewOnlyView.cc
+0
-386
WaypointViewOnlyView.h
src/ui/WaypointViewOnlyView.h
+0
-39
WaypointViewOnlyView.ui
src/ui/WaypointViewOnlyView.ui
+0
-570
MAV2DIcon.cc
src/ui/map/MAV2DIcon.cc
+0
-275
MAV2DIcon.h
src/ui/map/MAV2DIcon.h
+0
-72
QGCMapTool.cc
src/ui/map/QGCMapTool.cc
+0
-33
QGCMapTool.h
src/ui/map/QGCMapTool.h
+0
-43
QGCMapTool.ui
src/ui/map/QGCMapTool.ui
+0
-60
QGCMapToolBar.cc
src/ui/map/QGCMapToolBar.cc
+0
-258
QGCMapToolBar.h
src/ui/map/QGCMapToolBar.h
+0
-49
QGCMapToolBar.ui
src/ui/map/QGCMapToolBar.ui
+0
-132
QGCMapWidget.cc
src/ui/map/QGCMapWidget.cc
+0
-902
QGCMapWidget.h
src/ui/map/QGCMapWidget.h
+0
-185
Waypoint2DIcon.cc
src/ui/map/Waypoint2DIcon.cc
+0
-318
Waypoint2DIcon.h
src/ui/map/Waypoint2DIcon.h
+0
-54
MapDisplay.qml
src/ui/mapdisplay/MapDisplay.qml
+0
-170
QGCMapDisplay.cc
src/ui/mapdisplay/QGCMapDisplay.cc
+0
-93
QGCMapDisplay.h
src/ui/mapdisplay/QGCMapDisplay.h
+0
-65
QGCMissionConditionDelay.cc
src/ui/mission/QGCMissionConditionDelay.cc
+0
-22
QGCMissionConditionDelay.h
src/ui/mission/QGCMissionConditionDelay.h
+0
-26
QGCMissionConditionDelay.ui
src/ui/mission/QGCMissionConditionDelay.ui
+0
-91
QGCMissionDoFinishSearch.cc
src/ui/mission/QGCMissionDoFinishSearch.cc
+0
-34
QGCMissionDoFinishSearch.h
src/ui/mission/QGCMissionDoFinishSearch.h
+0
-25
QGCMissionDoFinishSearch.ui
src/ui/mission/QGCMissionDoFinishSearch.ui
+0
-129
QGCMissionDoJump.cc
src/ui/mission/QGCMissionDoJump.cc
+0
-24
QGCMissionDoJump.h
src/ui/mission/QGCMissionDoJump.h
+0
-26
QGCMissionDoJump.ui
src/ui/mission/QGCMissionDoJump.ui
+0
-134
QGCMissionDoStartSearch.cc
src/ui/mission/QGCMissionDoStartSearch.cc
+0
-34
QGCMissionDoStartSearch.h
src/ui/mission/QGCMissionDoStartSearch.h
+0
-26
QGCMissionDoStartSearch.ui
src/ui/mission/QGCMissionDoStartSearch.ui
+0
-92
QGCMissionNavLand.cc
src/ui/mission/QGCMissionNavLand.cc
+0
-68
QGCMissionNavLand.h
src/ui/mission/QGCMissionNavLand.h
+0
-29
QGCMissionNavLand.ui
src/ui/mission/QGCMissionNavLand.ui
+0
-319
QGCMissionNavLoiterTime.cc
src/ui/mission/QGCMissionNavLoiterTime.cc
+0
-68
QGCMissionNavLoiterTime.h
src/ui/mission/QGCMissionNavLoiterTime.h
+0
-29
QGCMissionNavLoiterTime.ui
src/ui/mission/QGCMissionNavLoiterTime.ui
+0
-384
QGCMissionNavLoiterTurns.cc
src/ui/mission/QGCMissionNavLoiterTurns.cc
+0
-68
QGCMissionNavLoiterTurns.h
src/ui/mission/QGCMissionNavLoiterTurns.h
+0
-29
QGCMissionNavLoiterTurns.ui
src/ui/mission/QGCMissionNavLoiterTurns.ui
+0
-384
QGCMissionNavLoiterUnlim.cc
src/ui/mission/QGCMissionNavLoiterUnlim.cc
+0
-68
QGCMissionNavLoiterUnlim.h
src/ui/mission/QGCMissionNavLoiterUnlim.h
+0
-29
QGCMissionNavLoiterUnlim.ui
src/ui/mission/QGCMissionNavLoiterUnlim.ui
+0
-350
QGCMissionNavReturnToLaunch.cc
src/ui/mission/QGCMissionNavReturnToLaunch.cc
+0
-16
QGCMissionNavReturnToLaunch.h
src/ui/mission/QGCMissionNavReturnToLaunch.h
+0
-26
QGCMissionNavReturnToLaunch.ui
src/ui/mission/QGCMissionNavReturnToLaunch.ui
+0
-52
QGCMissionNavSweep.cc
src/ui/mission/QGCMissionNavSweep.cc
+0
-80
QGCMissionNavSweep.h
src/ui/mission/QGCMissionNavSweep.h
+0
-29
QGCMissionNavSweep.ui
src/ui/mission/QGCMissionNavSweep.ui
+0
-470
QGCMissionNavTakeoff.cc
src/ui/mission/QGCMissionNavTakeoff.cc
+0
-68
QGCMissionNavTakeoff.h
src/ui/mission/QGCMissionNavTakeoff.h
+0
-29
QGCMissionNavTakeoff.ui
src/ui/mission/QGCMissionNavTakeoff.ui
+0
-365
QGCMissionNavWaypoint.cc
src/ui/mission/QGCMissionNavWaypoint.cc
+0
-69
QGCMissionNavWaypoint.h
src/ui/mission/QGCMissionNavWaypoint.h
+0
-29
QGCMissionNavWaypoint.ui
src/ui/mission/QGCMissionNavWaypoint.ui
+0
-370
QGCMissionOther.cc
src/ui/mission/QGCMissionOther.cc
+0
-36
QGCMissionOther.h
src/ui/mission/QGCMissionOther.h
+0
-26
QGCMissionOther.ui
src/ui/mission/QGCMissionOther.ui
+0
-239
MainToolBar.cc
src/ui/toolbar/MainToolBar.cc
+3
-3
MainToolBar.h
src/ui/toolbar/MainToolBar.h
+1
-1
No files found.
QGCApplication.pro
View file @
812ee272
...
...
@@ -166,23 +166,8 @@ FORMS += \
src
/
ui
/
Linechart
.
ui
\
src
/
ui
/
LogReplayLinkConfigurationWidget
.
ui
\
src
/
ui
/
MainWindow
.
ui
\
src
/
ui
/
map
/
QGCMapTool
.
ui
\
src
/
ui
/
map
/
QGCMapToolBar
.
ui
\
src
/
ui
/
mavlink
/
QGCMAVLinkMessageSender
.
ui
\
src
/
ui
/
MAVLinkSettingsWidget
.
ui
\
src
/
ui
/
mission
/
QGCMissionConditionDelay
.
ui
\
src
/
ui
/
mission
/
QGCMissionDoFinishSearch
.
ui
\
src
/
ui
/
mission
/
QGCMissionDoJump
.
ui
\
src
/
ui
/
mission
/
QGCMissionDoStartSearch
.
ui
\
src
/
ui
/
mission
/
QGCMissionNavLand
.
ui
\
src
/
ui
/
mission
/
QGCMissionNavLoiterTime
.
ui
\
src
/
ui
/
mission
/
QGCMissionNavLoiterTurns
.
ui
\
src
/
ui
/
mission
/
QGCMissionNavLoiterUnlim
.
ui
\
src
/
ui
/
mission
/
QGCMissionNavReturnToLaunch
.
ui
\
src
/
ui
/
mission
/
QGCMissionNavSweep
.
ui
\
src
/
ui
/
mission
/
QGCMissionNavTakeoff
.
ui
\
src
/
ui
/
mission
/
QGCMissionNavWaypoint
.
ui
\
src
/
ui
/
mission
/
QGCMissionOther
.
ui
\
src
/
ui
/
QGCCommConfiguration
.
ui
\
src
/
ui
/
QGCDataPlot2D
.
ui
\
src
/
ui
/
QGCLinkConfiguration
.
ui
\
...
...
@@ -195,7 +180,6 @@ FORMS += \
src
/
ui
/
QGCUASFileView
.
ui
\
src
/
ui
/
QGCUASFileViewMulti
.
ui
\
src
/
ui
/
QGCUDPLinkConfiguration
.
ui
\
src
/
ui
/
QGCWaypointListMulti
.
ui
\
src
/
ui
/
SettingsDialog
.
ui
\
src
/
ui
/
uas
/
QGCUnconnectedInfoWidget
.
ui
\
src
/
ui
/
uas
/
UASMessageView
.
ui
\
...
...
@@ -203,9 +187,6 @@ FORMS += \
src
/
ui
/
uas
/
UASQuickViewItemSelect
.
ui
\
src
/
ui
/
UASInfo
.
ui
\
src
/
ui
/
UASRawStatusView
.
ui
\
src
/
ui
/
WaypointEditableView
.
ui
\
src
/
ui
/
WaypointList
.
ui
\
src
/
ui
/
WaypointViewOnlyView
.
ui
\
!
iOSBuild
{
FORMS
+=
\
...
...
@@ -272,7 +253,6 @@ HEADERS += \
src
/
uas
/
UAS
.
h
\
src
/
uas
/
UASInterface
.
h
\
src
/
uas
/
UASMessageHandler
.
h
\
src
/
uas
/
UASWaypointManager
.
h
\
src
/
ui
/
linechart
/
ChartPlot
.
h
\
src
/
ui
/
linechart
/
IncrementalPlot
.
h
\
src
/
ui
/
linechart
/
LinechartPlot
.
h
\
...
...
@@ -283,27 +263,9 @@ HEADERS += \
src
/
ui
/
LogReplayLinkConfigurationWidget
.
h
\
src
/
ui
/
MainWindow
.
h
\
src
/
ui
/
map
/
MAV2DIcon
.
h
\
src
/
ui
/
map
/
QGCMapTool
.
h
\
src
/
ui
/
map
/
QGCMapToolBar
.
h
\
src
/
ui
/
map
/
QGCMapWidget
.
h
\
src
/
ui
/
map
/
Waypoint2DIcon
.
h
\
src
/
ui
/
mapdisplay
/
QGCMapDisplay
.
h
\
src
/
ui
/
mavlink
/
QGCMAVLinkMessageSender
.
h
\
src
/
ui
/
MAVLinkDecoder
.
h
\
src
/
ui
/
MAVLinkSettingsWidget
.
h
\
src
/
ui
/
mission
/
QGCMissionConditionDelay
.
h
\
src
/
ui
/
mission
/
QGCMissionDoFinishSearch
.
h
\
src
/
ui
/
mission
/
QGCMissionDoJump
.
h
\
src
/
ui
/
mission
/
QGCMissionDoStartSearch
.
h
\
src
/
ui
/
mission
/
QGCMissionNavLand
.
h
\
src
/
ui
/
mission
/
QGCMissionNavLoiterTime
.
h
\
src
/
ui
/
mission
/
QGCMissionNavLoiterTurns
.
h
\
src
/
ui
/
mission
/
QGCMissionNavLoiterUnlim
.
h
\
src
/
ui
/
mission
/
QGCMissionNavReturnToLaunch
.
h
\
src
/
ui
/
mission
/
QGCMissionNavSweep
.
h
\
src
/
ui
/
mission
/
QGCMissionNavTakeoff
.
h
\
src
/
ui
/
mission
/
QGCMissionNavWaypoint
.
h
\
src
/
ui
/
mission
/
QGCMissionOther
.
h
\
src
/
ui
/
QGCCommConfiguration
.
h
\
src
/
ui
/
QGCDataPlot2D
.
h
\
src
/
ui
/
QGCLinkConfiguration
.
h
\
...
...
@@ -317,7 +279,6 @@ HEADERS += \
src
/
ui
/
QGCUASFileView
.
h
\
src
/
ui
/
QGCUASFileViewMulti
.
h
\
src
/
ui
/
QGCUDPLinkConfiguration
.
h
\
src
/
ui
/
QGCWaypointListMulti
.
h
\
src
/
ui
/
SettingsDialog
.
h
\
src
/
ui
/
toolbar
/
MainToolBar
.
h
\
src
/
ui
/
uas
/
QGCUnconnectedInfoWidget
.
h
\
...
...
@@ -329,9 +290,6 @@ HEADERS += \
src
/
ui
/
uas
/
UASQuickViewItemSelect
.
h
\
src
/
ui
/
uas
/
UASQuickViewTextItem
.
h
\
src
/
ui
/
UASRawStatusView
.
h
\
src
/
ui
/
WaypointEditableView
.
h
\
src
/
ui
/
WaypointList
.
h
\
src
/
ui
/
WaypointViewOnlyView
.
h
\
src
/
ViewWidgets
/
CustomCommandWidget
.
h
\
src
/
ViewWidgets
/
CustomCommandWidgetController
.
h
\
src
/
ViewWidgets
/
ViewWidgetController
.
h
\
...
...
@@ -401,7 +359,6 @@ SOURCES += \
src
/
uas
/
FileManager
.
cc
\
src
/
uas
/
UAS
.
cc
\
src
/
uas
/
UASMessageHandler
.
cc
\
src
/
uas
/
UASWaypointManager
.
cc
\
src
/
ui
/
linechart
/
ChartPlot
.
cc
\
src
/
ui
/
linechart
/
IncrementalPlot
.
cc
\
src
/
ui
/
linechart
/
LinechartPlot
.
cc
\
...
...
@@ -411,28 +368,9 @@ SOURCES += \
src
/
ui
/
linechart
/
ScrollZoomer
.
cc
\
src
/
ui
/
LogReplayLinkConfigurationWidget
.
cc
\
src
/
ui
/
MainWindow
.
cc
\
src
/
ui
/
map
/
MAV2DIcon
.
cc
\
src
/
ui
/
map
/
QGCMapTool
.
cc
\
src
/
ui
/
map
/
QGCMapToolBar
.
cc
\
src
/
ui
/
map
/
QGCMapWidget
.
cc
\
src
/
ui
/
map
/
Waypoint2DIcon
.
cc
\
src
/
ui
/
mapdisplay
/
QGCMapDisplay
.
cc
\
src
/
ui
/
mavlink
/
QGCMAVLinkMessageSender
.
cc
\
src
/
ui
/
MAVLinkDecoder
.
cc
\
src
/
ui
/
MAVLinkSettingsWidget
.
cc
\
src
/
ui
/
mission
/
QGCMissionConditionDelay
.
cc
\
src
/
ui
/
mission
/
QGCMissionDoFinishSearch
.
cc
\
src
/
ui
/
mission
/
QGCMissionDoJump
.
cc
\
src
/
ui
/
mission
/
QGCMissionDoStartSearch
.
cc
\
src
/
ui
/
mission
/
QGCMissionNavLand
.
cc
\
src
/
ui
/
mission
/
QGCMissionNavLoiterTime
.
cc
\
src
/
ui
/
mission
/
QGCMissionNavLoiterTurns
.
cc
\
src
/
ui
/
mission
/
QGCMissionNavLoiterUnlim
.
cc
\
src
/
ui
/
mission
/
QGCMissionNavReturnToLaunch
.
cc
\
src
/
ui
/
mission
/
QGCMissionNavSweep
.
cc
\
src
/
ui
/
mission
/
QGCMissionNavTakeoff
.
cc
\
src
/
ui
/
mission
/
QGCMissionNavWaypoint
.
cc
\
src
/
ui
/
mission
/
QGCMissionOther
.
cc
\
src
/
ui
/
QGCCommConfiguration
.
cc
\
src
/
ui
/
QGCDataPlot2D
.
cc
\
src
/
ui
/
QGCLinkConfiguration
.
cc
\
...
...
@@ -446,7 +384,6 @@ SOURCES += \
src
/
ui
/
QGCUASFileView
.
cc
\
src
/
ui
/
QGCUASFileViewMulti
.
cc
\
src
/
ui
/
QGCUDPLinkConfiguration
.
cc
\
src
/
ui
/
QGCWaypointListMulti
.
cc
\
src
/
ui
/
SettingsDialog
.
cc
\
src
/
ui
/
toolbar
/
MainToolBar
.
cc
\
src
/
ui
/
uas
/
QGCUnconnectedInfoWidget
.
cc
\
...
...
@@ -458,9 +395,6 @@ SOURCES += \
src
/
ui
/
uas
/
UASQuickViewItemSelect
.
cc
\
src
/
ui
/
uas
/
UASQuickViewTextItem
.
cc
\
src
/
ui
/
UASRawStatusView
.
cpp
\
src
/
ui
/
WaypointEditableView
.
cc
\
src
/
ui
/
WaypointList
.
cc
\
src
/
ui
/
WaypointViewOnlyView
.
cc
\
src
/
ViewWidgets
/
CustomCommandWidget
.
cc
\
src
/
ViewWidgets
/
CustomCommandWidgetController
.
cc
\
src
/
ViewWidgets
/
ViewWidgetController
.
cc
\
...
...
QGCExternalLibs.pri
View file @
812ee272
...
...
@@ -61,16 +61,6 @@ exists($$MAVLINKPATH/common) {
INCLUDEPATH += libs/eigen
DEFINES += NOMINMAX
#
# [REQUIRED] OPMapControl library from OpenPilot. Provides 2D mapping functionality.
#
include(libs/opmapcontrol/opmapcontrol_external.pri)
INCLUDEPATH += \
libs/utils \
libs \
libs/opmapcontrol
#
# [REQUIRED] QWT plotting library dependency. Provides plotting capabilities.
#
...
...
libs/opmapcontrol/opmapcontrol.h
deleted
100644 → 0
View file @
782af62d
#include "src/mapwidget/opmapwidget.h"
libs/opmapcontrol/opmapcontrol.pri
deleted
100644 → 0
View file @
782af62d
LIBS *= -l$$qtLibraryTarget(opmapwidget)
libs/opmapcontrol/opmapcontrol.pro
deleted
100644 → 0
View file @
782af62d
TEMPLATE
=
subdirs
SUBDIRS
=
src
\
libs/opmapcontrol/opmapcontrol_external.pri
deleted
100644 → 0
View file @
782af62d
######################################################################
# Automatically generated by qmake (2.01a) Sa. Mrz 19 17:12:54 2011
######################################################################
# HACK! BIG TIME!
DEFINES += EXTERNAL_USE
DEPENDPATH += $$PWD/src/core $$PWD/src/internals $$PWD/src/mapwidget $$PWD/src/internals/projections
INCLUDEPATH += $$PWD/src/core $$PWD/src/internals $$PWD/src/internals/projections $$PWD/src/mapwidget
# Input
HEADERS += $$PWD/opmapcontrol.h \
$$PWD/src/core/accessmode.h \
$$PWD/src/core/alllayersoftype.h \
$$PWD/src/core/cache.h \
$$PWD/src/core/cacheitemqueue.h \
$$PWD/src/core/debugheader.h \
$$PWD/src/core/diagnostics.h \
$$PWD/src/core/geodecoderstatus.h \
$$PWD/src/core/kibertilecache.h \
$$PWD/src/core/languagetype.h \
$$PWD/src/core/maptype.h \
$$PWD/src/core/memorycache.h \
$$PWD/src/core/opmaps.h \
$$PWD/src/core/placemark.h \
$$PWD/src/core/point.h \
$$PWD/src/core/providerstrings.h \
$$PWD/src/core/pureimage.h \
$$PWD/src/core/pureimagecache.h \
$$PWD/src/core/rawtile.h \
$$PWD/src/core/size.h \
$$PWD/src/core/tilecachequeue.h \
$$PWD/src/core/urlfactory.h \
$$PWD/src/internals/copyrightstrings.h \
$$PWD/src/internals/core.h \
$$PWD/src/internals/debugheader.h \
$$PWD/src/internals/loadtask.h \
$$PWD/src/internals/mousewheelzoomtype.h \
$$PWD/src/internals/pointlatlng.h \
$$PWD/src/internals/pureprojection.h \
$$PWD/src/internals/rectangle.h \
$$PWD/src/internals/rectlatlng.h \
$$PWD/src/internals/sizelatlng.h \
$$PWD/src/internals/tile.h \
$$PWD/src/internals/tilematrix.h \
$$PWD/src/mapwidget/configuration.h \
$$PWD/src/mapwidget/gpsitem.h \
$$PWD/src/mapwidget/homeitem.h \
$$PWD/src/mapwidget/mapgraphicitem.h \
$$PWD/src/mapwidget/mapripform.h \
$$PWD/src/mapwidget/mapripper.h \
$$PWD/src/mapwidget/opmapwidget.h \
$$PWD/src/mapwidget/trailitem.h \
$$PWD/src/mapwidget/traillineitem.h \
$$PWD/src/mapwidget/uavitem.h \
$$PWD/src/mapwidget/uavmapfollowtype.h \
$$PWD/src/mapwidget/uavtrailtype.h \
$$PWD/src/mapwidget/waypointitem.h \
$$PWD/src/internals/projections/lks94projection.h \
$$PWD/src/internals/projections/mercatorprojection.h \
$$PWD/src/internals/projections/mercatorprojectionyandex.h \
$$PWD/src/internals/projections/platecarreeprojection.h \
$$PWD/src/internals/projections/platecarreeprojectionpergo.h \
$$PWD/src/mapwidget/waypointlineitem.h
FORMS += $$PWD/src/mapwidget/mapripform.ui
SOURCES += $$PWD/src/core/alllayersoftype.cpp \
$$PWD/src/core/cache.cpp \
$$PWD/src/core/cacheitemqueue.cpp \
$$PWD/src/core/diagnostics.cpp \
$$PWD/src/core/kibertilecache.cpp \
$$PWD/src/core/languagetype.cpp \
$$PWD/src/core/memorycache.cpp \
$$PWD/src/core/opmaps.cpp \
$$PWD/src/core/placemark.cpp \
$$PWD/src/core/point.cpp \
$$PWD/src/core/providerstrings.cpp \
$$PWD/src/core/pureimage.cpp \
$$PWD/src/core/pureimagecache.cpp \
$$PWD/src/core/rawtile.cpp \
$$PWD/src/core/size.cpp \
$$PWD/src/core/tilecachequeue.cpp \
$$PWD/src/core/urlfactory.cpp \
$$PWD/src/internals/core.cpp \
$$PWD/src/internals/loadtask.cpp \
$$PWD/src/internals/MouseWheelZoomType.cpp \
$$PWD/src/internals/pointlatlng.cpp \
$$PWD/src/internals/pureprojection.cpp \
$$PWD/src/internals/rectangle.cpp \
$$PWD/src/internals/rectlatlng.cpp \
$$PWD/src/internals/sizelatlng.cpp \
$$PWD/src/internals/tile.cpp \
$$PWD/src/internals/tilematrix.cpp \
$$PWD/src/mapwidget/configuration.cpp \
$$PWD/src/mapwidget/gpsitem.cpp \
$$PWD/src/mapwidget/homeitem.cpp \
$$PWD/src/mapwidget/mapgraphicitem.cpp \
$$PWD/src/mapwidget/mapripform.cpp \
$$PWD/src/mapwidget/mapripper.cpp \
$$PWD/src/mapwidget/opmapwidget.cpp \
$$PWD/src/mapwidget/trailitem.cpp \
$$PWD/src/mapwidget/traillineitem.cpp \
$$PWD/src/mapwidget/uavitem.cpp \
$$PWD/src/mapwidget/waypointitem.cpp \
$$PWD/src/internals/projections/lks94projection.cpp \
$$PWD/src/internals/projections/mercatorprojection.cpp \
$$PWD/src/internals/projections/mercatorprojectionyandex.cpp \
$$PWD/src/internals/projections/platecarreeprojection.cpp \
$$PWD/src/internals/projections/platecarreeprojectionpergo.cpp \
$$PWD/src/mapwidget/waypointlineitem.cpp
RESOURCES += $$PWD/src/mapwidget/mapresources.qrc
libs/opmapcontrol/src/common.pri
deleted
100644 → 0
View file @
782af62d
DESTDIR = ../build
QT += network
QT += sql
CONFIG += staticlib
TEMPLATE = lib
UI_DIR = uics
MOC_DIR = mocs
OBJECTS_DIR = objs
INCLUDEPATH +=../../../../libs/
libs/opmapcontrol/src/core/accessmode.h
deleted
100644 → 0
View file @
782af62d
/**
******************************************************************************
*
* @file accessmode.h
* @author The OpenPilot Team, http://www.openpilot.org Copyright (C) 2010.
* @brief
* @see The GNU Public License (GPL) Version 3
* @defgroup OPMapWidget
* @{
*
*****************************************************************************/
/*
* This program is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
* the Free Software Foundation; either version 3 of the License, or
* (at your option) any later version.
*
* This program is distributed in the hope that it will be useful, but
* WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY
* or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
* for more details.
*
* You should have received a copy of the GNU General Public License along
* with this program; if not, write to the Free Software Foundation, Inc.,
* 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
*/
#ifndef ACCESSMODE_H
#define ACCESSMODE_H
#include "debugheader.h"
#include <QObject>
#include <QMetaObject>
#include <QMetaEnum>
#include <QStringList>
namespace
core
{
class
AccessMode
:
public
QObject
{
Q_OBJECT
Q_ENUMS
(
Types
)
public:
enum
Types
{
/// <summary>
/// access only server
/// </summary>
ServerOnly
,
/// <summary>
/// access first server and caches localy
/// </summary>
ServerAndCache
,
/// <summary>
/// access only cache
/// </summary>
CacheOnly
};
static
QString
StrByType
(
Types
const
&
value
)
{
QMetaObject
metaObject
=
AccessMode
().
staticMetaObject
;
QMetaEnum
metaEnum
=
metaObject
.
enumerator
(
metaObject
.
indexOfEnumerator
(
"Types"
));
QString
s
=
metaEnum
.
valueToKey
(
value
);
return
s
;
}
static
Types
TypeByStr
(
QString
const
&
value
)
{
QMetaObject
metaObject
=
AccessMode
().
staticMetaObject
;
QMetaEnum
metaEnum
=
metaObject
.
enumerator
(
metaObject
.
indexOfEnumerator
(
"Types"
));
Types
s
=
(
Types
)
metaEnum
.
keyToValue
(
value
.
toLatin1
());
return
s
;
}
static
QStringList
TypesList
()
{
QStringList
ret
;
QMetaObject
metaObject
=
AccessMode
().
staticMetaObject
;
QMetaEnum
metaEnum
=
metaObject
.
enumerator
(
metaObject
.
indexOfEnumerator
(
"Types"
));
for
(
int
x
=
0
;
x
<
metaEnum
.
keyCount
();
++
x
)
{
ret
.
append
(
metaEnum
.
key
(
x
));
}
return
ret
;
}
};
}
#endif // ACCESSMODE_H
libs/opmapcontrol/src/core/alllayersoftype.cpp
deleted
100644 → 0
View file @
782af62d
/**
******************************************************************************
*
* @file alllayersoftype.cpp
* @author The OpenPilot Team, http://www.openpilot.org Copyright (C) 2010.
* @brief
* @see The GNU Public License (GPL) Version 3
* @defgroup OPMapWidget
* @{
*
*****************************************************************************/
/*
* This program is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
* the Free Software Foundation; either version 3 of the License, or
* (at your option) any later version.
*
* This program is distributed in the hope that it will be useful, but
* WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY
* or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
* for more details.
*
* You should have received a copy of the GNU General Public License along
* with this program; if not, write to the Free Software Foundation, Inc.,
* 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
*/
#include "alllayersoftype.h"
namespace
core
{
AllLayersOfType
::
AllLayersOfType
()
{
}
QVector
<
MapType
::
Types
>
AllLayersOfType
::
GetAllLayersOfType
(
const
MapType
::
Types
&
type
)
{
QVector
<
MapType
::
Types
>
types
;
{
switch
(
type
)
{
case
MapType
:
:
GoogleHybrid
:
{
types
.
append
(
MapType
::
GoogleSatellite
);
types
.
append
(
MapType
::
GoogleLabels
);
}
break
;
case
MapType
:
:
GoogleHybridChina
:
{
types
.
append
(
MapType
::
GoogleSatelliteChina
);
types
.
append
(
MapType
::
GoogleLabelsChina
);
}
break
;
case
MapType
:
:
GoogleHybridKorea
:
{
types
.
append
(
MapType
::
GoogleSatelliteKorea
);
types
.
append
(
MapType
::
GoogleLabelsKorea
);
}
break
;
case
MapType
:
:
YahooHybrid
:
{
types
.
append
(
MapType
::
YahooSatellite
);
types
.
append
(
MapType
::
YahooLabels
);
}
break
;
case
MapType
:
:
ArcGIS_MapsLT_Map_Hybrid
:
{
types
.
append
(
MapType
::
ArcGIS_MapsLT_OrtoFoto
);
types
.
append
(
MapType
::
ArcGIS_MapsLT_Map_Labels
);
}
break
;
default:
{
types
.
append
(
type
);
}
break
;
}
}
return
types
;
}
}
libs/opmapcontrol/src/core/alllayersoftype.h
deleted
100644 → 0
View file @
782af62d
/**
******************************************************************************
*
* @file alllayersoftype.h
* @author The OpenPilot Team, http://www.openpilot.org Copyright (C) 2010.
* @brief
* @see The GNU Public License (GPL) Version 3
* @defgroup OPMapWidget
* @{
*
*****************************************************************************/
/*
* This program is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
* the Free Software Foundation; either version 3 of the License, or
* (at your option) any later version.
*
* This program is distributed in the hope that it will be useful, but
* WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY
* or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
* for more details.
*
* You should have received a copy of the GNU General Public License along
* with this program; if not, write to the Free Software Foundation, Inc.,
* 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
*/
#ifndef ALLLAYERSOFTYPE_H
#define ALLLAYERSOFTYPE_H
#include "maptype.h"
#include <QList>
#include <QVector>
namespace
core
{
class
AllLayersOfType
{
public:
AllLayersOfType
();
QVector
<
MapType
::
Types
>
GetAllLayersOfType
(
const
MapType
::
Types
&
type
);
};
}
#endif // ALLLAYERSOFTYPE_H
libs/opmapcontrol/src/core/cache.cpp
deleted
100644 → 0
View file @
782af62d
/**
******************************************************************************
*
* @file cache.cpp
* @author The OpenPilot Team, http://www.openpilot.org Copyright (C) 2010.
* @brief
* @see The GNU Public License (GPL) Version 3
* @defgroup OPMapWidget
* @{
*
*****************************************************************************/
/*
* This program is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
* the Free Software Foundation; either version 3 of the License, or
* (at your option) any later version.
*
* This program is distributed in the hope that it will be useful, but
* WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY
* or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
* for more details.
*
* You should have received a copy of the GNU General Public License along
* with this program; if not, write to the Free Software Foundation, Inc.,
* 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
*/
#include "cache.h"
#include <QSettings>
namespace
core
{
Cache
*
Cache
::
m_pInstance
=
0
;
Cache
*
Cache
::
Instance
()
{
if
(
!
m_pInstance
)
m_pInstance
=
new
Cache
;
return
m_pInstance
;
}
void
Cache
::
setCacheLocation
(
const
QString
&
value
)
{
cache
=
value
;
routeCache
=
cache
+
"RouteCache/"
;
geoCache
=
cache
+
"GeocoderCache/"
;
placemarkCache
=
cache
+
"PlacemarkCache/"
;
ImageCache
.
setGtileCache
(
value
);
}
QString
Cache
::
CacheLocation
()
{
return
cache
;
}
Cache
::
Cache
()
{
if
(
cache
.
isNull
()
|
cache
.
isEmpty
())
{
cache
=
QDir
::
homePath
()
+
"/mapscache/"
;
setCacheLocation
(
cache
);
}
}
QString
Cache
::
GetGeocoderFromCache
(
const
QString
&
urlEnd
)
{
#ifdef DEBUG_GetGeocoderFromCache
qDebug
()
<<
"Entered GetGeocoderFromCache"
;
#endif
QString
ret
=
QString
::
null
;
QString
filename
=
geoCache
+
QString
(
urlEnd
)
+
".geo"
;
#ifdef DEBUG_GetGeocoderFromCache
qDebug
()
<<
"GetGeocoderFromCache: Does file exist?:"
<<
filename
;
#endif
QFileInfo
File
(
filename
);
if
(
File
.
exists
())
{
#ifdef DEBUG_GetGeocoderFromCache
qDebug
()
<<
"GetGeocoderFromCache:File exists!!"
;
#endif
QFile
file
(
filename
);
if
(
file
.
open
(
QIODevice
::
ReadOnly
))
{
QTextStream
stream
(
&
file
);
stream
.
setCodec
(
"UTF-8"
);
stream
>>
ret
;
}
}
#ifdef DEBUG_GetGeocoderFromCache
qDebug
()
<<
"GetGeocoderFromCache:Returning:"
<<
ret
;
#endif
return
ret
;
}
void
Cache
::
CacheGeocoder
(
const
QString
&
urlEnd
,
const
QString
&
content
)
{
QString
ret
=
QString
::
null
;
QString
filename
=
geoCache
+
QString
(
urlEnd
)
+
".geo"
;
#ifdef DEBUG_CACHE
qDebug
()
<<
"CacheGeocoder: Filename:"
<<
filename
;
#endif //DEBUG_CACHE
QFileInfo
File
(
filename
);;
QDir
dir
=
File
.
absoluteDir
();
QString
path
=
dir
.
absolutePath
();
#ifdef DEBUG_CACHE
qDebug
()
<<
"CacheGeocoder: Path:"
<<
path
;
#endif //DEBUG_CACHE
if
(
!
dir
.
exists
())
{
#ifdef DEBUG_CACHE
qDebug
()
<<
"CacheGeocoder: Cache path doesn't exist, try to create"
;
#endif //DEBUG_CACHE
if
(
!
dir
.
mkpath
(
path
))
{
#ifdef DEBUG_CACHE
qDebug
()
<<
"GetGeocoderFromCache: Could not create path"
;