1
0
mirror of https://github.com/tumic0/GPXSee.git synced 2025-07-03 22:39:15 +02:00

Compare commits

...

13 Commits
3.5 ... 3.6

Author SHA1 Message Date
b2a49eaa23 Version++ 2017-01-22 22:14:59 +01:00
8ff8d4bf16 Code cleanup 2017-01-20 01:17:22 +01:00
46598a85fc Fixed redirect loop handling logic 2017-01-17 10:37:02 +01:00
32cbd33c91 Fixed tile area computation 2017-01-16 21:45:50 +01:00
0e356d0222 Added redirect loop check 2017-01-16 21:45:27 +01:00
1a29ab6304 Enabled free map scroll. 2017-01-16 09:54:12 +01:00
5581cff55b Fixed download error handling in case of redirects
Do not download tiles multiple times.
2017-01-16 09:53:01 +01:00
a458b82e37 Code cleanup 2017-01-11 22:14:01 +01:00
bd946fb477 Fixed bounding rect computation in special case (rect + 1 waypoint) 2017-01-09 00:20:06 +01:00
7e6ed0933c Code cleanup 2017-01-08 20:02:51 +01:00
1586a5e912 Optimization 2017-01-07 22:20:04 +01:00
3e340ab941 Improved error reporting.
Cosmetics.
2017-01-02 23:01:50 +01:00
ea178d1acb Fixed benign memory leak 2017-01-02 09:42:34 +01:00
14 changed files with 301 additions and 255 deletions

View File

@ -1,5 +1,5 @@
TARGET = GPXSee TARGET = GPXSee
VERSION = 3.5 VERSION = 3.6
QT += core \ QT += core \
gui \ gui \
network network

View File

