diff --git a/.appveyor.yml b/.appveyor.yml index dce946ae..3ea711bf 100644 --- a/.appveyor.yml +++ b/.appveyor.yml @@ -1,4 +1,4 @@ -version: 13.43.{build} +version: 13.44.{build} configuration: - Release diff --git a/gpxsee.pro b/gpxsee.pro index 9db51f84..1725a55d 100644 --- a/gpxsee.pro +++ b/gpxsee.pro @@ -3,7 +3,7 @@ unix:!macx:!android { } else { TARGET = GPXSee } -VERSION = 13.43 +VERSION = 13.44 QT += core \ gui \ @@ -23,6 +23,8 @@ greaterThan(QT_MAJOR_VERSION, 5) { CONFIG += object_parallel_to_source INCLUDEPATH += ./src HEADERS += src/common/config.h \ + src/GUI/legendentryitem.h \ + src/GUI/legenditem.h \ src/common/garmin.h \ src/common/coordinates.h \ src/common/hash.h \ @@ -276,6 +278,8 @@ HEADERS += src/common/config.h \ src/data/geojsonparser.h SOURCES += src/main.cpp \ + src/GUI/legendentryitem.cpp \ + src/GUI/legenditem.cpp \ src/common/coordinates.cpp \ src/common/rectc.cpp \ src/common/range.cpp \ diff --git a/lang/gpxsee_ca.ts b/lang/gpxsee_ca.ts index 5d6ab357..75825144 100644 --- a/lang/gpxsee_ca.ts +++ b/lang/gpxsee_ca.ts @@ -30,7 +30,7 @@ Avg - Mitjana + Mitj @@ -371,21 +371,21 @@ - - + + Paths Camins - - + + Keyboard controls Controls del teclat - + About GPXSee Sobre GPXSee @@ -492,7 +492,7 @@ - + Next map Següent mapa @@ -577,502 +577,507 @@ Fites km/mi - + + Legend + + + + Do not show No mostris - + Marker only Només marcador - + Date/time Data i hora - + Coordinates Coordenades - + Use styles Empra estils - + Download data DEM Descarregar dades DEM - + Download map DEM Descarregar mapa DEM - + Show local DEM tiles Mostra tessel·les DEM locals - + Show hillshading Mostra l'ombrejat - + Show graphs Mostra gràfiques - - - + + + Distance Distància - - - - + + + + Time Temps - + Show grid Mostra malla - + Show slider info Mostra informació lliscant - + Show tabs Mostra pestanyes - + Show toolbars Mostra les barres d'eines - + Total time Temps total - - - + + + Moving time Temps en moviment - + Metric Mètric - + Imperial Imperial - + Nautical Nàutic - + Decimal degrees (DD) Graus decimals (DD) - + Degrees and decimal minutes (DMM) Graus i minuts decimals (DMM) - + Degrees, minutes, seconds (DMS) Graus, minuts, segons (DMS) - + Fullscreen mode Mode de pantalla completa - + Options... Opcions... - + Next Següent - + Previous Anterior - + Last Darrer - + First Primer - + &File &Fitxer - + Open recent Obert fa poc - + &Map &Mapa - + Layers Capes - + &Graph &Gràfic - + &Data &Dades - + Position info Informació de la posició - + &POI &POI - + DEM DEM - + Position Posició - + &Settings &Configuració - + Units Unitats - + Coordinates format Format de coordenades - + &Help &Ajuda - + File Fitxer - + Show Mostra - + Navigation Navegació - - + + Version %1 Versió %1 - - + + GPXSee is distributed under the terms of the GNU General Public License version 3. For more info about GPXSee visit the project homepage at %1. GPXSee es distribueix sota els termes de la Llicència Pública General de GNU versió 3. Per a més informació sobre GPXSee visiteu la web del projecte a %1. - + Next file Següent fitxer - + Previous file Fitxer anterior - + First file Primer fitxer - + Last file Darrer fitxer - + Append file Afegeix un fitxer - + Next/Previous Següent/Anterior - + Toggle graph type Canvia el tipus de gràfic - + Toggle time type Canvia el tipus de temps - + Toggle position info Commuta la informació de la posició - + Previous map Mapa anterior - + Zoom in Apropar - + Zoom out Allunyar - + Digital zoom Zoom digital - + Zoom Zoom - + Copy coordinates Copiar coordenades - + Left Click Clic esquerre - - + + Map directory: Directori de mapes: - - + + POI directory: Directori de POI: - - + + CRS directory: Directori CRS: - - + + DEM directory: Directori DEM: - - + + Styles directory: Directori d'estils: - - + + Symbols directory: Directori de simbologia: - - + + Tile cache directory: Directori de la memòria cau de tessel·les: - - + + Open file Obrir fitxer - + Open directory Obrir directori - + Error loading geo URI: Error en carregar geo URI: - + Error loading data file: Error en carregar fitxer de dades: - - + + Line: %1 Línia: %1 - - - - + + + + Don't show again No ho tornis a mostrar - + Open POI file Obrir fitxer POI - + Error loading POI file: Error en carregar fitxer POI: - - + + Tracks Traces - - + + Routes Rutes - - + + Waypoints Punts de pas - - + + Areas Àrees - - - - + + + + Date Data - - + + Statistics Estadístiques - + Name Nom - + Open map file Obrir arxiu de mapa - - - - + + + + Error loading map: Error en carregar mapa: - + Select map directory Escollir directori de mapes - + Clear "%1" tile cache? Buidar "%1"memòria cau de tessel·les? - + DEM tiles download limit exceeded. If you really need data for such a huge area, download the files manually. S'ha superat el límit de descàrrega de tessel·les DEM. Si realment necessiteu dades per a una àrea tan gran, descarregueu els fitxers manualment. - + Download %n DEM tiles? Descarregar %n tessel·la DEM? @@ -1080,22 +1085,22 @@ - + Could not download all required DEM files. No s'ha pogut descarregar tots els fitxers DEM necessaris. - + No local DEM tiles found. No s'ha trobat tessel·les DEM locals. - + No files loaded Cap fitxer carregat - + %n files %n fitxer @@ -1236,7 +1241,7 @@ Avg - Mitjana + Mitj @@ -2282,7 +2287,7 @@ Avg - Mitjana + Mitj @@ -2407,7 +2412,7 @@ Avg - Mitjana + Mitj @@ -2504,7 +2509,7 @@ Avg - Mitjana + Mitj diff --git a/lang/gpxsee_cs.ts b/lang/gpxsee_cs.ts index 18d24121..771389e6 100644 --- a/lang/gpxsee_cs.ts +++ b/lang/gpxsee_cs.ts @@ -365,14 +365,14 @@ GUI - - + + Open file Otevřít soubor - + Open POI file Otevřít POI soubor @@ -383,8 +383,8 @@ - - + + Keyboard controls Ovládací klávesy @@ -399,12 +399,12 @@ Znovu načíst - + Show Zobrazit - + File Soubor @@ -440,8 +440,8 @@ - - + + Paths Cesty @@ -498,7 +498,7 @@ - + Next map Následující mapa @@ -578,417 +578,422 @@ Kilometrovníky - + + Legend + Legenda + + + Do not show Nezobrazovat - + Marker only Pouze ukazatel - + Date/time Datum/čas - + Coordinates Souřadnice - + Use styles Použít styly - + Show local DEM tiles Zobrazit lokální DEM dlaždice - + Show hillshading Stínování kopců - + Show graphs Zobrazit grafy - + Show grid Zobrazit mřížku - + Show slider info Zobrazit informace o posuvníku - + Show tabs Zobrazit karty - + Show toolbars Zobrazovat nástrojové lišty - + Total time Celkový čas - - - + + + Moving time Čistý čas - + Metric Metrické - + Imperial Imperiální - + Nautical Námořní - + Decimal degrees (DD) Desetinné stupně (DD) - + Degrees and decimal minutes (DMM) Stupně a desetinné minuty (DMM) - + Degrees, minutes, seconds (DMS) Stupně, minuty, vteřiny (DMS) - + Fullscreen mode Celoobrazovkový režim - + Options... Nastavení... - + Next Následující - + Previous Předchozí - + Last Poslední - + First První - + Open recent Otevřít nedávný - + Layers Vrstvy - + Position info Informace o poloze - + DEM DEM - + Position Pozice - + Units Jednotky - + Coordinates format Formát souřadnic - - + + Version %1 Verze %1 - - + + GPXSee is distributed under the terms of the GNU General Public License version 3. For more info about GPXSee visit the project homepage at %1. 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 %1. - + Append file Přidat soubor - + Next/Previous Následující/Předchozí - + Toggle graph type Přepnout typ grafu - + Toggle time type Přepnout typ času - + Toggle position info Přepnout informace o poloze - + Previous map Předchozí mapa - + Zoom in Přiblížit - + Zoom out Oddálit - + Digital zoom Digitální zoom - + Zoom Zoom - + Copy coordinates Kopírovat souřadnice - + Left Click Levý klik myši - - + + DEM directory: Adresář s DEM daty: - - + + Styles directory: Adresář se styly: - - + + Symbols directory: Adresář se symboly: - + Open directory Otevřít adresář - + Error loading geo URI: geo URI nelze načíst: - - - - + + + + Don't show again Již nezobrazovat - - + + Areas Plochy - - + + Statistics Statistika - + Open map file Otevřít mapový soubor - + DEM tiles download limit exceeded. If you really need data for such a huge area, download the files manually. Překročen limit pro počet stahovaných DEM dlaždic. Pokud opravdu potřebujete data pro takto velikou oblast, stáhněte dlaždice manuálně. - + Could not download all required DEM files. Nepodařilo se stáhnout všechny DEM soubory. - + No files loaded Nejsou načteny žádné soubory - - - - + + + + Date Datum - + &File &Soubor - + &Map &Mapa - + &Graph &Graf - + &POI &POI - + &Data &Data - + Download data DEM Stáhnout DEM pro data - + Download map DEM Stáhnout DEM pro mapu - + &Settings &Nastavení - + &Help N&ápověda - - + + Map directory: Adresář s mapami: - - + + POI directory: Adresář s POI body: - - + + CRS directory: Adresář s CRS daty: - - + + Tile cache directory: Adresář mezipaměti dlaždic: - - + + Routes Trasy - - - - + + + + Error loading map: Mapu nelze načíst: - + Select map directory Vybrat adresář s mapami - + Clear "%1" tile cache? Vymazat mezipaměť mapy "%1"? - + Download %n DEM tiles? Stáhnout %n DEM dlaždici? @@ -997,12 +1002,12 @@ - + No local DEM tiles found. Nebyly nalezeny žádné lokální DEM dlaždice. - + %n files %n soubor @@ -1011,7 +1016,7 @@ - + Next file Následující soubor @@ -1026,13 +1031,13 @@ Exportovat do PDF... - - + + Waypoints Navigační body - + Previous file Předchozí soubor @@ -1042,65 +1047,65 @@ Body tras - + First file První soubor - + Last file Poslední soubor - + Error loading data file: Datový soubor nelze načíst: - - + + Line: %1 Řádka: %1 - + Error loading POI file: Soubor POI nelze načíst: - + Name Název - - + + Tracks Cesty - + About GPXSee O aplikaci GPXSee - + Navigation Navigace - - - + + + Distance Vzdálenost - - - - + + + + Time Čas diff --git a/lang/gpxsee_da.ts b/lang/gpxsee_da.ts index e182bb08..f63f8d19 100644 --- a/lang/gpxsee_da.ts +++ b/lang/gpxsee_da.ts @@ -371,21 +371,21 @@ - - + + Paths Stier - - + + Keyboard controls Tastaturgenveje - + About GPXSee Om GPXSee @@ -492,7 +492,7 @@ - + Next map Næste kort @@ -577,224 +577,229 @@ km/mi-markører - + + Legend + + + + Do not show Vis ikke - + Marker only Kun markør - + Date/time Dato/tid - + Coordinates Koordinater - + Use styles Brug stilarter - + Show local DEM tiles Vis lokale DEM-fliser - + Show hillshading Vis terrænskygge - + Show graphs Vis grafer - - - + + + Distance Afstand - - - - + + + + Time Tid - + Show grid Vis gitter - + Show slider info Vis skyder info - + Show tabs Vis faner - + Show toolbars Vis værktøjslinjer - + Total time Samlet tid - - - + + + Moving time Tid i bevægelse - + Metric Metrisk - + Imperial Imperial - + Nautical Nautisk - + Decimal degrees (DD) Decimalgrader (DD) - + Degrees and decimal minutes (DMM) Grader og decimalminutter (DMM) - + Degrees, minutes, seconds (DMS) Grader, minutter, sekunder (DMS) - + Fullscreen mode Fuldskærmstilstand - + Options... Indstillinger… - + Next Næste - + Previous Forrige - + Last Sidste - + First Første - + &File &Fil - + Open recent Åbn seneste - + &Map &Kort - + Layers Lag - + &Graph &Graf - + &POI &IP - + Position Position - - + + CRS directory: CRS-katalog: - - + + Symbols directory: Symbolmappe: - + Open directory Åbn mappe - + Error loading geo URI: Fejl ved indlæsning af geo-URI: - - - - + + + + Don't show again Vis ikke igen - + Clear "%1" tile cache? Ryd "%1" flise-cache? - + Download %n DEM tiles? Download %n DEM-flise? @@ -802,300 +807,300 @@ - + &Data &Data - + Download data DEM Download data-DEM - + Download map DEM Download kort-DEM - + Position info Positionsinfo - + DEM DEM - + &Settings &Indstillinger - + Units Enheder - + Coordinates format Koordinatformat - + &Help &Hjælp - + File Fil - + Show Vis - + Navigation Navigation - - + + Version %1 Version %1 - - + + GPXSee is distributed under the terms of the GNU General Public License version 3. For more info about GPXSee visit the project homepage at %1. GPXSee er distribueret under betingelserne i GNU General Public License version 3. For mere info om GPXSee besøg projektets hjemmeside på %1. - + Next file Næste fil - + Previous file Forrige fil - + First file Første fil - + Last file Sidste fil - + Append file Vedhæft fil - + Next/Previous Næste/Forrige - + Toggle graph type Skift graftype - + Toggle time type Skift tidstype - + Toggle position info Skift positionsoplysninger - + Previous map Forrige kort - + Zoom in Zoom ind - + Zoom out Zoom ud - + Digital zoom Digital zoom - + Zoom Zoom - + Copy coordinates Kopiér koordinater - + Left Click Venstreklik - - + + DEM directory: DEM-mappe: - - + + Styles directory: Stilmappe: - - + + Tile cache directory: Flisecache-mappe: - + Select map directory Vælg kortmappe - - + + Map directory: Kortmappe: - - + + POI directory: IP-mappe: - - + + Open file Åbn fil - + Error loading data file: Fejl ved indlæsning af data-fil: - - + + Line: %1 Linje: %1 - + Open POI file Åbn IP-fil - + Error loading POI file: Fejl ved indlæsning af IP-fil: - - + + Tracks Spor - - + + Routes Ruter - - + + Waypoints Rutepunkter - - + + Areas Områder - - - - + + + + Date Dato - - + + Statistics Statistikker - + Name Navn - + Open map file Åbn kort-fil - - - - + + + + Error loading map: Fejl ved indlæsning af kort: - + DEM tiles download limit exceeded. If you really need data for such a huge area, download the files manually. Downloadgrænsen for DEM-fliser er overskredet. Hvis du virkelig har brug for data for så stort et område, skal du downloade filerne manuelt. - + Could not download all required DEM files. Kunne ikke downloade alle de nødvendige DEM-filer. - + No local DEM tiles found. Der blev ikke fundet lokale DEM-fliser. - + No files loaded Ingen filer indlæst - + %n files %n fil diff --git a/lang/gpxsee_de.ts b/lang/gpxsee_de.ts index c1e989d1..24b23ff2 100644 --- a/lang/gpxsee_de.ts +++ b/lang/gpxsee_de.ts @@ -365,26 +365,26 @@ GUI - - + + Map directory: Kartenverzeichnis: - - + + POI directory: POI-Verzeichnis: - - + + Open file Datei öffnen - + Open POI file POI-Datei öffnen @@ -395,8 +395,8 @@ - - + + Keyboard controls Tastaturkürzel @@ -411,12 +411,12 @@ Neu laden - + Show Ansicht - + File Datei @@ -452,8 +452,8 @@ - - + + Paths Pfade @@ -510,7 +510,7 @@ - + Next map Nächste Karte @@ -590,324 +590,329 @@ km/mi-Markierungen - + + Legend + Legende + + + Do not show Nicht anzeigen - + Marker only Nur Markierung - + Date/time Datum/Zeit - + Coordinates Koordinaten - + Use styles Stile verwenden - + Show local DEM tiles Lokale DEM-Kacheln anzeigen - + Show hillshading Schummerung anzeigen - + Show graphs Graphen anzeigen - + Show grid Gitter anzeigen - + Show slider info Schieberinfo anzeigen - + Show tabs Registerkarten anzeigen - + Show toolbars Toolbars anzeigen - + Total time Gesamtzeit - - - + + + Moving time Bewegungszeit - + Metric Metrisch - + Imperial Angloamerikanisch - + Nautical Nautisch - + Decimal degrees (DD) Dezimalgrad (DD) - + Degrees and decimal minutes (DMM) Grad und Dezimalminuten (DMM) - + Degrees, minutes, seconds (DMS) Grad, Minuten, Sekunden (DMS) - + Fullscreen mode Vollbildmodus - + Options... Einstellungen … - + Next Nächste - + Previous Vorherige - + Last Letzte - + First Erste - + Open recent Zuletzt geöffnete Dateien - + Layers Schichten - + Position info Positionsinfos - + DEM DEM - + Position Position - + Units Einheiten - + Coordinates format Koordinatenformate - - + + Version %1 Version %1 - - + + GPXSee is distributed under the terms of the GNU General Public License version 3. For more info about GPXSee visit the project homepage at %1. GPXSee wird unter der GNU General Public License version 3 veröffentlicht. Mehr Informationen zu GPXSee auf der Homepage %1. - + Append file An Datei anhängen - + Next/Previous Nächste/Vorherige - + Toggle graph type Graphtyp umschalten - + Toggle time type Zeittyp umschalten - + Toggle position info Positionsinfo umschalten - + Previous map Vorherige Karte - + Zoom in Hineinzoomen - + Zoom out Herauszoomen - + Digital zoom Digitaler Zoom - + Zoom Zoom - + Copy coordinates Koordinaten kopieren - + Left Click Links-Klick - - + + DEM directory: DEM-Verzeichnis: - - + + Styles directory: Formatvorlagen-Verzeichnis: - - + + Symbols directory: Symbole-Verzeichnis: - + Open directory Verzeichnis öffnen - + Error loading geo URI: Fehler beim Laden der Geo-URI: - - - - + + + + Don't show again Nicht wieder anzeigen - - + + Areas Flächen - - + + Statistics Statistiken - + Open map file Kartendatei öffnen - - - - + + + + Error loading map: Fehler beim Laden der Kartendatei: - + Select map directory Kartenverzeichnis auswählen - + Clear "%1" tile cache? Kachel-Cache von "%1" bereinigen? - + DEM tiles download limit exceeded. If you really need data for such a huge area, download the files manually. Das Download-Limit für die DEM-Kacheln wurde überschritten. Wenn Sie wirklich Daten für so ein großes Gebiet benötigen, laden Sie die Dateien manuell herunter. - + Download %n DEM tiles? %n DEM-Kachel herunterladen? @@ -915,22 +920,22 @@ - + Could not download all required DEM files. Es konnten nicht alle erforderlichen DEM-Dateien heruntergeladen werden. - + No local DEM tiles found. Keine lokalen DEM-Kacheln gefunden. - + No files loaded Keine Dateien geladen - + %n files %n Datei @@ -938,21 +943,21 @@ - - - - + + + + Date Datum - - + + Routes Routen - + Next file Nächste Datei @@ -967,13 +972,13 @@ Als PDF exportieren … - - + + Waypoints Wegpunkte - + Previous file Vorherige Datei @@ -983,122 +988,122 @@ Routen-Wegpunkte - + &File &Datei - + &Map &Karte - + &Graph &Graph - + &POI &POI - + &Data D&ata - + Download data DEM DEM für Daten herunterladen - + Download map DEM DEM für die Karte herunterladen - + &Settings &Einstellungen - + &Help &Hilfe - + First file Erste Datei - + Last file Letzte Datei - - + + CRS directory: CRS-Verzeichnis: - - + + Tile cache directory: Kachel-Cache-Verzeichnis: - + Error loading data file: Fehler beim Laden der Datendatei: - - + + Line: %1 Zeile: %1 - + Error loading POI file: Fehler beim Laden der POI-Datei: - + Name Name - - + + Tracks Strecken - + About GPXSee Über GPXSee - + Navigation Navigation - - - + + + Distance Distanz - - - - + + + + Time Zeit diff --git a/lang/gpxsee_eo.ts b/lang/gpxsee_eo.ts index e957dbbe..5c73851c 100644 --- a/lang/gpxsee_eo.ts +++ b/lang/gpxsee_eo.ts @@ -172,7 +172,7 @@ VKX files - + VKX dosieroj @@ -371,21 +371,21 @@ - - + + Paths Vojprefiksoj - - + + Keyboard controls Klavarokomandoj - + About GPXSee Pri GPXSee @@ -492,7 +492,7 @@ - + Next map Sekva mapo @@ -577,224 +577,229 @@ km/mi markoj - + + Legend + + + + Do not show Ne montri - + Marker only - + Date/time Dato/tempo - + Coordinates Koordinatoj - + Use styles Uzi stilojn - + Show local DEM tiles - + Show hillshading - + Show graphs Montri grafikaĵojn - - - + + + Distance Distanco - - - - + + + + Time Tempo - + Show grid Montri kradon - + Show slider info Montri valoron de la ŝovilo - + Show tabs Montri langetojn - + Show toolbars Montri ilobretojn - + Total time Totala tempo - - - + + + Moving time Movada tempo - + Metric Metraj - + Imperial Britimperiaj - + Nautical Maraj - + Decimal degrees (DD) Decimalaj gradoj (DG) - + Degrees and decimal minutes (DMM) Gradoj kaj decimalaj minutoj (GDM) - + Degrees, minutes, seconds (DMS) Gradoj, minutoj, sekundoj (GMS) - + Fullscreen mode Plenekrana reĝimo - + Options... Opcioj... - + Next Sekva - + Previous Antaŭa - + Last Lasta - + First Unua - + &File &Dosiero - + Open recent Malfermi lastatempajn - + &Map &Mapo - + Layers - + &Graph &Grafikaĵo - + &POI &POI - + Position Pozicio - - + + CRS directory: CRS-dosierujo: - - + + Symbols directory: Dosierujo de simboloj: - + Open directory Malfermi dosierujon - + Error loading geo URI: - - - - + + + + Don't show again Ne montri denove - + Clear "%1" tile cache? - + Download %n DEM tiles? @@ -802,300 +807,300 @@ - + &Data Da&teno - + Download data DEM - + Download map DEM - + Position info Informo pri pozicio - + DEM DEM - + &Settings &Agordoj - + Units Unuoj - + Coordinates format Koordinata formato - + &Help &Helpo - + File Dosiero - + Show Montri - + Navigation Navigado - - + + Version %1 Versio %1 - - + + GPXSee is distributed under the terms of the GNU General Public License version 3. For more info about GPXSee visit the project homepage at %1. GPXSee estas distribuita laŭ la kondiĉoj de la GNU Ĝenerala Publika Permesilo, la versio 3. Por pliaj informoj pri GPXSee, vizitu la hejmpaĝo de projekto %1. - + Next file Sekva dosiero - + Previous file Antaŭa dosiero - + First file Unua dosiero - + Last file Lasta dosiero - + Append file Postaldoni dosieron - + Next/Previous Sekva/Antaŭa - + Toggle graph type Baskuligi tipon de la grafikaĵo - + Toggle time type Baskuligi tipon de la tempo - + Toggle position info Baskuligi informon pr pozicio - + Previous map Antaŭa mapo - + Zoom in Zomi - + Zoom out Malzomi - + Digital zoom Diĝita zomo - + Zoom Zoom - + Copy coordinates Kopii koordinatojn - + Left Click Maldekstra klako - - + + Map directory: Dosierujo kun mapoj: - - + + POI directory: Dosierujo kun POI: - - + + DEM directory: Dosierujo kun DEM-dateno: - - + + Styles directory: Dosierujo kun stildosieroj: - - + + Tile cache directory: Kaŝmemora dosierujo: - - + + Open file Malfermi dosieron - + Error loading data file: Eraro dum la ŝargado de la datumdosiero: - - + + Line: %1 Linio: %1 - + Open POI file Malfermi POI-dosieron - + Error loading POI file: Eraro dum la ŝargado de la POI-dosiero: - - + + Tracks Vojoj - - + + Routes Itineroj - - + + Waypoints Vojpunktoj - - + + Areas Areoj - - - - + + + + Date Dato - - + + Statistics Statistiko - + Name Nomo - + Open map file Malfermi mapdosieron - - - - + + + + Error loading map: Eraro dum la ŝargado de la mapo: - + Select map directory Elekti dosierujon kun mapoj - + DEM tiles download limit exceeded. If you really need data for such a huge area, download the files manually. - + Could not download all required DEM files. - + No local DEM tiles found. - + No files loaded Neniuj dosieroj estas ŝargitaj - + %n files %n dosiero diff --git a/lang/gpxsee_es.ts b/lang/gpxsee_es.ts index d9d20d22..5a424868 100644 --- a/lang/gpxsee_es.ts +++ b/lang/gpxsee_es.ts @@ -371,21 +371,21 @@ - - + + Paths Trayectos - - + + Keyboard controls Atajos de teclado - + About GPXSee Acerca de GPXSee @@ -492,7 +492,7 @@ - + Next map Próximo mapa @@ -577,224 +577,229 @@ Hitos kilométricos o cada milla - + + Legend + + + + Do not show No mostrar - + Marker only Sólo marcador - + Date/time Fecha/hora - + Coordinates Coordenadas - + Use styles Estilos de uso - + Show local DEM tiles Mostrar los mosaicos locales DEM - + Show hillshading Mostrar el sombreado - + Show graphs Ver gráficas - - - + + + Distance Distancia - - - - + + + + Time Tiempo - + Show grid Ver cuadrícula - + Show slider info Ver datos al señalar - + Show tabs Mostrar las pestañas - + Show toolbars Ver barra de herramientas - + Total time Tiempo total - - - + + + Moving time Tiempo en movimiento - + Metric Métrico - + Imperial Anglosajón - + Nautical Náutica - + Decimal degrees (DD) Grados decimales (DD) - + Degrees and decimal minutes (DMM) Grados y minutos decimales (DMM) - + Degrees, minutes, seconds (DMS) Grados, minutos, segundos (GMS) - + Fullscreen mode Pantalla completa - + Options... Opciones... - + Next Siguiente - + Previous Anterior - + Last Último - + First Primer - + &File &Archivo - + Open recent Abierto reciente - + &Map &Mapa - + Layers Capas - + &Graph &Gráfico - + &POI P&OI - + Position Posición - - + + CRS directory: Directorio CRS: - - + + Symbols directory: Directorio de los símbolos: - + Open directory Abrir el directorio - + Error loading geo URI: - - - - + + + + Don't show again No volver a mostrar - + Clear "%1" tile cache? ¿Vaciar "%1" caché de los mosaicos? - + Download %n DEM tiles? ¿Descargar %n mosaico DEM? @@ -802,300 +807,300 @@ - + &Data &Datos - + Download data DEM Descargar los datos DEM - + Download map DEM Descargar el mapa DEM - + Position info Información de la posición - + DEM DEM - + &Settings &Preferencias - + Units Unidades - + Coordinates format Formato de coordenadas - + &Help Ay&uda - + File Archivo - + Show Ver - + Navigation Navegación - - + + Version %1 Versión %1 - - + + GPXSee is distributed under the terms of the GNU General Public License version 3. For more info about GPXSee visit the project homepage at %1. GPXSee se distribuye bajo Licencia Plica General GNU versión 3. Más información en la web del proyecto %1. - + Next file Siguiente archivo - + Previous file Archivo anterior - + First file Primer archivo - + Last file Último archivo - + Append file Adjuntar archivo - + Next/Previous Siguiente/Anterior - + Toggle graph type Tipo de gráfica - + Toggle time type Cambiar hora - + Toggle position info Alternar la información de la posición - + Previous map Anterior mapa - + Zoom in Acercar - + Zoom out Alejar - + Digital zoom Escala digital - + Zoom Escala - + Copy coordinates Copiar las coordenadas - + Left Click Clic izquierdo - - + + Map directory: Carpeta de mapas: - - + + POI directory: Carpeta de POI: - - + + DEM directory: Carpeta del MDT : - - + + Styles directory: Directorio de estilos: - - + + Tile cache directory: Cache de teselas: - - + + Open file Abrir archivo - + Error loading data file: Error de carga del archivo: - - + + Line: %1 Renglón: %1 - + Open POI file Cargar archivo de POI - + Error loading POI file: Error al cargar el archivo de POI: - - + + Tracks Tracks - - + + Routes Rutas - - + + Waypoints Puntos de referencia - - + + Areas Áreas - - - - + + + + Date Fecha - - + + Statistics Estadísticas - + Name Nombre - + Open map file Abrir archivo de mapa - - - - + + + + Error loading map: Error al cargar el mapa: - + Select map directory Seleccionar el directorio de los mapas - + DEM tiles download limit exceeded. If you really need data for such a huge area, download the files manually. Límite de descarga de mosaicos DEM superado. Si realmente necesitas datos para un área tan grande, descarga los archivos manualmente. - + Could not download all required DEM files. No se han podido descargar todos los archivos DEM necesarios. - + No local DEM tiles found. No se encontraron los mosaicos locales DEM. - + No files loaded Sin archivos cargados - + %n files %n archivo diff --git a/lang/gpxsee_fi.ts b/lang/gpxsee_fi.ts index a10dd686..8ba1ccb3 100644 --- a/lang/gpxsee_fi.ts +++ b/lang/gpxsee_fi.ts @@ -172,7 +172,7 @@ VKX files - + VKX-tiedostot @@ -365,14 +365,14 @@ GUI - - + + Open file Avaa tiedosto - + Open POI file Avaa POI-tiedosto @@ -383,8 +383,8 @@ - - + + Keyboard controls Näppäimistön säätimet @@ -399,12 +399,12 @@ Lataa uudelleen - + Show Näytä - + File Tiedosto @@ -440,8 +440,8 @@ - - + + Paths Tiedostopolut @@ -498,7 +498,7 @@ - + Next map Seuraava kartta @@ -578,417 +578,422 @@ km/mi merkit - + + Legend + + + + Do not show Älä näytä - + Marker only Vain merkki - + Date/time Pvm/aika - + Coordinates Koordinaatit - + Use styles Käytä tyylejä - + Show local DEM tiles Näytä paikalliset DEM-laatat - + Show hillshading - + Show graphs Näytä kaaviokuvat - + Show grid Näytä ruudukko - + Show slider info Näytä liukusäätimen arvo - + Show tabs Näytä välilehdet - + Show toolbars Näytä työkalupalkit - + Total time Kokonaisaika - - - + + + Moving time Liikkumisaika - + Metric Metriset - + Imperial Brittiläiset - + Nautical Merelliset - + Decimal degrees (DD) Desimaaliasteet (DD) - + Degrees and decimal minutes (DMM) Asteet, desimaaliminuutit (DMM) - + Degrees, minutes, seconds (DMS) Asteet, minuutit, sekunnit (DMS) - + Fullscreen mode Kokoruututila - + Options... Valinnat... - + Next Seuraava - + Previous Edellinen - + Last Viimeinen - + First Ensimmäinen - + Open recent Avaa viimeisimmät - + Layers Kerrokset - + Position info Sijaintitiedot - + DEM DEM - + Position Sijainti - + Units Yksiköt - + Coordinates format Koordinaattien muoto - - + + Version %1 Versio %1 - - + + GPXSee is distributed under the terms of the GNU General Public License version 3. For more info about GPXSee visit the project homepage at %1. GPXSee levitetään GNU yleisen lisenssin version 3 alaisena. Voit katsoa lisätietoja GPXSee:stä projektin kotisivulla %1. - + Append file Lisää tiedosto - + Next/Previous Seuraava/edellinen - + Toggle graph type Vaihda kaaviokuvan tyyppi - + Toggle time type Vaihda ajan tyyppi - + Toggle position info Vaihda sijaintitiedot - + Previous map Edellinen kartta - + Zoom in Lähennä - + Zoom out Loitonna - + Digital zoom Digitaalinen zoomi - + Zoom Zoom - + Copy coordinates Kopioi koordinaatit - + Left Click Vasen painallus - - + + DEM directory: DEM -tietojen hakemisto: - - + + Styles directory: Tyylitiedostoiden hakemisto: - - + + Symbols directory: Symbolien hakemisto: - + Open directory Avaa hakemisto - + Error loading geo URI: - - - - + + + + Don't show again Älä näytä uudelleen - - + + Areas Alueet - - + + Statistics Tilasto - + Open map file Avaa karttatiedosto - + DEM tiles download limit exceeded. If you really need data for such a huge area, download the files manually. DEM-laattojen latausraja ylitetty. Jos todella tarvitset tietoja niin suurelta alueelta, lataa tiedostot manuaalisesti. - + Could not download all required DEM files. Kaikkia vaadittuja DEM-tiedostoja ei voitu ladata. - + No files loaded Yhtään tiedostoa ei ladattu - - - - + + + + Date Päivämäärä - + &File &Tiedosto - + &Map &Kartat - + &Graph Kaa&viokuva - + &POI &POI - + &Data Tie&dot - + Download data DEM Lataa data-DEM - + Download map DEM Lataa kartta-DEM - + &Settings &Asetukset - + &Help &Ohje - - + + Map directory: Karttojen hakemisto: - - + + POI directory: POI:n hakemisto: - - + + CRS directory: CRS-hakemisto: - - + + Tile cache directory: Välimuistin hakemisto: - - + + Routes Reitit - - - - + + + + Error loading map: Virhe ladattaessa karttaa: - + Select map directory Valitse karttahakemisto - + Clear "%1" tile cache? Tyhjennetäänkö "%1" ruutuvälimuisti? - + Download %n DEM tiles? @@ -996,12 +1001,12 @@ - + No local DEM tiles found. - + %n files %n tiedosto @@ -1009,7 +1014,7 @@ - + Next file Seuraava tiedosto @@ -1024,13 +1029,13 @@ Vie PDF:ksi... - - + + Waypoints Reittipisteet - + Previous file Edellinen tiedosto @@ -1040,65 +1045,65 @@ Reittipisteet - + First file Ensimmäinen tiedosto - + Last file Viimeinen tiedosto - + Error loading data file: Virhe ladattaessa datatiedostoa: - - + + Line: %1 Rivi: %1 - + Error loading POI file: Virhe ladattaessa POI-tiedostoa: - + Name Nimi - - + + Tracks Jäljet - + About GPXSee Tietoja GPXSee:stä - + Navigation Navigointi - - - + + + Distance Etäisyys - - - - + + + + Time Aika diff --git a/lang/gpxsee_fr.ts b/lang/gpxsee_fr.ts index 9f8f4c6d..389bfc67 100644 --- a/lang/gpxsee_fr.ts +++ b/lang/gpxsee_fr.ts @@ -365,26 +365,26 @@ GUI - - + + Map directory: Dossier de cartes : - - + + POI directory: Dossier des POI : - - + + Open file Ouvrir un fichier - + Open POI file Ouvrir un fichier POI @@ -395,8 +395,8 @@ - - + + Keyboard controls Raccourcis clavier @@ -411,12 +411,12 @@ Actualiser - + Show Afficher - + File Fichier @@ -452,8 +452,8 @@ - - + + Paths Chemins d'accès @@ -510,7 +510,7 @@ - + Next map Carte suivante @@ -590,324 +590,329 @@ Bornes kilométriques ou milliaires - + + Legend + Légende + + + Do not show Aucun affichage - + Marker only Seulement les points - + Date/time Date et heure - + Coordinates Coordonnées - + Use styles Utiliser styles - + Show local DEM tiles Afficher les tuiles MNT locales - + Show hillshading Afficher les ombrages du relief - + Show graphs Afficher les graphes - + Show grid Afficher la grille - + Show slider info Afficher les infos du curseur - + Show tabs Voir les onglets - + Show toolbars Afficher la barre d'outils - + Total time Durée totale - - - + + + Moving time Durée en déplacement - + Metric Métrique - + Imperial Anglo-saxon - + Nautical Nautique - + Decimal degrees (DD) Degrés décimaux (DD) - + Degrees and decimal minutes (DMM) Degrés, minutes décimales (DMM) - + Degrees, minutes, seconds (DMS) Degrés, minutes, secondes (DMS) - + Fullscreen mode Mode plein écran - + Options... Options... - + Next Suivant - + Previous Précédent - + Last Dernier - + First Premier - + Open recent Fichiers récents - + Layers Couches - + Position info Infos de position - + DEM MNT - + Position Position - + Units Système d'unités - + Coordinates format Unités des coordonnées - - + + Version %1 Version %1 - - + + GPXSee is distributed under the terms of the GNU General Public License version 3. For more info about GPXSee visit the project homepage at %1. GPXSee est distribué selon les termes de la licence publique générale GNU (version 3). Pour plus d'information sur GPXSee, visiter le site du projet %1. - + Append file Joindre un fichier - + Next/Previous Suivant/Précédant - + Toggle graph type Controler le type de graphe - + Toggle time type Controler le type de durée - + Toggle position info Activer ou non les infos de position - + Previous map Carte précédente - + Zoom in Zoomer - + Zoom out Dézoomer - + Digital zoom Zoom numérique - + Zoom Zoom - + Copy coordinates Copier les coordonnées - + Left Click Clic gauche - - + + DEM directory: Dossier DEM : - - + + Styles directory: Dossier de styles : - - + + Symbols directory: Dossier de symboles : - + Open directory Ouvrir dossier - + Error loading geo URI: Erreur de chargement de l'URI géo : - - - - + + + + Don't show again Ne plus afficher - - + + Areas Zones - - + + Statistics Statistiques - + Open map file Ouvrir un fichier de carte - - - - + + + + Error loading map: Erreur lors du chargement de la carte : - + Select map directory Sélectionner un dossier de cartes - + Clear "%1" tile cache? Vider le cache de tuiles "%1" ? - + DEM tiles download limit exceeded. If you really need data for such a huge area, download the files manually. Le téléchargement des tuiles MNT a atteint sa limite. Si vous avez vraiment besoin des données pour une zone aussi énorme, téléchargez les fichiers manuellement. - + Download %n DEM tiles? Télécharger %n tuile de MNT ? @@ -915,22 +920,22 @@ - + Could not download all required DEM files. Le téléchargement de tout les fichiers MNT a échoué. - + No local DEM tiles found. Aucune tuile MNT trouvée en local. - + No files loaded Aucun fichier chargé - + %n files %n fichier @@ -938,21 +943,21 @@ - - - - + + + + Date Date - - + + Routes Routes - + Next file Fichier suivant @@ -967,13 +972,13 @@ Exporter au format PDF... - - + + Waypoints Jalons - + Previous file Fichier précédent @@ -983,122 +988,122 @@ Jalons de route - + &File &Fichier - + &Map &Carte - + &Graph &Graphe - + &POI &POI - + &Data &Données - + Download data DEM Télécharger les données du MNT - + Download map DEM Télécharger la carte du MNT - + &Settings &Paramètres - + &Help &Aide - + First file Premier fichier - + Last file Dernier fichier - - + + CRS directory: Dossier CRS : - - + + Tile cache directory: Dossier du cache de tuiles : - + Error loading data file: Erreur lors du chargement des données : - - + + Line: %1 Ligne : %1 - + Error loading POI file: Erreur lors du chargement du fichier POI : - + Name Nom - - + + Tracks Traces - + About GPXSee À propos de GPXSee - + Navigation Navigation - - - + + + Distance Distance - - - - + + + + Time Temps diff --git a/lang/gpxsee_hu.ts b/lang/gpxsee_hu.ts index 9df737bb..499808ff 100644 --- a/lang/gpxsee_hu.ts +++ b/lang/gpxsee_hu.ts @@ -371,21 +371,21 @@ - - + + Paths Elérési útvonalak - - + + Keyboard controls Gyorsbillentyűk - + About GPXSee A GPXSee névjegye @@ -492,7 +492,7 @@ - + Next map Következő térkép @@ -577,524 +577,529 @@ km(mérföld) jelölők - + + Legend + Jelmagyarázat + + + Do not show Ne mutassa - + Marker only Csak jelölő - + Date/time Időpont - + Coordinates Koordináták - + Use styles Stílusok használata - + Show local DEM tiles Helyi DEM csempék mutatása - + Show hillshading Domborzatárnyékolás - + Show graphs Grafikon mutatása - - - + + + Distance Távolság - - - - + + + + Time Idő - + Show grid Rácsvonalak mutatása - + Show slider info Adatok a csúszka mellett - + Show tabs Fülek mutatása - + Show toolbars Gombok mutatása - + Total time Teljes időtartam - - - + + + Moving time Mozgásban töltött idő - + Metric Metrikus - + Imperial Angolszász - + Nautical Tengeri - + Decimal degrees (DD) Fok, tizedfok (DD) - + Degrees and decimal minutes (DMM) Fok, perc (DMM) - + Degrees, minutes, seconds (DMS) Fok, perc, másodperc (DMS) - + Fullscreen mode Teljes képernyős - + Options... Beállítások… - + Next Következő - + Previous Előző - + Last Utolsó - + First Első - + &File &Fájl - + Open recent Legutóbbiak megnyitása - + &Map &Térkép - + Layers Rétegek - + &Graph &Grafikon - + &POI &POI - + Position Pozíció - - + + CRS directory: CRS könyvtár: - - + + Symbols directory: Szimbólumkönyvtár: - + Open directory Könyvtár megnyitása - + Error loading geo URI: Hiba a geo URI betöltésekor: - - - - + + + + Don't show again Ne mutassa újra - + Clear "%1" tile cache? "%1" csempe gyorsítótár törlése? - + Download %n DEM tiles? %n DEM csempe letöltése? - + &Data &Adatok - + Download data DEM DEM adat letöltése - + Download map DEM DEM térkép letöltése - + Position info Pozíció információ - + DEM DEM - + &Settings &Beállítások - + Units Mértékegységek - + Coordinates format Koordináta formátum - + &Help &Segítség - + File Műveletgombok - + Show Szűrőgombok - + Navigation Léptető gombok - - + + Version %1 %1. verzió - - + + GPXSee is distributed under the terms of the GNU General Public License version 3. For more info about GPXSee visit the project homepage at %1. A GPXSee-t a GNU General Public License 3. verziója szerint terjesztik. A GPXSee-re vonatkozó további információkért látogasson el a projekt honlapjára a %1 oldalon. - + Next file Következő fájl - + Previous file Előző fájl - + First file Első fájl - + Last file Utolsó fájl - + Append file További fájl (hozzáadás) - + Next/Previous Következő/előző - + Toggle graph type Grafikon: idő/távolság váltás - + Toggle time type Idő: összes/mozgásban váltás - + Toggle position info Pozíció információ váltás - + Previous map Előző térkép - + Zoom in Nagyítás - + Zoom out Kicsinyítés - + Digital zoom Digitális nagyítás - + Zoom Nagyítás - + Copy coordinates Koordináták másolása - + Left Click Bal kattintás - - + + Map directory: Térképmappa: - - + + POI directory: POI mappa: - - + + DEM directory: DEM mappa: - - + + Styles directory: Stílusok mappa: - - + + Tile cache directory: Gyorsítótár mappa: - - + + Open file Fájl megnyitása - + Error loading data file: Adatfájl betöltési hiba: - - + + Line: %1 Sor: %1 - + Open POI file POI fájl megnyitása - + Error loading POI file: Hiba a POI fájl betöltése során: - - + + Tracks Nyomvonalak - - + + Routes Útvonalak - - + + Waypoints Köztespontok - - + + Areas Területek - - - - + + + + Date Dátum - - + + Statistics Összesítés - + Name Név - + Open map file Térképfájl megnyitása - - - - + + + + Error loading map: Térképbetöltési hiba: - + Select map directory Térképmappa kiválasztása - + DEM tiles download limit exceeded. If you really need data for such a huge area, download the files manually. DEM csempe letöltési limit túllépve. Ha valóban szüksége van ilyen nagy területre vonatkozó adatokra, töltse le a fájlokat kézzel. - + Could not download all required DEM files. Nem volt letölthető minden szükséges DEM fájl. - + No local DEM tiles found. Nem található helyi DEM csempe. - + No files loaded Nincs betöltött fájl - + %n files %n fájl diff --git a/lang/gpxsee_it.ts b/lang/gpxsee_it.ts index 0b31a04f..965ebeee 100644 --- a/lang/gpxsee_it.ts +++ b/lang/gpxsee_it.ts @@ -371,21 +371,21 @@ - - + + Paths Percorsi - - + + Keyboard controls Scorciatoie da tastiera - + About GPXSee A proposito di GPXSee @@ -492,7 +492,7 @@ - + Next map Mappa successiva @@ -577,224 +577,229 @@ Pietre miliari - + + Legend + + + + Do not show Non mostrare - + Marker only Solo indicatori - + Date/time Data e ora - + Coordinates Coordinate - + Use styles - + Show local DEM tiles - + Show hillshading - + Show graphs Mostra grafici - - - + + + Distance Distanza - - - - + + + + Time Tempo - + Show grid Mostra griglia - + Show slider info Mostra informazioni cursore - + Show tabs - + Show toolbars Mostra barra degli strumenti - + Total time Tempo totale - - - + + + Moving time Tempo in movimento - + Metric Metrico - + Imperial Imperiale - + Nautical Nautico - + Decimal degrees (DD) Gradi decimali (DD) - + Degrees and decimal minutes (DMM) Gradi e minuti decimali (DMM) - + Degrees, minutes, seconds (DMS) Gradi, minuti e secondi (DMS) - + Fullscreen mode Schermo intero - + Options... Opzioni... - + Next Successivo - + Previous Precedente - + Last Ultimo - + First Primo - + &File &File - + Open recent - + &Map &Mappa - + Layers - + &Graph &Grafico - + &POI &POI - + Position Posizione - - + + CRS directory: - - + + Symbols directory: Cartella simboli - + Open directory - + Error loading geo URI: - - - - + + + + Don't show again - + Clear "%1" tile cache? - + Download %n DEM tiles? @@ -802,300 +807,300 @@ - + &Data &Dati - + Download data DEM - + Download map DEM - + Position info Info sulla posizione - + DEM DEM - + &Settings Impo&stazioni - + Units Unità - + Coordinates format Formato coordinate - + &Help &Aiuto - + File File - + Show Mostra - + Navigation Navigazione - - + + Version %1 Versione %1 - - + + GPXSee is distributed under the terms of the GNU General Public License version 3. For more info about GPXSee visit the project homepage at %1. GPXSee è distribuito sotto i termini della GNU General Public License versione 3. Per maggiori informazioni su GPXSee visitare il sito del progetto %1. - + Next file File successivo - + Previous file File precedente - + First file Primo file - + Last file Ultimo file - + Append file Aggiungi file - + Next/Previous Successivo/Precedente - + Toggle graph type Cambia formato del grafico - + Toggle time type Cambia formato del tempo - + Toggle position info Attiva/disattiva le informazioni posizione - + Previous map Mappa precedente - + Zoom in Zoom in - + Zoom out Zoom out - + Digital zoom Zoom digitale - + Zoom Zoom - + Copy coordinates Copia le coordinate - + Left Click Clic sinistro - - + + Map directory: Cartella mappe: - - + + POI directory: Cartella POI: - - + + DEM directory: Cartella DEM: - - + + Styles directory: Cartella stili: - - + + Tile cache directory: Cartella cache mappe: - - + + Open file Apri file - + Error loading data file: Errore caricamento file: - - + + Line: %1 Linea: %1 - + Open POI file Apri file POI - + Error loading POI file: Errore caricamento file POI: - - + + Tracks Tracce - - + + Routes Percorsi - - + + Waypoints Punti - - + + Areas Aree - - - - + + + + Date Data - - + + Statistics Statistiche - + Name Nome - + Open map file Apri file mappa - - - - + + + + Error loading map: Errore caricamento mappa: - + Select map directory Seleziona la directory mappa - + DEM tiles download limit exceeded. If you really need data for such a huge area, download the files manually. - + Could not download all required DEM files. Impossibile scaricare tutti i file DEM. - + No local DEM tiles found. Nessun file DEM trovato. - + No files loaded Nessun file caricato - + %n files %n file diff --git a/lang/gpxsee_ko.ts b/lang/gpxsee_ko.ts index ca1612c0..587a9809 100644 --- a/lang/gpxsee_ko.ts +++ b/lang/gpxsee_ko.ts @@ -371,21 +371,21 @@ - - + + Paths 경로 - - + + Keyboard controls 키보드 제어 - + About GPXSee GPXSee 정보 @@ -492,7 +492,7 @@ - + Next map 다음 지도 @@ -577,524 +577,529 @@ km/mi 마커 - + + Legend + + + + Do not show 표시 안 함 - + Marker only 마커만 - + Date/time 날짜/시간 - + Coordinates 좌표 - + Use styles 스타일 사용 - + Download data DEM 데이터 DEM 다운로드 - + Download map DEM 지도 DEM 다운로드 - + Show local DEM tiles 로컬 DEM 타일 표시 - + Show hillshading 언덕 음영 표시 - + Show graphs 그래프 표시 - - - + + + Distance 거리 - - - - + + + + Time 시간 - + Show grid 격자 표시 - + Show slider info 슬라이더 정보 표시 - + Show tabs 탭 표시 - + Show toolbars 도구 모음 표시 - + Total time 총 시간 - - - + + + Moving time 이동시간 - + Metric 미터법 - + Imperial 야드·파운드법 - + Nautical 항해 - + Decimal degrees (DD) 십진법 (DD) - + Degrees and decimal minutes (DMM) 도 및 소수 분 (DMM) - + Degrees, minutes, seconds (DMS) 도, 분, 초 (DMS) - + Fullscreen mode 전체 화면 모드 - + Options... 옵션... - + Next 다음 - + Previous 이전 - + Last 마지막 - + First 처음 - + &File 파일(&F) - + Open recent 최근 열기 - + &Map 지도(&M) - + Layers 레이어 - + &Graph 그래프(&G) - + &Data 데이터(&D) - + Position info 위치 정보 - + &POI POI(&P) - + DEM DEM - + Position 위치 - + &Settings 설정(&S) - + Units 단위 - + Coordinates format 좌표 형식 - + &Help 도움말(&H) - + File 파일 - + Show 표시 - + Navigation 네비게이션 - - + + Version %1 버전 %1 - - + + GPXSee is distributed under the terms of the GNU General Public License version 3. For more info about GPXSee visit the project homepage at %1. GPXSee는 GNU General Public License 버전 3의 조건에 따라 배포됩니다. GPX에 대한 자세한 내용은 %1의 프로젝트 홈페이지를 참조하십시오. - + Next file 다음 파일 - + Previous file 이전 파일 - + First file 첫 번째 파일 - + Last file 마지막 파일 - + Append file 파일 추가 - + Next/Previous 다음/이전 - + Toggle graph type 그래프 유형 전환 - + Toggle time type 시간 유형 전환 - + Toggle position info 위치 정보 전환 - + Previous map 이전 지도 - + Zoom in 확대 - + Zoom out 축소 - + Digital zoom 디지털 줌 - + Zoom 확대/축소 - + Copy coordinates 좌표 복사 - + Left Click 왼쪽 클릭 - - + + Map directory: 지도 디렉터리: - - + + POI directory: POI 디렉터리: - - + + CRS directory: CRS 디렉토리: - - + + DEM directory: DEM 디렉터리: - - + + Styles directory: 스타일 디렉터리: - - + + Symbols directory: 기호 디렉터리: - - + + Tile cache directory: 타일 캐시 디렉터리: - - + + Open file 파일 열기 - + Open directory 디렉터리 열기 - + Error loading geo URI: - + Error loading data file: 데이터 파일 불어오는 중 오류 발생: - - + + Line: %1 줄: %1 - - - - + + + + Don't show again 다시 표시 안 함 - + Open POI file POI 파일 열기 - + Error loading POI file: POI 파일 불어오는 중 오류 발생: - - + + Tracks 트랙 - - + + Routes 경로 - - + + Waypoints 경유지 - - + + Areas 영역 - - - - + + + + Date 날짜 - - + + Statistics 통계 - + Name 이름 - + Open map file 지도 파일 열기 - - - - + + + + Error loading map: 지도 불러오는 중 오류 발생: - + Select map directory 지도 디렉터리 선택 - + Clear "%1" tile cache? %1 타일 캐시를 지우시겠습니까? - + DEM tiles download limit exceeded. If you really need data for such a huge area, download the files manually. DEM 타일 다운로드 제한을 초과했습니다. 이렇게 넓은 지역에 대한 데이터가 정말 필요하다면 수동으로 파일을 다운로드하세요. - + Download %n DEM tiles? %n개의 DEM 타일을 다운로드하시겠습니까? - + Could not download all required DEM files. 필요한 모든 DEM 파일을 다운로드할 수 없습니다. - + No local DEM tiles found. 로컬 DEM 타일을 찾을 수 없습니다. - + No files loaded 불러온 파일이 없습니다 - + %n files %n개 파일 diff --git a/lang/gpxsee_nb.ts b/lang/gpxsee_nb.ts index 6a463deb..16d95d21 100644 --- a/lang/gpxsee_nb.ts +++ b/lang/gpxsee_nb.ts @@ -371,21 +371,21 @@ - - + + Paths Mappebaner - - + + Keyboard controls Tastatursnarveier - + About GPXSee Om @@ -492,7 +492,7 @@ - + Next map Neste kart @@ -577,224 +577,229 @@ km/mi-markører - + + Legend + + + + Do not show Ikke vis - + Marker only Kun markør - + Date/time Dato/tid - + Coordinates Koordinater - + Use styles Bruk stiler - + Show local DEM tiles Vis lokale DEM-fliser - + Show hillshading Vis relieffskygge - + Show graphs Vis diagrammer - - - + + + Distance Distanse - - - - + + + + Time Tid - + Show grid Vis rutenett - + Show slider info Vis skyverinfo - + Show tabs Vis faner - + Show toolbars Vis verktøylinjer - + Total time Total tid - - - + + + Moving time Tid i bevegelse - + Metric Metrisk - + Imperial Britisk - + Nautical Nautisk - + Decimal degrees (DD) Desimalgrader (DD) - + Degrees and decimal minutes (DMM) Grader og desimalminutter (DMM) - + Degrees, minutes, seconds (DMS) Grader, minutter, sekunder (DMS) - + Fullscreen mode Fullskjermmodus - + Options... Alternativer… - + Next Neste - + Previous Forrige - + Last Siste - + First Første - + &File &Fil - + Open recent Åpne nylige - + &Map &Kart - + Layers Lag - + &Graph &Graf - + &POI I&nteressepunkt - + Position Posisjon - - + + CRS directory: CRS-mappe: - - + + Symbols directory: Symbolmappe: - + Open directory Åpne mappe - + Error loading geo URI: - - - - + + + + Don't show again Ikke vis igjen - + Clear "%1" tile cache? Tøm «%1»-flishurtiglager? - + Download %n DEM tiles? Laste ned %n DEM-flis? @@ -802,300 +807,300 @@ - + &Data &Data - + Download data DEM Last ned data-DEM - + Download map DEM Last ned kart-DEM - + Position info Posisjonsinfo - + DEM DEM - + &Settings &Innstillinger - + Units Enheter - + Coordinates format Koordinatformat - + &Help &Hjelp - + File Fil - + Show Vis - + Navigation Navigasjon - - + + Version %1 Versjon %1 - - + + GPXSee is distributed under the terms of the GNU General Public License version 3. For more info about GPXSee visit the project homepage at %1. GPXSee er distribuert i henhold til vilkårene i GNU general public lisens, versjon 3. For mer info om GPXSee, besøk prosjekthjemmesiden på %1. - + Next file Neste fil - + Previous file Forrige fil - + First file Første fil - + Last file Siste fil - + Append file Legg til fil - + Next/Previous Neste/forrige - + Toggle graph type Veksle diagramtype - + Toggle time type Veksle tidstype - + Toggle position info Veksle posisjonsinfo - + Previous map Forrige kart - + Zoom in Zoom inn - + Zoom out Zoom ut - + Digital zoom Digital zoom - + Zoom Zoom - + Copy coordinates Kopier koordinater - + Left Click Venstreklikk - - + + DEM directory: DEM-mappe: - - + + Styles directory: Stilmappe: - - + + Tile cache directory: Flishurtiglagringsmappe: - + Select map directory Velg kartmappe - - + + Map directory: Kartmappe: - - + + POI directory: Interessepunktmappe: - - + + Open file Åpne fil - + Error loading data file: Feil ved innlasting av datafil: - - + + Line: %1 Linje: %1 - + Open POI file Åpne interessepunktfil - + Error loading POI file: Feil ved innlasting av interessepunktfil: - - + + Tracks Spor - - + + Routes Ruter - - + + Waypoints Veipunkter - - + + Areas Områder - - - - + + + + Date Dato - - + + Statistics Statistikk - + Name Navn - + Open map file Åpne kartfil - - - - + + + + Error loading map: Feil ved innlasting av kart: - + DEM tiles download limit exceeded. If you really need data for such a huge area, download the files manually. Nedlastingsgrensen for DEM-fliser er overskredet. Hvis du virkelig trenger data for et så stort område, last ned filene manuelt. - + Could not download all required DEM files. Kunne ikke laste ned alle påkrevde DEM-filer. - + No local DEM tiles found. Fant ingen lokale DEM-fliser. - + No files loaded Ingen filer lastet - + %n files %n fil diff --git a/lang/gpxsee_pl.ts b/lang/gpxsee_pl.ts index ac3fdf60..1e93b8d6 100644 --- a/lang/gpxsee_pl.ts +++ b/lang/gpxsee_pl.ts @@ -365,14 +365,14 @@ GUI - - + + Open file Otwórz plik - + Open POI file Otwórz plik POI @@ -383,8 +383,8 @@ - - + + Keyboard controls Elementy sterujące klawiatury @@ -399,12 +399,12 @@ Odśwież - + Show Pokaż - + File Plik @@ -440,8 +440,8 @@ - - + + Paths Ścieżki @@ -498,7 +498,7 @@ - + Next map Następna mapa @@ -578,417 +578,422 @@ Znaczniki km/mi - + + Legend + + + + Do not show Nie pokazuj - + Marker only Tylko znacznik - + Date/time Data/czas - + Coordinates Współrzędne - + Use styles - + Show local DEM tiles - + Show hillshading - + Show graphs Pokaż wykresy - + Show grid Pokaż siatkę - + Show slider info Pokaż informację o suwaku - + Show tabs - + Show toolbars Pokaż paski narzędzi - + Total time Całkowity czas - - - + + + Moving time Czas ruchu - + Metric Metryczne - + Imperial Imperialne - + Nautical Morskie - + Decimal degrees (DD) Stopnie dziesiętne (DD) - + Degrees and decimal minutes (DMM) Stopnie i minuty dziesiętne (DMM) - + Degrees, minutes, seconds (DMS) Stopnie, minuty, sekundy (DMS) - + Fullscreen mode Tryb pełnoekranowy - + Options... Opcje... - + Next Następny - + Previous Poprzedni - + Last Ostatni - + First Pierwszy - + Open recent - + Layers - + Position info Informacje o pozycji - + DEM - + Position - + Units Jednostki - + Coordinates format Format współrzędnych - - + + Version %1 Wersja %1 - - + + GPXSee is distributed under the terms of the GNU General Public License version 3. For more info about GPXSee visit the project homepage at %1. Program GPXSee jest rozpowszechniany na warunkach licencji GNU General Public License w wersji 3. Więcej informacji o programie GPXSee można znaleźć na stronie głównej projektu pod adresem %1. - + Append file Dołącz plik - + Next/Previous Następny/Poprzedni - + Toggle graph type Zmień typ wykresu - + Toggle time type Zmień typ czasu - + Toggle position info Przełącz informacje o pozycji - + Previous map Poprzednia mapa - + Zoom in Przybliż - + Zoom out Oddal - + Digital zoom Zoom cyfrowy - + Zoom Zoom - + Copy coordinates Skopiuj współrzędne - + Left Click Lewy przycisk myszy - - + + DEM directory: Katalog z danymi DEM: - - + + Styles directory: Katalog ze stylami: - - + + Symbols directory: - + Open directory - + Error loading geo URI: - - - - + + + + Don't show again - - + + Areas Obszary - - + + Statistics Statystyka - + Open map file Otwórz plik mapy - + DEM tiles download limit exceeded. If you really need data for such a huge area, download the files manually. - + Could not download all required DEM files. - + No files loaded Nie załadowano żadnych plików - - - - + + + + Date Data - + &File &Plik - + &Map &Mapa - + &Graph &Wykres - + &POI P&OI - + &Data &Dane - + Download data DEM - + Download map DEM - + &Settings &Ustawienia - + &Help Pomo&c - - + + Map directory: Katalog z mapami: - - + + POI directory: Katalog z POI: - - + + CRS directory: - - + + Tile cache directory: Katalog pamięci podręcznej kafelków: - - + + Routes Trasy - - - - + + + + Error loading map: Wystąpił błąd podczas ładowania mapy: - + Select map directory Wybierz katalog map - + Clear "%1" tile cache? - + Download %n DEM tiles? @@ -997,12 +1002,12 @@ - + No local DEM tiles found. - + %n files %n plik @@ -1011,7 +1016,7 @@ - + Next file Następny plik @@ -1026,13 +1031,13 @@ Eksportuj do PDF... - - + + Waypoints Punkty nawigacyjne - + Previous file Poprzedni plik @@ -1042,65 +1047,65 @@ Punkty trasy - + First file Pierwszy plik - + Last file Ostatni plik - + Error loading data file: Błąd podczas ładowania pliku danych: - - + + Line: %1 Linia: %1 - + Error loading POI file: Błąd podczas ładowania pliku POI: - + Name Nazwa - - + + Tracks Ślady - + About GPXSee O programie GPXSee - + Navigation Nawigacja - - - + + + Distance Dystans - - - - + + + + Time Czas diff --git a/lang/gpxsee_pt_BR.ts b/lang/gpxsee_pt_BR.ts index 2c191626..a9128af4 100644 --- a/lang/gpxsee_pt_BR.ts +++ b/lang/gpxsee_pt_BR.ts @@ -371,21 +371,21 @@ - - + + Paths Caminhos - - + + Keyboard controls Controles de teclado - + About GPXSee Sobre o GPXSee @@ -492,7 +492,7 @@ - + Next map Próximo mapa @@ -577,224 +577,229 @@ Marcadores de km/mi - + + Legend + + + + Do not show - + Marker only - + Date/time - + Coordinates Coordenadas - + Use styles - + Show local DEM tiles - + Show hillshading - + Show graphs Mostrar gráficos - - - + + + Distance Distância - - - - + + + + Time Tempo - + Show grid Mostrar grade - + Show slider info Mostrar informações do cursor - + Show tabs - + Show toolbars Mostrar barra de ferramentas - + Total time Tempo total - - - + + + Moving time Tempo em movimento - + Metric Métrica - + Imperial Imperial - + Nautical Naútica - + Decimal degrees (DD) Graus decimais (DD) - + Degrees and decimal minutes (DMM) Graus e minutos decimais (DMM) - + Degrees, minutes, seconds (DMS) Graus, minutos, segundos (DMS) - + Fullscreen mode Tela inteira - + Options... Preferências... - + Next Próximo - + Previous Anterior - + Last Último - + First Primeiro - + &File &Arquivo - + Open recent - + &Map &Mapa - + Layers - + &Graph &Gráfico - + &POI &POI - + Position - - - - CRS directory: - - + CRS directory: + + + + + Symbols directory: - + Open directory - + Error loading geo URI: - - - - + + + + Don't show again - + Clear "%1" tile cache? - + Download %n DEM tiles? @@ -802,300 +807,300 @@ - + &Data &Dados - + Download data DEM - + Download map DEM - + Position info - + DEM - + &Settings &Configurações - + Units Unidades - + Coordinates format Formato de coordenadas - + &Help Aj&uda - + File Arquivo - + Show Exibir - + Navigation Navegação - - + + Version %1 Versão %1 - - + + GPXSee is distributed under the terms of the GNU General Public License version 3. For more info about GPXSee visit the project homepage at %1. GPXSee é distribuído nos termos da Licença Pública Geral GNU versão 3. Para mais informações sobre o GPXSee visite a página do projeto em %1. - + Next file Próximo arquivo - + Previous file Arquivo anterior - + First file Primeiro arquivo - + Last file Último arquivo - + Append file Anexar arquivo - + Next/Previous Próximo/Anterior - + Toggle graph type Alterna o tipo do gráfico - + Toggle time type Alterna o tipo de tempo - + Toggle position info - + Previous map Mapa anterior - + Zoom in Aumentar o zoom - + Zoom out Reduzir o zoom - + Digital zoom Zoom digital - + Zoom Zoom - + Copy coordinates Copiar coordenadas - + Left Click Clique esquerdo - - + + Map directory: Diretório de mapas: - - + + POI directory: Diretório de POI: - - + + DEM directory: Diretório de DEM: - - + + Styles directory: Diretório de estilos: - - + + Tile cache directory: Diretório de cache de ladrilhos: - - + + Open file Abrir arquivo - + Error loading data file: Erro ao carregar arquivo de dados: - - + + Line: %1 Linha: %1 - + Open POI file Abrir aquivo POI - + Error loading POI file: Erro ao carregar arquivo POI: - - + + Tracks Trilhas - - + + Routes Rotas - - + + Waypoints Waypoints - - + + Areas Áreas - - - - + + + + Date Data - - + + Statistics Estatísticas - + Name Nome - + Open map file Abrir arquivo de mapa - - - - + + + + Error loading map: Erro ao carregar o mapa: - + Select map directory Selecionar diretório de mapa - + DEM tiles download limit exceeded. If you really need data for such a huge area, download the files manually. - + Could not download all required DEM files. - + No local DEM tiles found. - + No files loaded Nenhum arquivo carregado - + %n files %n arquivo diff --git a/lang/gpxsee_ru.ts b/lang/gpxsee_ru.ts index 973c5501..4ebd8af3 100644 --- a/lang/gpxsee_ru.ts +++ b/lang/gpxsee_ru.ts @@ -172,7 +172,7 @@ VKX files - + VKX файлы @@ -365,14 +365,14 @@ GUI - - + + Open file Открыть файл - + Open POI file Открыть файл с точками POI @@ -383,8 +383,8 @@ - - + + Keyboard controls Управление с помощью клавиатуры @@ -399,12 +399,12 @@ Обновить - + Show Показать - + File Файл @@ -440,8 +440,8 @@ - - + + Paths Пути @@ -498,7 +498,7 @@ - + Next map Следующая карта @@ -578,417 +578,422 @@ км/мл отметки - + + Legend + Легенда + + + Do not show Не показывать - + Marker only Только отметки - + Date/time Дата/время - + Coordinates Координаты - + Use styles Использовать стили - + Show local DEM tiles Показать локальные DEM тайлы - + Show hillshading Показывать отмывку рельефа - + Show graphs Показывать графики - + Show grid Показывать сетку - + Show slider info Показывать значение на слайдере - + Show tabs Показать вкладки - + Show toolbars Показывать панель инструментов - + Total time Общее время - - - + + + Moving time Время движения - + Metric Метрические - + Imperial Британские - + Nautical Морские - + Decimal degrees (DD) Десятичные градусы (DD) - + Degrees and decimal minutes (DMM) Градусы, десятичные минуты (DMM) - + Degrees, minutes, seconds (DMS) Градусы, минуты, секунды (DMS) - + Fullscreen mode Полноэкранный режим - + Options... Параметры… - + Next Следующий - + Previous Предыдущий - + Last Последний - + First Первый - + Open recent Открыть недавние - + Layers Слои - + Position info Информация о позиции - + DEM DEM - + Position Позиция - + Units Единицы - + Coordinates format Формат координат - - + + Version %1 Версия %1 - - + + GPXSee is distributed under the terms of the GNU General Public License version 3. For more info about GPXSee visit the project homepage at %1. GPXSee распространяется в соответствии с условиями GNU General Public License 3 версии. Для получения дополнительной информации о GPXSee посетите страницу проекта %1. - + Append file Добавить файл - + Next/Previous Следующий/предыдущий - + Toggle graph type Переключить тип графика - + Toggle time type Переключить тип времени - + Toggle position info Переключить информацию о позиции - + Previous map Предыдущая карта - + Zoom in Увеличить - + Zoom out Уменьшить - + Digital zoom Цифровой зум - + Zoom Zoom - + Copy coordinates Скопировать координаты - + Left Click Левый клик мышью - - + + DEM directory: Каталог с DEM данными: - - + + Styles directory: Каталог со стилями: - - + + Symbols directory: Каталог символов: - + Open directory Открыть каталог - + Error loading geo URI: Ошибка загрузки гео URI: - - - - + + + + Don't show again Больше не показывать - - + + Areas Области - - + + Statistics Статистика - + Open map file Открыть файл карты - + DEM tiles download limit exceeded. If you really need data for such a huge area, download the files manually. Превышен лимит загрузки DEM тайлов. Если вам действительно нужны данные для такой огромной области, загрузите файлы вручную. - + Could not download all required DEM files. Не удалось загрузить все необходимые DEM файлы. - + No files loaded Нет загруженных файлов - - - - + + + + Date Дата - + &File &Файл - + &Map &Карты - + &Graph &График - + &POI &Точки POI - + &Data &Данные - + Download data DEM Скачать данные DEM - + Download map DEM Скачать карту DEM - + &Settings &Настройки - + &Help &Справка - - + + Map directory: Каталог с картами: - - + + POI directory: Каталог с POI: - - + + CRS directory: Каталог CRS: - - + + Tile cache directory: Каталог кеша тайлов: - - + + Routes Маршруты - - - - + + + + Error loading map: Ошибка загрузки карты: - + Select map directory Выберите каталог с картами - + Clear "%1" tile cache? Очистить кеш тайлов "%1"? - + Download %n DEM tiles? Скачать %n DEM тайл? @@ -997,12 +1002,12 @@ - + No local DEM tiles found. Не найдено локальных DEM тайлов. - + %n files %n файл @@ -1011,7 +1016,7 @@ - + Next file Следующий файл @@ -1026,13 +1031,13 @@ Экспорт в PDF… - - + + Waypoints Путевые точки - + Previous file Предыдущий файл @@ -1042,65 +1047,65 @@ Маршрутные точки - + First file Первый файл - + Last file Последний файл - + Error loading data file: Ошибка загрузки файла данных: - - + + Line: %1 Строка: %1 - + Error loading POI file: Ошибка загрузки файла с точками POI: - + Name Имя - - + + Tracks Треки - + About GPXSee О GPXSee - + Navigation Навигация - - - + + + Distance Расстояние - - - - + + + + Time Время diff --git a/lang/gpxsee_sv.ts b/lang/gpxsee_sv.ts index 0c0a1f3b..6e38ad41 100644 --- a/lang/gpxsee_sv.ts +++ b/lang/gpxsee_sv.ts @@ -365,26 +365,26 @@ GUI - - + + Map directory: Kartmapp: - - + + POI directory: POI-mapp: - - + + Open file Öppna fil - + Open POI file Öppna POI-fil @@ -395,8 +395,8 @@ - - + + Keyboard controls Snabbtangenter @@ -411,12 +411,12 @@ Uppdatera - + Show Visa - + File Arkiv @@ -452,8 +452,8 @@ - - + + Paths Sökvägar @@ -510,7 +510,7 @@ - + Next map Nästa karta @@ -590,324 +590,329 @@ km/mi-markörer - + + Legend + Deklaration + + + Do not show Visa inte - + Marker only Endast markör - + Date/time Datum/tid - + Coordinates Koordinater - + Use styles Använd stilmallar - + Show local DEM tiles Visa lokala DEM-rutor - + Show hillshading Visa bergsskuggning - + Show graphs Visa diagram - + Show grid Visa stödlinjer - + Show slider info Visa reglageinfo - + Show tabs Visa flikar - + Show toolbars Visa verktygsfält - + Total time Total tid - - - + + + Moving time Förflyttningstid - + Metric Meter - + Imperial Imperial - + Nautical Nautiska - + Decimal degrees (DD) Decimala grader (DD) - + Degrees and decimal minutes (DMM) Grader och decimala minuter (DMM) - + Degrees, minutes, seconds (DMS) Grader, minuter, sekunder (DMS) - + Fullscreen mode Helskärmsläge - + Options... Alternativ... - + Next Nästa - + Previous Föregående - + Last Sista - + First Första - + Open recent Öppna senaste - + Layers Lager - + Position info Positionsinformation - + DEM DEM - + Position Position - + Units Enhet - + Coordinates format Koordinatformat - - + + Version %1 Version %1 - - + + GPXSee is distributed under the terms of the GNU General Public License version 3. For more info about GPXSee visit the project homepage at %1. GPXSee distribueras under vilkoren för GNU General Public License version 3. För mer info om GPXSee, besök hemsidan på %1. - + Append file Lägg till fil - + Next/Previous Nästa/Föregående - + Toggle graph type Växla diagramtyp - + Toggle time type Växla tidstyp - + Toggle position info Positionsinfo av/på - + Previous map Föregående karta - + Zoom in Zooma in - + Zoom out Zooma ut - + Digital zoom Digital zoom - + Zoom Zoom - + Copy coordinates Kopiera koordinater - + Left Click Vänsterklick - - + + DEM directory: DEM-mapp: - - + + Styles directory: Mapp för stilar: - - + + Symbols directory: Symbolmapp: - + Open directory Öppna mapp - + Error loading geo URI: Kunde inte läsa in geo-URI: - - - - + + + + Don't show again Visa inte igen - - + + Areas Områden - - + + Statistics Statistik - + Open map file Öppna kartfil - - - - + + + + Error loading map: Fel vid inläsning av karta: - + Select map directory Välj kartmapp - + Clear "%1" tile cache? Vill du rensa kartcachen "%1"? - + DEM tiles download limit exceeded. If you really need data for such a huge area, download the files manually. DEM-kartrutors nedladdningsgräns har överskridits. Ladda ner filer manuellt, om du verkligen behöver data för ett så stort område. - + Download %n DEM tiles? Vill du ladda ner %n DEM-kartruta? @@ -915,22 +920,22 @@ - + Could not download all required DEM files. Kunde inte ladda ner alla nödvändiga DEM-filer. - + No local DEM tiles found. Inga lokala DEM -rutor hittades. - + No files loaded Inga filer inlästa - + %n files %n fil @@ -938,21 +943,21 @@ - - - - + + + + Date Datum - - + + Routes Rutter - + Next file Nästa fil @@ -967,13 +972,13 @@ Exportera till PDF... - - + + Waypoints Vägpunkter - + Previous file Föregående fil @@ -983,122 +988,122 @@ Ruttvägpunkter - + &File &Arkiv - + &Map &Karta - + &Graph &Diagram - + &POI &POI - + &Data Da&ta - + Download data DEM Ladda ner data DEM - + Download map DEM Ladda ner karta DEM - + &Settings &Inställningar - + &Help &Hjälp - + First file Första filen - + Last file Sista filen - - + + CRS directory: CRS-mapp: - - + + Tile cache directory: Mapp för kart-cache: - + Error loading data file: Fel vid inläsning av datafil: - - + + Line: %1 Rad: %1 - + Error loading POI file: Fel vid inläsning av POI-fil: - + Name Namn - - + + Tracks Spår - + About GPXSee Om GPXSee - + Navigation Navigation - - - + + + Distance Avstånd - - - - + + + + Time Tid diff --git a/lang/gpxsee_tr.ts b/lang/gpxsee_tr.ts index 216380ff..84bcfeed 100644 --- a/lang/gpxsee_tr.ts +++ b/lang/gpxsee_tr.ts @@ -371,21 +371,21 @@ - - + + Paths Klasör konumları - - + + Keyboard controls Klavye denetimleri - + About GPXSee GPXSee hakkında @@ -492,7 +492,7 @@ - + Next map Sonraki harita @@ -577,524 +577,529 @@ km/mil işaretleri - + + Legend + + + + Do not show Gösterme - + Marker only Yalnızca işaretleyici - + Date/time Tarih/saat - + Coordinates Koordinatlar - + Use styles Tarzları kullan - + Show local DEM tiles Yerel DEM döşemelerini göster - + Show hillshading Tepe gölgelendirmesini göster - + Show graphs Grafikleri göster - - - + + + Distance Mesafe - - - - + + + + Time Zaman - + Show grid Izgarayı göster - + Show slider info Kaydırıcı bilgisi göster - + Show tabs Sekmeleri göster - + Show toolbars Araç çubuklarını göster - + Total time Toplam süre - - - + + + Moving time Hareket süresi - + Metric Metrik - + Imperial İngiliz - + Nautical Denizcilik - + Decimal degrees (DD) Desimal derece (DD) - + Degrees and decimal minutes (DMM) Derece ve desimal dakika (DDD) - + Degrees, minutes, seconds (DMS) Derece, dakika, saniye (DDS) - + Fullscreen mode Tam ekran modu - + Options... Seçenekler... - + Next Sonraki - + Previous Önceki - + Last Son - + First İlk - + &File &Dosya - + Open recent Son kullanılanları aç - + &Map &Harita - + Layers Katmanlar - + &Graph &Grafik - + &POI &POI - + Position Konum - - + + CRS directory: CRS dizini: - - + + Symbols directory: Semboller dizini: - + Open directory Dizin aç - + Error loading geo URI: GEO URI yükleme hatası: - - - - + + + + Don't show again Tekrar gösterme - + Clear "%1" tile cache? "%1" döşeme önbelleği temizlensin mi? - + Download %n DEM tiles? %n DEM döşemesi indirilsin mi? - + &Data &Veri - + Download data DEM DEM verisini indir - + Download map DEM DEM haritasını indir - + Position info Konum bilgisi - + DEM DEM - + &Settings &Ayarlar - + Units Birimler - + Coordinates format Koordinat biçimi - + &Help &Yardım - + File Dosya - + Show Göster - + Navigation Navigasyon - - + + Version %1 Sürüm %1 - - + + GPXSee is distributed under the terms of the GNU General Public License version 3. For more info about GPXSee visit the project homepage at %1. GPXSee, GNU Genel Kamu Lisansı sürüm 3 şartlarına göre dağıtılır. GPXSee hakkında daha fazla bilgi için %1 proje ana sayfasını ziyaret edin. - + Next file Sonraki dosya - + Previous file Önceki dosya - + First file İlk dosya - + Last file Son dosya - + Append file Dosya ekle - + Next/Previous Sonraki/Önceki - + Toggle graph type Geçiş grafik türü - + Toggle time type Geçiş zaman türü - + Toggle position info Konum bilgilerini değiştir - + Previous map Önceki harita - + Zoom in Yaklaş - + Zoom out Uzaklaş - + Digital zoom Dijital yakınlaştırma - + Zoom Yakınlaştırma - + Copy coordinates Koordinatları kopyala - + Left Click Sol Tık - - + + Map directory: Harita dizini: - - + + POI directory: POI dizini: - - + + DEM directory: DEM dizini: - - + + Styles directory: Tarz dizini: - - + + Tile cache directory: Döşeme önbellek dizini: - - + + Open file Dosya aç - + Error loading data file: Veri dosyası yüklenirken hata oluştu: - - + + Line: %1 Satır: %1 - + Open POI file POI dosyası aç - + Error loading POI file: POI dosyası yükleme hatası: - - + + Tracks İzler - - + + Routes Rotalar - - + + Waypoints Yer işaretleri - - + + Areas Alanlar - - - - + + + + Date Tarih - - + + Statistics İstatistikler - + Name Adı - + Open map file Harita dosyası aç - - - - + + + + Error loading map: Harita yüklenirken hata oluştu: - + Select map directory Harita dizinini seç - + DEM tiles download limit exceeded. If you really need data for such a huge area, download the files manually. DEM döşemeleri indirme sınırı aşıldı. Bu kadar büyük bir alan için gerçekten veriye ihtiyacınız varsa, dosyaları elle indirin. - + Could not download all required DEM files. Gerekli tüm DEM dosyaları indirilemedi. - + No local DEM tiles found. Yerel DEM döşemesi bulunamadı. - + No files loaded Hiç dosya yüklenmedi - + %n files %n dosya diff --git a/lang/gpxsee_uk.ts b/lang/gpxsee_uk.ts index 180c1dda..b212e4d6 100644 --- a/lang/gpxsee_uk.ts +++ b/lang/gpxsee_uk.ts @@ -371,21 +371,21 @@ - - + + Paths Шляхи - - + + Keyboard controls Управління з клавіатури - + About GPXSee Про GPXSee @@ -492,7 +492,7 @@ - + Next map Наступна мапа @@ -577,224 +577,229 @@ км/миля позначки - + + Legend + Легенда + + + Do not show Не показувати - + Marker only Лише позначки - + Date/time Дата/час - + Coordinates Координати - + Use styles Використовувати стилі - + Show local DEM tiles Показувати локальні DEM тайли - + Show hillshading Показати затінення пагорба - + Show graphs Відображати графіки - - - + + + Distance Відстань - - - - + + + + Time Час - + Show grid Відображати сітку - + Show slider info Відображати інформацію на повзунку - + Show tabs Показати вкладки - + Show toolbars Відображати панелі інструментів - + Total time Загальний час - - - + + + Moving time Час руху - + Metric Метричні - + Imperial Імперські - + Nautical Морські - + Decimal degrees (DD) Десяткові градуси (DD) - + Degrees and decimal minutes (DMM) Градуси та десяткові мінути (DMM) - + Degrees, minutes, seconds (DMS) Градуси, мінути, секунди (DMS) - + Fullscreen mode Повноекранний режим - + Options... Налаштування... - + Next Наступний - + Previous Попередній - + Last Останній - + First Перший - + &File &Файл - + Open recent Відкрити недавні - + &Map &Мапи - + Layers Шари - + &Graph &Графік - + &POI &Точки POI - + Position Позиція - - + + CRS directory: Каталог CRS: - - + + Symbols directory: Каталог символів: - + Open directory Відкрити теку - + Error loading geo URI: Помилка завантаження geo URI: - - - - + + + + Don't show again Більше не показувати - + Clear "%1" tile cache? Очистити кеш тайлів "%1"? - + Download %n DEM tiles? Завантажити %n плитку DEM? @@ -803,300 +808,300 @@ - + &Data &Дані - + Download data DEM Завантажити дані DEM - + Download map DEM Завантажити карту DEM - + Position info Інформація про позицію - + DEM DEM - + &Settings &Налаштування - + Units Одиниці - + Coordinates format Формат координат - + &Help &Допомога - + File Файл - + Show Відобразити - + Navigation Навігація - - + + Version %1 Версія %1 - - + + GPXSee is distributed under the terms of the GNU General Public License version 3. For more info about GPXSee visit the project homepage at %1. GPXSee розповсюджується згідно умов ліцензії GNU General Public License version 3. Більше інформації про GPXSee знаходиться на офіційній сторінці проєкту, що доступна за посиланням %1. - + Next file Наступний файл - + Previous file Попередній файл - + First file Перший файл - + Last file Останній файл - + Append file Додати файл - + Next/Previous Наступний/попередній - + Toggle graph type Змінити тип графіка - + Toggle time type Змінити тип часу - + Toggle position info Перемкнути інформацію про позицію - + Previous map Попередня мапа - + Zoom in Збільшити - + Zoom out Зменшити - + Digital zoom Цифровий зум - + Zoom Зум - + Copy coordinates Скопіювати координати - + Left Click Клацання лівою КМ - - + + Map directory: Каталог мап: - - + + POI directory: Каталог POI: - - + + DEM directory: Каталог DEM: - - + + Styles directory: Каталог стилів: - - + + Tile cache directory: Каталог кеша тайлів: - - + + Open file Відкрити файл - + Error loading data file: Помилка завантаження файлу даних: - - + + Line: %1 Строка: %1 - + Open POI file Відкрити файл із точками POI - + Error loading POI file: Помилка під час завантаження файлу POI: - - + + Tracks Треки - - + + Routes Маршрути - - + + Waypoints Маршрутні точки - - + + Areas Області - - - - + + + + Date Дата - - + + Statistics Статистика - + Name Ім’я - + Open map file Відкрити файл мапи - - - - + + + + Error loading map: Помилка завантаження мапи: - + Select map directory Оберіть каталог з картами - + DEM tiles download limit exceeded. If you really need data for such a huge area, download the files manually. Перевищено ліміт завантаження плиток DEM. Якщо вам дійсно потрібні дані для такої величезної території, завантажте файли вручну. - + Could not download all required DEM files. Не вдалося завантажити всі необхідні DEM-файли. - + No local DEM tiles found. Не знайдено локальних DEM тайлів. - + No files loaded Файли не завантажені - + %n files %n файл diff --git a/lang/gpxsee_zh_CN.ts b/lang/gpxsee_zh_CN.ts index 80eaca66..59c0767d 100644 --- a/lang/gpxsee_zh_CN.ts +++ b/lang/gpxsee_zh_CN.ts @@ -167,17 +167,17 @@ 70mai GPS log files - + 70迈 GPS 记录文件 VKX files - + VKX 文件 VTK files - + VTK 文件 @@ -371,21 +371,21 @@ - - + + Paths 路径 - - + + Keyboard controls 键盘控制 - + About GPXSee 关于 GPXSee @@ -492,7 +492,7 @@ - + Next map 下一个地图 @@ -577,524 +577,529 @@ km/mi 标记 - + + Legend + + + + Do not show 不显示 - + Marker only 仅标记 - + Date/time 日期/时间 - + Coordinates 坐标 - + Use styles 使用样式 - + Download data DEM 下载 DEM 数据 - + Download map DEM 下载 DEM 地图 - + Show local DEM tiles 显示本地 DEM 瓦片 - + Show hillshading 显示山体阴影 - + Show graphs 显示图表 - - - + + + Distance 距离 - - - - + + + + Time 时间 - + Show grid 显示网格 - + Show slider info 显示滑块信息 - + Show tabs 显示选项卡 - + Show toolbars 显示工具栏 - + Total time 总时长 - - - + + + Moving time 移动时长 - + Metric 公制 - + Imperial 英制 - + Nautical 航海 - + Decimal degrees (DD) 小数度数 (DD) - + Degrees and decimal minutes (DMM) 度、十进制分 (DMM) - + Degrees, minutes, seconds (DMS) 度、分、秒 (DMS) - + Fullscreen mode 全屏模式 - + Options... 选项... - + Next 下一个 - + Previous 上一个 - + Last 最后一个 - + First 第一个 - + &File 文件(&F) - + Open recent 最近打开文件 - + &Map 地图(&M) - + Layers 图层 - + &Graph 图表(&G) - + &Data 数据(&D) - + Position info 位置信息 - + &POI POI(&P) - + DEM DEM - + Position 位置 - + &Settings 设置(&S) - + Units 单位 - + Coordinates format 坐标格式 - + &Help 帮助(&H) - + File 文件 - + Show 显示 - + Navigation 导航 - - + + Version %1 版本 %1 - - + + GPXSee is distributed under the terms of the GNU General Public License version 3. For more info about GPXSee visit the project homepage at %1. GPXSee 依照《GNU 通用公共许可证 v3.0》之条款发布。有关 GPXSee 的详细信息，请访问项目主页 %1 。 - + Next file 下一个文件 - + Previous file 上一个文件 - + First file 第一个文件 - + Last file 最后一个文件 - + Append file 追加文件 - + Next/Previous 下一个/上一个 - + Toggle graph type 切换图表类型 - + Toggle time type 切换时间类型 - + Toggle position info 切换位置信息 - + Previous map 上一个地图 - + Zoom in 放大 - + Zoom out 缩小 - + Digital zoom 数字缩放 - + Zoom 缩放 - + Copy coordinates 复制坐标 - + Left Click 左击 - - + + Map directory: 地图目录： - - + + POI directory: POI 目录： - - + + CRS directory: CRS 目录： - - + + DEM directory: DEM 目录： - - + + Styles directory: 样式目录： - - + + Symbols directory: 符号目录： - - + + Tile cache directory: 瓦片缓存目录： - - + + Open file 打开文件 - + Open directory 打开目录 - + Error loading geo URI: - + 加载 geo URI 出错： - + Error loading data file: 加载数据文件出错： - - + + Line: %1 行：%1 - - - - + + + + Don't show again 不要再次显示 - + Open POI file 打开 POI 文件 - + Error loading POI file: 加载POI文件出错： - - + + Tracks 航迹 - - + + Routes 航线 - - + + Waypoints 航点 - - + + Areas 区域 - - - - + + + + Date 日期 - - + + Statistics 统计 - + Name 名称 - + Open map file 打开地图文件 - - - - + + + + Error loading map: 加载地图出错： - + Select map directory 选择地图目录 - + Clear "%1" tile cache? 清除"%1 "瓦片缓存？ - + DEM tiles download limit exceeded. If you really need data for such a huge area, download the files manually. 已超过 DEM 瓦片下载限额。如您确需大量数据，请手动下载。 - + Download %n DEM tiles? 下载 %n DEM 瓦片？ - + Could not download all required DEM files. 无法下载所有需要的 DEM 文件。 - + No local DEM tiles found. 未找到本地 DEM 瓦片。 - + No files loaded 没有加载文件 - + %n files %n 文件 diff --git a/pkg/windows/gpxsee64.nsi b/pkg/windows/gpxsee64.nsi index 801c0937..d3b1be56 100644 --- a/pkg/windows/gpxsee64.nsi +++ b/pkg/windows/gpxsee64.nsi @@ -49,7 +49,7 @@ Unicode true ; The name of the installer Name "GPXSee" ; Program version -!define VERSION "13.43" +!define VERSION "13.44" ; The file to write OutFile "GPXSee-${VERSION}_x64.exe" diff --git a/src/GUI/areaitem.cpp b/src/GUI/areaitem.cpp index 189c195c..b9700190 100644 --- a/src/GUI/areaitem.cpp +++ b/src/GUI/areaitem.cpp @@ -178,6 +178,16 @@ void AreaItem::setDigitalZoom(int zoom) _pen.setWidthF(width() * pow(2, -_digitalZoom)); } +void AreaItem::hover(bool hvr) +{ + if (hvr) + _pen.setWidthF((_width + 1) * pow(2, -_digitalZoom)); + else + _pen.setWidthF(_width * pow(2, -_digitalZoom)); + + update(); +} + void AreaItem::hoverEnterEvent(QGraphicsSceneHoverEvent *event) { Q_UNUSED(event); diff --git a/src/GUI/areaitem.h b/src/GUI/areaitem.h index 62f92c91..920a80f9 100644 --- a/src/GUI/areaitem.h +++ b/src/GUI/areaitem.h @@ -6,6 +6,8 @@ class AreaItem : public PlaneItem { + Q_OBJECT + public: AreaItem(const Area &area, Map *map, GraphicsItem *parent = 0); @@ -28,6 +30,12 @@ public: ToolTip info(bool extended) const; + const QColor color() const {return _pen.color();} + const QString &name() const {return _area.name();} + +public slots: + void hover(bool hvr); + protected: void hoverEnterEvent(QGraphicsSceneHoverEvent *event); void hoverLeaveEvent(QGraphicsSceneHoverEvent *event); diff --git a/src/GUI/coordinatesitem.cpp b/src/GUI/coordinatesitem.cpp index dbf3911b..1e1688ad 100644 --- a/src/GUI/coordinatesitem.cpp +++ b/src/GUI/coordinatesitem.cpp @@ -1,3 +1,4 @@ +#include #include #include #include "font.h" @@ -14,7 +15,6 @@ CoordinatesItem::CoordinatesItem(QGraphicsItem *parent) : QGraphicsItem(parent) _drawBackground = false; _font.setPixelSize(FONT_SIZE); _font.setFamily(FONT_FAMILY); - _digitalZoom = 0; setAcceptHoverEvents(true); @@ -77,8 +77,7 @@ void CoordinatesItem::setUnits(Units units) void CoordinatesItem::setDigitalZoom(qreal zoom) { - _digitalZoom = zoom; - setScale(pow(2, -_digitalZoom)); + setScale(pow(2, -zoom)); } QString CoordinatesItem::text() const diff --git a/src/GUI/coordinatesitem.h b/src/GUI/coordinatesitem.h index 0112e17b..c612fd32 100644 --- a/src/GUI/coordinatesitem.h +++ b/src/GUI/coordinatesitem.h @@ -35,7 +35,6 @@ private: Units _units; QRectF _boundingRect; QFont _font; - qreal _digitalZoom; QColor _color, _bgColor; bool _drawBackground; }; diff --git a/src/GUI/gui.cpp b/src/GUI/gui.cpp index 1f3bf9b4..2ee572a3 100644 --- a/src/GUI/gui.cpp +++ b/src/GUI/gui.cpp @@ -448,6 +448,11 @@ void GUI::createActions() _showTicksAction->setCheckable(true); connect(_showTicksAction, &QAction::triggered, _mapView, &MapView::showTicks); + _showLegendAction = new QAction(tr("Legend"), this); + _showLegendAction->setMenuRole(QAction::NoRole); + _showLegendAction->setCheckable(true); + connect(_showLegendAction, &QAction::triggered, _mapView, + &MapView::showLegend); QActionGroup *markerInfoGroup = new QActionGroup(this); connect(markerInfoGroup, &QActionGroup::triggered, this, &GUI::showPathMarkerInfo); @@ -719,6 +724,7 @@ void GUI::createMenus() dataMenu->addAction(_showWaypointLabelsAction); dataMenu->addAction(_showRouteWaypointsAction); dataMenu->addAction(_showTicksAction); + dataMenu->addAction(_showLegendAction); QMenu *markerMenu = dataMenu->addMenu(tr("Position info")); markerMenu->menuAction()->setMenuRole(QAction::NoRole); markerMenu->addAction(_hideMarkersAction); @@ -2609,6 +2615,7 @@ void GUI::writeSettings() WRITE(waypointLabels, _showWaypointLabelsAction->isChecked()); WRITE(routeWaypoints, _showRouteWaypointsAction->isChecked()); WRITE(pathTicks, _showTicksAction->isChecked()); + WRITE(legend, _showLegendAction->isChecked()); WRITE(positionMarkers, _showMarkersAction->isChecked() || _showMarkerDateAction->isChecked() || _showMarkerCoordinatesAction->isChecked()); @@ -2900,6 +2907,10 @@ void GUI::readSettings(QString &activeMap, QStringList &disabledPOIs, _showTicksAction->setChecked(true); _mapView->showTicks(true); } + if (READ(legend).toBool()) { + _showLegendAction->setChecked(true); + _mapView->showLegend(true); + } if (READ(useStyles).toBool()) { _useStylesAction->setChecked(true); _mapView->useStyles(true); diff --git a/src/GUI/gui.h b/src/GUI/gui.h index f8020de7..2c64b35d 100644 --- a/src/GUI/gui.h +++ b/src/GUI/gui.h @@ -293,6 +293,7 @@ private: QAction *_showMarkerDateAction; QAction *_showMarkerCoordinatesAction; QAction *_showTicksAction; + QAction *_showLegendAction; QAction *_useStylesAction; QAction *_showCoordinatesAction; QAction *_openOptionsAction; diff --git a/src/GUI/legendentryitem.cpp b/src/GUI/legendentryitem.cpp new file mode 100644 index 00000000..3b5b4290 --- /dev/null +++ b/src/GUI/legendentryitem.cpp @@ -0,0 +1,72 @@ +#include +#include +#include "font.h" +#include "legendentryitem.h" + +#define PADDING 2 + +LegendEntryItem::LegendEntryItem(const QColor &color, const QString &text, + QGraphicsItem *parent) : QGraphicsItem(parent), _color(color), _text(text) +{ + _textColor = Qt::black; + _font.setPixelSize(FONT_SIZE); + _font.setFamily(FONT_FAMILY); + + QFontMetrics fm(_font); + _boundingRect = QRectF(0, 0, FONT_SIZE * 2 + PADDING * 2 + + fm.tightBoundingRect(text).width() + PADDING * 2, + FONT_SIZE + PADDING * 2); + + setCursor(Qt::ArrowCursor); + setAcceptHoverEvents(true); +} + +void LegendEntryItem::paint(QPainter *painter, + const QStyleOptionGraphicsItem *option, QWidget *widget) +{ + Q_UNUSED(option); + Q_UNUSED(widget); + QFontMetrics fm(_font); + + painter->setRenderHint(QPainter::Antialiasing, false); + + painter->setFont(_font); + painter->setBrush(_color); + painter->setPen(QPen(Qt::black)); + painter->drawRect(PADDING, PADDING, FONT_SIZE * 2, FONT_SIZE); + painter->setPen(QPen(_textColor)); + painter->drawText(FONT_SIZE * 2 + PADDING * 2 + PADDING, + PADDING + fm.ascent(), _text); + + //painter->setPen(Qt::red); + //painter->setBrush(Qt::NoBrush); + //painter->drawRect(boundingRect()); +} + +void LegendEntryItem::setTextColor(const QColor &color) +{ + _textColor = color; + update(); +} + +void LegendEntryItem::hoverEnterEvent(QGraphicsSceneHoverEvent *event) +{ + Q_UNUSED(event); + + _font.setBold(true); + setZValue(zValue() + 1.0); + update(); + + emit selected(true); +} + +void LegendEntryItem::hoverLeaveEvent(QGraphicsSceneHoverEvent *event) +{ + Q_UNUSED(event); + + _font.setBold(false); + setZValue(zValue() - 1.0); + update(); + + emit selected(false); +} diff --git a/src/GUI/legendentryitem.h b/src/GUI/legendentryitem.h new file mode 100644 index 00000000..9c45756d --- /dev/null +++ b/src/GUI/legendentryitem.h @@ -0,0 +1,36 @@ +#ifndef LEGENDENTRYITEM_H +#define LEGENDENTRYITEM_H + +#include +#include +#include + +class LegendEntryItem : public QObject, public QGraphicsItem +{ + Q_OBJECT + Q_INTERFACES(QGraphicsItem) + +public: + LegendEntryItem(const QColor &color, const QString &text, + QGraphicsItem *parent = 0); + + QRectF boundingRect() const {return _boundingRect;} + void paint(QPainter *painter, const QStyleOptionGraphicsItem *option, + QWidget *widget); + + void setTextColor(const QColor &color); + +signals: + void selected(bool); + +private: + void hoverEnterEvent(QGraphicsSceneHoverEvent *event); + void hoverLeaveEvent(QGraphicsSceneHoverEvent *event); + + QRectF _boundingRect; + QColor _color, _textColor; + QString _text; + QFont _font; +}; + +#endif // LEGENDENTRYITEM_H diff --git a/src/GUI/legenditem.cpp b/src/GUI/legenditem.cpp new file mode 100644 index 00000000..08102742 --- /dev/null +++ b/src/GUI/legenditem.cpp @@ -0,0 +1,103 @@ +#include +#include +#include +#include "font.h" +#include "pathitem.h" +#include "graphitem.h" +#include "planeitem.h" +#include "legendentryitem.h" +#include "legenditem.h" + +LegendItem::LegendItem(QGraphicsItem *parent) : QGraphicsItem(parent) +{ + _bgColor = Qt::white; + _drawBackground = false; +} + +void LegendItem::paint(QPainter *painter, const QStyleOptionGraphicsItem *option, + QWidget *widget) +{ + Q_UNUSED(option); + Q_UNUSED(widget); + + painter->setRenderHint(QPainter::Antialiasing, false); + + if (_drawBackground) { + painter->setPen(Qt::NoPen); + QColor bc(_bgColor); + bc.setAlpha(196); + painter->setBrush(QBrush(bc)); + painter->drawRect(_boundingRect); + } + + //painter->setPen(Qt::red); + //painter->setBrush(Qt::NoBrush); + //painter->drawRect(boundingRect()); +} + +void LegendItem::addItem(PathItem *item) +{ + prepareGeometryChange(); + + LegendEntryItem *li = new LegendEntryItem(item->color(), + item->name().isEmpty() ? QFileInfo(item->file()).fileName() : item->name(), + this); + li->setPos(0, _items.size() * li->boundingRect().height()); + + _items.append(li); + + _boundingRect = QRectF(0, 0, qMax(_boundingRect.width(), + li->boundingRect().width()), _items.size() * li->boundingRect().height()); + + QObject::connect(li, &LegendEntryItem::selected, item, &PathItem::hoverAll); +} + +void LegendItem::addItem(PlaneItem *item) +{ + if (item->name().isEmpty()) + return; + + prepareGeometryChange(); + + LegendEntryItem *li = new LegendEntryItem(item->color(), item->name(), this); + li->setPos(0, _items.size() * li->boundingRect().height()); + + _items.append(li); + + _boundingRect = QRectF(0, 0, qMax(_boundingRect.width(), + li->boundingRect().width()), _items.size() * li->boundingRect().height()); + + QObject::connect(li, &LegendEntryItem::selected, item, &PlaneItem::hover); +} + +void LegendItem::setColor(const QColor &color) +{ + for (int i = 0; i < _items.size(); i++) + _items.at(i)->setTextColor(color); +} + +void LegendItem::setBackgroundColor(const QColor &color) +{ + _bgColor = color; + update(); +} + +void LegendItem::drawBackground(bool draw) +{ + _drawBackground = draw; + update(); +} + +void LegendItem::clear() +{ + prepareGeometryChange(); + + qDeleteAll(_items); + _items.clear(); + _boundingRect = QRectF(); +} + +void LegendItem::setDigitalZoom(qreal zoom) +{ + setScale(pow(2, -zoom)); +} diff --git a/src/GUI/legenditem.h b/src/GUI/legenditem.h new file mode 100644 index 00000000..8dbce3b5 --- /dev/null +++ b/src/GUI/legenditem.h @@ -0,0 +1,34 @@ +#ifndef LEGENDITEM_H +#define LEGENDITEM_H + +#include + +class LegendEntryItem; +class PathItem; +class PlaneItem; + +class LegendItem : public QGraphicsItem +{ +public: + LegendItem(QGraphicsItem *parent = 0); + + QRectF boundingRect() const {return _boundingRect;} + void paint(QPainter *painter, const QStyleOptionGraphicsItem *option, + QWidget *widget); + + void addItem(PathItem *item); + void addItem(PlaneItem *item); + void setDigitalZoom(qreal zoom); + void setColor(const QColor &color); + void setBackgroundColor(const QColor &color); + void drawBackground(bool draw); + void clear(); + +private: + QList _items; + QRectF _boundingRect; + QColor _bgColor; + bool _drawBackground; +}; + +#endif // LEGENDITEM_H diff --git a/src/GUI/mapitem.cpp b/src/GUI/mapitem.cpp index a1de70d8..8d81af43 100644 --- a/src/GUI/mapitem.cpp +++ b/src/GUI/mapitem.cpp @@ -205,6 +205,16 @@ void MapItem::setDigitalZoom(int zoom) _pen.setWidthF(_width * pow(2, -_digitalZoom)); } +void MapItem::hover(bool hvr) +{ + if (hvr) + _pen.setWidthF((_width + 1) * pow(2, -_digitalZoom)); + else + _pen.setWidthF(_width * pow(2, -_digitalZoom)); + + update(); +} + void MapItem::hoverEnterEvent(QGraphicsSceneHoverEvent *event) { Q_UNUSED(event); diff --git a/src/GUI/mapitem.h b/src/GUI/mapitem.h index b76e157d..93a00d3e 100644 --- a/src/GUI/mapitem.h +++ b/src/GUI/mapitem.h @@ -6,7 +6,7 @@ class MapAction; class Projection; -class MapItem : public QObject, public PlaneItem +class MapItem : public PlaneItem { Q_OBJECT @@ -29,6 +29,12 @@ public: ToolTip info(bool extended) const; + const QColor color() const {return _pen.color();} + const QString &name() const {return _name;} + +public slots: + void hover(bool hvr); + signals: void triggered(); diff --git a/src/GUI/mapview.cpp b/src/GUI/mapview.cpp index 86940503..5267f297 100644 --- a/src/GUI/mapview.cpp +++ b/src/GUI/mapview.cpp @@ -31,6 +31,7 @@ #define MARGIN 10 #define SCALE_OFFSET 7 #define COORDINATES_OFFSET SCALE_OFFSET +#define LEGEND_OFFSET SCALE_OFFSET MapView::MapView(Map *map, POI *poi, QWidget *parent) : QGraphicsView(parent) @@ -87,6 +88,11 @@ MapView::MapView(Map *map, POI *poi, QWidget *parent) : QGraphicsView(parent) _motionInfo->setVisible(false); _scene->addItem(_motionInfo); + _legend = new LegendItem(); + _legend->setZValue(2.0); + _legend->setVisible(false); + _scene->addItem(_legend); + _mapOpacity = 1.0; _backgroundColor = Qt::white; _markerColor = Qt::red; @@ -141,6 +147,24 @@ void MapView::centerOn(const QPointF &pos) _cursorCoordinates->setCoordinates(Coordinates()); } +void MapView::updateLegend() +{ + _legend->clear(); + + if (_showTracks) { + for (int i = 0; i < _tracks.size(); i++) + _legend->addItem(_tracks.at(i)); + } + if (_showRoutes) { + for (int i = 0; i < _routes.size(); i++) + _legend->addItem(_routes.at(i)); + } + if (_showAreas) { + for (int i = 0; i < _areas.size(); i++) + _legend->addItem(_areas.at(i)); + } +} + PathItem *MapView::addTrack(const Track &track) { if (!track.isValid()) { @@ -164,8 +188,10 @@ PathItem *MapView::addTrack(const Track &track) ti->showTicks(_showPathTicks); _scene->addItem(ti); - if (_showTracks) + if (_showTracks) { addPOI(_poi->points(ti->path())); + _legend->addItem(ti); + } return ti; } @@ -196,8 +222,10 @@ PathItem *MapView::addRoute(const Route &route) ri->showTicks(_showPathTicks); _scene->addItem(ri); - if (_showRoutes) + if (_showRoutes) { addPOI(_poi->points(ri->path())); + _legend->addItem(ri); + } return ri; } @@ -222,8 +250,10 @@ void MapView::addArea(const Area &area) _ar |= ai->bounds(); _areas.append(ai); - if (_showAreas) + if (_showAreas) { addPOI(_poi->points(ai->bounds())); + _legend->addItem(ai); + } } void MapView::addWaypoints(const QVector &waypoints) @@ -263,8 +293,10 @@ MapItem *MapView::addMap(MapAction *map) _ar |= mi->bounds(); _areas.append(mi); - if (_showAreas) + if (_showAreas) { addPOI(_poi->points(mi->bounds())); + _legend->addItem(mi); + } return mi; } @@ -397,6 +429,8 @@ void MapView::setPalette(const Palette &palette) _routes.at(i)->setColor(_palette.nextColor()); for (int i = 0; i < _areas.count(); i++) _areas.at(i)->setColor(_palette.nextColor()); + + updateLegend(); } void MapView::setMap(Map *map) @@ -577,6 +611,7 @@ void MapView::digitalZoom(int zoom) _positionCoordinates->setDigitalZoom(_digitalZoom); _motionInfo->setDigitalZoom(_digitalZoom); _crosshair->setDigitalZoom(_digitalZoom); + _legend->setDigitalZoom(_digitalZoom); } void MapView::zoom(int zoom, const QPoint &pos, bool shift) @@ -684,7 +719,7 @@ void MapView::plot(QPainter *painter, const QRectF &target, qreal scale, { QRect orig; qreal ratio, diff, q, p; - QPointF scenePos, scalePos, posPos, motionPos; + QPointF scenePos, scalePos, posPos, motionPos, legendPos; bool hidpi = _hidpi && _deviceRatio > 1.0; int zoom; @@ -699,6 +734,7 @@ void MapView::plot(QPainter *painter, const QRectF &target, qreal scale, scalePos = _mapScale->pos(); posPos = _positionCoordinates->pos(); motionPos = _motionInfo->pos(); + legendPos = _legend->pos(); if (orig.height() * (target.width() / target.height()) - orig.width() < 0) { ratio = target.height() / target.width(); @@ -756,6 +792,10 @@ void MapView::plot(QPainter *painter, const QRectF &target, qreal scale, _motionInfo->setPos(mapToScene(adj.topRight().toPoint() + QPoint( (-COORDINATES_OFFSET - _motionInfo->boundingRect().width()) * p, (COORDINATES_OFFSET + _motionInfo->boundingRect().height()) * p))); + _legend->setDigitalZoom(_digitalZoom - log2(p)); + _legend->setPos(mapToScene(adj.topRight().toPoint() + QPoint( + (-LEGEND_OFFSET - _legend->boundingRect().width()) * p, + LEGEND_OFFSET * p))); // Print the view render(painter, target, adj.toRect()); @@ -776,6 +816,8 @@ void MapView::plot(QPainter *painter, const QRectF &target, qreal scale, _positionCoordinates->setPos(posPos); _motionInfo->setDigitalZoom(_digitalZoom); _motionInfo->setPos(motionPos); + _legend->setDigitalZoom(_digitalZoom); + _legend->setPos(legendPos); // Exit plot mode _plot = false; @@ -795,12 +837,15 @@ void MapView::clear() _scene->removeItem(_positionCoordinates); _scene->removeItem(_crosshair); _scene->removeItem(_motionInfo); + _scene->removeItem(_legend); _scene->clear(); _scene->addItem(_mapScale); _scene->addItem(_cursorCoordinates); _scene->addItem(_positionCoordinates); _scene->addItem(_crosshair); _scene->addItem(_motionInfo); + _legend->clear(); + _scene->addItem(_legend); _palette.reset(); @@ -822,6 +867,7 @@ void MapView::showTracks(bool show) for (int i = 0; i < _tracks.count(); i++) _tracks.at(i)->setVisible(show); + updateLegend(); updatePOI(); } @@ -832,6 +878,7 @@ void MapView::showRoutes(bool show) for (int i = 0; i < _routes.count(); i++) _routes.at(i)->setVisible(show); + updateLegend(); updatePOI(); } @@ -978,6 +1025,12 @@ void MapView::showMotionInfo(bool show) _scene->invalidate(); } +void MapView::showLegend(bool show) +{ + _legend->setVisible(show); + _scene->invalidate(); +} + void MapView::showOverlappedPOIs(bool show) { _overlapPOIs = show; @@ -1087,6 +1140,7 @@ void MapView::setBackgroundColor(const QColor &color) _cursorCoordinates->setBackgroundColor(color); _positionCoordinates->setBackgroundColor(color); _motionInfo->setBackgroundColor(color); + _legend->setBackgroundColor(color); for (int i = 0; i < _tracks.size(); i++) _tracks.at(i)->setMarkerBackgroundColor(color); @@ -1153,6 +1207,10 @@ void MapView::paintEvent(QPaintEvent *event) if (_motionInfo->pos() != coordinatesScenePos) _motionInfo->setPos(coordinatesScenePos); } + + QPointF legendPos = mapToScene(rect().topRight() + QPoint( + -(LEGEND_OFFSET + _legend->boundingRect().width()), LEGEND_OFFSET)); + _legend->setPos(legendPos); } QGraphicsView::paintEvent(event); @@ -1273,6 +1331,8 @@ void MapView::useStyles(bool use) _areas.at(i)->updateStyle(); for (int i = 0; i < _waypoints.size(); i++) _waypoints.at(i)->updateStyle(); + + updateLegend(); } void MapView::setMarkerColor(const QColor &color) @@ -1401,6 +1461,7 @@ void MapView::setInfoColor(const QColor &color) _cursorCoordinates->setColor(color); _positionCoordinates->setColor(color); _motionInfo->setColor(color); + _legend->setColor(color); } void MapView::drawInfoBackground(bool draw) @@ -1410,6 +1471,7 @@ void MapView::drawInfoBackground(bool draw) _cursorCoordinates->drawBackground(draw); _positionCoordinates->drawBackground(draw); _motionInfo->drawBackground(draw); + _legend->drawBackground(draw); for (int i = 0; i < _tracks.size(); i++) _tracks.at(i)->drawMarkerBackground(draw); diff --git a/src/GUI/mapview.h b/src/GUI/mapview.h index 4eaa467f..c4180961 100644 --- a/src/GUI/mapview.h +++ b/src/GUI/mapview.h @@ -13,6 +13,7 @@ #include "units.h" #include "format.h" #include "markerinfoitem.h" +#include "legenditem.h" #include "palette.h" #include "graphicsscene.h" @@ -134,6 +135,7 @@ public slots: void setMarkerPosition(qreal pos); void followPosition(bool follow); void showMotionInfo(bool show); + void showLegend(bool show); void useStyles(bool use); void drawHillShading(bool draw); void selectLayers(MapView::Layers layers); @@ -166,6 +168,7 @@ private: void pinchGesture(QPinchGesture *gesture); void skipColor() {_palette.nextColor();} void setHidpi(bool hidpi); + void updateLegend(); void mouseMoveEvent(QMouseEvent *event); void mousePressEvent(QMouseEvent *event); @@ -185,6 +188,7 @@ private: CoordinatesItem *_cursorCoordinates, *_positionCoordinates; CrosshairItem *_crosshair; MotionInfoItem *_motionInfo; + LegendItem *_legend; QList _tracks; QList _routes; QList _waypoints; diff --git a/src/GUI/pathitem.cpp b/src/GUI/pathitem.cpp index 646ca6a5..e7174e8e 100644 --- a/src/GUI/pathitem.cpp +++ b/src/GUI/pathitem.cpp @@ -388,9 +388,9 @@ void PathItem::drawMarkerBackground(bool draw) _markerInfo->drawBackground(draw); } -void PathItem::hover(bool hover) +void PathItem::hover(bool hvr) { - if (hover) { + if (hvr) { _pen.setWidth((width() + 1) * pow(2, -_digitalZoom)); setZValue(zValue() + 1.0); } else { @@ -401,6 +401,12 @@ void PathItem::hover(bool hover) update(); } +void PathItem::hoverAll(bool hvr) +{ + hover(hvr); + emit selected(hvr); +} + void PathItem::showMarker(bool show) { if (_showMarker == show) diff --git a/src/GUI/pathitem.h b/src/GUI/pathitem.h index 728af6db..72fbd3a4 100644 --- a/src/GUI/pathitem.h +++ b/src/GUI/pathitem.h @@ -4,6 +4,7 @@ #include #include #include "data/path.h" +#include "data/link.h" #include "graphicsscene.h" #include "markerinfoitem.h" #include "format.h" @@ -27,9 +28,11 @@ public: void paint(QPainter *painter, const QStyleOptionGraphicsItem *option, QWidget *widget); - virtual QDateTime date() const = 0; - + const QDateTime &date() const {return _date;} + const QString &file() const {return _file;} + const QString &name() const {return _name;} const Path &path() const {return _path;} + const QColor &color() const; void addGraph(GraphItem *graph); @@ -57,7 +60,8 @@ public: static void setTimeZone(const QTimeZone &zone) {_timeZone = zone;} public slots: - void hover(bool hover); + void hover(bool hvr); + void hoverAll(bool hvr); signals: void selected(bool); @@ -67,6 +71,13 @@ protected: void hoverLeaveEvent(QGraphicsSceneHoverEvent *event); void mousePressEvent(QGraphicsSceneMouseEvent *event); + QDateTime _date; + QString _name; + QString _file; + QString _desc; + QString _comment; + QVector _links; + static Units _units; static QTimeZone _timeZone; @@ -81,7 +92,6 @@ private: void updateWidth(); void updatePenStyle(); qreal width() const; - const QColor &color() const; Qt::PenStyle penStyle() const; qreal xInM() const; diff --git a/src/GUI/planeitem.h b/src/GUI/planeitem.h index 40b196c0..c13a6e48 100644 --- a/src/GUI/planeitem.h +++ b/src/GUI/planeitem.h @@ -6,8 +6,10 @@ class Map; -class PlaneItem : public GraphicsItem +class PlaneItem : public QObject, public GraphicsItem { + Q_OBJECT + public: PlaneItem(GraphicsItem *parent = 0) : GraphicsItem(parent) {} @@ -20,6 +22,12 @@ public: virtual void setPenStyle(Qt::PenStyle style) = 0; virtual void setDigitalZoom(int zoom) = 0; virtual void updateStyle() {} + + virtual const QColor color() const = 0; + virtual const QString &name() const = 0; + +public slots: + virtual void hover(bool hvr) = 0; }; #endif // PLANEITEM_H diff --git a/src/GUI/routeitem.h b/src/GUI/routeitem.h index 2859f1a2..620b7cc5 100644 --- a/src/GUI/routeitem.h +++ b/src/GUI/routeitem.h @@ -23,15 +23,9 @@ public: void showWaypointIcons(bool show); ToolTip info(bool extended) const; - QDateTime date() const {return QDateTime();} private: - QString _name; - QString _desc; - QString _comment; - QVector _links; QVector _waypoints; - QString _file; }; #endif // ROUTEITEM_H diff --git a/src/GUI/settings.cpp b/src/GUI/settings.cpp index a367ca85..eeb6d98c 100644 --- a/src/GUI/settings.cpp +++ b/src/GUI/settings.cpp @@ -173,6 +173,7 @@ SETTING(routeWaypoints, "routeWaypoints", true ); SETTING(waypointIcons, "waypointIcons", false ); SETTING(waypointLabels, "waypointLabels", true ); SETTING(pathTicks, "pathTicks", false ); +SETTING(legend, "legend", false ); SETTING(positionMarkers, "positionMarkers", true ); SETTING(markerInfo, "markerInfo", MarkerInfoItem::None ); SETTING(useStyles, "styles", true ); diff --git a/src/GUI/settings.h b/src/GUI/settings.h index 10433693..ea2b46de 100644 --- a/src/GUI/settings.h +++ b/src/GUI/settings.h @@ -122,6 +122,7 @@ public: static const Setting waypointIcons; static const Setting waypointLabels; static const Setting pathTicks; + static const Setting legend; static const Setting positionMarkers; static const Setting markerInfo; static const Setting useStyles; diff --git a/src/GUI/trackitem.h b/src/GUI/trackitem.h index eaf6fe1f..fb8532fd 100644 --- a/src/GUI/trackitem.h +++ b/src/GUI/trackitem.h @@ -2,7 +2,6 @@ #define TRACKITEM_H #include -#include "data/link.h" #include "pathitem.h" class Map; @@ -16,17 +15,10 @@ public: TrackItem(const Track &track, Map *map, QGraphicsItem *parent = 0); ToolTip info(bool extended) const; - QDateTime date() const {return _date;} private: - QString _name; - QString _desc; - QString _comment; - QVector _links; - QDateTime _date; qreal _time; qreal _movingTime; - QString _file; }; #endif // TRACKITEM_H diff --git a/src/data/vkxparser.cpp b/src/data/vkxparser.cpp index 98af4ba5..c61fec05 100644 --- a/src/data/vkxparser.cpp +++ b/src/data/vkxparser.cpp @@ -146,6 +146,7 @@ bool VKXParser::parse(QFile *file, QList &tracks, } tracks.append(segment); + tracks.last().setFile(file->fileName()); return true; } diff --git a/src/data/vtkparser.cpp b/src/data/vtkparser.cpp index bb32a551..caed0e74 100644 --- a/src/data/vtkparser.cpp +++ b/src/data/vtkparser.cpp @@ -213,5 +213,7 @@ bool VTKParser::parse(QFile *file, QList &tracks, } tracks.append(segment); + tracks.last().setFile(file->fileName()); + return true; } diff --git a/src/map/ENC/data.h b/src/map/ENC/data.h index a620cdac..c39fc9dd 100644 --- a/src/map/ENC/data.h +++ b/src/map/ENC/data.h @@ -19,13 +19,13 @@ public: const Polygon &path() const {return _path;} uint type() const {return _type;} const Attributes &attributes() const {return _attr;} - uint HUNI() const {return _HUNI;} + uint huni() const {return _huni;} private: uint _type; Polygon _path; Attributes _attr; - uint _HUNI; + uint _huni; }; class Line { diff --git a/src/map/ENC/mapdata.cpp b/src/map/ENC/mapdata.cpp index 2f62a8e0..e49db966 100644 --- a/src/map/ENC/mapdata.cpp +++ b/src/map/ENC/mapdata.cpp @@ -215,7 +215,7 @@ static bool polygonPointCb(const MapData::Poly *polygon, void *context) || type == SUBTYPE(RESARE, 25) || type == SUBTYPE(I_RESARE, 25) || type == SUBTYPE(RESARE, 26) || type == SUBTYPE(I_RESARE, 26)) points->append(MapData::Point(baseType, polygon->bounds().center(), - polygon->attributes(), polygon->HUNI(), true)); + polygon->attributes(), polygon->huni(), true)); return true; } @@ -466,7 +466,7 @@ MapData::Point::Point(uint type, const Coordinates &c, const Attributes &attr, } MapData::Poly::Poly(uint type, const Polygon &path, const Attributes &attr, - uint HUNI) : _path(path), _attr(attr), _HUNI(HUNI) + uint HUNI) : _path(path), _attr(attr), _huni(HUNI) { uint subtype = 0; diff --git a/src/map/IMG/rastertile.cpp b/src/map/IMG/rastertile.cpp index 732d7cd4..4c898d25 100644 --- a/src/map/IMG/rastertile.cpp +++ b/src/map/IMG/rastertile.cpp @@ -532,6 +532,16 @@ static Light::Color ordinaryLight(const QVector &lights) return Light::None; } +static quint32 pointType(quint32 type, quint32 flags) +{ + if (Style::hasColorset(type) || Style::isDHPoint(type)) + return type | (flags & 0xFF000000); + else if (Style::isLabelPoint(type)) + return type | (flags & 0xFFF00000); + else + return type; +} + void RasterTile::processPoints(QList &points, QList &textItems, QList &lights, QList §orLights) @@ -541,9 +551,7 @@ void RasterTile::processPoints(QList &points, for (int i = 0; i < points.size(); i++) { const MapData::Point &point = points.at(i); const Style *style = _data->style(); - const Style::Point &ps = style->point(Style::hasColorset(point.type) - ? point.type | (point.flags & 0xFF000000) - : point.type | (point.flags & 0x00F00000)); + const Style::Point &ps = style->point(pointType(point.type, point.flags)); bool poi = Style::isPOI(point.type); bool sl = sectorLight(point.lights); diff --git a/src/map/IMG/rgnfile.cpp b/src/map/IMG/rgnfile.cpp index 829b99c0..706aab44 100644 --- a/src/map/IMG/rgnfile.cpp +++ b/src/map/IMG/rgnfile.cpp @@ -120,7 +120,7 @@ bool RGNFile::readBuoyInfo(Handle &hdl, quint8 flags, quint32 size, if (!(size >= 2 && readUInt16(hdl, val))) return false; - point->flags = (val & 0x3f)<<24; + point->flags |= (val & 0x3f)<<24; lc = (val >> 10) & 0x0f; if (!lc) @@ -563,6 +563,25 @@ bool RGNFile::readLclNavaid(Handle &hdl, quint32 size, return (size == 0); } +bool RGNFile::readLclImg(Handle &hdl, quint32 size, + MapData::Point *point) const +{ + quint32 img; + + if (size == 1) { + if (!readUInt8(hdl, img)) + return false; + } else if (size == 2) { + if (!readUInt16(hdl, img)) + return false; + } else + return false; + + point->flags |= img<<24; + + return true; +} + bool RGNFile::readLclFields(Handle &hdl, const quint32 flags[3], SegmentType segmentType, void *object) const { @@ -586,13 +605,15 @@ bool RGNFile::readLclFields(Handle &hdl, const quint32 flags[3], } else size = m + 1; - if (i == 2 && point) { - if (!readLclNavaid(hdl, size, point)) - return false; - } else { - if (!seek(hdl, pos(hdl) + size)) - return false; - } + quint32 off = pos(hdl); + + if (i == 2 && point) + readLclNavaid(hdl, size, point); + else if (i == 3 && point) + readLclImg(hdl, size, point); + + if (!seek(hdl, off + size)) + return false; } bitfield >>= 1; j++; diff --git a/src/map/IMG/rgnfile.h b/src/map/IMG/rgnfile.h index 5016e098..3b4517b5 100644 --- a/src/map/IMG/rgnfile.h +++ b/src/map/IMG/rgnfile.h @@ -75,12 +75,12 @@ private: MapData::Poly *line) const; bool readLabel(Handle &hdl, LBLFile *lbl, Handle &lblHdl, quint8 flags, quint32 size, MapData::Point *point) const; - bool readLclNavaid(Handle &hdl, quint32 size, - MapData::Point *point) const; + bool readLclNavaid(Handle &hdl, quint32 size, MapData::Point *point) const; bool readLclSectors(Handle &hdl, quint32 &size, quint32 flags, Light &light) const; bool readLclLights(Handle &hdl, quint32 &size, quint32 lights, MapData::Point *point) const; + bool readLclImg(Handle &hdl, quint32 size, MapData::Point *point) const; HuffmanTable *_huffmanTable; Section _base, _dict, _polygons, _lines, _points; diff --git a/src/map/IMG/style.cpp b/src/map/IMG/style.cpp index 0c492014..a695dff0 100644 --- a/src/map/IMG/style.cpp +++ b/src/map/IMG/style.cpp @@ -869,6 +869,9 @@ void Style::defaultPointStyle(qreal ratio) _points[0x10217] = Point(QImage(":/marine/pylon.png")); _points[0x10218] = Point(QImage(":/marine/pylon.png")); + _points[0x10300 | 29<<24] = Point(QImage(":/marine/flagstaff.png")); + _points[0x10300 | 30<<24] = Point(QImage(":/marine/monument.png")); + _points[0x10300 | 83<<24] = Point(QImage(":/marine/crane.png")); _points[0x10304] = Point(QImage(":/marine/building.png")); _points[0x10305] = Point(QImage(":/marine/chimney.png"), QPoint(0, -11)); _points[0x10306] = Point(QImage(":/marine/church.png")); @@ -903,6 +906,8 @@ void Style::defaultPointStyle(qreal ratio) _points[0x10500 | 13<<20] = Point(Small, QColor(0xfc, 0xc6, 0xfc)); _points[0x10500 | 14<<20] = Point(Small, QColor(0xe2, 0xdc, 0xa9)); _points[0x10500 | 15<<20] = Point(Small, QColor(0xcd, 0xcd, 0xcd)); + _points[0x10500 | 5<<24] = Point(QImage(":/marine/eddies.png")); + _points[0x10500 | 6<<24] = Point(QImage(":/marine/overfalls.png")); _points[0x10701] = Point(QImage(":/marine/anchorage.png")); _points[0x10702] = Point(QImage(":/marine/boarding-place.png")); diff --git a/src/map/IMG/style.h b/src/map/IMG/style.h index 93ed37bb..9d81c36f 100644 --- a/src/map/IMG/style.h +++ b/src/map/IMG/style.h @@ -147,7 +147,7 @@ public: static bool isRaster(quint32 type) {return (type == 0x10613);} static bool isDepthPoint(quint32 type) - {return (type == 0x10301);} + {return (type >= 0x10301 && type <= 0x10302);} static bool isObstructionPoint(quint32 type) {return (type >= 0x10400 && type <= 0x10401);} static bool isBuoy(quint32 type) @@ -156,6 +156,8 @@ public: {return (type >= 0x10100 && type < 0x10200);} static bool isLabelPoint(quint32 type) {return type == 0x10500;} + static bool isDHPoint(quint32 type) + {return type == 0x10300;} static bool isMarinePoint(quint32 type) {return type >= 0x10100 && type < 0x10a00;} static bool isStyledLine(quint32 type) diff --git a/src/map/proj/polyconic.cpp b/src/map/proj/polyconic.cpp index fbb42665..b8293650 100644 --- a/src/map/proj/polyconic.cpp +++ b/src/map/proj/polyconic.cpp @@ -84,7 +84,7 @@ Polyconic::Polyconic(const Ellipsoid &ellipsoid, double latitudeOrigin, sin2lat = POLY_COEFF_TIMES_SIN(_c1, 2.0, _latitudeOrigin); sin4lat = POLY_COEFF_TIMES_SIN(_c2, 4.0, _latitudeOrigin); sin6lat = POLY_COEFF_TIMES_SIN(_c3, 6.0, _latitudeOrigin); - _M0 = POLY_M(lat, sin2lat, sin4lat, sin6lat); + _m0 = POLY_M(lat, sin2lat, sin4lat, sin6lat); } PointD Polyconic::ll2xy(const Coordinates &c) const @@ -107,7 +107,7 @@ PointD Polyconic::ll2xy(const Coordinates &c) const if (Latitude == 0.0) { return PointD(_a * dlam + _falseEasting, - -_M0 + _falseNorthing); + -_m0 + _falseNorthing); } else { NN = _a / sqrt(1.0 - _es2 * (slat * slat)); NN_OVER_tlat = NN / tan(Latitude); @@ -118,7 +118,7 @@ PointD Polyconic::ll2xy(const Coordinates &c) const MM = POLY_M(lat, sin2lat, sin4lat, sin6lat); EE = dlam * slat; return PointD(NN_OVER_tlat * sin(EE) + _falseEasting, - MM - _M0 + NN_OVER_tlat * (1.0 - cos(EE)) + _falseNorthing); + MM - _m0 + NN_OVER_tlat * (1.0 - cos(EE)) + _falseNorthing); } } @@ -146,11 +146,11 @@ Coordinates Polyconic::xy2ll(const PointD &p) const dx = p.x() - _falseEasting; dx_OVER_Poly_a = dx / _a; - if (FLOAT_EQ(dy,-_M0,1)) { + if (FLOAT_EQ(dy,-_m0,1)) { Latitude = 0.0; Longitude = dx_OVER_Poly_a + _longitudeOrigin; } else { - AA = (_M0 + dy) / _a; + AA = (_m0 + dy) / _a; BB = dx_OVER_Poly_a * dx_OVER_Poly_a + (AA * AA); PHIn = AA; diff --git a/src/map/proj/polyconic.h b/src/map/proj/polyconic.h index 285e89b3..8d4e730a 100644 --- a/src/map/proj/polyconic.h +++ b/src/map/proj/polyconic.h @@ -23,7 +23,7 @@ private: double _es2; double _es4; double _es6; - double _M0; + double _m0; double _c0; double _c1; double _c2;