From 56e4c8099945d7e941a71d8ea979935d200f4be0 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Martin=20T=C5=AFma?= Date: Sun, 26 Nov 2017 18:54:03 +0100 Subject: [PATCH] Project structure refactoring --- gpxsee.pro | 347 ++++++++++++------------ src/{ => GUI}/app.cpp | 4 +- src/{ => GUI}/app.h | 0 src/{ => GUI}/axisitem.cpp | 2 +- src/{ => GUI}/axisitem.h | 2 +- src/{ => GUI}/cadencegraph.cpp | 2 +- src/{ => GUI}/cadencegraph.h | 0 src/{ => GUI}/cadencegraphitem.cpp | 0 src/{ => GUI}/cadencegraphitem.h | 0 src/{ => GUI}/colorbox.cpp | 0 src/{ => GUI}/colorbox.h | 0 src/{ => GUI}/cpuarch.h | 0 src/{ => GUI}/elevationgraph.cpp | 2 +- src/{ => GUI}/elevationgraph.h | 0 src/{ => GUI}/elevationgraphitem.cpp | 0 src/{ => GUI}/elevationgraphitem.h | 0 src/{ => GUI}/exportdialog.cpp | 0 src/{ => GUI}/exportdialog.h | 0 src/{ => GUI}/filebrowser.cpp | 0 src/{ => GUI}/filebrowser.h | 0 src/{ => GUI}/fileselectwidget.cpp | 0 src/{ => GUI}/fileselectwidget.h | 0 src/{ => GUI}/format.cpp | 2 +- src/{ => GUI}/format.h | 0 src/{ => GUI}/graphitem.cpp | 0 src/{ => GUI}/graphitem.h | 2 +- src/{ => GUI}/graphtab.h | 0 src/{ => GUI}/graphview.cpp | 2 +- src/{ => GUI}/graphview.h | 2 +- src/{ => GUI}/griditem.cpp | 0 src/{ => GUI}/griditem.h | 0 src/{ => GUI}/gui.cpp | 12 +- src/{ => GUI}/gui.h | 5 +- src/{ => GUI}/heartrategraph.cpp | 2 +- src/{ => GUI}/heartrategraph.h | 0 src/{ => GUI}/heartrategraphitem.cpp | 0 src/{ => GUI}/heartrategraphitem.h | 0 src/{ => GUI}/icons.h | 0 src/{ => GUI}/infoitem.cpp | 0 src/{ => GUI}/infoitem.h | 0 src/{ => GUI}/keys.h | 0 src/{ => GUI}/margins.cpp | 0 src/{ => GUI}/margins.h | 0 src/{ => GUI}/markeritem.cpp | 0 src/{ => GUI}/markeritem.h | 0 src/{misc.cpp => GUI/nicenum.cpp} | 24 +- src/GUI/nicenum.h | 6 + src/{ => GUI}/oddspinbox.cpp | 0 src/{ => GUI}/oddspinbox.h | 0 src/{ => GUI}/opengl.h | 0 src/{ => GUI}/optionsdialog.cpp | 0 src/{ => GUI}/optionsdialog.h | 0 src/{ => GUI}/palette.cpp | 0 src/{ => GUI}/palette.h | 0 src/{ => GUI}/pathitem.cpp | 4 +- src/{ => GUI}/pathitem.h | 3 +- src/{ => GUI}/pathview.cpp | 40 ++- src/{ => GUI}/pathview.h | 8 +- src/{ => GUI}/percentslider.cpp | 0 src/{ => GUI}/percentslider.h | 0 src/{ => GUI}/powergraph.cpp | 2 +- src/{ => GUI}/powergraph.h | 0 src/{ => GUI}/powergraphitem.cpp | 0 src/{ => GUI}/powergraphitem.h | 0 src/{ => GUI}/routeitem.cpp | 4 +- src/{ => GUI}/routeitem.h | 2 +- src/{ => GUI}/scaleitem.cpp | 2 +- src/{ => GUI}/scaleitem.h | 0 src/{ => GUI}/searchpointer.h | 0 src/{ => GUI}/settings.h | 0 src/{ => GUI}/sliderinfoitem.cpp | 0 src/{ => GUI}/sliderinfoitem.h | 0 src/{ => GUI}/slideritem.cpp | 0 src/{ => GUI}/slideritem.h | 0 src/{ => GUI}/speedgraph.cpp | 2 +- src/{ => GUI}/speedgraph.h | 0 src/{ => GUI}/speedgraphitem.cpp | 0 src/{ => GUI}/speedgraphitem.h | 0 src/{ => GUI}/stylecombobox.cpp | 0 src/{ => GUI}/stylecombobox.h | 0 src/{ => GUI}/temperaturegraph.cpp | 2 +- src/{ => GUI}/temperaturegraph.h | 0 src/{ => GUI}/temperaturegraphitem.cpp | 0 src/{ => GUI}/temperaturegraphitem.h | 0 src/{ => GUI}/timetype.h | 0 src/{ => GUI}/tooltip.cpp | 0 src/{ => GUI}/tooltip.h | 0 src/{ => GUI}/trackinfo.cpp | 0 src/{ => GUI}/trackinfo.h | 0 src/{ => GUI}/trackitem.cpp | 2 +- src/{ => GUI}/trackitem.h | 2 +- src/{ => GUI}/units.h | 0 src/{ => GUI}/waypointitem.cpp | 0 src/{ => GUI}/waypointitem.h | 4 +- src/{ => common}/coordinates.cpp | 6 +- src/{ => common}/coordinates.h | 8 +- src/{ => common}/range.cpp | 0 src/{ => common}/range.h | 0 src/{ => common}/rectc.cpp | 0 src/{ => common}/rectc.h | 0 src/{assert.h => common/staticassert.h} | 0 src/{ => common}/wgs84.h | 0 src/{ => data}/csvparser.cpp | 0 src/{ => data}/csvparser.h | 0 src/{ => data}/data.cpp | 0 src/{ => data}/data.h | 0 src/{ => data}/fitparser.cpp | 2 +- src/{ => data}/fitparser.h | 0 src/{ => data}/gpxparser.cpp | 0 src/{ => data}/gpxparser.h | 0 src/{ => data}/graph.h | 8 +- src/{ => data}/igcparser.cpp | 2 +- src/{ => data}/igcparser.h | 0 src/{ => data}/kmlparser.cpp | 0 src/{ => data}/kmlparser.h | 0 src/{ => data}/nmeaparser.cpp | 2 +- src/{ => data}/nmeaparser.h | 0 src/{ => data}/parser.h | 0 src/{ => data}/path.cpp | 0 src/{ => data}/path.h | 4 +- src/{ => data}/poi.cpp | 72 ++--- src/{ => data}/poi.h | 9 +- src/{ => data}/route.cpp | 0 src/{ => data}/route.h | 0 src/{ => data}/routedata.h | 0 src/{ => data}/rtree.h | 8 +- src/data/str2int.cpp | 16 ++ src/data/str2int.h | 6 + src/{ => data}/tcxparser.cpp | 0 src/{ => data}/tcxparser.h | 0 src/{ => data}/track.cpp | 0 src/{ => data}/track.h | 0 src/{ => data}/trackdata.h | 0 src/{ => data}/trackpoint.h | 13 +- src/{ => data}/waypoint.h | 9 +- src/graph.cpp | 8 - src/main.cpp | 2 +- src/{ => map}/albersequal.cpp | 1 - src/{ => map}/albersequal.h | 0 src/{ => map}/atlas.cpp | 2 +- src/{ => map}/atlas.h | 2 +- src/{ => map}/datum.cpp | 3 +- src/{ => map}/datum.h | 2 +- src/{ => map}/downloader.cpp | 0 src/{ => map}/downloader.h | 0 src/{ => map}/ellipsoid.cpp | 0 src/{ => map}/ellipsoid.h | 0 src/{ => map}/emptymap.cpp | 9 +- src/{ => map}/emptymap.h | 2 +- src/{ => map}/lambertazimuthal.cpp | 1 - src/{ => map}/lambertazimuthal.h | 0 src/{ => map}/lambertconic.cpp | 1 - src/{ => map}/lambertconic.h | 0 src/{ => map}/latlon.h | 0 src/{ => map}/map.h | 0 src/{ => map}/maplist.cpp | 2 +- src/{ => map}/maplist.h | 0 src/{ => map}/matrix.cpp | 0 src/{ => map}/matrix.h | 0 src/{ => map}/mercator.cpp | 1 - src/{ => map}/mercator.h | 0 src/map/misc.h | 7 + src/{ => map}/offlinemap.cpp | 100 +------ src/{ => map}/offlinemap.h | 22 +- src/{ => map}/onlinemap.cpp | 9 +- src/{ => map}/onlinemap.h | 2 +- src/{ => map}/ozf.cpp | 0 src/{ => map}/ozf.h | 0 src/map/projection.cpp | 89 ++++++ src/map/projection.h | 36 +++ src/{ => map}/tar.cpp | 0 src/{ => map}/tar.h | 0 src/{ => map}/tile.h | 0 src/{ => map}/transversemercator.cpp | 1 - src/{ => map}/transversemercator.h | 0 src/{ => map}/utm.cpp | 7 +- src/{ => map}/utm.h | 3 +- src/misc.h | 13 - src/projection.h | 15 - src/rd.h | 13 - src/trackpoint.cpp | 10 - src/waypoint.cpp | 8 - 182 files changed, 500 insertions(+), 529 deletions(-) rename src/{ => GUI}/app.cpp (95%) rename src/{ => GUI}/app.h (100%) rename src/{ => GUI}/axisitem.cpp (99%) rename src/{ => GUI}/axisitem.h (96%) rename src/{ => GUI}/cadencegraph.cpp (98%) rename src/{ => GUI}/cadencegraph.h (100%) rename src/{ => GUI}/cadencegraphitem.cpp (100%) rename src/{ => GUI}/cadencegraphitem.h (100%) rename src/{ => GUI}/colorbox.cpp (100%) rename src/{ => GUI}/colorbox.h (100%) rename src/{ => GUI}/cpuarch.h (100%) rename src/{ => GUI}/elevationgraph.cpp (99%) rename src/{ => GUI}/elevationgraph.h (100%) rename src/{ => GUI}/elevationgraphitem.cpp (100%) rename src/{ => GUI}/elevationgraphitem.h (100%) rename src/{ => GUI}/exportdialog.cpp (100%) rename src/{ => GUI}/exportdialog.h (100%) rename src/{ => GUI}/filebrowser.cpp (100%) rename src/{ => GUI}/filebrowser.h (100%) rename src/{ => GUI}/fileselectwidget.cpp (100%) rename src/{ => GUI}/fileselectwidget.h (100%) rename src/{ => GUI}/format.cpp (97%) rename src/{ => GUI}/format.h (100%) rename src/{ => GUI}/graphitem.cpp (100%) rename src/{ => GUI}/graphitem.h (98%) rename src/{ => GUI}/graphtab.h (100%) rename src/{ => GUI}/graphview.cpp (99%) rename src/{ => GUI}/graphview.h (99%) rename src/{ => GUI}/griditem.cpp (100%) rename src/{ => GUI}/griditem.h (100%) rename src/{ => GUI}/gui.cpp (99%) rename src/{ => GUI}/gui.h (99%) rename src/{ => GUI}/heartrategraph.cpp (98%) rename src/{ => GUI}/heartrategraph.h (100%) rename src/{ => GUI}/heartrategraphitem.cpp (100%) rename src/{ => GUI}/heartrategraphitem.h (100%) rename src/{ => GUI}/icons.h (100%) rename src/{ => GUI}/infoitem.cpp (100%) rename src/{ => GUI}/infoitem.h (100%) rename src/{ => GUI}/keys.h (100%) rename src/{ => GUI}/margins.cpp (100%) rename src/{ => GUI}/margins.h (100%) rename src/{ => GUI}/markeritem.cpp (100%) rename src/{ => GUI}/markeritem.h (100%) rename src/{misc.cpp => GUI/nicenum.cpp} (51%) create mode 100644 src/GUI/nicenum.h rename src/{ => GUI}/oddspinbox.cpp (100%) rename src/{ => GUI}/oddspinbox.h (100%) rename src/{ => GUI}/opengl.h (100%) rename src/{ => GUI}/optionsdialog.cpp (100%) rename src/{ => GUI}/optionsdialog.h (100%) rename src/{ => GUI}/palette.cpp (100%) rename src/{ => GUI}/palette.h (100%) rename src/{ => GUI}/pathitem.cpp (98%) rename src/{ => GUI}/pathitem.h (98%) rename src/{ => GUI}/pathview.cpp (96%) rename src/{ => GUI}/pathview.h (96%) rename src/{ => GUI}/percentslider.cpp (100%) rename src/{ => GUI}/percentslider.h (100%) rename src/{ => GUI}/powergraph.cpp (98%) rename src/{ => GUI}/powergraph.h (100%) rename src/{ => GUI}/powergraphitem.cpp (100%) rename src/{ => GUI}/powergraphitem.h (100%) rename src/{ => GUI}/routeitem.cpp (97%) rename src/{ => GUI}/routeitem.h (94%) rename src/{ => GUI}/scaleitem.cpp (99%) rename src/{ => GUI}/scaleitem.h (100%) rename src/{ => GUI}/searchpointer.h (100%) rename src/{ => GUI}/settings.h (100%) rename src/{ => GUI}/sliderinfoitem.cpp (100%) rename src/{ => GUI}/sliderinfoitem.h (100%) rename src/{ => GUI}/slideritem.cpp (100%) rename src/{ => GUI}/slideritem.h (100%) rename src/{ => GUI}/speedgraph.cpp (98%) rename src/{ => GUI}/speedgraph.h (100%) rename src/{ => GUI}/speedgraphitem.cpp (100%) rename src/{ => GUI}/speedgraphitem.h (100%) rename src/{ => GUI}/stylecombobox.cpp (100%) rename src/{ => GUI}/stylecombobox.h (100%) rename src/{ => GUI}/temperaturegraph.cpp (98%) rename src/{ => GUI}/temperaturegraph.h (100%) rename src/{ => GUI}/temperaturegraphitem.cpp (100%) rename src/{ => GUI}/temperaturegraphitem.h (100%) rename src/{ => GUI}/timetype.h (100%) rename src/{ => GUI}/tooltip.cpp (100%) rename src/{ => GUI}/tooltip.h (100%) rename src/{ => GUI}/trackinfo.cpp (100%) rename src/{ => GUI}/trackinfo.h (100%) rename src/{ => GUI}/trackitem.cpp (97%) rename src/{ => GUI}/trackitem.h (94%) rename src/{ => GUI}/units.h (100%) rename src/{ => GUI}/waypointitem.cpp (100%) rename src/{ => GUI}/waypointitem.h (95%) rename src/{ => common}/coordinates.cpp (88%) rename src/{ => common}/coordinates.h (84%) rename src/{ => common}/range.cpp (100%) rename src/{ => common}/range.h (100%) rename src/{ => common}/rectc.cpp (100%) rename src/{ => common}/rectc.h (100%) rename src/{assert.h => common/staticassert.h} (100%) rename src/{ => common}/wgs84.h (100%) rename src/{ => data}/csvparser.cpp (100%) rename src/{ => data}/csvparser.h (100%) rename src/{ => data}/data.cpp (100%) rename src/{ => data}/data.h (100%) rename src/{ => data}/fitparser.cpp (99%) rename src/{ => data}/fitparser.h (100%) rename src/{ => data}/gpxparser.cpp (100%) rename src/{ => data}/gpxparser.h (100%) rename src/{ => data}/graph.h (77%) rename src/{ => data}/igcparser.cpp (99%) rename src/{ => data}/igcparser.h (100%) rename src/{ => data}/kmlparser.cpp (100%) rename src/{ => data}/kmlparser.h (100%) rename src/{ => data}/nmeaparser.cpp (99%) rename src/{ => data}/nmeaparser.h (100%) rename src/{ => data}/parser.h (100%) rename src/{ => data}/path.cpp (100%) rename src/{ => data}/path.h (91%) rename src/{ => data}/poi.cpp (60%) rename src/{ => data}/poi.h (82%) rename src/{ => data}/route.cpp (100%) rename src/{ => data}/route.h (100%) rename src/{ => data}/routedata.h (100%) rename src/{ => data}/rtree.h (99%) create mode 100644 src/data/str2int.cpp create mode 100644 src/data/str2int.h rename src/{ => data}/tcxparser.cpp (100%) rename src/{ => data}/tcxparser.h (100%) rename src/{ => data}/track.cpp (100%) rename src/{ => data}/track.h (100%) rename src/{ => data}/trackdata.h (100%) rename src/{ => data}/trackpoint.h (84%) rename src/{ => data}/waypoint.h (84%) delete mode 100644 src/graph.cpp rename src/{ => map}/albersequal.cpp (99%) rename src/{ => map}/albersequal.h (100%) rename src/{ => map}/atlas.cpp (99%) rename src/{ => map}/atlas.h (98%) rename src/{ => map}/datum.cpp (98%) rename src/{ => map}/datum.h (96%) rename src/{ => map}/downloader.cpp (100%) rename src/{ => map}/downloader.h (100%) rename src/{ => map}/ellipsoid.cpp (100%) rename src/{ => map}/ellipsoid.h (100%) rename src/{ => map}/emptymap.cpp (95%) rename src/{ => map}/emptymap.h (96%) rename src/{ => map}/lambertazimuthal.cpp (99%) rename src/{ => map}/lambertazimuthal.h (100%) rename src/{ => map}/lambertconic.cpp (99%) rename src/{ => map}/lambertconic.h (100%) rename src/{ => map}/latlon.h (100%) rename src/{ => map}/map.h (100%) rename src/{ => map}/maplist.cpp (99%) rename src/{ => map}/maplist.h (100%) rename src/{ => map}/matrix.cpp (100%) rename src/{ => map}/matrix.h (100%) rename src/{ => map}/mercator.cpp (95%) rename src/{ => map}/mercator.h (100%) create mode 100644 src/map/misc.h rename src/{ => map}/offlinemap.cpp (81%) rename src/{ => map}/offlinemap.h (84%) rename src/{ => map}/onlinemap.cpp (98%) rename src/{ => map}/onlinemap.h (97%) rename src/{ => map}/ozf.cpp (100%) rename src/{ => map}/ozf.h (100%) create mode 100644 src/map/projection.cpp create mode 100644 src/map/projection.h rename src/{ => map}/tar.cpp (100%) rename src/{ => map}/tar.h (100%) rename src/{ => map}/tile.h (100%) rename src/{ => map}/transversemercator.cpp (99%) rename src/{ => map}/transversemercator.h (100%) rename src/{ => map}/utm.cpp (72%) rename src/{ => map}/utm.h (87%) delete mode 100644 src/misc.h delete mode 100644 src/projection.h delete mode 100644 src/rd.h delete mode 100644 src/trackpoint.cpp delete mode 100644 src/waypoint.cpp diff --git a/gpxsee.pro b/gpxsee.pro index 66bed997..6053360f 100644 --- a/gpxsee.pro +++ b/gpxsee.pro @@ -7,181 +7,182 @@ greaterThan(QT_MAJOR_VERSION, 4): QT += widgets greaterThan(QT_MAJOR_VERSION, 4): QT += printsupport lessThan(QT_VERSION, 5.4): QT += opengl macx: QT += opengl +INCLUDEPATH += ./src HEADERS += src/config.h \ - src/icons.h \ - src/gui.h \ - src/poi.h \ - src/rtree.h \ - src/axisitem.h \ - src/keys.h \ - src/slideritem.h \ - src/markeritem.h \ - src/infoitem.h \ - src/elevationgraph.h \ - src/speedgraph.h \ - src/sliderinfoitem.h \ - src/filebrowser.h \ - src/map.h \ - src/onlinemap.h \ - src/downloader.h \ - src/units.h \ - src/scaleitem.h \ - src/waypoint.h \ - src/track.h \ - src/graphview.h \ - src/trackpoint.h \ - src/waypointitem.h \ - src/palette.h \ - src/heartrategraph.h \ - src/range.h \ - src/cpuarch.h \ - src/settings.h \ - src/app.h \ - src/trackinfo.h \ - src/exportdialog.h \ - src/fileselectwidget.h \ - src/margins.h \ - src/temperaturegraph.h \ - src/graphtab.h \ - src/misc.h \ - src/trackitem.h \ - src/tooltip.h \ - src/route.h \ - src/routeitem.h \ - src/graphitem.h \ - src/graph.h \ - src/pathitem.h \ - src/pathview.h \ - src/griditem.h \ - src/data.h \ - src/gpxparser.h \ - src/tcxparser.h \ - src/parser.h \ - src/csvparser.h \ - src/coordinates.h \ - src/tile.h \ - src/rd.h \ - src/wgs84.h \ - src/kmlparser.h \ - src/trackdata.h \ - src/routedata.h \ - src/fitparser.h \ - src/format.h \ - src/path.h \ - src/assert.h \ - src/cadencegraph.h \ - src/powergraph.h \ - src/igcparser.h \ - src/nmeaparser.h \ - src/optionsdialog.h \ - src/colorbox.h \ - src/stylecombobox.h \ - src/opengl.h \ - src/timetype.h \ - src/emptymap.h \ - src/offlinemap.h \ - src/matrix.h \ - src/tar.h \ - src/atlas.h \ - src/projection.h \ - src/mercator.h \ - src/transversemercator.h \ - src/latlon.h \ - src/utm.h \ - src/lambertconic.h \ - src/ellipsoid.h \ - src/ozf.h \ - src/datum.h \ - src/maplist.h \ - src/albersequal.h \ - src/oddspinbox.h \ - src/rectc.h \ - src/searchpointer.h \ - src/percentslider.h \ - src/elevationgraphitem.h \ - src/speedgraphitem.h \ - src/heartrategraphitem.h \ - src/temperaturegraphitem.h \ - src/cadencegraphitem.h \ - src/powergraphitem.h \ - src/lambertazimuthal.h + src/common/staticassert.h \ + src/common/coordinates.h \ + src/common/range.h \ + src/common/rectc.h \ + src/common/wgs84.h \ + src/GUI/app.h \ + src/GUI/icons.h \ + src/GUI/gui.h \ + src/GUI/axisitem.h \ + src/GUI/keys.h \ + src/GUI/slideritem.h \ + src/GUI/markeritem.h \ + src/GUI/infoitem.h \ + src/GUI/elevationgraph.h \ + src/GUI/speedgraph.h \ + src/GUI/sliderinfoitem.h \ + src/GUI/filebrowser.h \ + src/GUI/units.h \ + src/GUI/scaleitem.h \ + src/GUI/graphview.h \ + src/GUI/waypointitem.h \ + src/GUI/palette.h \ + src/GUI/heartrategraph.h \ + src/GUI/trackinfo.h \ + src/GUI/exportdialog.h \ + src/GUI/fileselectwidget.h \ + src/GUI/margins.h \ + src/GUI/temperaturegraph.h \ + src/GUI/graphtab.h \ + src/GUI/trackitem.h \ + src/GUI/tooltip.h \ + src/GUI/routeitem.h \ + src/GUI/graphitem.h \ + src/GUI/pathitem.h \ + src/GUI/pathview.h \ + src/GUI/griditem.h \ + src/GUI/format.h \ + src/GUI/cadencegraph.h \ + src/GUI/powergraph.h \ + src/GUI/optionsdialog.h \ + src/GUI/colorbox.h \ + src/GUI/stylecombobox.h \ + src/GUI/opengl.h \ + src/GUI/timetype.h \ + src/GUI/percentslider.h \ + src/GUI/elevationgraphitem.h \ + src/GUI/speedgraphitem.h \ + src/GUI/heartrategraphitem.h \ + src/GUI/temperaturegraphitem.h \ + src/GUI/cadencegraphitem.h \ + src/GUI/powergraphitem.h \ + src/GUI/oddspinbox.h \ + src/GUI/settings.h \ + src/GUI/nicenum.h \ + src/GUI/cpuarch.h \ + src/GUI/searchpointer.h \ + src/map/projection.h \ + src/map/ellipsoid.h \ + src/map/datum.h \ + src/map/mercator.h \ + src/map/transversemercator.h \ + src/map/latlon.h \ + src/map/utm.h \ + src/map/lambertconic.h \ + src/map/lambertazimuthal.h \ + src/map/albersequal.h \ + src/map/map.h \ + src/map/maplist.h \ + src/map/onlinemap.h \ + src/map/downloader.h \ + src/map/tile.h \ + src/map/emptymap.h \ + src/map/offlinemap.h \ + src/map/tar.h \ + src/map/ozf.h \ + src/map/atlas.h \ + src/map/matrix.h \ + src/map/misc.h \ + src/data/graph.h \ + src/data/poi.h \ + src/data/waypoint.h \ + src/data/track.h \ + src/data/route.h \ + src/data/trackpoint.h \ + src/data/data.h \ + src/data/parser.h \ + src/data/trackdata.h \ + src/data/routedata.h \ + src/data/path.h \ + src/data/rtree.h \ + src/data/gpxparser.h \ + src/data/tcxparser.h \ + src/data/csvparser.h \ + src/data/kmlparser.h \ + src/data/fitparser.h \ + src/data/igcparser.h \ + src/data/nmeaparser.h \ + src/data/str2int.h SOURCES += src/main.cpp \ - src/gui.cpp \ - src/poi.cpp \ - src/axisitem.cpp \ - src/slideritem.cpp \ - src/markeritem.cpp \ - src/infoitem.cpp \ - src/elevationgraph.cpp \ - src/speedgraph.cpp \ - src/sliderinfoitem.cpp \ - src/filebrowser.cpp \ - src/onlinemap.cpp \ - src/downloader.cpp \ - src/scaleitem.cpp \ - src/track.cpp \ - src/graphview.cpp \ - src/waypointitem.cpp \ - src/palette.cpp \ - src/heartrategraph.cpp \ - src/range.cpp \ - src/app.cpp \ - src/trackinfo.cpp \ - src/exportdialog.cpp \ - src/fileselectwidget.cpp \ - src/temperaturegraph.cpp \ - src/trackpoint.cpp \ - src/misc.cpp \ - src/waypoint.cpp \ - src/trackitem.cpp \ - src/tooltip.cpp \ - src/route.cpp \ - src/routeitem.cpp \ - src/graphitem.cpp \ - src/pathitem.cpp \ - src/pathview.cpp \ - src/griditem.cpp \ - src/data.cpp \ - src/gpxparser.cpp \ - src/tcxparser.cpp \ - src/csvparser.cpp \ - src/coordinates.cpp \ - src/kmlparser.cpp \ - src/fitparser.cpp \ - src/format.cpp \ - src/graph.cpp \ - src/cadencegraph.cpp \ - src/powergraph.cpp \ - src/igcparser.cpp \ - src/path.cpp \ - src/nmeaparser.cpp \ - src/optionsdialog.cpp \ - src/colorbox.cpp \ - src/stylecombobox.cpp \ - src/emptymap.cpp \ - src/offlinemap.cpp \ - src/matrix.cpp \ - src/tar.cpp \ - src/atlas.cpp \ - src/mercator.cpp \ - src/transversemercator.cpp \ - src/utm.cpp \ - src/lambertconic.cpp \ - src/ellipsoid.cpp \ - src/ozf.cpp \ - src/datum.cpp \ - src/maplist.cpp \ - src/albersequal.cpp \ - src/oddspinbox.cpp \ - src/rectc.cpp \ - src/percentslider.cpp \ - src/elevationgraphitem.cpp \ - src/speedgraphitem.cpp \ - src/heartrategraphitem.cpp \ - src/temperaturegraphitem.cpp \ - src/cadencegraphitem.cpp \ - src/powergraphitem.cpp \ - src/lambertazimuthal.cpp + src/common/coordinates.cpp \ + src/common/rectc.cpp \ + src/common/range.cpp \ + src/GUI/app.cpp \ + src/GUI/gui.cpp \ + src/GUI/axisitem.cpp \ + src/GUI/slideritem.cpp \ + src/GUI/markeritem.cpp \ + src/GUI/infoitem.cpp \ + src/GUI/elevationgraph.cpp \ + src/GUI/speedgraph.cpp \ + src/GUI/sliderinfoitem.cpp \ + src/GUI/filebrowser.cpp \ + src/GUI/scaleitem.cpp \ + src/GUI/graphview.cpp \ + src/GUI/waypointitem.cpp \ + src/GUI/palette.cpp \ + src/GUI/heartrategraph.cpp \ + src/GUI/trackinfo.cpp \ + src/GUI/exportdialog.cpp \ + src/GUI/fileselectwidget.cpp \ + src/GUI/temperaturegraph.cpp \ + src/GUI/trackitem.cpp \ + src/GUI/tooltip.cpp \ + src/GUI/routeitem.cpp \ + src/GUI/graphitem.cpp \ + src/GUI/pathitem.cpp \ + src/GUI/pathview.cpp \ + src/GUI/griditem.cpp \ + src/GUI/format.cpp \ + src/GUI/cadencegraph.cpp \ + src/GUI/powergraph.cpp \ + src/GUI/optionsdialog.cpp \ + src/GUI/colorbox.cpp \ + src/GUI/stylecombobox.cpp \ + src/GUI/oddspinbox.cpp \ + src/GUI/percentslider.cpp \ + src/GUI/elevationgraphitem.cpp \ + src/GUI/speedgraphitem.cpp \ + src/GUI/heartrategraphitem.cpp \ + src/GUI/temperaturegraphitem.cpp \ + src/GUI/cadencegraphitem.cpp \ + src/GUI/powergraphitem.cpp \ + src/GUI/nicenum.cpp \ + src/map/maplist.cpp \ + src/map/onlinemap.cpp \ + src/map/downloader.cpp \ + src/map/emptymap.cpp \ + src/map/offlinemap.cpp \ + src/map/tar.cpp \ + src/map/atlas.cpp \ + src/map/ozf.cpp \ + src/map/matrix.cpp \ + src/map/ellipsoid.cpp \ + src/map/datum.cpp \ + src/map/projection.cpp \ + src/map/mercator.cpp \ + src/map/transversemercator.cpp \ + src/map/utm.cpp \ + src/map/lambertconic.cpp \ + src/map/albersequal.cpp \ + src/map/lambertazimuthal.cpp \ + src/data/data.cpp \ + src/data/poi.cpp \ + src/data/track.cpp \ + src/data/route.cpp \ + src/data/path.cpp \ + src/data/gpxparser.cpp \ + src/data/tcxparser.cpp \ + src/data/csvparser.cpp \ + src/data/kmlparser.cpp \ + src/data/fitparser.cpp \ + src/data/igcparser.cpp \ + src/data/nmeaparser.cpp \ + src/data/str2int.cpp RESOURCES += gpxsee.qrc TRANSLATIONS = lang/gpxsee_cs.ts \ lang/gpxsee_sv.ts \ diff --git a/src/app.cpp b/src/GUI/app.cpp similarity index 95% rename from src/app.cpp rename to src/GUI/app.cpp index 398896e3..38850442 100644 --- a/src/app.cpp +++ b/src/GUI/app.cpp @@ -4,10 +4,10 @@ #include #include #include +#include "map/onlinemap.h" +#include "map/downloader.h" #include "opengl.h" #include "gui.h" -#include "onlinemap.h" -#include "downloader.h" #include "app.h" diff --git a/src/app.h b/src/GUI/app.h similarity index 100% rename from src/app.h rename to src/GUI/app.h diff --git a/src/axisitem.cpp b/src/GUI/axisitem.cpp similarity index 99% rename from src/axisitem.cpp rename to src/GUI/axisitem.cpp index 4eb66a3c..5e927623 100644 --- a/src/axisitem.cpp +++ b/src/GUI/axisitem.cpp @@ -1,7 +1,7 @@ #include #include #include "config.h" -#include "misc.h" +#include "nicenum.h" #include "axisitem.h" diff --git a/src/axisitem.h b/src/GUI/axisitem.h similarity index 96% rename from src/axisitem.h rename to src/GUI/axisitem.h index f5a653a4..e302cb0e 100644 --- a/src/axisitem.h +++ b/src/GUI/axisitem.h @@ -2,7 +2,7 @@ #define AXISITEM_H #include -#include "range.h" +#include "common/range.h" class AxisItem : public QGraphicsItem { diff --git a/src/cadencegraph.cpp b/src/GUI/cadencegraph.cpp similarity index 98% rename from src/cadencegraph.cpp rename to src/GUI/cadencegraph.cpp index 7bd32a43..feee3770 100644 --- a/src/cadencegraph.cpp +++ b/src/GUI/cadencegraph.cpp @@ -1,4 +1,4 @@ -#include "data.h" +#include "data/data.h" #include "cadencegraphitem.h" #include "cadencegraph.h" diff --git a/src/cadencegraph.h b/src/GUI/cadencegraph.h similarity index 100% rename from src/cadencegraph.h rename to src/GUI/cadencegraph.h diff --git a/src/cadencegraphitem.cpp b/src/GUI/cadencegraphitem.cpp similarity index 100% rename from src/cadencegraphitem.cpp rename to src/GUI/cadencegraphitem.cpp diff --git a/src/cadencegraphitem.h b/src/GUI/cadencegraphitem.h similarity index 100% rename from src/cadencegraphitem.h rename to src/GUI/cadencegraphitem.h diff --git a/src/colorbox.cpp b/src/GUI/colorbox.cpp similarity index 100% rename from src/colorbox.cpp rename to src/GUI/colorbox.cpp diff --git a/src/colorbox.h b/src/GUI/colorbox.h similarity index 100% rename from src/colorbox.h rename to src/GUI/colorbox.h diff --git a/src/cpuarch.h b/src/GUI/cpuarch.h similarity index 100% rename from src/cpuarch.h rename to src/GUI/cpuarch.h diff --git a/src/elevationgraph.cpp b/src/GUI/elevationgraph.cpp similarity index 99% rename from src/elevationgraph.cpp rename to src/GUI/elevationgraph.cpp index c4c39bd1..4611a872 100644 --- a/src/elevationgraph.cpp +++ b/src/GUI/elevationgraph.cpp @@ -1,6 +1,6 @@ #include +#include "data/data.h" #include "config.h" -#include "data.h" #include "tooltip.h" #include "elevationgraphitem.h" #include "elevationgraph.h" diff --git a/src/elevationgraph.h b/src/GUI/elevationgraph.h similarity index 100% rename from src/elevationgraph.h rename to src/GUI/elevationgraph.h diff --git a/src/elevationgraphitem.cpp b/src/GUI/elevationgraphitem.cpp similarity index 100% rename from src/elevationgraphitem.cpp rename to src/GUI/elevationgraphitem.cpp diff --git a/src/elevationgraphitem.h b/src/GUI/elevationgraphitem.h similarity index 100% rename from src/elevationgraphitem.h rename to src/GUI/elevationgraphitem.h diff --git a/src/exportdialog.cpp b/src/GUI/exportdialog.cpp similarity index 100% rename from src/exportdialog.cpp rename to src/GUI/exportdialog.cpp diff --git a/src/exportdialog.h b/src/GUI/exportdialog.h similarity index 100% rename from src/exportdialog.h rename to src/GUI/exportdialog.h diff --git a/src/filebrowser.cpp b/src/GUI/filebrowser.cpp similarity index 100% rename from src/filebrowser.cpp rename to src/GUI/filebrowser.cpp diff --git a/src/filebrowser.h b/src/GUI/filebrowser.h similarity index 100% rename from src/filebrowser.h rename to src/GUI/filebrowser.h diff --git a/src/fileselectwidget.cpp b/src/GUI/fileselectwidget.cpp similarity index 100% rename from src/fileselectwidget.cpp rename to src/GUI/fileselectwidget.cpp diff --git a/src/fileselectwidget.h b/src/GUI/fileselectwidget.h similarity index 100% rename from src/fileselectwidget.h rename to src/GUI/fileselectwidget.h diff --git a/src/format.cpp b/src/GUI/format.cpp similarity index 97% rename from src/format.cpp rename to src/GUI/format.cpp index ef97ce09..fe2fc63e 100644 --- a/src/format.cpp +++ b/src/GUI/format.cpp @@ -1,5 +1,5 @@ #include -#include "coordinates.h" +#include "common/coordinates.h" #include "format.h" QString Format::timeSpan(qreal time, bool full) diff --git a/src/format.h b/src/GUI/format.h similarity index 100% rename from src/format.h rename to src/GUI/format.h diff --git a/src/graphitem.cpp b/src/GUI/graphitem.cpp similarity index 100% rename from src/graphitem.cpp rename to src/GUI/graphitem.cpp diff --git a/src/graphitem.h b/src/GUI/graphitem.h similarity index 98% rename from src/graphitem.h rename to src/GUI/graphitem.h index 106865c6..edfbdefb 100644 --- a/src/graphitem.h +++ b/src/GUI/graphitem.h @@ -3,8 +3,8 @@ #include #include +#include "data/graph.h" #include "units.h" -#include "graph.h" class GraphItem : public QGraphicsObject { diff --git a/src/graphtab.h b/src/GUI/graphtab.h similarity index 100% rename from src/graphtab.h rename to src/GUI/graphtab.h diff --git a/src/graphview.cpp b/src/GUI/graphview.cpp similarity index 99% rename from src/graphview.cpp rename to src/GUI/graphview.cpp index 97be3a41..7a53cf70 100644 --- a/src/graphview.cpp +++ b/src/GUI/graphview.cpp @@ -3,6 +3,7 @@ #include #include #include +#include "data/graph.h" #include "opengl.h" #include "config.h" #include "axisitem.h" @@ -10,7 +11,6 @@ #include "sliderinfoitem.h" #include "infoitem.h" #include "griditem.h" -#include "graph.h" #include "graphitem.h" #include "pathitem.h" #include "format.h" diff --git a/src/graphview.h b/src/GUI/graphview.h similarity index 99% rename from src/graphview.h rename to src/GUI/graphview.h index 6cd03b25..381cfb47 100644 --- a/src/graphview.h +++ b/src/GUI/graphview.h @@ -4,7 +4,7 @@ #include #include #include -#include "graph.h" +#include "data/graph.h" #include "palette.h" #include "units.h" diff --git a/src/griditem.cpp b/src/GUI/griditem.cpp similarity index 100% rename from src/griditem.cpp rename to src/GUI/griditem.cpp diff --git a/src/griditem.h b/src/GUI/griditem.h similarity index 100% rename from src/griditem.h rename to src/GUI/griditem.h diff --git a/src/gui.cpp b/src/GUI/gui.cpp similarity index 99% rename from src/gui.cpp rename to src/GUI/gui.cpp index 30fd21c4..d59dc946 100644 --- a/src/gui.cpp +++ b/src/GUI/gui.cpp @@ -22,16 +22,16 @@ #include #include #include +#include "data/data.h" +#include "map/ellipsoid.h" +#include "map/datum.h" +#include "map/map.h" +#include "map/maplist.h" +#include "map/emptymap.h" #include "config.h" #include "icons.h" #include "keys.h" #include "settings.h" -#include "data.h" -#include "ellipsoid.h" -#include "datum.h" -#include "map.h" -#include "maplist.h" -#include "emptymap.h" #include "elevationgraph.h" #include "speedgraph.h" #include "heartrategraph.h" diff --git a/src/gui.h b/src/GUI/gui.h similarity index 99% rename from src/gui.h rename to src/GUI/gui.h index 050cd06b..e7cc0913 100644 --- a/src/gui.h +++ b/src/GUI/gui.h @@ -6,14 +6,13 @@ #include #include #include +#include "data/graph.h" +#include "data/poi.h" #include "units.h" #include "timetype.h" -#include "graph.h" -#include "poi.h" #include "exportdialog.h" #include "optionsdialog.h" - class QMenu; class QToolBar; class QTabWidget; diff --git a/src/heartrategraph.cpp b/src/GUI/heartrategraph.cpp similarity index 98% rename from src/heartrategraph.cpp rename to src/GUI/heartrategraph.cpp index 9e7ac1bf..61bb4a14 100644 --- a/src/heartrategraph.cpp +++ b/src/GUI/heartrategraph.cpp @@ -1,4 +1,4 @@ -#include "data.h" +#include "data/data.h" #include "heartrategraphitem.h" #include "heartrategraph.h" diff --git a/src/heartrategraph.h b/src/GUI/heartrategraph.h similarity index 100% rename from src/heartrategraph.h rename to src/GUI/heartrategraph.h diff --git a/src/heartrategraphitem.cpp b/src/GUI/heartrategraphitem.cpp similarity index 100% rename from src/heartrategraphitem.cpp rename to src/GUI/heartrategraphitem.cpp diff --git a/src/heartrategraphitem.h b/src/GUI/heartrategraphitem.h similarity index 100% rename from src/heartrategraphitem.h rename to src/GUI/heartrategraphitem.h diff --git a/src/icons.h b/src/GUI/icons.h similarity index 100% rename from src/icons.h rename to src/GUI/icons.h diff --git a/src/infoitem.cpp b/src/GUI/infoitem.cpp similarity index 100% rename from src/infoitem.cpp rename to src/GUI/infoitem.cpp diff --git a/src/infoitem.h b/src/GUI/infoitem.h similarity index 100% rename from src/infoitem.h rename to src/GUI/infoitem.h diff --git a/src/keys.h b/src/GUI/keys.h similarity index 100% rename from src/keys.h rename to src/GUI/keys.h diff --git a/src/margins.cpp b/src/GUI/margins.cpp similarity index 100% rename from src/margins.cpp rename to src/GUI/margins.cpp diff --git a/src/margins.h b/src/GUI/margins.h similarity index 100% rename from src/margins.h rename to src/GUI/margins.h diff --git a/src/markeritem.cpp b/src/GUI/markeritem.cpp similarity index 100% rename from src/markeritem.cpp rename to src/GUI/markeritem.cpp diff --git a/src/markeritem.h b/src/GUI/markeritem.h similarity index 100% rename from src/markeritem.h rename to src/GUI/markeritem.h diff --git a/src/misc.cpp b/src/GUI/nicenum.cpp similarity index 51% rename from src/misc.cpp rename to src/GUI/nicenum.cpp index 4135c7bb..f81d30b3 100644 --- a/src/misc.cpp +++ b/src/GUI/nicenum.cpp @@ -1,7 +1,5 @@ #include -#include -#include "misc.h" - +#include "nicenum.h" double niceNum(double x, int round) { @@ -34,23 +32,3 @@ double niceNum(double x, int round) return nf * pow(10.0, expv); } - -int str2int(const char *str, int len) -{ - int res = 0; - - for (const char *sp = str; sp < str + len; sp++) { - if (::isdigit(*sp)) - res = res * 10 + *sp - '0'; - else - return -1; - } - - return res; -} - -QRectF scaled(const QRectF &rect, qreal factor) -{ - return QRectF(QPointF(rect.left() * factor, rect.top() * factor), - QSizeF(rect.width() * factor, rect.height() * factor)); -} diff --git a/src/GUI/nicenum.h b/src/GUI/nicenum.h new file mode 100644 index 00000000..b0d3aaaa --- /dev/null +++ b/src/GUI/nicenum.h @@ -0,0 +1,6 @@ +#ifndef MISC_H +#define MISC_H + +double niceNum(double x, int round); + +#endif // MISC_H diff --git a/src/oddspinbox.cpp b/src/GUI/oddspinbox.cpp similarity index 100% rename from src/oddspinbox.cpp rename to src/GUI/oddspinbox.cpp diff --git a/src/oddspinbox.h b/src/GUI/oddspinbox.h similarity index 100% rename from src/oddspinbox.h rename to src/GUI/oddspinbox.h diff --git a/src/opengl.h b/src/GUI/opengl.h similarity index 100% rename from src/opengl.h rename to src/GUI/opengl.h diff --git a/src/optionsdialog.cpp b/src/GUI/optionsdialog.cpp similarity index 100% rename from src/optionsdialog.cpp rename to src/GUI/optionsdialog.cpp diff --git a/src/optionsdialog.h b/src/GUI/optionsdialog.h similarity index 100% rename from src/optionsdialog.h rename to src/GUI/optionsdialog.h diff --git a/src/palette.cpp b/src/GUI/palette.cpp similarity index 100% rename from src/palette.cpp rename to src/GUI/palette.cpp diff --git a/src/palette.h b/src/GUI/palette.h similarity index 100% rename from src/palette.h rename to src/GUI/palette.h diff --git a/src/pathitem.cpp b/src/GUI/pathitem.cpp similarity index 98% rename from src/pathitem.cpp rename to src/GUI/pathitem.cpp index b15d333b..50e40113 100644 --- a/src/pathitem.cpp +++ b/src/GUI/pathitem.cpp @@ -2,9 +2,9 @@ #include #include #include +#include "map/map.h" #include "tooltip.h" -#include "map.h" -#include "misc.h" +#include "nicenum.h" #include "pathitem.h" diff --git a/src/pathitem.h b/src/GUI/pathitem.h similarity index 98% rename from src/pathitem.h rename to src/GUI/pathitem.h index d4d4e4cc..95b0cf0d 100644 --- a/src/pathitem.h +++ b/src/GUI/pathitem.h @@ -3,9 +3,8 @@ #include #include +#include "data/path.h" #include "markeritem.h" -#include "path.h" - class Map; diff --git a/src/pathview.cpp b/src/GUI/pathview.cpp similarity index 96% rename from src/pathview.cpp rename to src/GUI/pathview.cpp index 44d92184..7091ac07 100644 --- a/src/pathview.cpp +++ b/src/GUI/pathview.cpp @@ -4,11 +4,10 @@ #include #include #include +#include "data/poi.h" +#include "data/data.h" +#include "map/map.h" #include "opengl.h" -#include "misc.h" -#include "poi.h" -#include "data.h" -#include "map.h" #include "trackitem.h" #include "routeitem.h" #include "waypointitem.h" @@ -116,7 +115,8 @@ PathItem *PathView::addTrack(const Track &track) ti->setDigitalZoom(_digitalZoom); _scene->addItem(ti); - addPOI(_poi->points(ti->path())); + if (_showTracks) + addPOI(_poi->points(ti->path())); return ti; } @@ -141,7 +141,8 @@ PathItem *PathView::addRoute(const Route &route) ri->setDigitalZoom(_digitalZoom); _scene->addItem(ri); - addPOI(_poi->points(ri->path())); + if (_showRoutes) + addPOI(_poi->points(ri->path())); return ri; } @@ -162,9 +163,10 @@ void PathView::addWaypoints(const QList &waypoints) wi->setVisible(_showWaypoints); wi->setDigitalZoom(_digitalZoom); _scene->addItem(wi); - } - addPOI(_poi->points(waypoints)); + if (_showWaypoints) + addPOI(_poi->points(w)); + } } QList PathView::loadData(const Data &data) @@ -320,16 +322,20 @@ void PathView::updatePOI() } _pois.clear(); - for (int i = 0; i < _tracks.size(); i++) - addPOI(_poi->points(_tracks.at(i)->path())); - for (int i = 0; i < _routes.size(); i++) - addPOI(_poi->points(_routes.at(i)->path())); - addPOI(_poi->points(_waypoints)); + if (_showTracks) + for (int i = 0; i < _tracks.size(); i++) + addPOI(_poi->points(_tracks.at(i)->path())); + if (_showRoutes) + for (int i = 0; i < _routes.size(); i++) + addPOI(_poi->points(_routes.at(i)->path())); + if (_showWaypoints) + for (int i = 0; i< _waypoints.size(); i++) + addPOI(_poi->points(_waypoints.at(i)->waypoint())); updatePOIVisibility(); } -void PathView::addPOI(const QVector &waypoints) +void PathView::addPOI(const QList &waypoints) { for (int i = 0; i < waypoints.size(); i++) { const Waypoint &w = waypoints.at(i); @@ -586,6 +592,8 @@ void PathView::showTracks(bool show) for (int i = 0; i < _tracks.count(); i++) _tracks.at(i)->setVisible(show); + + updatePOI(); } void PathView::showRoutes(bool show) @@ -594,6 +602,8 @@ void PathView::showRoutes(bool show) for (int i = 0; i < _routes.count(); i++) _routes.at(i)->setVisible(show); + + updatePOI(); } void PathView::showWaypoints(bool show) @@ -602,6 +612,8 @@ void PathView::showWaypoints(bool show) for (int i = 0; i < _waypoints.count(); i++) _waypoints.at(i)->setVisible(show); + + updatePOI(); } void PathView::showWaypointLabels(bool show) diff --git a/src/pathview.h b/src/GUI/pathview.h similarity index 96% rename from src/pathview.h rename to src/GUI/pathview.h index f79dc900..06937b71 100644 --- a/src/pathview.h +++ b/src/GUI/pathview.h @@ -5,11 +5,11 @@ #include #include #include +#include "common/rectc.h" +#include "data/waypoint.h" +#include "searchpointer.h" #include "units.h" #include "palette.h" -#include "waypoint.h" -#include "rectc.h" -#include "searchpointer.h" class Data; class POI; @@ -77,7 +77,7 @@ private: PathItem *addTrack(const Track &track); PathItem *addRoute(const Route &route); void addWaypoints(const QList &waypoints); - void addPOI(const QVector &waypoints); + void addPOI(const QList &waypoints); void loadPOI(); void clearPOI(); diff --git a/src/percentslider.cpp b/src/GUI/percentslider.cpp similarity index 100% rename from src/percentslider.cpp rename to src/GUI/percentslider.cpp diff --git a/src/percentslider.h b/src/GUI/percentslider.h similarity index 100% rename from src/percentslider.h rename to src/GUI/percentslider.h diff --git a/src/powergraph.cpp b/src/GUI/powergraph.cpp similarity index 98% rename from src/powergraph.cpp rename to src/GUI/powergraph.cpp index 76a2a484..3bd41aad 100644 --- a/src/powergraph.cpp +++ b/src/GUI/powergraph.cpp @@ -1,4 +1,4 @@ -#include "data.h" +#include "data/data.h" #include "powergraphitem.h" #include "powergraph.h" diff --git a/src/powergraph.h b/src/GUI/powergraph.h similarity index 100% rename from src/powergraph.h rename to src/GUI/powergraph.h diff --git a/src/powergraphitem.cpp b/src/GUI/powergraphitem.cpp similarity index 100% rename from src/powergraphitem.cpp rename to src/GUI/powergraphitem.cpp diff --git a/src/powergraphitem.h b/src/GUI/powergraphitem.h similarity index 100% rename from src/powergraphitem.h rename to src/GUI/powergraphitem.h diff --git a/src/routeitem.cpp b/src/GUI/routeitem.cpp similarity index 97% rename from src/routeitem.cpp rename to src/GUI/routeitem.cpp index 33bfab26..e8fb9dba 100644 --- a/src/routeitem.cpp +++ b/src/GUI/routeitem.cpp @@ -1,9 +1,9 @@ #include +#include "data/waypoint.h" +#include "map/map.h" #include "format.h" -#include "waypoint.h" #include "waypointitem.h" #include "tooltip.h" -#include "map.h" #include "routeitem.h" diff --git a/src/routeitem.h b/src/GUI/routeitem.h similarity index 94% rename from src/routeitem.h rename to src/GUI/routeitem.h index 2c818e5f..cb1be783 100644 --- a/src/routeitem.h +++ b/src/GUI/routeitem.h @@ -1,8 +1,8 @@ #ifndef ROUTEITEM_H #define ROUTEITEM_H +#include "data/route.h" #include "pathitem.h" -#include "route.h" #include "units.h" class Map; diff --git a/src/scaleitem.cpp b/src/GUI/scaleitem.cpp similarity index 99% rename from src/scaleitem.cpp rename to src/GUI/scaleitem.cpp index c721e8ee..116e1f4f 100644 --- a/src/scaleitem.cpp +++ b/src/GUI/scaleitem.cpp @@ -1,7 +1,7 @@ #include #include #include "config.h" -#include "misc.h" +#include "nicenum.h" #include "scaleitem.h" diff --git a/src/scaleitem.h b/src/GUI/scaleitem.h similarity index 100% rename from src/scaleitem.h rename to src/GUI/scaleitem.h diff --git a/src/searchpointer.h b/src/GUI/searchpointer.h similarity index 100% rename from src/searchpointer.h rename to src/GUI/searchpointer.h diff --git a/src/settings.h b/src/GUI/settings.h similarity index 100% rename from src/settings.h rename to src/GUI/settings.h diff --git a/src/sliderinfoitem.cpp b/src/GUI/sliderinfoitem.cpp similarity index 100% rename from src/sliderinfoitem.cpp rename to src/GUI/sliderinfoitem.cpp diff --git a/src/sliderinfoitem.h b/src/GUI/sliderinfoitem.h similarity index 100% rename from src/sliderinfoitem.h rename to src/GUI/sliderinfoitem.h diff --git a/src/slideritem.cpp b/src/GUI/slideritem.cpp similarity index 100% rename from src/slideritem.cpp rename to src/GUI/slideritem.cpp diff --git a/src/slideritem.h b/src/GUI/slideritem.h similarity index 100% rename from src/slideritem.h rename to src/GUI/slideritem.h diff --git a/src/speedgraph.cpp b/src/GUI/speedgraph.cpp similarity index 98% rename from src/speedgraph.cpp rename to src/GUI/speedgraph.cpp index b9bd7f8f..edb0b5eb 100644 --- a/src/speedgraph.cpp +++ b/src/GUI/speedgraph.cpp @@ -1,5 +1,5 @@ +#include "data/data.h" #include "config.h" -#include "data.h" #include "tooltip.h" #include "speedgraphitem.h" #include "speedgraph.h" diff --git a/src/speedgraph.h b/src/GUI/speedgraph.h similarity index 100% rename from src/speedgraph.h rename to src/GUI/speedgraph.h diff --git a/src/speedgraphitem.cpp b/src/GUI/speedgraphitem.cpp similarity index 100% rename from src/speedgraphitem.cpp rename to src/GUI/speedgraphitem.cpp diff --git a/src/speedgraphitem.h b/src/GUI/speedgraphitem.h similarity index 100% rename from src/speedgraphitem.h rename to src/GUI/speedgraphitem.h diff --git a/src/stylecombobox.cpp b/src/GUI/stylecombobox.cpp similarity index 100% rename from src/stylecombobox.cpp rename to src/GUI/stylecombobox.cpp diff --git a/src/stylecombobox.h b/src/GUI/stylecombobox.h similarity index 100% rename from src/stylecombobox.h rename to src/GUI/stylecombobox.h diff --git a/src/temperaturegraph.cpp b/src/GUI/temperaturegraph.cpp similarity index 98% rename from src/temperaturegraph.cpp rename to src/GUI/temperaturegraph.cpp index ffd4fc66..31ab3a30 100644 --- a/src/temperaturegraph.cpp +++ b/src/GUI/temperaturegraph.cpp @@ -1,4 +1,4 @@ -#include "data.h" +#include "data/data.h" #include "temperaturegraphitem.h" #include "temperaturegraph.h" diff --git a/src/temperaturegraph.h b/src/GUI/temperaturegraph.h similarity index 100% rename from src/temperaturegraph.h rename to src/GUI/temperaturegraph.h diff --git a/src/temperaturegraphitem.cpp b/src/GUI/temperaturegraphitem.cpp similarity index 100% rename from src/temperaturegraphitem.cpp rename to src/GUI/temperaturegraphitem.cpp diff --git a/src/temperaturegraphitem.h b/src/GUI/temperaturegraphitem.h similarity index 100% rename from src/temperaturegraphitem.h rename to src/GUI/temperaturegraphitem.h diff --git a/src/timetype.h b/src/GUI/timetype.h similarity index 100% rename from src/timetype.h rename to src/GUI/timetype.h diff --git a/src/tooltip.cpp b/src/GUI/tooltip.cpp similarity index 100% rename from src/tooltip.cpp rename to src/GUI/tooltip.cpp diff --git a/src/tooltip.h b/src/GUI/tooltip.h similarity index 100% rename from src/tooltip.h rename to src/GUI/tooltip.h diff --git a/src/trackinfo.cpp b/src/GUI/trackinfo.cpp similarity index 100% rename from src/trackinfo.cpp rename to src/GUI/trackinfo.cpp diff --git a/src/trackinfo.h b/src/GUI/trackinfo.h similarity index 100% rename from src/trackinfo.h rename to src/GUI/trackinfo.h diff --git a/src/trackitem.cpp b/src/GUI/trackitem.cpp similarity index 97% rename from src/trackitem.cpp rename to src/GUI/trackitem.cpp index c586c5ce..7fa8dacc 100644 --- a/src/trackitem.cpp +++ b/src/GUI/trackitem.cpp @@ -1,7 +1,7 @@ #include +#include "map/map.h" #include "format.h" #include "tooltip.h" -#include "map.h" #include "trackitem.h" diff --git a/src/trackitem.h b/src/GUI/trackitem.h similarity index 94% rename from src/trackitem.h rename to src/GUI/trackitem.h index 616a6e54..39a5d3e7 100644 --- a/src/trackitem.h +++ b/src/GUI/trackitem.h @@ -3,7 +3,7 @@ #include #include -#include "track.h" +#include "data/track.h" #include "pathitem.h" #include "units.h" diff --git a/src/units.h b/src/GUI/units.h similarity index 100% rename from src/units.h rename to src/GUI/units.h diff --git a/src/waypointitem.cpp b/src/GUI/waypointitem.cpp similarity index 100% rename from src/waypointitem.cpp rename to src/GUI/waypointitem.cpp diff --git a/src/waypointitem.h b/src/GUI/waypointitem.h similarity index 95% rename from src/waypointitem.h rename to src/GUI/waypointitem.h index 4a1d71ca..17abca32 100644 --- a/src/waypointitem.h +++ b/src/GUI/waypointitem.h @@ -3,9 +3,9 @@ #include #include -#include "waypoint.h" +#include "data/waypoint.h" +#include "map/map.h" #include "units.h" -#include "map.h" class WaypointItem : public QGraphicsItem { diff --git a/src/coordinates.cpp b/src/common/coordinates.cpp similarity index 88% rename from src/coordinates.cpp rename to src/common/coordinates.cpp index 71415600..6231174c 100644 --- a/src/coordinates.cpp +++ b/src/common/coordinates.cpp @@ -1,4 +1,3 @@ -#include "rd.h" #include "wgs84.h" #include "coordinates.h" @@ -17,10 +16,9 @@ qreal Coordinates::distanceTo(const Coordinates &c) const return (WGS84_RADIUS * (2.0 * atan2(sqrt(a), sqrt(1.0 - a)))); } -QDebug operator<<(QDebug dbg, const Coordinates &coordinates) +QDebug operator<<(QDebug dbg, const Coordinates &c) { - dbg.nospace() << "Coordinates(" << coordinates.lon() << ", " - << coordinates.lat() << ")"; + dbg.nospace() << "Coordinates(" << c.lon() << ", " << c.lat() << ")"; return dbg.space(); } diff --git a/src/coordinates.h b/src/common/coordinates.h similarity index 84% rename from src/coordinates.h rename to src/common/coordinates.h index 6fc09983..f446f618 100644 --- a/src/coordinates.h +++ b/src/common/coordinates.h @@ -5,6 +5,12 @@ #include #include +#ifndef M_PI + #define M_PI 3.14159265358979323846 +#endif // M_PI +#define deg2rad(d) (((d)*M_PI)/180.0) +#define rad2deg(d) (((d)*180.0)/M_PI) + class Coordinates { public: @@ -37,6 +43,6 @@ inline bool operator==(const Coordinates &c1, const Coordinates &c2) inline bool operator!=(const Coordinates &c1, const Coordinates &c2) {return !(c1 == c2);} -QDebug operator<<(QDebug dbg, const Coordinates &trackpoint); +QDebug operator<<(QDebug dbg, const Coordinates &c); #endif // COORDINATES_H diff --git a/src/range.cpp b/src/common/range.cpp similarity index 100% rename from src/range.cpp rename to src/common/range.cpp diff --git a/src/range.h b/src/common/range.h similarity index 100% rename from src/range.h rename to src/common/range.h diff --git a/src/rectc.cpp b/src/common/rectc.cpp similarity index 100% rename from src/rectc.cpp rename to src/common/rectc.cpp diff --git a/src/rectc.h b/src/common/rectc.h similarity index 100% rename from src/rectc.h rename to src/common/rectc.h diff --git a/src/assert.h b/src/common/staticassert.h similarity index 100% rename from src/assert.h rename to src/common/staticassert.h diff --git a/src/wgs84.h b/src/common/wgs84.h similarity index 100% rename from src/wgs84.h rename to src/common/wgs84.h diff --git a/src/csvparser.cpp b/src/data/csvparser.cpp similarity index 100% rename from src/csvparser.cpp rename to src/data/csvparser.cpp diff --git a/src/csvparser.h b/src/data/csvparser.h similarity index 100% rename from src/csvparser.h rename to src/data/csvparser.h diff --git a/src/data.cpp b/src/data/data.cpp similarity index 100% rename from src/data.cpp rename to src/data/data.cpp diff --git a/src/data.h b/src/data/data.h similarity index 100% rename from src/data.h rename to src/data/data.h diff --git a/src/fitparser.cpp b/src/data/fitparser.cpp similarity index 99% rename from src/fitparser.cpp rename to src/data/fitparser.cpp index 69c397a0..5b473aea 100644 --- a/src/fitparser.cpp +++ b/src/data/fitparser.cpp @@ -1,6 +1,6 @@ #include #include -#include "assert.h" +#include "common/staticassert.h" #include "fitparser.h" diff --git a/src/fitparser.h b/src/data/fitparser.h similarity index 100% rename from src/fitparser.h rename to src/data/fitparser.h diff --git a/src/gpxparser.cpp b/src/data/gpxparser.cpp similarity index 100% rename from src/gpxparser.cpp rename to src/data/gpxparser.cpp diff --git a/src/gpxparser.h b/src/data/gpxparser.h similarity index 100% rename from src/gpxparser.h rename to src/data/gpxparser.h diff --git a/src/graph.h b/src/data/graph.h similarity index 77% rename from src/graph.h rename to src/data/graph.h index 61cb4db1..536da5ec 100644 --- a/src/graph.h +++ b/src/data/graph.h @@ -29,7 +29,13 @@ private: }; Q_DECLARE_TYPEINFO(GraphPoint, Q_PRIMITIVE_TYPE); -QDebug operator<<(QDebug dbg, const GraphPoint &point); + +inline QDebug operator<<(QDebug dbg, const GraphPoint &point) +{ + dbg.nospace() << "GraphPoint(" << point.s() << ", " << point.t() << ", " + << point.y() << ")"; + return dbg.space(); +} typedef QVector Graph; diff --git a/src/igcparser.cpp b/src/data/igcparser.cpp similarity index 99% rename from src/igcparser.cpp rename to src/data/igcparser.cpp index 30f1ce95..9a18d9cd 100644 --- a/src/igcparser.cpp +++ b/src/data/igcparser.cpp @@ -1,5 +1,5 @@ #include -#include "misc.h" +#include "str2int.h" #include "igcparser.h" diff --git a/src/igcparser.h b/src/data/igcparser.h similarity index 100% rename from src/igcparser.h rename to src/data/igcparser.h diff --git a/src/kmlparser.cpp b/src/data/kmlparser.cpp similarity index 100% rename from src/kmlparser.cpp rename to src/data/kmlparser.cpp diff --git a/src/kmlparser.h b/src/data/kmlparser.h similarity index 100% rename from src/kmlparser.h rename to src/data/kmlparser.h diff --git a/src/nmeaparser.cpp b/src/data/nmeaparser.cpp similarity index 99% rename from src/nmeaparser.cpp rename to src/data/nmeaparser.cpp index d1a4fbb6..4b82236a 100644 --- a/src/nmeaparser.cpp +++ b/src/data/nmeaparser.cpp @@ -1,5 +1,5 @@ #include -#include "misc.h" +#include "str2int.h" #include "nmeaparser.h" diff --git a/src/nmeaparser.h b/src/data/nmeaparser.h similarity index 100% rename from src/nmeaparser.h rename to src/data/nmeaparser.h diff --git a/src/parser.h b/src/data/parser.h similarity index 100% rename from src/parser.h rename to src/data/parser.h diff --git a/src/path.cpp b/src/data/path.cpp similarity index 100% rename from src/path.cpp rename to src/data/path.cpp diff --git a/src/path.h b/src/data/path.h similarity index 91% rename from src/path.h rename to src/data/path.h index 4e506f99..3cc7e123 100644 --- a/src/path.h +++ b/src/data/path.h @@ -3,8 +3,8 @@ #include #include -#include "coordinates.h" -#include "rectc.h" +#include "common/coordinates.h" +#include "common/rectc.h" class PathPoint { diff --git a/src/poi.cpp b/src/data/poi.cpp similarity index 60% rename from src/poi.cpp rename to src/data/poi.cpp index 7ea9ff41..c962f73a 100644 --- a/src/poi.cpp +++ b/src/data/poi.cpp @@ -1,8 +1,4 @@ #include -#include -#include -#include "pathitem.h" -#include "waypointitem.h" #include "data.h" #include "poi.h" @@ -58,11 +54,12 @@ static bool cb(size_t data, void* context) return true; } -QVector POI::points(const Path &path) const +QList POI::points(const Path &path) const { - QVector ret; + QList ret; QSet set; qreal min[2], max[2]; + QSet::const_iterator it; for (int i = 0; i < path.count(); i++) { const Coordinates &c = path.at(i).coordinates(); @@ -75,66 +72,31 @@ QVector POI::points(const Path &path) const _tree.Search(min, max, cb, &set); } - QSet::const_iterator i = set.constBegin(); - while (i != set.constEnd()) { - ret.append(_data.at(*i)); - ++i; - } + for (it = set.constBegin(); it != set.constEnd(); ++it) + ret.append(_data.at(*it)); return ret; } -QVector POI::points(const QList &list) - const +QList POI::points(const Waypoint &point) const { - QVector ret; + QList ret; QSet set; qreal min[2], max[2]; + QSet::const_iterator it; - for (int i = 0; i < list.count(); i++) { - const Coordinates &p = list.at(i)->waypoint().coordinates(); + const Coordinates &c = point.coordinates(); - QPair br = p.boundingRect(_radius); - min[0] = br.first.lon(); - min[1] = br.first.lat(); - max[0] = br.second.lon(); - max[1] = br.second.lat(); + QPair br = c.boundingRect(_radius); + min[0] = br.first.lon(); + min[1] = br.first.lat(); + max[0] = br.second.lon(); + max[1] = br.second.lat(); - _tree.Search(min, max, cb, &set); - } + _tree.Search(min, max, cb, &set); - QSet::const_iterator i = set.constBegin(); - while (i != set.constEnd()) { - ret.append(_data.at(*i)); - ++i; - } - - return ret; -} - -QVector POI::points(const QList &list) const -{ - QVector ret; - QSet set; - qreal min[2], max[2]; - - for (int i = 0; i < list.count(); i++) { - const Coordinates &p = list.at(i).coordinates(); - - QPair br = p.boundingRect(_radius); - min[0] = br.first.lon(); - min[1] = br.first.lat(); - max[0] = br.second.lon(); - max[1] = br.second.lat(); - - _tree.Search(min, max, cb, &set); - } - - QSet::const_iterator i = set.constBegin(); - while (i != set.constEnd()) { - ret.append(_data.at(*i)); - ++i; - } + for (it = set.constBegin(); it != set.constEnd(); ++it) + ret.append(_data.at(*it)); return ret; } diff --git a/src/poi.h b/src/data/poi.h similarity index 82% rename from src/poi.h rename to src/data/poi.h index ff9256d3..a7ea0006 100644 --- a/src/poi.h +++ b/src/data/poi.h @@ -1,12 +1,12 @@ #ifndef POI_H #define POI_H -#include +#include #include #include #include -#include "waypoint.h" #include "rtree.h" +#include "waypoint.h" #include "path.h" class WaypointItem; @@ -25,9 +25,8 @@ public: unsigned radius() const {return _radius;} void setRadius(unsigned radius); - QVector points(const Path &path) const; - QVector points(const QList &list) const; - QVector points(const QList &list) const; + QList points(const Path &path) const; + QList points(const Waypoint &point) const; const QStringList &files() const {return _files;} void enableFile(const QString &fileName, bool enable); diff --git a/src/route.cpp b/src/data/route.cpp similarity index 100% rename from src/route.cpp rename to src/data/route.cpp diff --git a/src/route.h b/src/data/route.h similarity index 100% rename from src/route.h rename to src/data/route.h diff --git a/src/routedata.h b/src/data/routedata.h similarity index 100% rename from src/routedata.h rename to src/data/routedata.h diff --git a/src/rtree.h b/src/data/rtree.h similarity index 99% rename from src/rtree.h rename to src/data/rtree.h index b308dcda..fb45265f 100644 --- a/src/rtree.h +++ b/src/data/rtree.h @@ -1,10 +1,10 @@ #ifndef RTREE_H #define RTREE_H -#include -#include -#include -#include +#include +#include +#include +#include #define ASSERT assert // RTree uses ASSERT( condition ) diff --git a/src/data/str2int.cpp b/src/data/str2int.cpp new file mode 100644 index 00000000..e985f0ad --- /dev/null +++ b/src/data/str2int.cpp @@ -0,0 +1,16 @@ +#include +#include "str2int.h" + +int str2int(const char *str, int len) +{ + int res = 0; + + for (const char *sp = str; sp < str + len; sp++) { + if (::isdigit(*sp)) + res = res * 10 + *sp - '0'; + else + return -1; + } + + return res; +} diff --git a/src/data/str2int.h b/src/data/str2int.h new file mode 100644 index 00000000..65a051b4 --- /dev/null +++ b/src/data/str2int.h @@ -0,0 +1,6 @@ +#ifndef MISC_H +#define MISC_H + +int str2int(const char *str, int len); + +#endif // MISC_H diff --git a/src/tcxparser.cpp b/src/data/tcxparser.cpp similarity index 100% rename from src/tcxparser.cpp rename to src/data/tcxparser.cpp diff --git a/src/tcxparser.h b/src/data/tcxparser.h similarity index 100% rename from src/tcxparser.h rename to src/data/tcxparser.h diff --git a/src/track.cpp b/src/data/track.cpp similarity index 100% rename from src/track.cpp rename to src/data/track.cpp diff --git a/src/track.h b/src/data/track.h similarity index 100% rename from src/track.h rename to src/data/track.h diff --git a/src/trackdata.h b/src/data/trackdata.h similarity index 100% rename from src/trackdata.h rename to src/data/trackdata.h diff --git a/src/trackpoint.h b/src/data/trackpoint.h similarity index 84% rename from src/trackpoint.h rename to src/data/trackpoint.h index 77f3166b..aa50f68f 100644 --- a/src/trackpoint.h +++ b/src/data/trackpoint.h @@ -4,7 +4,7 @@ #include #include #include -#include "coordinates.h" +#include "common/coordinates.h" class Trackpoint { @@ -55,8 +55,15 @@ private: qreal _power; }; -QDebug operator<<(QDebug dbg, const Trackpoint &trackpoint); - Q_DECLARE_TYPEINFO(Trackpoint, Q_MOVABLE_TYPE); +inline QDebug operator<<(QDebug dbg, const Trackpoint &trackpoint) +{ + dbg.nospace() << "Trackpoint(" << trackpoint.coordinates() << ", " + << trackpoint.timestamp() << ", " << trackpoint.elevation() << ", " + << trackpoint.speed() << ", " << trackpoint.heartRate() << ", " + << trackpoint.temperature() << ")"; + return dbg.space(); +} + #endif // TRACKPOINT_H diff --git a/src/waypoint.h b/src/data/waypoint.h similarity index 84% rename from src/waypoint.h rename to src/data/waypoint.h index 0128d5f1..7ab3e7b5 100644 --- a/src/waypoint.h +++ b/src/data/waypoint.h @@ -6,7 +6,7 @@ #include #include #include -#include "coordinates.h" +#include "common/coordinates.h" class Waypoint { @@ -48,7 +48,12 @@ inline uint qHash(const Waypoint &key) return ::qHash(key.name()); } -QDebug operator<<(QDebug dbg, const Waypoint &waypoint); +inline QDebug operator<<(QDebug dbg, const Waypoint &waypoint) +{ + dbg.nospace() << "Waypoint(" << waypoint.coordinates() << ", " + << waypoint.name() << ", " << waypoint.description() << ")"; + return dbg.space(); +} Q_DECLARE_TYPEINFO(Waypoint, Q_MOVABLE_TYPE); diff --git a/src/graph.cpp b/src/graph.cpp deleted file mode 100644 index 019edd72..00000000 --- a/src/graph.cpp +++ /dev/null @@ -1,8 +0,0 @@ -#include "graph.h" - -QDebug operator<<(QDebug dbg, const GraphPoint &point) -{ - dbg.nospace() << "GraphPoint(" << point.s() << ", " << point.t() << ", " - << point.y() << ")"; - return dbg.space(); -} diff --git a/src/main.cpp b/src/main.cpp index 585f02ce..7854d2c5 100644 --- a/src/main.cpp +++ b/src/main.cpp @@ -1,4 +1,4 @@ -#include "app.h" +#include "GUI/app.h" int main(int argc, char *argv[]) { diff --git a/src/albersequal.cpp b/src/map/albersequal.cpp similarity index 99% rename from src/albersequal.cpp rename to src/map/albersequal.cpp index 7dcf8a10..3e85087c 100644 --- a/src/albersequal.cpp +++ b/src/map/albersequal.cpp @@ -41,7 +41,6 @@ Defense. */ -#include "rd.h" #include "albersequal.h" diff --git a/src/albersequal.h b/src/map/albersequal.h similarity index 100% rename from src/albersequal.h rename to src/map/albersequal.h diff --git a/src/atlas.cpp b/src/map/atlas.cpp similarity index 99% rename from src/atlas.cpp rename to src/map/atlas.cpp index 2b071858..222cc779 100644 --- a/src/atlas.cpp +++ b/src/map/atlas.cpp @@ -1,7 +1,7 @@ #include #include #include -#include "rectc.h" +#include "common/rectc.h" #include "tar.h" #include "atlas.h" diff --git a/src/atlas.h b/src/map/atlas.h similarity index 98% rename from src/atlas.h rename to src/map/atlas.h index ea52d85e..8f0cae54 100644 --- a/src/atlas.h +++ b/src/map/atlas.h @@ -2,7 +2,7 @@ #define ATLAS_H #include -#include "map.h" +#include "map/map.h" #include "offlinemap.h" diff --git a/src/datum.cpp b/src/map/datum.cpp similarity index 98% rename from src/datum.cpp rename to src/map/datum.cpp index 705fd5fb..d17fef6f 100644 --- a/src/datum.cpp +++ b/src/map/datum.cpp @@ -1,7 +1,6 @@ #include #include -#include "wgs84.h" -#include "rd.h" +#include "common/wgs84.h" #include "datum.h" diff --git a/src/datum.h b/src/map/datum.h similarity index 96% rename from src/datum.h rename to src/map/datum.h index 0a787633..7c801bfd 100644 --- a/src/datum.h +++ b/src/map/datum.h @@ -3,7 +3,7 @@ #include #include "ellipsoid.h" -#include "coordinates.h" +#include "common/coordinates.h" class Datum { diff --git a/src/downloader.cpp b/src/map/downloader.cpp similarity index 100% rename from src/downloader.cpp rename to src/map/downloader.cpp diff --git a/src/downloader.h b/src/map/downloader.h similarity index 100% rename from src/downloader.h rename to src/map/downloader.h diff --git a/src/ellipsoid.cpp b/src/map/ellipsoid.cpp similarity index 100% rename from src/ellipsoid.cpp rename to src/map/ellipsoid.cpp diff --git a/src/ellipsoid.h b/src/map/ellipsoid.h similarity index 100% rename from src/ellipsoid.h rename to src/map/ellipsoid.h diff --git a/src/emptymap.cpp b/src/map/emptymap.cpp similarity index 95% rename from src/emptymap.cpp rename to src/map/emptymap.cpp index a414ab6a..9c7eb981 100644 --- a/src/emptymap.cpp +++ b/src/map/emptymap.cpp @@ -1,11 +1,10 @@ #include #include -#include "rectc.h" -#include "misc.h" -#include "rd.h" -#include "wgs84.h" -#include "coordinates.h" +#include "common/coordinates.h" +#include "common/rectc.h" +#include "common/wgs84.h" #include "mercator.h" +#include "misc.h" #include "emptymap.h" diff --git a/src/emptymap.h b/src/map/emptymap.h similarity index 96% rename from src/emptymap.h rename to src/map/emptymap.h index 65a0d905..27b56491 100644 --- a/src/emptymap.h +++ b/src/map/emptymap.h @@ -1,7 +1,7 @@ #ifndef EMPTYMAP_H #define EMPTYMAP_H -#include "map.h" +#include "map/map.h" class EmptyMap : public Map { diff --git a/src/lambertazimuthal.cpp b/src/map/lambertazimuthal.cpp similarity index 99% rename from src/lambertazimuthal.cpp rename to src/map/lambertazimuthal.cpp index 1b78c106..b666b242 100644 --- a/src/lambertazimuthal.cpp +++ b/src/map/lambertazimuthal.cpp @@ -41,7 +41,6 @@ Defense. */ -#include "rd.h" #include "lambertazimuthal.h" diff --git a/src/lambertazimuthal.h b/src/map/lambertazimuthal.h similarity index 100% rename from src/lambertazimuthal.h rename to src/map/lambertazimuthal.h diff --git a/src/lambertconic.cpp b/src/map/lambertconic.cpp similarity index 99% rename from src/lambertconic.cpp rename to src/map/lambertconic.cpp index e3e88738..89d80f4a 100644 --- a/src/lambertconic.cpp +++ b/src/map/lambertconic.cpp @@ -1,5 +1,4 @@ #include -#include "rd.h" #include "lambertconic.h" #ifndef M_PI_2 diff --git a/src/lambertconic.h b/src/map/lambertconic.h similarity index 100% rename from src/lambertconic.h rename to src/map/lambertconic.h diff --git a/src/latlon.h b/src/map/latlon.h similarity index 100% rename from src/latlon.h rename to src/map/latlon.h diff --git a/src/map.h b/src/map/map.h similarity index 100% rename from src/map.h rename to src/map/map.h diff --git a/src/maplist.cpp b/src/map/maplist.cpp similarity index 99% rename from src/maplist.cpp rename to src/map/maplist.cpp index 404ea41f..b37b5de3 100644 --- a/src/maplist.cpp +++ b/src/map/maplist.cpp @@ -1,6 +1,6 @@ #include #include -#include "range.h" +#include "common/range.h" #include "atlas.h" #include "offlinemap.h" #include "onlinemap.h" diff --git a/src/maplist.h b/src/map/maplist.h similarity index 100% rename from src/maplist.h rename to src/map/maplist.h diff --git a/src/matrix.cpp b/src/map/matrix.cpp similarity index 100% rename from src/matrix.cpp rename to src/map/matrix.cpp diff --git a/src/matrix.h b/src/map/matrix.h similarity index 100% rename from src/matrix.h rename to src/map/matrix.h diff --git a/src/mercator.cpp b/src/map/mercator.cpp similarity index 95% rename from src/mercator.cpp rename to src/map/mercator.cpp index 1d0e3dfa..e46e5122 100644 --- a/src/mercator.cpp +++ b/src/map/mercator.cpp @@ -1,5 +1,4 @@ #include -#include "rd.h" #include "mercator.h" QPointF Mercator::ll2xy(const Coordinates &c) const diff --git a/src/mercator.h b/src/map/mercator.h similarity index 100% rename from src/mercator.h rename to src/map/mercator.h diff --git a/src/map/misc.h b/src/map/misc.h new file mode 100644 index 00000000..bd05f2f5 --- /dev/null +++ b/src/map/misc.h @@ -0,0 +1,7 @@ +#include + +inline QRectF scaled(const QRectF &rect, qreal factor) +{ + return QRectF(QPointF(rect.left() * factor, rect.top() * factor), + QSizeF(rect.width() * factor, rect.height() * factor)); +} diff --git a/src/offlinemap.cpp b/src/map/offlinemap.cpp similarity index 81% rename from src/offlinemap.cpp rename to src/map/offlinemap.cpp index 2ba9ab4b..acfa6ba0 100644 --- a/src/offlinemap.cpp +++ b/src/map/offlinemap.cpp @@ -7,26 +7,17 @@ #include #include #include -#include "misc.h" -#include "rd.h" -#include "wgs84.h" -#include "coordinates.h" -#include "matrix.h" +#include "common/coordinates.h" +#include "common/rectc.h" #include "datum.h" -#include "latlon.h" -#include "mercator.h" -#include "transversemercator.h" #include "utm.h" -#include "lambertconic.h" -#include "albersequal.h" -#include "lambertazimuthal.h" +#include "matrix.h" #include "ozf.h" -#include "rectc.h" #include "offlinemap.h" int OfflineMap::parse(QIODevice &device, QList &points, - QString &projection, ProjectionSetup &setup, QString &datum) + QString &projection, Projection::Setup &setup, QString &datum) { bool res; int ln = 1; @@ -147,11 +138,14 @@ int OfflineMap::parse(QIODevice &device, QList &points, ln++; } + if (!setup.zone && !points.first().ll.isNull()) + setup.zone = UTM::zone(points.first().ll); + return 0; } bool OfflineMap::parseMapFile(QIODevice &device, QList &points, - QString &projection, ProjectionSetup &setup, QString &datum) + QString &projection, Projection::Setup &setup, QString &datum) { int el; @@ -170,7 +164,7 @@ bool OfflineMap::parseMapFile(QIODevice &device, QList &points, } bool OfflineMap::createProjection(const QString &datum, - const QString &projection, const ProjectionSetup &setup, + const QString &projection, const Projection::Setup &setup, QList &points) { if (points.count() < 2) { @@ -184,75 +178,9 @@ bool OfflineMap::createProjection(const QString &datum, return false; } - if (setup.latitudeOrigin < -90.0 || setup.latitudeOrigin > 90.0 - || setup.longitudeOrigin < -180.0 || setup.longitudeOrigin > 180.0 - || setup.standardParallel1 < -90.0 || setup.standardParallel1 > 90.0 - || setup.standardParallel2 < -90.0 || setup.standardParallel2 > 90.0) { - _errorString = "Invalid projection setup"; - return false; - } - - if (projection == "Mercator") - _projection = new Mercator(); - else if (projection == "Transverse Mercator") - _projection = new TransverseMercator(d.ellipsoid(), - setup.latitudeOrigin, setup.longitudeOrigin, setup.scale, - setup.falseEasting, setup.falseNorthing); - else if (projection == "Latitude/Longitude") - _projection = new LatLon(); - else if (projection == "Lambert Conformal Conic") - _projection = new LambertConic(d.ellipsoid(), - setup.standardParallel1, setup.standardParallel2, - setup.latitudeOrigin, setup.longitudeOrigin, setup.scale, - setup.falseEasting, setup.falseNorthing); - else if (projection == "Albers Equal Area") - _projection = new AlbersEqual(d.ellipsoid(), setup.standardParallel1, - setup.standardParallel2, setup.latitudeOrigin, setup.longitudeOrigin, - setup.falseEasting, setup.falseNorthing); - else if (projection == "(A)Lambert Azimuthual Equal Area") - _projection = new LambertAzimuthal(d.ellipsoid(), setup.latitudeOrigin, - setup.longitudeOrigin, setup.falseEasting, setup.falseNorthing); - else if (projection == "(UTM) Universal Transverse Mercator") { - if (setup.zone) - _projection = new UTM(d.ellipsoid(), setup.zone); - else if (!points.first().ll.isNull()) - _projection = new UTM(d.ellipsoid(), points.first().ll); - else { - _errorString = "Can not determine UTM zone"; - return false; - } - } else if (projection == "(NZTM2) New Zealand TM 2000") - _projection = new TransverseMercator(d.ellipsoid(), 0, 173.0, 0.9996, - 1600000, 10000000); - else if (projection == "(BNG) British National Grid") - _projection = new TransverseMercator(d.ellipsoid(), 49, -2, 0.999601, - 400000, -100000); - else if (projection == "(IG) Irish Grid") - _projection = new TransverseMercator(d.ellipsoid(), 53.5, -8, 1.000035, - 200000, 250000); - else if (projection == "(SG) Swedish Grid") - _projection = new TransverseMercator(d.ellipsoid(), 0, 15.808278, 1, - 1500000, 0); - else if (projection == "(I) France Zone I") - _projection = new LambertConic(d.ellipsoid(), 48.598523, 50.395912, - 49.5, 2.337229, 1 /*0.99987734*/, 600000, 1200000); - else if (projection == "(II) France Zone II") - _projection = new LambertConic(d.ellipsoid(), 45.898919, 47.696014, - 46.8, 2.337229, 1 /*0.99987742*/, 600000, 2200000); - else if (projection == "(III) France Zone III") - _projection = new LambertConic(d.ellipsoid(), 43.199291, 44.996094, - 44.1, 2.337229, 1 /*0.99987750*/, 600000, 3200000); - else if (projection == "(IV) France Zone IV") - _projection = new LambertConic(d.ellipsoid(), 41.560388, 42.767663, - 42.165, 2.337229, 1 /*0.99994471*/, 234.358, 4185861.369); - else if (projection == "(VICGRID) Victoria Australia") - _projection = new LambertConic(d.ellipsoid(), -36, -38, -37, 145, 1, - 2500000, 4500000); - else if (projection == "(VG94) VICGRID94 Victoria Australia") - _projection = new LambertConic(d.ellipsoid(), -36, -38, -37, 145, 1, - 2500000, 2500000); - else { - _errorString = QString("%1: Unknown map projection").arg(projection); + _projection = Projection::projection(projection, d.ellipsoid(), setup); + if (!_projection) { + _errorString = Projection::errorString(); return false; } @@ -458,7 +386,7 @@ OfflineMap::OfflineMap(const QString &fileName, QObject *parent) { QList points; QString proj, datum; - ProjectionSetup setup; + Projection::Setup setup; QFileInfo fi(fileName); QString suffix = fi.suffix().toLower(); @@ -528,7 +456,7 @@ OfflineMap::OfflineMap(const QString &fileName, Tar &tar, QObject *parent) { QList points; QString proj, datum; - ProjectionSetup setup; + Projection::Setup setup; QFileInfo fi(fileName); _valid = false; diff --git a/src/offlinemap.h b/src/map/offlinemap.h similarity index 84% rename from src/offlinemap.h rename to src/map/offlinemap.h index 93e924ed..38e8cdab 100644 --- a/src/offlinemap.h +++ b/src/map/offlinemap.h @@ -2,12 +2,11 @@ #define OFFLINEMAP_H #include +#include "common/coordinates.h" +#include "projection.h" #include "map.h" #include "tar.h" #include "ozf.h" -#include "coordinates.h" -#include "projection.h" - class QIODevice; class QImage; @@ -57,24 +56,13 @@ private: QPointF pp; }; - struct ProjectionSetup { - double latitudeOrigin; - double longitudeOrigin; - double scale; - double falseEasting; - double falseNorthing; - double standardParallel1; - double standardParallel2; - int zone; - }; - int parse(QIODevice &device, QList &points, - QString &projection, ProjectionSetup &setup, QString &datum); + QString &projection, Projection::Setup &setup, QString &datum); bool parseMapFile(QIODevice &device, QList &points, - QString &projection, ProjectionSetup &setup, QString &datum); + QString &projection, Projection::Setup &setup, QString &datum); bool totalSizeSet(); bool createProjection(const QString &datum, const QString &projection, - const ProjectionSetup &setup, QList &points); + const Projection::Setup &setup, QList &points); bool simpleTransformation(const QList &points); bool affineTransformation(const QList &points); bool computeTransformation(const QList &points); diff --git a/src/onlinemap.cpp b/src/map/onlinemap.cpp similarity index 98% rename from src/onlinemap.cpp rename to src/map/onlinemap.cpp index b2b4822c..1bac4f48 100644 --- a/src/onlinemap.cpp +++ b/src/map/onlinemap.cpp @@ -1,14 +1,13 @@ #include #include #include -#include "rectc.h" +#include "common/coordinates.h" +#include "common/rectc.h" +#include "common/wgs84.h" +#include "mercator.h" #include "downloader.h" #include "config.h" -#include "rd.h" -#include "wgs84.h" #include "misc.h" -#include "coordinates.h" -#include "mercator.h" #include "onlinemap.h" diff --git a/src/onlinemap.h b/src/map/onlinemap.h similarity index 97% rename from src/onlinemap.h rename to src/map/onlinemap.h index e7f75318..8eb8d8ab 100644 --- a/src/onlinemap.h +++ b/src/map/onlinemap.h @@ -1,9 +1,9 @@ #ifndef ONLINEMAP_H #define ONLINEMAP_H +#include "common/range.h" #include "map.h" #include "tile.h" -#include "range.h" class Downloader; diff --git a/src/ozf.cpp b/src/map/ozf.cpp similarity index 100% rename from src/ozf.cpp rename to src/map/ozf.cpp diff --git a/src/ozf.h b/src/map/ozf.h similarity index 100% rename from src/ozf.h rename to src/map/ozf.h diff --git a/src/map/projection.cpp b/src/map/projection.cpp new file mode 100644 index 00000000..ba52242e --- /dev/null +++ b/src/map/projection.cpp @@ -0,0 +1,89 @@ +#include "latlon.h" +#include "mercator.h" +#include "transversemercator.h" +#include "utm.h" +#include "lambertconic.h" +#include "albersequal.h" +#include "lambertazimuthal.h" + + +QString Projection::_errorString; + +Projection *Projection::projection(const QString &name, + const Ellipsoid &ellipsoid, const Setup &setup) +{ + if (setup.latitudeOrigin < -90.0 || setup.latitudeOrigin > 90.0 + || setup.longitudeOrigin < -180.0 || setup.longitudeOrigin > 180.0 + || setup.standardParallel1 < -90.0 || setup.standardParallel1 > 90.0 + || setup.standardParallel2 < -90.0 || setup.standardParallel2 > 90.0) { + _errorString = "Invalid projection setup"; + return 0; + } + + if (name == "Mercator") + return new Mercator(); + else if (name == "Transverse Mercator") + return new TransverseMercator(ellipsoid, + setup.latitudeOrigin, setup.longitudeOrigin, setup.scale, + setup.falseEasting, setup.falseNorthing); + else if (name == "Latitude/Longitude") + return new LatLon(); + else if (name == "Lambert Conformal Conic") + return new LambertConic(ellipsoid, + setup.standardParallel1, setup.standardParallel2, + setup.latitudeOrigin, setup.longitudeOrigin, setup.scale, + setup.falseEasting, setup.falseNorthing); + else if (name == "Albers Equal Area") + return new AlbersEqual(ellipsoid, setup.standardParallel1, + setup.standardParallel2, setup.latitudeOrigin, setup.longitudeOrigin, + setup.falseEasting, setup.falseNorthing); + else if (name == "(A)Lambert Azimuthual Equal Area") + return new LambertAzimuthal(ellipsoid, setup.latitudeOrigin, + setup.longitudeOrigin, setup.falseEasting, setup.falseNorthing); + else if (name == "(UTM) Universal Transverse Mercator") { + if (setup.zone) + return new UTM(ellipsoid, setup.zone); + else { + _errorString = "Can not determine UTM zone"; + return 0; + } + } else if (name == "(NZTM2) New Zealand TM 2000") + return new TransverseMercator(ellipsoid, 0, 173.0, 0.9996, + 1600000, 10000000); + else if (name == "(BNG) British National Grid") + return new TransverseMercator(ellipsoid, 49, -2, 0.999601, + 400000, -100000); + else if (name == "(IG) Irish Grid") + return new TransverseMercator(ellipsoid, 53.5, -8, 1.000035, + 200000, 250000); + else if (name == "(SG) Swedish Grid") + return new TransverseMercator(ellipsoid, 0, 15.808278, 1, + 1500000, 0); + else if (name == "(I) France Zone I") + return new LambertConic(ellipsoid, 48.598523, 50.395912, + 49.5, 2.337229, 1 /*0.99987734*/, 600000, 1200000); + else if (name == "(II) France Zone II") + return new LambertConic(ellipsoid, 45.898919, 47.696014, + 46.8, 2.337229, 1 /*0.99987742*/, 600000, 2200000); + else if (name == "(III) France Zone III") + return new LambertConic(ellipsoid, 43.199291, 44.996094, + 44.1, 2.337229, 1 /*0.99987750*/, 600000, 3200000); + else if (name == "(IV) France Zone IV") + return new LambertConic(ellipsoid, 41.560388, 42.767663, + 42.165, 2.337229, 1 /*0.99994471*/, 234.358, 4185861.369); + else if (name == "(VICGRID) Victoria Australia") + return new LambertConic(ellipsoid, -36, -38, -37, 145, 1, + 2500000, 4500000); + else if (name == "(VG94) VICGRID94 Victoria Australia") + return new LambertConic(ellipsoid, -36, -38, -37, 145, 1, + 2500000, 2500000); + else { + _errorString = QString("%1: Unknown map projection").arg(name); + return 0; + } +} + +const QString &Projection::errorString() +{ + return _errorString; +} diff --git a/src/map/projection.h b/src/map/projection.h new file mode 100644 index 00000000..a4b1f049 --- /dev/null +++ b/src/map/projection.h @@ -0,0 +1,36 @@ +#ifndef PROJECTION_H +#define PROJECTION_H + +#include +#include +#include "common/coordinates.h" + +class Ellipsoid; + +class Projection { +public: + struct Setup { + double latitudeOrigin; + double longitudeOrigin; + double scale; + double falseEasting; + double falseNorthing; + double standardParallel1; + double standardParallel2; + int zone; + }; + + virtual ~Projection() {} + + virtual QPointF ll2xy(const Coordinates &c) const = 0; + virtual Coordinates xy2ll(const QPointF &p) const = 0; + + static Projection *projection(const QString &name, + const Ellipsoid &ellipsoid, const Setup &setup); + static const QString &errorString(); + +private: + static QString _errorString; +}; + +#endif // PROJECTION_H diff --git a/src/tar.cpp b/src/map/tar.cpp similarity index 100% rename from src/tar.cpp rename to src/map/tar.cpp diff --git a/src/tar.h b/src/map/tar.h similarity index 100% rename from src/tar.h rename to src/map/tar.h diff --git a/src/tile.h b/src/map/tile.h similarity index 100% rename from src/tile.h rename to src/map/tile.h diff --git a/src/transversemercator.cpp b/src/map/transversemercator.cpp similarity index 99% rename from src/transversemercator.cpp rename to src/map/transversemercator.cpp index d06428cb..7be3e5e5 100644 --- a/src/transversemercator.cpp +++ b/src/map/transversemercator.cpp @@ -42,7 +42,6 @@ Defense. */ #include -#include "rd.h" #include "ellipsoid.h" #include "transversemercator.h" diff --git a/src/transversemercator.h b/src/map/transversemercator.h similarity index 100% rename from src/transversemercator.h rename to src/map/transversemercator.h diff --git a/src/utm.cpp b/src/map/utm.cpp similarity index 72% rename from src/utm.cpp rename to src/map/utm.cpp index ba3634e1..d5a4d246 100644 --- a/src/utm.cpp +++ b/src/map/utm.cpp @@ -7,8 +7,7 @@ UTM::UTM(const Ellipsoid &ellipsoid, int zone) { } -UTM::UTM(const Ellipsoid &ellipsoid, const Coordinates &c) - : _tm(ellipsoid, 0, 0, 0, 0, 0) +int UTM::zone(const Coordinates &c) { int zone = int((c.lon() + 180)/6) + 1; @@ -24,8 +23,6 @@ UTM::UTM(const Ellipsoid &ellipsoid, const Coordinates &c) else if (c.lon() >= 33.0 && c.lon() < 42.0) zone = 37; } - double cm = (zone - 1)*6 - 180 + 3; - _tm = TransverseMercator(ellipsoid, 0, cm, 0.9996, 500000, - (c.lat() < 0) ? 10000000 : 0); + return zone; } diff --git a/src/utm.h b/src/map/utm.h similarity index 87% rename from src/utm.h rename to src/map/utm.h index 3b989952..e6fb465c 100644 --- a/src/utm.h +++ b/src/map/utm.h @@ -8,13 +8,14 @@ class UTM : public Projection { public: UTM(const Ellipsoid &ellipsoid, int zone); - UTM(const Ellipsoid &ellipsoid, const Coordinates &c); virtual QPointF ll2xy(const Coordinates &c) const {return _tm.ll2xy(c);} virtual Coordinates xy2ll(const QPointF &p) const {return _tm.xy2ll(p);} + static int zone(const Coordinates &c); + private: TransverseMercator _tm; }; diff --git a/src/misc.h b/src/misc.h deleted file mode 100644 index 307ee373..00000000 --- a/src/misc.h +++ /dev/null @@ -1,13 +0,0 @@ -#ifndef MISC_H -#define MISC_H - -#include - -#define ARRAY_SIZE(array) \ - (sizeof(array) / sizeof((array)[0])) - -double niceNum(double x, int round); -int str2int(const char *str, int len); -QRectF scaled(const QRectF &rect, qreal factor); - -#endif // MISC_H diff --git a/src/projection.h b/src/projection.h deleted file mode 100644 index e487468a..00000000 --- a/src/projection.h +++ /dev/null @@ -1,15 +0,0 @@ -#ifndef PROJECTION_H -#define PROJECTION_H - -#include -#include "coordinates.h" - -class Projection { -public: - virtual ~Projection() {} - - virtual QPointF ll2xy(const Coordinates &c) const = 0; - virtual Coordinates xy2ll(const QPointF &p) const = 0; -}; - -#endif // PROJECTION_H diff --git a/src/rd.h b/src/rd.h deleted file mode 100644 index fc746d46..00000000 --- a/src/rd.h +++ /dev/null @@ -1,13 +0,0 @@ -#ifndef RD_H -#define RD_H - -#include - -#ifndef M_PI - #define M_PI 3.14159265358979323846 -#endif // M_PI - -#define deg2rad(d) (((d)*M_PI)/180.0) -#define rad2deg(d) (((d)*180.0)/M_PI) - -#endif // RD_H diff --git a/src/trackpoint.cpp b/src/trackpoint.cpp deleted file mode 100644 index 481dba0f..00000000 --- a/src/trackpoint.cpp +++ /dev/null @@ -1,10 +0,0 @@ -#include "trackpoint.h" - -QDebug operator<<(QDebug dbg, const Trackpoint &trackpoint) -{ - dbg.nospace() << "Trackpoint(" << trackpoint.coordinates() << ", " - << trackpoint.timestamp() << ", " << trackpoint.elevation() << ", " - << trackpoint.speed() << ", " << trackpoint.heartRate() << ", " - << trackpoint.temperature() << ")"; - return dbg.space(); -} diff --git a/src/waypoint.cpp b/src/waypoint.cpp deleted file mode 100644 index 27b7b904..00000000 --- a/src/waypoint.cpp +++ /dev/null @@ -1,8 +0,0 @@ -#include "waypoint.h" - -QDebug operator<<(QDebug dbg, const Waypoint &waypoint) -{ - dbg.nospace() << "Waypoint(" << waypoint.coordinates() << ", " - << waypoint.name() << ", " << waypoint.description() << ")"; - return dbg.space(); -}