@ -190,55 +190,55 @@
<context> <context>
<name>GUI</name> <name>GUI</name>
<message> <message>
<location filename="../src/gui.cpp" line="545"/> <location filename="../src/gui.cpp" line="552"/>
<source>GPXSee is distributed under the terms of the GNU General Public License version 3. For more info about GPXSee visit the project homepage at </source> <source>GPXSee is distributed under the terms of the GNU General Public License version 3. For more info about GPXSee visit the project homepage at </source>
<translation>Program GPXSee je distribuován pod podmínkami licence GNU General Public License verze 3. Pro více informací navštivte stránky programu na adrese </translation> <translation>Program GPXSee je distribuován pod podmínkami licence GNU General Public License verze 3. Pro více informací navštivte stránky programu na adrese </translation>
</message> </message>
<message> <message>
<location filename="../src/gui.cpp" line="609"/> <location filename="../src/gui.cpp" line="616"/>
<source>Open file</source> <source>Open file</source>
<translation>Otevřít soubor</translation> <translation>Otevřít soubor</translation>
</message> </message>
<message> <message>
<location filename="../src/gui.cpp" line="698"/> <location filename="../src/gui.cpp" line="705"/>
<source>Open POI file</source> <source>Open POI file</source>
<translation>Otevřít POI soubor</translation> <translation>Otevřít POI soubor</translation>
</message> </message>
<message> <message>
<location filename="../src/gui.cpp" line="216"/> <location filename="../src/gui.cpp" line="223"/>
<source>Open</source> <source>Open</source>
<translation>Otevřít</translation> <translation>Otevřít</translation>
</message> </message>
<message> <message>
<location filename="../src/gui.cpp" line="200"/> <location filename="../src/gui.cpp" line="207"/>
<source>Quit</source> <source>Quit</source>
<translation>Ukončit</translation> <translation>Ukončit</translation>
</message> </message>
<message> <message>
<location filename="../src/gui.cpp" line="208"/> <location filename="../src/gui.cpp" line="215"/>
<location filename="../src/gui.cpp" line="561"/> <location filename="../src/gui.cpp" line="568"/>
<location filename="../src/gui.cpp" line="562"/> <location filename="../src/gui.cpp" line="569"/>
<source>Keyboard controls</source> <source>Keyboard controls</source>
<translation>Ovládací klávesy</translation> <translation>Ovládací klávesy</translation>
</message> </message>
<message> <message>
<location filename="../src/gui.cpp" line="232"/> <location filename="../src/gui.cpp" line="239"/>
<source>Close</source> <source>Close</source>
<translation>Zavřít</translation> <translation>Zavřít</translation>
</message> </message>
<message> <message>
<location filename="../src/gui.cpp" line="238"/> <location filename="../src/gui.cpp" line="245"/>
<source>Reload</source> <source>Reload</source>
<translation>Znovu načíst</translation> <translation>Znovu načíst</translation>
</message> </message>
<message> <message>
<location filename="../src/gui.cpp" line="471"/> <location filename="../src/gui.cpp" line="478"/>
<source>Show</source> <source>Show</source>
<translation>Zobrazit</translation> <translation>Zobrazit</translation>
</message> </message>
<message> <message>
<location filename="../src/gui.cpp" line="392"/> <location filename="../src/gui.cpp" line="399"/>
<location filename="../src/gui.cpp" line="465"/> <location filename="../src/gui.cpp" line="472"/>
<source>File</source> <source>File</source>
<translation>Soubor</translation> <translation>Soubor</translation>
</message> </message>
@ -258,176 +258,176 @@
<translation>Soubory NMEA (*.nmea)</translation> <translation>Soubory NMEA (*.nmea)</translation>
</message> </message>
<message> <message>
<location filename="../src/gui.cpp" line="206"/> <location filename="../src/gui.cpp" line="213"/>
<location filename="../src/gui.cpp" line="584"/> <location filename="../src/gui.cpp" line="591"/>
<location filename="../src/gui.cpp" line="585"/> <location filename="../src/gui.cpp" line="592"/>
<source>Data sources</source> <source>Data sources</source>
<translation>Zdroje dat</translation> <translation>Zdroje dat</translation>
</message> </message>
<message> <message>
<location filename="../src/gui.cpp" line="246"/> <location filename="../src/gui.cpp" line="253"/>
<source>Load POI file</source> <source>Load POI file</source>
<translation>Nahrát POI soubor</translation> <translation>Nahrát POI soubor</translation>
</message> </message>
<message> <message>
<location filename="../src/gui.cpp" line="249"/> <location filename="../src/gui.cpp" line="256"/>
<source>Close POI files</source> <source>Close POI files</source>
<translation>Zavřit POI soubory</translation> <translation>Zavřit POI soubory</translation>
</message> </message>
<message> <message>
<location filename="../src/gui.cpp" line="251"/> <location filename="../src/gui.cpp" line="258"/>
<source>Overlap POIs</source> <source>Overlap POIs</source>
<translation>Překrývat POI</translation> <translation>Překrývat POI</translation>
</message> </message>
<message> <message>
<location filename="../src/gui.cpp" line="255"/> <location filename="../src/gui.cpp" line="262"/>
<source>Show POI labels</source> <source>Show POI labels</source>
<translation>Zobrazovat názvy POI</translation> <translation>Zobrazovat názvy POI</translation>
</message> </message>
<message> <message>
<location filename="../src/gui.cpp" line="260"/> <location filename="../src/gui.cpp" line="267"/>
<source>Show POIs</source> <source>Show POIs</source>
<translation>Zobrazit POI</translation> <translation>Zobrazit POI</translation>
</message> </message>
<message> <message>
<location filename="../src/gui.cpp" line="269"/> <location filename="../src/gui.cpp" line="276"/>
<source>Show map</source> <source>Show map</source>
<translation>Zobrazit mapu</translation> <translation>Zobrazit mapu</translation>
</message> </message>
<message> <message>
<location filename="../src/gui.cpp" line="275"/> <location filename="../src/gui.cpp" line="282"/>
<source>Clear tile cache</source> <source>Clear tile cache</source>
<translation>Vymazat mezipaměť dlaždic</translation> <translation>Vymazat mezipaměť dlaždic</translation>
</message> </message>
<message> <message>
<location filename="../src/gui.cpp" line="284"/> <location filename="../src/gui.cpp" line="291"/>
<location filename="../src/gui.cpp" line="288"/> <location filename="../src/gui.cpp" line="295"/>
<location filename="../src/gui.cpp" line="571"/> <location filename="../src/gui.cpp" line="578"/>
<source>Next map</source> <source>Next map</source>
<translation>Následující mapa</translation> <translation>Následující mapa</translation>
</message> </message>
<message> <message>
<location filename="../src/gui.cpp" line="295"/> <location filename="../src/gui.cpp" line="302"/>
<source>Show tracks</source> <source>Show tracks</source>
<translation>Zobrazit cesty</translation> <translation>Zobrazit cesty</translation>
</message> </message>
<message> <message>
<location filename="../src/gui.cpp" line="299"/> <location filename="../src/gui.cpp" line="306"/>
<source>Show routes</source> <source>Show routes</source>
<translation>Zobrazit trasy</translation> <translation>Zobrazit trasy</translation>
</message> </message>
<message> <message>
<location filename="../src/gui.cpp" line="303"/> <location filename="../src/gui.cpp" line="310"/>
<source>Show waypoints</source> <source>Show waypoints</source>
<translation>Zobrazit navigační body</translation> <translation>Zobrazit navigační body</translation>
</message> </message>
<message> <message>
<location filename="../src/gui.cpp" line="307"/> <location filename="../src/gui.cpp" line="314"/>
<source>Waypoint labels</source> <source>Waypoint labels</source>
<translation>Názvy navigačních bodů</translation> <translation>Názvy navigačních bodů</translation>
</message> </message>
<message> <message>
<location filename="../src/gui.cpp" line="318"/> <location filename="../src/gui.cpp" line="325"/>
<source>Show graphs</source> <source>Show graphs</source>
<translation>Zobrazovat grafy</translation> <translation>Zobrazovat grafy</translation>
</message> </message>
<message> <message>
<location filename="../src/gui.cpp" line="340"/> <location filename="../src/gui.cpp" line="347"/>
<source>Show grid</source> <source>Show grid</source>
<translation>Zobrazit mřížku</translation> <translation>Zobrazit mřížku</translation>
</message> </message>
<message> <message>
<location filename="../src/gui.cpp" line="346"/> <location filename="../src/gui.cpp" line="353"/>
<source>Show toolbars</source> <source>Show toolbars</source>
<translation>Zobrazovat nástrojové lišty</translation> <translation>Zobrazovat nástrojové lišty</translation>
</message> </message>
<message> <message>
<location filename="../src/gui.cpp" line="352"/> <location filename="../src/gui.cpp" line="359"/>
<source>Metric</source> <source>Metric</source>
<translation>Metrické</translation> <translation>Metrické</translation>
</message> </message>
<message> <message>
<location filename="../src/gui.cpp" line="357"/> <location filename="../src/gui.cpp" line="364"/>
<source>Imperial</source> <source>Imperial</source>
<translation>Imperiální</translation> <translation>Imperiální</translation>
</message> </message>
<message> <message>
<location filename="../src/gui.cpp" line="363"/> <location filename="../src/gui.cpp" line="370"/>
<source>Fullscreen mode</source> <source>Fullscreen mode</source>
<translation>Celoobrazovkový režim</translation> <translation>Celoobrazovkový režim</translation>
</message> </message>
<message> <message>
<location filename="../src/gui.cpp" line="369"/> <location filename="../src/gui.cpp" line="376"/>
<source>Options...</source> <source>Options...</source>
<translation>Nastavení...</translation> <translation>Nastavení...</translation>
</message> </message>
<message> <message>
<location filename="../src/gui.cpp" line="374"/> <location filename="../src/gui.cpp" line="381"/>
<source>Next</source> <source>Next</source>
<translation>Následující</translation> <translation>Následující</translation>
</message> </message>
<message> <message>
<location filename="../src/gui.cpp" line="377"/> <location filename="../src/gui.cpp" line="384"/>
<source>Previous</source> <source>Previous</source>
<translation>Předchozí</translation> <translation>Předchozí</translation>
</message> </message>
<message> <message>
<location filename="../src/gui.cpp" line="381"/> <location filename="../src/gui.cpp" line="388"/>
<source>Last</source> <source>Last</source>
<translation>Poslední</translation> <translation>Poslední</translation>
</message> </message>
<message> <message>
<location filename="../src/gui.cpp" line="384"/> <location filename="../src/gui.cpp" line="391"/>
<source>First</source> <source>First</source>
<translation>První</translation> <translation>První</translation>
</message> </message>
<message> <message>
<location filename="../src/gui.cpp" line="406"/> <location filename="../src/gui.cpp" line="413"/>
<source>Map</source> <source>Map</source>
<translation>Mapa</translation> <translation>Mapa</translation>
</message> </message>
<message> <message>
<location filename="../src/gui.cpp" line="413"/> <location filename="../src/gui.cpp" line="420"/>
<source>Graph</source> <source>Graph</source>
<translation>Graf</translation> <translation>Graf</translation>
</message> </message>
<message> <message>
<location filename="../src/gui.cpp" line="421"/> <location filename="../src/gui.cpp" line="428"/>
<source>POI</source> <source>POI</source>
<translation>POI</translation> <translation>POI</translation>
</message> </message>
<message> <message>
<location filename="../src/gui.cpp" line="422"/> <location filename="../src/gui.cpp" line="429"/>
<source>POI files</source> <source>POI files</source>
<translation>POI soubory</translation> <translation>POI soubory</translation>
</message> </message>
<message> <message>
<location filename="../src/gui.cpp" line="433"/> <location filename="../src/gui.cpp" line="440"/>
<source>Data</source> <source>Data</source>
<translation>Data</translation> <translation>Data</translation>
</message> </message>
<message> <message>
<location filename="../src/gui.cpp" line="434"/> <location filename="../src/gui.cpp" line="441"/>
<source>Display</source> <source>Display</source>
<translation>Zobrazit</translation> <translation>Zobrazit</translation>
</message> </message>
<message> <message>
<location filename="../src/gui.cpp" line="442"/> <location filename="../src/gui.cpp" line="449"/>
<source>Settings</source> <source>Settings</source>
<translation>Nastavení</translation> <translation>Nastavení</translation>
</message> </message>
<message> <message>
<location filename="../src/gui.cpp" line="443"/> <location filename="../src/gui.cpp" line="450"/>
<source>Units</source> <source>Units</source>
<translation>Jednotky</translation> <translation>Jednotky</translation>
</message> </message>
<message> <message>
<location filename="../src/gui.cpp" line="452"/> <location filename="../src/gui.cpp" line="459"/>
<source>Help</source> <source>Help</source>
<translation>Nápověda</translation> <translation>Nápověda</translation>
</message> </message>
<message> <message>
<location filename="../src/gui.cpp" line="573"/> <location filename="../src/gui.cpp" line="580"/>
<source>Previous map</source> <source>Previous map</source>
<translation>Předchozí mapa</translation> <translation>Předchozí mapa</translation>
</message> </message>
@ -457,23 +457,23 @@
<translation>Všechny soubory (*)</translation> <translation>Všechny soubory (*)</translation>
</message> </message>
<message> <message>
<location filename="../src/gui.cpp" line="837"/> <location filename="../src/gui.cpp" line="844"/>
<location filename="../src/gui.cpp" line="840"/> <location filename="../src/gui.cpp" line="847"/>
<source>Date</source> <source>Date</source>
<translation>Datum</translation> <translation>Datum</translation>
</message> </message>
<message> <message>
<location filename="../src/gui.cpp" line="829"/> <location filename="../src/gui.cpp" line="836"/>
<source>Routes</source> <source>Routes</source>
<translation>Trasy</translation> <translation>Trasy</translation>
</message> </message>
<message> <message>
<location filename="../src/gui.cpp" line="1053"/> <location filename="../src/gui.cpp" line="1060"/>
<source>No GPX files loaded</source> <source>No GPX files loaded</source>
<translation>Nejsou načteny žádné GPX soubory</translation> <translation>Nejsou načteny žádné GPX soubory</translation>
</message> </message>
<message numerus="yes"> <message numerus="yes">
<location filename="../src/gui.cpp" line="1057"/> <location filename="../src/gui.cpp" line="1064"/>
<source>%n files</source> <source>%n files</source>
<translation> <translation>
<numerusform>%n soubor</numerusform> <numerusform>%n soubor</numerusform>
@ -482,32 +482,32 @@
</translation> </translation>
</message> </message>
<message> <message>
<location filename="../src/gui.cpp" line="564"/> <location filename="../src/gui.cpp" line="571"/>
<source>Next file</source> <source>Next file</source>
<translation>Následující soubor</translation> <translation>Následující soubor</translation>
</message> </message>
<message> <message>
<location filename="../src/gui.cpp" line="541"/> <location filename="../src/gui.cpp" line="548"/>
<source>Version </source> <source>Version </source>
<translation>Verze </translation> <translation>Verze </translation>
</message> </message>
<message> <message>
<location filename="../src/gui.cpp" line="221"/> <location filename="../src/gui.cpp" line="228"/>
<source>Print...</source> <source>Print...</source>
<translation>Tisknout...</translation> <translation>Tisknout...</translation>
</message> </message>
<message> <message>
<location filename="../src/gui.cpp" line="226"/> <location filename="../src/gui.cpp" line="233"/>
<source>Export to PDF...</source> <source>Export to PDF...</source>
<translation>Exportovat do PDF...</translation> <translation>Exportovat do PDF...</translation>
</message> </message>
<message> <message>
<location filename="../src/gui.cpp" line="831"/> <location filename="../src/gui.cpp" line="838"/>
<source>Waypoints</source> <source>Waypoints</source>
<translation>Navigační body</translation> <translation>Navigační body</translation>
</message> </message>
<message> <message>
<location filename="../src/gui.cpp" line="565"/> <location filename="../src/gui.cpp" line="572"/>
<source>Previous file</source> <source>Previous file</source>
<translation>Předchozí soubor</translation> <translation>Předchozí soubor</translation>
</message> </message>
@ -517,96 +517,96 @@
<translation>Podporované soubory (*.csv *.fit *.gpx *.igc *.kml *.nmea *.tcx)</translation> <translation>Podporované soubory (*.csv *.fit *.gpx *.igc *.kml *.nmea *.tcx)</translation>
</message> </message>
<message> <message>
<location filename="../src/gui.cpp" line="311"/> <location filename="../src/gui.cpp" line="318"/>
<source>Route waypoints</source> <source>Route waypoints</source>
<translation>Body tras</translation> <translation>Body tras</translation>
</message> </message>
<message> <message>
<location filename="../src/gui.cpp" line="567"/> <location filename="../src/gui.cpp" line="574"/>
<source>First file</source> <source>First file</source>
<translation>První soubor</translation> <translation>První soubor</translation>
</message> </message>
<message> <message>
<location filename="../src/gui.cpp" line="568"/> <location filename="../src/gui.cpp" line="575"/>
<source>Last file</source> <source>Last file</source>
<translation>Poslední soubor</translation> <translation>Poslední soubor</translation>
</message> </message>
<message> <message>
<location filename="../src/gui.cpp" line="569"/> <location filename="../src/gui.cpp" line="576"/>
<source>Append modifier</source> <source>Append modifier</source>
<translation>Modifikátor nahradit/přidat</translation> <translation>Modifikátor nahradit/přidat</translation>
</message> </message>
<message> <message>
<location filename="../src/gui.cpp" line="588"/> <location filename="../src/gui.cpp" line="595"/>
<source>Map (tiles) source URLs are read on program startup from the following file:</source> <source>Map (tiles) source URLs are read on program startup from the following file:</source>
<translation>URL mapových zdrojů (dlaždic) jsou načteny při startu programu z následujícího souboru:</translation> <translation>URL mapových zdrojů (dlaždic) jsou načteny při startu programu z následujícího souboru:</translation>
</message> </message>
<message> <message>
<location filename="../src/gui.cpp" line="591"/> <location filename="../src/gui.cpp" line="598"/>
<source>The file format is one map entry per line, consisting of the map name and tiles URL delimited by a TAB character. The tile X and Y coordinates are replaced with $x and $y in the URL and the zoom level is replaced with $z. An example map file could look like:</source> <source>The file format is one map entry per line, consisting of the map name and tiles URL delimited by a TAB character. The tile X and Y coordinates are replaced with $x and $y in the URL and the zoom level is replaced with $z. An example map file could look like:</source>
<translation>Formát souboru je jeden mapový záznam na řádku, kde mapový záznam sestává ze jména mapy a URL dlaždic navzájem oddělených tabulátorem. Souřadnice dlaždice jsou v URL nahrazeny řetězci $x a $y, úroven přiblížení (zoom) pak řetězcem $z. Příklad:</translation> <translation>Formát souboru je jeden mapový záznam na řádku, kde mapový záznam sestává ze jména mapy a URL dlaždic navzájem oddělených tabulátorem. Souřadnice dlaždice jsou v URL nahrazeny řetězci $x a $y, úroven přiblížení (zoom) pak řetězcem $z. Příklad:</translation>
</message> </message>
<message> <message>
<location filename="../src/gui.cpp" line="599"/> <location filename="../src/gui.cpp" line="606"/>
<source>To make GPXSee load a POI file automatically on startup, add the file to the following directory:</source> <source>To make GPXSee load a POI file automatically on startup, add the file to the following directory:</source>
<translation>POI soubory, které se mají automaticky nahrát při startu programu jsou načítány z následujícího adresáře:</translation> <translation>POI soubory, které se mají automaticky nahrát při startu programu jsou načítány z následujícího adresáře:</translation>
</message> </message>
<message> <message>
<location filename="../src/gui.cpp" line="687"/> <location filename="../src/gui.cpp" line="694"/>
<source>Error loading data file:</source> <source>Error loading data file:</source>
<translation>Datový soubor nelze načíst:</translation> <translation>Datový soubor nelze načíst:</translation>
</message> </message>
<message> <message>
<location filename="../src/gui.cpp" line="690"/> <location filename="../src/gui.cpp" line="697"/>
<location filename="../src/gui.cpp" line="715"/> <location filename="../src/gui.cpp" line="722"/>
<source>Line: %1</source> <source>Line: %1</source>
<translation>Řádka: %1</translation> <translation>Řádka: %1</translation>
</message> </message>
<message> <message>
<location filename="../src/gui.cpp" line="712"/> <location filename="../src/gui.cpp" line="719"/>
<source>Error loading POI file:</source> <source>Error loading POI file:</source>
<translation>Soubor POI nelze načíst:</translation> <translation>Soubor POI nelze načíst:</translation>
</message> </message>
<message> <message>
<location filename="../src/gui.cpp" line="823"/> <location filename="../src/gui.cpp" line="830"/>
<source>Name</source> <source>Name</source>
<translation>Název</translation> <translation>Název</translation>
</message> </message>
<message> <message>
<location filename="../src/gui.cpp" line="827"/> <location filename="../src/gui.cpp" line="834"/>
<source>Tracks</source> <source>Tracks</source>
<translation>Cesty</translation> <translation>Cesty</translation>
</message> </message>
<message> <message>
<location filename="../src/gui.cpp" line="211"/> <location filename="../src/gui.cpp" line="218"/>
<location filename="../src/gui.cpp" line="539"/> <location filename="../src/gui.cpp" line="546"/>
<source>About GPXSee</source> <source>About GPXSee</source>
<translation>O aplikaci GPXSee</translation> <translation>O aplikaci GPXSee</translation>
</message> </message>
<message> <message>
<location filename="../src/gui.cpp" line="476"/> <location filename="../src/gui.cpp" line="483"/>
<source>Navigation</source> <source>Navigation</source>
<translation>Navigace</translation> <translation>Navigace</translation>
</message> </message>
<message> <message>
<location filename="../src/gui.cpp" line="587"/> <location filename="../src/gui.cpp" line="594"/>
<source>Map sources</source> <source>Map sources</source>
<translation>Mapové zdroje</translation> <translation>Mapové zdroje</translation>
</message> </message>
<message> <message>
<location filename="../src/gui.cpp" line="598"/> <location filename="../src/gui.cpp" line="605"/>
<source>POIs</source> <source>POIs</source>
<translation>POI body</translation> <translation>POI body</translation>
</message> </message>
<message> <message>
<location filename="../src/gui.cpp" line="326"/> <location filename="../src/gui.cpp" line="333"/>
<location filename="../src/gui.cpp" line="847"/> <location filename="../src/gui.cpp" line="854"/>
<source>Distance</source> <source>Distance</source>
<translation>Vzdálenost</translation> <translation>Vzdálenost</translation>
</message> </message>
<message> <message>
<location filename="../src/gui.cpp" line="333"/> <location filename="../src/gui.cpp" line="340"/>
<location filename="../src/gui.cpp" line="849"/> <location filename="../src/gui.cpp" line="856"/>
<source>Time</source> <source>Time</source>
<translation>Čas</translation> <translation>Čas</translation>
</message> </message>
@ -614,48 +614,48 @@
<context> <context>
<name>GraphView</name> <name>GraphView</name>
<message> <message>
<location filename="../src/graphview.cpp" line="112"/> <location filename="../src/graphview.cpp" line="108"/>
<source>m</source> <source>m</source>
<translation>m</translation> <translation>m</translation>
</message> </message>
<message> <message>
<location filename="../src/graphview.cpp" line="115"/> <location filename="../src/graphview.cpp" line="111"/>
<source>km</source> <source>km</source>
<translation>km</translation> <translation>km</translation>
</message> </message>
<message> <message>
<location filename="../src/graphview.cpp" line="120"/> <location filename="../src/graphview.cpp" line="116"/>
<source>ft</source> <source>ft</source>
<translation>ft</translation> <translation>ft</translation>
</message> </message>
<message> <message>
<location filename="../src/graphview.cpp" line="123"/> <location filename="../src/graphview.cpp" line="119"/>
<source>mi</source> <source>mi</source>
<translation>mi</translation> <translation>mi</translation>
</message> </message>
<message> <message>
<location filename="../src/graphview.cpp" line="129"/> <location filename="../src/graphview.cpp" line="125"/>
<source>s</source> <source>s</source>
<translation>s</translation> <translation>s</translation>
</message> </message>
<message> <message>
<location filename="../src/graphview.cpp" line="132"/> <location filename="../src/graphview.cpp" line="128"/>
<source>min</source> <source>min</source>
<translation>min</translation> <translation>min</translation>
</message> </message>
<message> <message>
<location filename="../src/graphview.cpp" line="135"/> <location filename="../src/graphview.cpp" line="131"/>
<source>h</source> <source>h</source>
<translation>h</translation> <translation>h</translation>
</message> </message>
<message> <message>
<location filename="../src/graphview.cpp" line="64"/> <location filename="../src/graphview.cpp" line="60"/>
<location filename="../src/graphview.cpp" line="161"/> <location filename="../src/graphview.cpp" line="157"/>
<source>Distance</source> <source>Distance</source>
<translation>Vzdálenost</translation> <translation>Vzdálenost</translation>
</message> </message>
<message> <message>
<location filename="../src/graphview.cpp" line="163"/> <location filename="../src/graphview.cpp" line="159"/>
<source>Time</source> <source>Time</source>
<translation>Čas</translation> <translation>Čas</translation>
</message> </message>
@ -770,7 +770,7 @@
</message> </message>
<message> <message>
<location filename="../src/optionsdialog.cpp" line="140"/> <location filename="../src/optionsdialog.cpp" line="140"/>
<location filename="../src/optionsdialog.cpp" line="225"/> <location filename="../src/optionsdialog.cpp" line="221"/>
<source>POI</source> <source>POI</source>
<translation>POI</translation> <translation>POI</translation>
</message> </message>
@ -815,23 +815,23 @@
<translation>Používat OpenGL</translation> <translation>Používat OpenGL</translation>
</message> </message>
<message> <message>
<location filename="../src/optionsdialog.cpp" line="207"/> <location filename="../src/optionsdialog.cpp" line="203"/>
<location filename="../src/optionsdialog.cpp" line="228"/> <location filename="../src/optionsdialog.cpp" line="224"/>
<source>System</source> <source>System</source>
<translation>Systém</translation> <translation>Systém</translation>
</message> </message>
<message> <message>
<location filename="../src/optionsdialog.cpp" line="223"/> <location filename="../src/optionsdialog.cpp" line="219"/>
<source>Appearance</source> <source>Appearance</source>
<translation>Vzhled</translation> <translation>Vzhled</translation>
</message> </message>
<message> <message>
<location filename="../src/optionsdialog.cpp" line="226"/> <location filename="../src/optionsdialog.cpp" line="222"/>
<source>Print &amp; Export</source> <source>Print &amp; Export</source>
<translation>Tisk a export</translation> <translation>Tisk a export</translation>
</message> </message>
<message> <message>
<location filename="../src/optionsdialog.cpp" line="255"/> <location filename="../src/optionsdialog.cpp" line="251"/>
<source>Options</source> <source>Options</source>
<translation>Nastavení</translation> <translation>Nastavení</translation>
</message> </message>
@ -863,17 +863,17 @@
<context> <context>
<name>RouteItem</name> <name>RouteItem</name>
<message> <message>
<location filename="../src/routeitem.cpp" line="15"/> <location filename="../src/routeitem.cpp" line="14"/>
<source>Name</source> <source>Name</source>
<translation>Název</translation> <translation>Název</translation>
</message> </message>
<message> <message>
<location filename="../src/routeitem.cpp" line="17"/> <location filename="../src/routeitem.cpp" line="16"/>
<source>Description</source> <source>Description</source>
<translation>Popis</translation> <translation>Popis</translation>
</message> </message>
<message> <message>
<location filename="../src/routeitem.cpp" line="18"/> <location filename="../src/routeitem.cpp" line="17"/>
<source>Distance</source> <source>Distance</source>
<translation>Vzdálenost</translation> <translation>Vzdálenost</translation>
</message> </message>
@ -967,27 +967,27 @@
<context> <context>
<name>TrackItem</name> <name>TrackItem</name>
<message> <message>
<location filename="../src/trackitem.cpp" line="14"/> <location filename="../src/trackitem.cpp" line="13"/>
<source>Name</source> <source>Name</source>
<translation>Název</translation> <translation>Název</translation>
</message> </message>
<message> <message>
<location filename="../src/trackitem.cpp" line="16"/> <location filename="../src/trackitem.cpp" line="15"/>
<source>Description</source> <source>Description</source>
<translation>Popis</translation> <translation>Popis</translation>
</message> </message>
<message> <message>
<location filename="../src/trackitem.cpp" line="17"/> <location filename="../src/trackitem.cpp" line="16"/>
<source>Distance</source> <source>Distance</source>
<translation>Vzdálenost</translation> <translation>Vzdálenost</translation>
</message> </message>
<message> <message>
<location filename="../src/trackitem.cpp" line="20"/> <location filename="../src/trackitem.cpp" line="18"/>
<source>Time</source> <source>Time</source>
<translation>Čas</translation> <translation>Čas</translation>
</message> </message>
<message> <message>
<location filename="../src/trackitem.cpp" line="23"/> <location filename="../src/trackitem.cpp" line="20"/>
<source>Date</source> <source>Date</source>
<translation>Datum</translation> <translation>Datum</translation>
</message> </message>

View File

@ -4,7 +4,7 @@
; The name of the installer ; The name of the installer
Name "GPXSee" Name "GPXSee"
; Program version ; Program version
!define VERSION "3.5" !define VERSION "3.6"
; The file to write ; The file to write
OutFile "GPXSee-${VERSION}.exe" OutFile "GPXSee-${VERSION}.exe"

View File

@ -4,7 +4,7 @@
; The name of the installer ; The name of the installer
Name "GPXSee" Name "GPXSee"
; Program version ; Program version
!define VERSION "3.5" !define VERSION "3.6"
; The file to write ; The file to write
OutFile "GPXSee-${VERSION}_x64.exe" OutFile "GPXSee-${VERSION}_x64.exe"

View File

@ -17,25 +17,39 @@
#define USER_AGENT \ #define USER_AGENT \
APP_NAME "/" APP_VERSION " (" PLATFORM_STR "; Qt " QT_VERSION_STR ")" APP_NAME "/" APP_VERSION " (" PLATFORM_STR "; Qt " QT_VERSION_STR ")"
#define ATTR_REDIRECT QNetworkRequest::RedirectionTargetAttribute
#define ATTR_FILE QNetworkRequest::User
#define ATTR_ORIGIN (QNetworkRequest::Attribute)(QNetworkRequest::User + 1)
#define ATTR_LEVEL (QNetworkRequest::Attribute)(QNetworkRequest::User + 2)
#define MAX_REDIRECT_LEVEL 5
Downloader::Downloader() Downloader::Downloader()
{ {
connect(&_manager, SIGNAL(finished(QNetworkReply*)), connect(&_manager, SIGNAL(finished(QNetworkReply*)),
SLOT(downloadFinished(QNetworkReply*))); SLOT(downloadFinished(QNetworkReply*)));
} }
bool Downloader::doDownload(const Download &dl) bool Downloader::doDownload(const Download &dl, const Redirect &redirect)
{ {
QUrl url(dl.url()); QUrl url(dl.url());
if (_errorDownloads.contains(url)) if (_errorDownloads.contains(url))
return false; return false;
if (_currentDownloads.contains(url))
return false;
QNetworkRequest request(url); QNetworkRequest request(url);
request.setAttribute(QNetworkRequest::User, QVariant(dl.file())); request.setAttribute(ATTR_FILE, QVariant(dl.file()));
if (!redirect.isNull()) {
request.setAttribute(ATTR_ORIGIN, QVariant(redirect.origin()));
request.setAttribute(ATTR_LEVEL, QVariant(redirect.level()));
}
request.setRawHeader("User-Agent", USER_AGENT); request.setRawHeader("User-Agent", USER_AGENT);
QNetworkReply *reply = _manager.get(request); QNetworkReply *reply = _manager.get(request);
_currentDownloads.append(reply); _currentDownloads.insert(url, reply);
return true; return true;
} }
@ -58,26 +72,49 @@ bool Downloader::saveToDisk(const QString &filename, QIODevice *data)
void Downloader::downloadFinished(QNetworkReply *reply) void Downloader::downloadFinished(QNetworkReply *reply)
{ {
QUrl url = reply->url(); QUrl url = reply->request().url();
if (reply->error()) { if (reply->error()) {
_errorDownloads.insert(url); QUrl origin = reply->request().attribute(ATTR_ORIGIN).toUrl();
fprintf(stderr, "Error downloading map tile: %s: %s\n", if (origin.isEmpty()) {
url.toEncoded().constData(), qPrintable(reply->errorString())); _errorDownloads.insert(url);
fprintf(stderr, "Error downloading map tile: %s: %s\n",
url.toEncoded().constData(), qPrintable(reply->errorString()));
} else {
_errorDownloads.insert(origin);
fprintf(stderr, "Error downloading map tile: %s -> %s: %s\n",
origin.toEncoded().constData(), url.toEncoded().constData(),
qPrintable(reply->errorString()));
}
} else { } else {
QUrl redirect = reply->attribute( QUrl location = reply->attribute(ATTR_REDIRECT).toUrl();
QNetworkRequest::RedirectionTargetAttribute).toUrl(); QString filename = reply->request().attribute(ATTR_FILE)
QString filename = reply->request().attribute(QNetworkRequest::User)
.toString(); .toString();
if (!redirect.isEmpty()) { if (!location.isEmpty()) {
Download dl(redirect, filename); QUrl origin = reply->request().attribute(ATTR_ORIGIN).toUrl();
doDownload(dl); int level = reply->request().attribute(ATTR_LEVEL).toInt();
if (location == url) {
_errorDownloads.insert(url);
fprintf(stderr, "Error downloading map tile: %s: "
"redirect loop\n", url.toEncoded().constData());
} else if (level >= MAX_REDIRECT_LEVEL) {
_errorDownloads.insert(origin);
fprintf(stderr, "Error downloading map tile: %s: "
"redirect level limit reached\n",
origin.toEncoded().constData());
} else {
Redirect redirect(origin.isEmpty() ? url : origin, level + 1);
Download dl(location, filename);
doDownload(dl, redirect);
}
} else } else
if (!saveToDisk(filename, reply)) if (!saveToDisk(filename, reply))
_errorDownloads.insert(url); _errorDownloads.insert(url);
} }
_currentDownloads.removeAll(reply); _currentDownloads.remove(url);
reply->deleteLater(); reply->deleteLater();
if (_currentDownloads.isEmpty()) if (_currentDownloads.isEmpty())

View File

@ -5,7 +5,7 @@
#include <QNetworkRequest> #include <QNetworkRequest>
#include <QNetworkReply> #include <QNetworkReply>
#include <QUrl> #include <QUrl>
#include <QList> #include <QMap>
#include <QSet> #include <QSet>
@ -39,15 +39,32 @@ private slots:
void downloadFinished(QNetworkReply *reply); void downloadFinished(QNetworkReply *reply);
private: private:
class Redirect
{
public:
Redirect() : _level(0) {}
Redirect(const QUrl &origin, int level) :
_origin(origin), _level(level) {}
const QUrl &origin() const {return _origin;}
int level() const {return _level;}
bool isNull() const {return (_level == 0);}
private:
QUrl _origin;
int _level;
};
Downloader(); Downloader();
Downloader(Downloader const&); Downloader(Downloader const&);
void operator=(Downloader const&); void operator=(Downloader const&);
bool doDownload(const Download &dl); bool doDownload(const Download &dl, const Redirect &redirect = Redirect());
bool saveToDisk(const QString &filename, QIODevice *data); bool saveToDisk(const QString &filename, QIODevice *data);
QNetworkAccessManager _manager; QNetworkAccessManager _manager;
QList<QNetworkReply *> _currentDownloads; QMap<QUrl, QNetworkReply *> _currentDownloads;
QSet<QUrl> _errorDownloads; QSet<QUrl> _errorDownloads;
}; };

View File

@ -22,7 +22,7 @@
GraphView::GraphView(QWidget *parent) GraphView::GraphView(QWidget *parent)
: QGraphicsView(parent) : QGraphicsView(parent)
{ {
_scene = new QGraphicsScene(); _scene = new QGraphicsScene(this);
setScene(_scene); setScene(_scene);
setViewportUpdateMode(QGraphicsView::FullViewportUpdate); setViewportUpdateMode(QGraphicsView::FullViewportUpdate);
@ -462,7 +462,7 @@ void GraphView::useOpenGL(bool use)
#ifdef Q_OS_WIN32 #ifdef Q_OS_WIN32
if (QSysInfo::WindowsVersion >= QSysInfo::WV_VISTA) if (QSysInfo::WindowsVersion >= QSysInfo::WV_VISTA)
#endif // Q_OS_WIN32 #endif // Q_OS_WIN32
setViewport(new OPENGL_WIDGET); setViewport(new OPENGL_WIDGET);
} else } else
setViewport(new QWidget); setViewport(new QWidget);
} }

View File

@ -135,8 +135,15 @@ void GUI::loadPOIs()
else else
list = globalDir.entryInfoList(QStringList(), QDir::Files); list = globalDir.entryInfoList(QStringList(), QDir::Files);
for (int i = 0; i < list.size(); ++i) for (int i = 0; i < list.size(); ++i) {
_poi->loadFile(list.at(i).absoluteFilePath()); if (!_poi->loadFile(list.at(i).absoluteFilePath())) {
fprintf(stderr, "Error loading POI file: %s: %s\n",
qPrintable(list.at(i).fileName()),
qPrintable(_poi->errorString()));
if (_poi->errorLine())
fprintf(stderr, "Line: %d\n", _poi->errorLine());
}
}
} }
void GUI::createMapActions() void GUI::createMapActions()

View File

@ -4,6 +4,7 @@
#include <QSysInfo> #include <QSysInfo>
#include "opengl.h" #include "opengl.h"
#include "rd.h" #include "rd.h"
#include "wgs84.h"
#include "poi.h" #include "poi.h"
#include "data.h" #include "data.h"
#include "map.h" #include "map.h"
@ -23,21 +24,20 @@ static QPoint mercator2tile(const QPointF &m, int z)
{ {
QPoint tile; QPoint tile;
tile.setX((int)(floor((m.x() + 180.0) / 360.0 * pow(2.0, z)))); tile.setX((int)(floor((m.x() + 180.0) / 360.0 * (1<<z))));
tile.setY((int)(floor((1.0 - (m.y() / 180.0)) / 2.0 * pow(2.0, z)))); tile.setY((int)(floor((1.0 - (m.y() / 180.0)) / 2.0 * (1<<z))));
return tile; return tile;
} }
static QPointF tile2mercator(const QPoint &tile, int z) static QPointF tile2mercator(const QPoint &tile, int z)
{ {
Coordinates m; QPointF m;
m.setLon(tile.x() / pow(2.0, z) * 360.0 - 180); m.setX(((360.0 * tile.x()) / (qreal)(1<<z)) - 180.0);
qreal n = M_PI - 2.0 * M_PI * tile.y() / pow(2.0, z); m.setY((1.0 - (2.0 * tile.y()) / (qreal)(1<<z)) * 180.0);
m.setLat(rad2deg(atan(0.5 * (exp(n) - exp(-n)))));
return m.toMercator(); return m;
} }
static int scale2zoom(qreal scale) static int scale2zoom(qreal scale)
@ -57,10 +57,15 @@ qreal mapScale(int zoom)
return ((360.0/(qreal)(1<<zoom))/(qreal)Tile::size()); return ((360.0/(qreal)(1<<zoom))/(qreal)Tile::size());
} }
static QRectF qrectf(const QPointF &p1, const QPointF &p2) static QRectF mapBounds()
{ {
return QRectF(QPointF(qMin(p1.x(), p2.x()), qMin(p1.y(), p2.y())), return QRectF(QPointF(-180, -180), QSizeF(360, 360));
QPointF(qMax(p1.x(), p2.x()), qMax(p1.y(), p2.y()))); }
static qreal zoom2resolution(int zoom, qreal y)
{
return (WGS84_RADIUS * 2 * M_PI / Tile::size()
* cos(2.0 * atan(exp(deg2rad(y))) - M_PI/2)) / (qreal)(1<<zoom);
} }
static void unite(QRectF &rect, const QPointF &p) static void unite(QRectF &rect, const QPointF &p)
@ -99,6 +104,7 @@ PathView::PathView(QWidget *parent)
_mapScale->setZValue(2.0); _mapScale->setZValue(2.0);
_zoom = ZOOM_MAX; _zoom = ZOOM_MAX;
_res = 1.0;
_map = 0; _map = 0;
_poi = 0; _poi = 0;
@ -118,6 +124,8 @@ PathView::PathView(QWidget *parent)
_routeStyle = Qt::DashLine; _routeStyle = Qt::DashLine;
_plot = false; _plot = false;
_scene->setSceneRect(scaled(mapBounds(), 1.0 / mapScale(_zoom)));
} }
PathView::~PathView() PathView::~PathView()
@ -184,21 +192,13 @@ void PathView::addWaypoints(const QList<Waypoint> &waypoints)
const Waypoint &w = waypoints.at(i); const Waypoint &w = waypoints.at(i);
WaypointItem *wi = new WaypointItem(w); WaypointItem *wi = new WaypointItem(w);
_waypoints.append(wi);
updateWaypointsBoundingRect(wi->coordinates());
wi->setScale(1.0/scale); wi->setScale(1.0/scale);
wi->setZValue(1); wi->setZValue(1);
wi->showLabel(_showWaypointLabels); wi->showLabel(_showWaypointLabels);
wi->setVisible(_showWaypoints); wi->setVisible(_showWaypoints);
_scene->addItem(wi); _scene->addItem(wi);
if (_wr.isNull()) {
if (_wp.isNull())
_wp = wi->coordinates();
else
_wr = qrectf(_wp, wi->coordinates());
} else
unite(_wr, wi->coordinates());
_waypoints.append(wi);
} }
if (_poi) if (_poi)
@ -215,33 +215,49 @@ QList<PathItem *> PathView::loadData(const Data &data)
for (int i = 0; i < data.tracks().count(); i++) for (int i = 0; i < data.tracks().count(); i++)
paths.append(addTrack(*(data.tracks().at(i)))); paths.append(addTrack(*(data.tracks().at(i))));
for (int i = 0; i < data.routes().count(); i++) for (int i = 0; i < data.routes().count(); i++)
paths.append(addRoute(*(data.routes().at(i)))); paths.append(addRoute(*(data.routes().at(i))));
addWaypoints(data.waypoints()); addWaypoints(data.waypoints());
if (_tracks.empty() && _routes.empty() && _waypoints.empty()) if (_tracks.empty() && _routes.empty() && _waypoints.empty())
return paths; return paths;
if ((_tracks.size() + _routes.size() > 1 && _zoom < zoom) if (_zoom < zoom)
|| (_waypoints.size() && _zoom < zoom))
rescale(_zoom); rescale(_zoom);
else else
updatePOIVisibility(); updatePOIVisibility();
QRectF sr = contentsSceneRect(); QPointF center = contentsCenter();
_scene->setSceneRect(sr); centerOn(center);
centerOn(sr.center());
_mapScale->setZoom(_zoom, -(sr.center().ry() * mapScale(_zoom))); _res = zoom2resolution(_zoom, -(center.y() * mapScale(_zoom)));
_mapScale->setResolution(_res);
if (_mapScale->scene() != _scene) if (_mapScale->scene() != _scene)
_scene->addItem(_mapScale); _scene->addItem(_mapScale);
return paths; return paths;
} }
void PathView::updateWaypointsBoundingRect(const QPointF &wp)
{
if (_wr.isNull()) {
if (_wp.isNull())
_wp = wp;
else {
_wr = QRectF(_wp, wp).normalized();
_wp = QPointF();
}
} else
unite(_wr, wp);
}
qreal PathView::contentsScale() const qreal PathView::contentsScale() const
{ {
QRectF br = _tr | _rr | _wr; QRectF br = _tr | _rr | _wr;
if (!br.isNull() && !_wp.isNull())
unite(br, _wp);
if (br.isNull()) if (br.isNull())
return mapScale(ZOOM_MAX); return mapScale(ZOOM_MAX);
@ -252,17 +268,18 @@ qreal PathView::contentsScale() const
return qMax(sc.x(), sc.y()); return qMax(sc.x(), sc.y());
} }
QRectF PathView::contentsSceneRect() const QPointF PathView::contentsCenter() const
{ {
QRectF br = _tr | _rr | _wr;
if (!br.isNull() && !_wp.isNull())
unite(br, _wp);
qreal scale = mapScale(_zoom); qreal scale = mapScale(_zoom);
QRectF br = scaled(_tr | _rr | _wr, 1.0/scale);
if (br.isNull()) if (br.isNull())
return QRectF(QPointF(_wp.x() / scale - Tile::size()/2, return _wp / scale;
_wp.y() /scale - Tile::size()/2), QSizeF(Tile::size(), Tile::size()));
else else
return br.adjusted(-Tile::size(), -Tile::size(), Tile::size(), return scaled(br, 1.0/scale).center();
Tile::size());
} }
void PathView::updatePOIVisibility() void PathView::updatePOIVisibility()
@ -291,6 +308,8 @@ void PathView::rescale(int zoom)
_zoom = zoom; _zoom = zoom;
qreal scale = mapScale(zoom); qreal scale = mapScale(zoom);
_scene->setSceneRect(scaled(mapBounds(), 1.0 / scale));
for (int i = 0; i < _tracks.size(); i++) for (int i = 0; i < _tracks.size(); i++)
_tracks.at(i)->setScale(1.0/scale); _tracks.at(i)->setScale(1.0/scale);
@ -410,16 +429,6 @@ void PathView::redraw()
resetCachedContent(); resetCachedContent();
} }
void PathView::rescale()
{
int zoom = scale2zoom(contentsScale());
if (zoom != _zoom) {
rescale(zoom);
_mapScale->setZoom(zoom);
}
}
void PathView::zoom(int z, const QPoint &pos) void PathView::zoom(int z, const QPoint &pos)
{ {
if (_tracks.isEmpty() && _routes.isEmpty() && _waypoints.isEmpty()) if (_tracks.isEmpty() && _routes.isEmpty() && _waypoints.isEmpty())
@ -433,16 +442,11 @@ void PathView::zoom(int z, const QPoint &pos)
rescale(_zoom); rescale(_zoom);
QRectF sr = contentsSceneRect(); QPointF center = (spos * (os/mapScale(_zoom))) - offset;
_scene->setSceneRect(sr); centerOn(center);
if (sr.width() < viewport()->size().width() _res = zoom2resolution(_zoom, -(center.y() * mapScale(_zoom)));
&& sr.height() < viewport()->size().height()) _mapScale->setResolution(_res);
centerOn(sr.center());
else
centerOn((spos * (os/mapScale(_zoom))) - offset);
_mapScale->setZoom(_zoom);
resetCachedContent(); resetCachedContent();
} }
@ -528,6 +532,7 @@ void PathView::clear()
_palette.reset(); _palette.reset();
_zoom = ZOOM_MAX; _zoom = ZOOM_MAX;
_res = 1.0;
_tr = QRectF(); _rr = QRectF(); _wr = QRectF(); _tr = QRectF(); _rr = QRectF(); _wr = QRectF();
_wp = QPointF(); _wp = QPointF();
@ -651,15 +656,14 @@ void PathView::drawBackground(QPainter *painter, const QRectF &rect)
QPoint tile = mercator2tile(QPointF(rr.topLeft().x(), -rr.topLeft().y()), QPoint tile = mercator2tile(QPointF(rr.topLeft().x(), -rr.topLeft().y()),
_zoom); _zoom);
QPointF tm = tile2mercator(tile, _zoom); QPointF tm = tile2mercator(tile, _zoom);
QPoint tl = mapToScene(mapFromScene(QPointF(tm.x() / scale, QPoint tl = QPoint((int)(tm.x() / scale), (int)(-tm.y() / scale));
-tm.y() / scale))).toPoint();
QList<Tile> tiles; QList<Tile> tiles;
for (int i = 0; i <= rr.size().width() / Tile::size() + 1; i++) { QSizeF s(rect.right() - tl.x(), rect.bottom() - tl.y());
for (int j = 0; j <= rr.size().height() / Tile::size() + 1; j++) { for (int i = 0; i < ceil(s.width() / Tile::size()); i++)
for (int j = 0; j < ceil(s.height() / Tile::size()); j++)
tiles.append(Tile(QPoint(tile.x() + i, tile.y() + j), _zoom)); tiles.append(Tile(QPoint(tile.x() + i, tile.y() + j), _zoom));
}
}
_map->loadTiles(tiles, _plot); _map->loadTiles(tiles, _plot);
@ -673,24 +677,20 @@ void PathView::drawBackground(QPainter *painter, const QRectF &rect)
void PathView::resizeEvent(QResizeEvent *event) void PathView::resizeEvent(QResizeEvent *event)
{ {
Q_UNUSED(event);
if (_tracks.isEmpty() && _routes.isEmpty() && _waypoints.isEmpty()) if (_tracks.isEmpty() && _routes.isEmpty() && _waypoints.isEmpty())
return; return;
rescale(); int zoom = scale2zoom(contentsScale());
if (zoom != _zoom)
rescale(zoom);
QRectF sr = contentsSceneRect(); QPointF center = contentsCenter();
centerOn(center);
if (sr.width() < event->size().width()) { _res = zoom2resolution(_zoom, -(center.y() * mapScale(_zoom)));
qreal diff = event->size().width() - sr.width(); _mapScale->setResolution(_res);
sr.adjust(-diff/2, 0, diff/2, 0);
}
if (sr.height() < event->size().height()) {
qreal diff = event->size().height() - sr.height();
sr.adjust(0, -diff/2, 0, diff/2);
}
_scene->setSceneRect(sr);
centerOn(sr.center());
resetCachedContent(); resetCachedContent();
} }
@ -706,13 +706,26 @@ void PathView::paintEvent(QPaintEvent *event)
QGraphicsView::paintEvent(event); QGraphicsView::paintEvent(event);
} }
void PathView::scrollContentsBy(int dx, int dy)
{
QGraphicsView::scrollContentsBy(dx, dy);
QPointF center = mapToScene(viewport()->rect().center());
qreal res = zoom2resolution(_zoom, -(center.y() * mapScale(_zoom)));
if (qMax(res, _res) / qMin(res, _res) > 1.1) {
_mapScale->setResolution(res);
_res = res;
}
}
void PathView::useOpenGL(bool use) void PathView::useOpenGL(bool use)
{ {
if (use) { if (use) {
#ifdef Q_OS_WIN32 #ifdef Q_OS_WIN32
if (QSysInfo::WindowsVersion >= QSysInfo::WV_VISTA) if (QSysInfo::WindowsVersion >= QSysInfo::WV_VISTA)
#endif // Q_OS_WIN32 #endif // Q_OS_WIN32
setViewport(new OPENGL_WIDGET); setViewport(new OPENGL_WIDGET);
} else } else
setViewport(new QWidget); setViewport(new QWidget);
} }

View File

@ -73,11 +73,11 @@ private:
void clearPOI(); void clearPOI();
qreal contentsScale() const; qreal contentsScale() const;
QRectF contentsSceneRect() const; QPointF contentsCenter() const;
void rescale(int zoom); void rescale(int zoom);
void rescale();
void zoom(int z, const QPoint &pos); void zoom(int z, const QPoint &pos);
void updatePOIVisibility(); void updatePOIVisibility();
void updateWaypointsBoundingRect(const QPointF &wp);
void mouseDoubleClickEvent(QMouseEvent *event); void mouseDoubleClickEvent(QMouseEvent *event);
void wheelEvent(QWheelEvent *event); void wheelEvent(QWheelEvent *event);
@ -85,6 +85,7 @@ private:
void drawBackground(QPainter *painter, const QRectF &rect); void drawBackground(QPainter *painter, const QRectF &rect);
void resizeEvent(QResizeEvent *event); void resizeEvent(QResizeEvent *event);
void paintEvent(QPaintEvent *event); void paintEvent(QPaintEvent *event);
void scrollContentsBy(int dx, int dy);
QGraphicsScene *_scene; QGraphicsScene *_scene;
ScaleItem *_mapScale; ScaleItem *_mapScale;
@ -96,6 +97,7 @@ private:
int _zoom; int _zoom;
QRectF _tr, _rr, _wr; QRectF _tr, _rr, _wr;
QPointF _wp; QPointF _wp;
qreal _res;
Map *_map; Map *_map;
POI *_poi; POI *_poi;

View File

@ -1,4 +1,3 @@
#include <QApplication>
#include <QPainter> #include <QPainter>
#include "format.h" #include "format.h"
#include "waypoint.h" #include "waypoint.h"
@ -12,11 +11,10 @@ QString RouteItem::toolTip()
ToolTip tt; ToolTip tt;
if (!_name.isEmpty()) if (!_name.isEmpty())
tt.insert(qApp->translate("RouteItem", "Name"), _name); tt.insert(tr("Name"), _name);
if (!_desc.isEmpty()) if (!_desc.isEmpty())
tt.insert(qApp->translate("RouteItem", "Description"), _desc); tt.insert(tr("Description"), _desc);
tt.insert(qApp->translate("RouteItem", "Distance"), tt.insert(tr("Distance"), Format::distance(_distance.last(), _units));
Format::distance(_distance.last(), _units));
return tt.toString(); return tt.toString();
} }

View File

@ -1,8 +1,5 @@
#include <QPainter> #include <QPainter>
#include "config.h" #include "config.h"
#include "rd.h"
#include "wgs84.h"
#include "tile.h"
#include "misc.h" #include "misc.h"
#include "scaleitem.h" #include "scaleitem.h"
@ -13,17 +10,11 @@
#define SEGMENTS 3 #define SEGMENTS 3
#define PADDING 4 #define PADDING 4
static qreal zoom2resolution(int zoom, qreal y)
{
return (WGS84_RADIUS * 2 * M_PI / Tile::size()
* cos(2 * atan(exp(deg2rad(y))) - M_PI/2)) / pow(2.0, zoom);
}
ScaleItem::ScaleItem(QGraphicsItem *parent) : QGraphicsItem(parent) ScaleItem::ScaleItem(QGraphicsItem *parent) : QGraphicsItem(parent)
{ {
_units = Metric; _units = Metric;
_zoom = 0; _res = 1.0;
_lat = 0;
#ifndef Q_OS_MAC #ifndef Q_OS_MAC
setCacheMode(QGraphicsItem::DeviceCoordinateCache); setCacheMode(QGraphicsItem::DeviceCoordinateCache);
@ -96,45 +87,33 @@ QString ScaleItem::units() const
void ScaleItem::computeScale() void ScaleItem::computeScale()
{ {
qreal res = zoom2resolution(_zoom, _lat);
if (_units == Imperial) { if (_units == Imperial) {
_length = niceNum((res * M2FT * SCALE_WIDTH) / SEGMENTS, 1); _length = niceNum((_res * M2FT * SCALE_WIDTH) / SEGMENTS, 1);
if (_length >= MIINFT) { if (_length >= MIINFT) {
_length = niceNum((res * M2FT * FT2MI * SCALE_WIDTH) / SEGMENTS, 1); _length = niceNum((_res * M2FT * FT2MI * SCALE_WIDTH) / SEGMENTS, 1);
_width = (_length / (res * M2FT * FT2MI)); _width = (_length / (_res * M2FT * FT2MI));
_scale = true; _scale = true;
} else { } else {
_width = (_length / (res * M2FT)); _width = (_length / (_res * M2FT));
_scale = false; _scale = false;
} }
} else { } else {
_length = niceNum((res * SCALE_WIDTH) / SEGMENTS, 1); _length = niceNum((_res * SCALE_WIDTH) / SEGMENTS, 1);
if (_length >= KMINM) { if (_length >= KMINM) {
_length *= M2KM; _length *= M2KM;
_width = (_length / (res * M2KM)); _width = (_length / (_res * M2KM));
_scale = true; _scale = true;
} else { } else {
_width = (_length / res); _width = (_length / _res);
_scale = false; _scale = false;
} }
} }
} }
void ScaleItem::setZoom(int z, qreal lat) void ScaleItem::setResolution(qreal res)
{ {
prepareGeometryChange(); prepareGeometryChange();
_zoom = z; _res = res;
_lat = lat;
computeScale();
updateBoundingRect();
update();
}
void ScaleItem::setZoom(int z)
{
prepareGeometryChange();
_zoom = z;
computeScale(); computeScale();
updateBoundingRect(); updateBoundingRect();
update(); update();

View File

@ -13,8 +13,7 @@ public:
void paint(QPainter *painter, const QStyleOptionGraphicsItem *option, void paint(QPainter *painter, const QStyleOptionGraphicsItem *option,
QWidget *widget); QWidget *widget);
void setZoom(int z); void setResolution(qreal res);
void setZoom(int z, qreal lat);
void setUnits(enum Units units); void setUnits(enum Units units);
private: private:
@ -22,8 +21,7 @@ private:
void computeScale(); void computeScale();
QString units() const; QString units() const;
int _zoom; qreal _res;
qreal _lat;
qreal _width; qreal _width;
qreal _length; qreal _length;
Units _units; Units _units;

View File

@ -1,5 +1,3 @@
#include <QApplication>
#include <QCursor>
#include <QPainter> #include <QPainter>
#include "format.h" #include "format.h"
#include "tooltip.h" #include "tooltip.h"
@ -11,17 +9,14 @@ QString TrackItem::toolTip()
ToolTip tt; ToolTip tt;
if (!_name.isEmpty()) if (!_name.isEmpty())
tt.insert(qApp->translate("TrackItem", "Name"), _name); tt.insert(tr("Name"), _name);
if (!_desc.isEmpty()) if (!_desc.isEmpty())
tt.insert(qApp->translate("TrackItem", "Description"), _desc); tt.insert(tr("Description"), _desc);
tt.insert(qApp->translate("TrackItem", "Distance"), tt.insert(tr("Distance"), Format::distance(_distance.last(), _units));
Format::distance(_distance.last(), _units));
if (_time > 0) if (_time > 0)
tt.insert(qApp->translate("TrackItem", "Time"), tt.insert(tr("Time"), Format::timeSpan(_time));
Format::timeSpan(_time));
if (!_date.isNull()) if (!_date.isNull())
tt.insert(qApp->translate("TrackItem", "Date"), tt.insert(tr("Date"), _date.toString(Qt::SystemLocaleShortDate));
_date.toString(Qt::SystemLocaleShortDate));
return tt.toString(); return tt.toString();
} }