mirror of
https://github.com/tumic0/GPXSee.git
synced 2025-07-10 09:14:28 +02:00
Compare commits
32 Commits
Author | SHA1 | Date | |
---|---|---|---|
a4906e7d01 | |||
f56dfd95e3 | |||
2bda7ba714 | |||
940bd0511e | |||
30518cebc0 | |||
696bc50ba1 | |||
b91358a6bd | |||
94eab9fba0 | |||
44b98754d7 | |||
8451178808 | |||
7eedcc083e | |||
cd32b21aca | |||
e1bda86b35 | |||
967e307be9 | |||
7cf1e3e1a5 | |||
0f44feebb1 | |||
ecb82952f6 | |||
ab6ea84255 | |||
0b2d610a34 | |||
f67eaa8dec | |||
2a619aa0ef | |||
dd292bc995 | |||
680104fec3 | |||
b72a9e67fe | |||
24b7b9d996 | |||
7965f2ff34 | |||
5f5b391cd9 | |||
faed6fc203 | |||
38b62c0121 | |||
f26f8a95ac | |||
1297db26f6 | |||
2ee955172d |
@ -1,4 +1,4 @@
|
||||
version: 7.11.{build}
|
||||
version: 7.12.{build}
|
||||
configuration: Release
|
||||
platform: Any CPU
|
||||
environment:
|
||||
|
@ -9,7 +9,7 @@ before_install:
|
||||
|
||||
install:
|
||||
- if [[ "$TRAVIS_OS_NAME" == "osx" ]]; then brew install qt; fi
|
||||
- if [[ "$TRAVIS_OS_NAME" == "linux" ]]; then sudo apt-get install libqt4-dev; fi
|
||||
- if [[ "$TRAVIS_OS_NAME" == "linux" ]]; then sudo apt-get install libqt4-dev libqt4-opengl-dev; fi
|
||||
|
||||
script:
|
||||
- if [[ "$TRAVIS_OS_NAME" == "osx" ]]; then PATH=/usr/local/opt/qt/bin/:${PATH}; fi
|
||||
|
16
gpxsee.pro
16
gpxsee.pro
@ -3,7 +3,7 @@ unix:!macx {
|
||||
} else {
|
||||
TARGET = GPXSee
|
||||
}
|
||||
VERSION = 7.11
|
||||
VERSION = 7.12
|
||||
|
||||
QT += core \
|
||||
gui \
|
||||
@ -181,7 +181,9 @@ HEADERS += src/common/config.h \
|
||||
src/GUI/limitedcombobox.h \
|
||||
src/GUI/pathtickitem.h \
|
||||
src/map/IMG/textitem.h \
|
||||
src/map/IMG/label.h
|
||||
src/map/IMG/label.h \
|
||||
src/data/csv.h \
|
||||
src/data/cupparser.h
|
||||
SOURCES += src/main.cpp \
|
||||
src/common/coordinates.cpp \
|
||||
src/common/rectc.cpp \
|
||||
@ -312,7 +314,9 @@ SOURCES += src/main.cpp \
|
||||
src/map/IMG/style.cpp \
|
||||
src/map/IMG/netfile.cpp \
|
||||
src/GUI/pathtickitem.cpp \
|
||||
src/map/IMG/textitem.cpp
|
||||
src/map/IMG/textitem.cpp \
|
||||
src/data/csv.cpp \
|
||||
src/data/cupparser.cpp
|
||||
|
||||
greaterThan(QT_MAJOR_VERSION, 4) {
|
||||
HEADERS += src/data/geojsonparser.h
|
||||
@ -371,7 +375,8 @@ macx {
|
||||
icons/formats/wpt.icns \
|
||||
icons/formats/loc.icns \
|
||||
icons/formats/slf.icns \
|
||||
icons/formats/json.icns
|
||||
icons/formats/json.icns \
|
||||
icons/formats/cup.icns
|
||||
QMAKE_BUNDLE_DATA += locale maps icons csv
|
||||
}
|
||||
|
||||
@ -388,7 +393,8 @@ win32 {
|
||||
icons/formats/wpt.ico \
|
||||
icons/formats/loc.ico \
|
||||
icons/formats/slf.ico \
|
||||
icons/formats/json.ico
|
||||
icons/formats/json.ico \
|
||||
icons/formats/cup.ico
|
||||
DEFINES += _USE_MATH_DEFINES \
|
||||
NOGDI
|
||||
}
|
||||
|
BIN
icons/formats/cup.icns
Normal file
BIN
icons/formats/cup.icns
Normal file
Binary file not shown.
BIN
icons/formats/cup.ico
Normal file
BIN
icons/formats/cup.ico
Normal file
Binary file not shown.
After Width: | Height: | Size: 304 KiB |
@ -10,3 +10,4 @@ tcx:#ffcc00
|
||||
wpt:#66ff00
|
||||
loc:#556677
|
||||
slf:#881199
|
||||
cup:#20a810
|
||||
|
@ -30,7 +30,7 @@
|
||||
<message>
|
||||
<location filename="../src/GUI/cadencegraphitem.cpp" line="17"/>
|
||||
<source>Maximum</source>
|
||||
<translation>Mínima</translation>
|
||||
<translation>Máxima</translation>
|
||||
</message>
|
||||
<message>
|
||||
<location filename="../src/GUI/cadencegraphitem.cpp" line="18"/>
|
||||
|
@ -422,7 +422,7 @@
|
||||
<location filename="../src/GUI/gui.cpp" line="721"/>
|
||||
<location filename="../src/GUI/gui.cpp" line="722"/>
|
||||
<source>Paths</source>
|
||||
<translation>Chemin d'accès</translation>
|
||||
<translation>Chemins d'accès</translation>
|
||||
</message>
|
||||
<message>
|
||||
<location filename="../src/GUI/gui.cpp" line="248"/>
|
||||
|
@ -211,6 +211,22 @@
|
||||
<key>CFBundleTypeRole</key>
|
||||
<string>Viewer</string>
|
||||
</dict>
|
||||
<dict>
|
||||
<key>CFBundleTypeExtensions</key>
|
||||
<array>
|
||||
<string>cup</string>
|
||||
</array>
|
||||
<key>CFBundleTypeMIMETypes</key>
|
||||
<array>
|
||||
<string>application/vnd.naviter.seeyou.cup</string>
|
||||
</array>
|
||||
<key>CFBundleTypeIconFile</key>
|
||||
<string>icons/cup.icns</string>
|
||||
<key>CFBundleTypeName</key>
|
||||
<string>SeeYou CUP File</string>
|
||||
<key>CFBundleTypeRole</key>
|
||||
<string>Viewer</string>
|
||||
</dict>
|
||||
</array>
|
||||
|
||||
<key>UTImportedTypeDeclarations</key>
|
||||
@ -467,6 +483,27 @@
|
||||
<string>application/geo+json</string>
|
||||
</dict>
|
||||
</dict>
|
||||
<dict>
|
||||
<key>UTTypeIdentifier</key>
|
||||
<string>com.naviter.seeyou.cup</string>
|
||||
<key>UTTypeReferenceURL</key>
|
||||
<string>http://www.naviter.com</string>
|
||||
<key>UTTypeDescription</key>
|
||||
<string>SeeYou CUP File</string>
|
||||
<key>UTTypeConformsTo</key>
|
||||
<array>
|
||||
<string>public.data</string>
|
||||
</array>
|
||||
<key>UTTypeTagSpecification</key>
|
||||
<dict>
|
||||
<key>public.filename-extension</key>
|
||||
<array>
|
||||
<string>cup</string>
|
||||
</array>
|
||||
<key>public.mime-type</key>
|
||||
<string>application/vnd.naviter.seeyou.cup</string>
|
||||
</dict>
|
||||
</dict>
|
||||
</array>
|
||||
</dict>
|
||||
</plist>
|
||||
|
@ -13,7 +13,8 @@
|
||||
<p>Features:</p>
|
||||
<ul>
|
||||
<li>Opens GPX, TCX, FIT, KML, IGC, NMEA, SLF, LOC, OziExplorer (PLT,
|
||||
WPT, RTE), GeoJSON, Garmin CSV and geotagged JPEG files.</li>
|
||||
WPT, RTE), GeoJSON, SeeYou CUP, Garmin CSV and geotagged
|
||||
JPEG files.</li>
|
||||
<li>User-definable online maps (OpenStreetMap/Google tiles, WMTS,
|
||||
WMS, TMS).</li>
|
||||
<li>Offline maps (MBTiles, OziExplorer maps, TrekBuddy maps/atlases,
|
||||
@ -67,5 +68,6 @@
|
||||
<mimetype>application/loc+xml</mimetype>
|
||||
<mimetype>application/slf+xml</mimetype>
|
||||
<mimetype>application/geo+json</mimetype>
|
||||
<mimetype>application/vnd.naviter.seeyou.cup</mimetype>
|
||||
</mimetypes>
|
||||
</component>
|
||||
|
@ -11,4 +11,4 @@ Icon=gpxsee
|
||||
Terminal=false
|
||||
Type=Application
|
||||
Categories=Graphics;Viewer;Education;Geography;Maps;Sports;Qt;
|
||||
MimeType=application/gpx+xml;application/tcx+xml;application/vnd.ant.fit;application/vnd.google-earth.kml+xml;application/vnd.fai.igc;application/vnd.nmea.nmea;application/vnd.oziexplorer.plt;application/vnd.oziexplorer.rte;application/vnd.oziexplorer.wpt;application/loc+xml;application/slf+xml;application/geo+json;
|
||||
MimeType=application/gpx+xml;application/tcx+xml;application/vnd.ant.fit;application/vnd.google-earth.kml+xml;application/vnd.fai.igc;application/vnd.nmea.nmea;application/vnd.oziexplorer.plt;application/vnd.oziexplorer.rte;application/vnd.oziexplorer.wpt;application/loc+xml;application/slf+xml;application/geo+json;application/vnd.naviter.seeyou.cup;
|
||||
|
@ -7,7 +7,7 @@
|
||||
; The name of the installer
|
||||
Name "GPXSee"
|
||||
; Program version
|
||||
!define VERSION "7.11"
|
||||
!define VERSION "7.12"
|
||||
|
||||
; The file to write
|
||||
OutFile "GPXSee-${VERSION}.exe"
|
||||
@ -106,18 +106,19 @@ Section "GPXSee" SEC_APP
|
||||
|
||||
; Associate file formats
|
||||
DetailPrint "Associating file types..."
|
||||
!insertmacro FILE_ASSOCIATION_ADD "gpx" "GPS Exchange Format" 5
|
||||
!insertmacro FILE_ASSOCIATION_ADD "tcx" "Training Center XML" 6
|
||||
!insertmacro FILE_ASSOCIATION_ADD "kml" "Keyhole Markup Language" 7
|
||||
!insertmacro FILE_ASSOCIATION_ADD "fit" "Flexible and Interoperable Data Transfer" 8
|
||||
!insertmacro FILE_ASSOCIATION_ADD "igc" "Flight Recorder Data Format" 9
|
||||
!insertmacro FILE_ASSOCIATION_ADD "nmea" "NMEA 0183 data" 10
|
||||
!insertmacro FILE_ASSOCIATION_ADD "plt" "OziExplorer Track Point File" 11
|
||||
!insertmacro FILE_ASSOCIATION_ADD "rte" "OziExplorer Route File" 12
|
||||
!insertmacro FILE_ASSOCIATION_ADD "gpx" "GPS Exchange Format" 6
|
||||
!insertmacro FILE_ASSOCIATION_ADD "tcx" "Training Center XML" 7
|
||||
!insertmacro FILE_ASSOCIATION_ADD "kml" "Keyhole Markup Language" 8
|
||||
!insertmacro FILE_ASSOCIATION_ADD "fit" "Flexible and Interoperable Data Transfer" 9
|
||||
!insertmacro FILE_ASSOCIATION_ADD "igc" "Flight Recorder Data Format" 10
|
||||
!insertmacro FILE_ASSOCIATION_ADD "nmea" "NMEA 0183 data" 11
|
||||
!insertmacro FILE_ASSOCIATION_ADD "plt" "OziExplorer Track Point File" 12
|
||||
!insertmacro FILE_ASSOCIATION_ADD "rte" "OziExplorer Route File" 13
|
||||
!insertmacro FILE_ASSOCIATION_ADD "wpt" "OziExplorer Waypoint File" 1
|
||||
!insertmacro FILE_ASSOCIATION_ADD "loc" "Geocaching.com Waypoint File" 2
|
||||
!insertmacro FILE_ASSOCIATION_ADD "slf" "Sigma Log File" 3
|
||||
!insertmacro FILE_ASSOCIATION_ADD "geojson" "GeoJSON" 4
|
||||
!insertmacro FILE_ASSOCIATION_ADD "cup" "SeeYou CUP file" 5
|
||||
System::Call 'shell32.dll::SHChangeNotify(i, i, i, i) v (0x08000000, 0, 0, 0)'
|
||||
|
||||
SectionEnd
|
||||
@ -227,6 +228,7 @@ Section "Uninstall"
|
||||
!insertmacro FILE_ASSOCIATION_REMOVE "loc"
|
||||
!insertmacro FILE_ASSOCIATION_REMOVE "slf"
|
||||
!insertmacro FILE_ASSOCIATION_REMOVE "geojson"
|
||||
!insertmacro FILE_ASSOCIATION_REMOVE "cup"
|
||||
System::Call 'shell32.dll::SHChangeNotify(i, i, i, i) v (0x08000000, 0, 0, 0)'
|
||||
|
||||
SectionEnd
|
||||
@ -257,4 +259,4 @@ LangString DESC_LOCALIZATION ${LANG_ENGLISH} \
|
||||
!insertmacro MUI_DESCRIPTION_TEXT ${SEC_MSVC} $(DESC_MSVC)
|
||||
!insertmacro MUI_DESCRIPTION_TEXT ${SEC_APP} $(DESC_APP)
|
||||
!insertmacro MUI_DESCRIPTION_TEXT ${SEC_LOCALIZATION} $(DESC_LOCALIZATION)
|
||||
!insertmacro MUI_FUNCTION_DESCRIPTION_END
|
||||
!insertmacro MUI_FUNCTION_DESCRIPTION_END
|
@ -84,4 +84,11 @@
|
||||
<generic-icon name="text-plain"/>
|
||||
<glob pattern="*.geojson"/>
|
||||
</mime-type>
|
||||
|
||||
<mime-type type="application/vnd.naviter.seeyou.cup">
|
||||
<comment>SeeYou CUP File</comment>
|
||||
<sub-class-of type="text/plain"/>
|
||||
<generic-icon name="text-plain"/>
|
||||
<glob pattern="*.cup"/>
|
||||
</mime-type>
|
||||
</mime-info>
|
||||
|
@ -7,7 +7,7 @@
|
||||
; The name of the installer
|
||||
Name "GPXSee"
|
||||
; Program version
|
||||
!define VERSION "7.11"
|
||||
!define VERSION "7.12"
|
||||
|
||||
; The file to write
|
||||
OutFile "GPXSee-${VERSION}_x64.exe"
|
||||
@ -113,18 +113,19 @@ Section "GPXSee" SEC_APP
|
||||
|
||||
; Associate file formats
|
||||
DetailPrint "Associating file types..."
|
||||
!insertmacro FILE_ASSOCIATION_ADD "gpx" "GPS Exchange Format" 5
|
||||
!insertmacro FILE_ASSOCIATION_ADD "tcx" "Training Center XML" 6
|
||||
!insertmacro FILE_ASSOCIATION_ADD "kml" "Keyhole Markup Language" 7
|
||||
!insertmacro FILE_ASSOCIATION_ADD "fit" "Flexible and Interoperable Data Transfer" 8
|
||||
!insertmacro FILE_ASSOCIATION_ADD "igc" "Flight Recorder Data Format" 9
|
||||
!insertmacro FILE_ASSOCIATION_ADD "nmea" "NMEA 0183 data" 10
|
||||
!insertmacro FILE_ASSOCIATION_ADD "plt" "OziExplorer Track Point File" 11
|
||||
!insertmacro FILE_ASSOCIATION_ADD "rte" "OziExplorer Route File" 12
|
||||
!insertmacro FILE_ASSOCIATION_ADD "gpx" "GPS Exchange Format" 6
|
||||
!insertmacro FILE_ASSOCIATION_ADD "tcx" "Training Center XML" 7
|
||||
!insertmacro FILE_ASSOCIATION_ADD "kml" "Keyhole Markup Language" 8
|
||||
!insertmacro FILE_ASSOCIATION_ADD "fit" "Flexible and Interoperable Data Transfer" 9
|
||||
!insertmacro FILE_ASSOCIATION_ADD "igc" "Flight Recorder Data Format" 10
|
||||
!insertmacro FILE_ASSOCIATION_ADD "nmea" "NMEA 0183 data" 11
|
||||
!insertmacro FILE_ASSOCIATION_ADD "plt" "OziExplorer Track Point File" 12
|
||||
!insertmacro FILE_ASSOCIATION_ADD "rte" "OziExplorer Route File" 13
|
||||
!insertmacro FILE_ASSOCIATION_ADD "wpt" "OziExplorer Waypoint File" 1
|
||||
!insertmacro FILE_ASSOCIATION_ADD "loc" "Geocaching.com Waypoint File" 2
|
||||
!insertmacro FILE_ASSOCIATION_ADD "slf" "Sigma Log File" 3
|
||||
!insertmacro FILE_ASSOCIATION_ADD "geojson" "GeoJSON" 4
|
||||
!insertmacro FILE_ASSOCIATION_ADD "cup" "SeeYou CUP file" 5
|
||||
System::Call 'shell32.dll::SHChangeNotify(i, i, i, i) v (0x08000000, 0, 0, 0)'
|
||||
|
||||
SectionEnd
|
||||
@ -230,6 +231,7 @@ Section "Uninstall"
|
||||
!insertmacro FILE_ASSOCIATION_REMOVE "loc"
|
||||
!insertmacro FILE_ASSOCIATION_REMOVE "slf"
|
||||
!insertmacro FILE_ASSOCIATION_REMOVE "geojson"
|
||||
!insertmacro FILE_ASSOCIATION_REMOVE "cup"
|
||||
System::Call 'shell32.dll::SHChangeNotify(i, i, i, i) v (0x08000000, 0, 0, 0)'
|
||||
|
||||
SectionEnd
|
||||
@ -260,4 +262,4 @@ LangString DESC_LOCALIZATION ${LANG_ENGLISH} \
|
||||
!insertmacro MUI_DESCRIPTION_TEXT ${SEC_MSVC} $(DESC_MSVC)
|
||||
!insertmacro MUI_DESCRIPTION_TEXT ${SEC_APP} $(DESC_APP)
|
||||
!insertmacro MUI_DESCRIPTION_TEXT ${SEC_LOCALIZATION} $(DESC_LOCALIZATION)
|
||||
!insertmacro MUI_FUNCTION_DESCRIPTION_END
|
||||
!insertmacro MUI_FUNCTION_DESCRIPTION_END
|
@ -27,7 +27,7 @@ public:
|
||||
~GraphView();
|
||||
|
||||
bool isEmpty() const {return _graphs.isEmpty();}
|
||||
const QList<KV> &info() const {return _info->info();}
|
||||
const QList<KV<QString, QString> > &info() const {return _info->info();}
|
||||
void clear();
|
||||
|
||||
void plot(QPainter *painter, const QRectF &target, qreal scale);
|
||||
|
@ -1066,7 +1066,7 @@ void GUI::statistics()
|
||||
|
||||
text.append("<tr><th colspan=\"2\">" + tab->label() + "</th></tr>");
|
||||
for (int j = 0; j < tab->info().size(); j++) {
|
||||
const KV &kv = tab->info().at(j);
|
||||
const KV<QString, QString> &kv = tab->info().at(j);
|
||||
text.append("<tr><td>" + kv.key() + ":</td><td>" + kv.value()
|
||||
+ "</td></tr>");
|
||||
}
|
||||
|
@ -16,7 +16,7 @@ void InfoItem::updateBoundingRect()
|
||||
QFontMetrics fm(_font);
|
||||
qreal width = 0;
|
||||
|
||||
for (QList<KV>::const_iterator i = _list.constBegin();
|
||||
for (QList<KV<QString, QString> >::const_iterator i = _list.constBegin();
|
||||
i != _list.constEnd(); i++) {
|
||||
width += fm.width(i->key() + ": ");
|
||||
width += fm.width(i->value()) + ((i == _list.constEnd() - 1)
|
||||
@ -37,7 +37,7 @@ void InfoItem::paint(QPainter *painter, const QStyleOptionGraphicsItem *option,
|
||||
painter->setFont(_font);
|
||||
painter->setRenderHint(QPainter::Antialiasing, false);
|
||||
|
||||
for (QList<KV>::const_iterator i = _list.constBegin();
|
||||
for (QList<KV<QString, QString> >::const_iterator i = _list.constBegin();
|
||||
i != _list.constEnd(); i++) {
|
||||
painter->drawText(width, fm.height() - fm.descent(), i->key() + ": ");
|
||||
width += fm.width(i->key() + ": ");
|
||||
@ -61,7 +61,7 @@ void InfoItem::paint(QPainter *painter, const QStyleOptionGraphicsItem *option,
|
||||
|
||||
void InfoItem::insert(const QString &key, const QString &value)
|
||||
{
|
||||
KV kv(key, value);
|
||||
KV<QString, QString> kv(key, value);
|
||||
int i;
|
||||
|
||||
prepareGeometryChange();
|
||||
|
@ -14,7 +14,7 @@ public:
|
||||
void paint(QPainter *painter, const QStyleOptionGraphicsItem *option,
|
||||
QWidget *widget);
|
||||
|
||||
const QList<KV> &info() const {return _list;}
|
||||
const QList<KV<QString, QString> > &info() const {return _list;}
|
||||
|
||||
void insert(const QString &key, const QString &value);
|
||||
void clear();
|
||||
@ -23,7 +23,7 @@ public:
|
||||
private:
|
||||
void updateBoundingRect();
|
||||
|
||||
QList<KV> _list;
|
||||
QList<KV<QString, QString> > _list;
|
||||
QRectF _boundingRect;
|
||||
QFont _font;
|
||||
};
|
||||
|
@ -255,17 +255,18 @@ QPointF MapView::contentCenter() const
|
||||
|
||||
void MapView::updatePOIVisibility()
|
||||
{
|
||||
QHash<SearchPointer<Waypoint>, WaypointItem*>::const_iterator it, jt;
|
||||
|
||||
if (!_showPOI)
|
||||
return;
|
||||
|
||||
for (it = _pois.constBegin(); it != _pois.constEnd(); it++)
|
||||
for (POIHash::const_iterator it = _pois.constBegin();
|
||||
it != _pois.constEnd(); it++)
|
||||
it.value()->show();
|
||||
|
||||
if (!_overlapPOIs) {
|
||||
for (it = _pois.constBegin(); it != _pois.constEnd(); it++) {
|
||||
for (jt = _pois.constBegin(); jt != _pois.constEnd(); jt++) {
|
||||
for (POIHash::const_iterator it = _pois.constBegin();
|
||||
it != _pois.constEnd(); it++) {
|
||||
for (POIHash::const_iterator jt = _pois.constBegin();
|
||||
jt != _pois.constEnd(); jt++) {
|
||||
if (it.value()->isVisible() && jt.value()->isVisible()
|
||||
&& it != jt && it.value()->collidesWithItem(jt.value()))
|
||||
jt.value()->hide();
|
||||
@ -288,8 +289,8 @@ void MapView::rescale()
|
||||
for (int i = 0; i < _waypoints.size(); i++)
|
||||
_waypoints.at(i)->setMap(_map);
|
||||
|
||||
QHash<SearchPointer<Waypoint>, WaypointItem*>::const_iterator it;
|
||||
for (it = _pois.constBegin(); it != _pois.constEnd(); it++)
|
||||
for (POIHash::const_iterator it = _pois.constBegin();
|
||||
it != _pois.constEnd(); it++)
|
||||
it.value()->setMap(_map);
|
||||
|
||||
updatePOIVisibility();
|
||||
@ -339,8 +340,8 @@ void MapView::setMap(Map *map)
|
||||
for (int i = 0; i < _waypoints.size(); i++)
|
||||
_waypoints.at(i)->setMap(map);
|
||||
|
||||
QHash<SearchPointer<Waypoint>, WaypointItem*>::const_iterator it;
|
||||
for (it = _pois.constBegin(); it != _pois.constEnd(); it++)
|
||||
for (POIHash::const_iterator it = _pois.constBegin();
|
||||
it != _pois.constEnd(); it++)
|
||||
it.value()->setMap(_map);
|
||||
updatePOIVisibility();
|
||||
|
||||
@ -364,12 +365,10 @@ void MapView::setPOI(POI *poi)
|
||||
|
||||
void MapView::updatePOI()
|
||||
{
|
||||
QHash<SearchPointer<Waypoint>, WaypointItem*>::const_iterator it;
|
||||
|
||||
for (it = _pois.constBegin(); it != _pois.constEnd(); it++) {
|
||||
for (POIHash::const_iterator it = _pois.constBegin();
|
||||
it != _pois.constEnd(); it++)
|
||||
_scene->removeItem(it.value());
|
||||
delete it.value();
|
||||
}
|
||||
qDeleteAll(_pois);
|
||||
_pois.clear();
|
||||
|
||||
if (_showTracks)
|
||||
@ -426,8 +425,8 @@ void MapView::setUnits(Units units)
|
||||
for (int i = 0; i < _waypoints.size(); i++)
|
||||
_waypoints.at(i)->setToolTipFormat(_units, _coordinatesFormat);
|
||||
|
||||
QHash<SearchPointer<Waypoint>, WaypointItem*>::const_iterator it;
|
||||
for (it = _pois.constBegin(); it != _pois.constEnd(); it++)
|
||||
for (POIHash::const_iterator it = _pois.constBegin();
|
||||
it != _pois.constEnd(); it++)
|
||||
it.value()->setToolTipFormat(_units, _coordinatesFormat);
|
||||
}
|
||||
|
||||
@ -445,8 +444,8 @@ void MapView::setCoordinatesFormat(CoordinatesFormat format)
|
||||
for (int i = 0; i < _routes.count(); i++)
|
||||
_routes[i]->setCoordinatesFormat(_coordinatesFormat);
|
||||
|
||||
QHash<SearchPointer<Waypoint>, WaypointItem*>::const_iterator it;
|
||||
for (it = _pois.constBegin(); it != _pois.constEnd(); it++)
|
||||
for (POIHash::const_iterator it = _pois.constBegin();
|
||||
it != _pois.constEnd(); it++)
|
||||
it.value()->setToolTipFormat(_units, _coordinatesFormat);
|
||||
}
|
||||
|
||||
@ -461,8 +460,6 @@ void MapView::clearMapCache()
|
||||
|
||||
void MapView::digitalZoom(int zoom)
|
||||
{
|
||||
QHash<SearchPointer<Waypoint>, WaypointItem*>::const_iterator it;
|
||||
|
||||
if (zoom) {
|
||||
_digitalZoom += zoom;
|
||||
scale(pow(2, zoom), pow(2, zoom));
|
||||
@ -479,7 +476,8 @@ void MapView::digitalZoom(int zoom)
|
||||
_areas.at(i)->setDigitalZoom(_digitalZoom);
|
||||
for (int i = 0; i < _waypoints.size(); i++)
|
||||
_waypoints.at(i)->setDigitalZoom(_digitalZoom);
|
||||
for (it = _pois.constBegin(); it != _pois.constEnd(); it++)
|
||||
for (POIHash::const_iterator it = _pois.constBegin();
|
||||
it != _pois.constEnd(); it++)
|
||||
it.value()->setDigitalZoom(_digitalZoom);
|
||||
|
||||
_mapScale->setDigitalZoom(_digitalZoom);
|
||||
@ -747,8 +745,8 @@ void MapView::showPOI(bool show)
|
||||
{
|
||||
_showPOI = show;
|
||||
|
||||
QHash<SearchPointer<Waypoint>, WaypointItem*>::const_iterator it;
|
||||
for (it = _pois.constBegin(); it != _pois.constEnd(); it++)
|
||||
for (POIHash::const_iterator it = _pois.constBegin();
|
||||
it != _pois.constEnd(); it++)
|
||||
it.value()->setVisible(show);
|
||||
|
||||
updatePOIVisibility();
|
||||
@ -758,8 +756,8 @@ void MapView::showPOILabels(bool show)
|
||||
{
|
||||
_showPOILabels = show;
|
||||
|
||||
QHash<SearchPointer<Waypoint>, WaypointItem*>::const_iterator it;
|
||||
for (it = _pois.constBegin(); it != _pois.constEnd(); it++)
|
||||
for (POIHash::const_iterator it = _pois.constBegin();
|
||||
it != _pois.constEnd(); it++)
|
||||
it.value()->showLabel(show);
|
||||
|
||||
updatePOIVisibility();
|
||||
@ -852,21 +850,19 @@ void MapView::setWaypointColor(const QColor &color)
|
||||
|
||||
void MapView::setPOISize(int size)
|
||||
{
|
||||
QHash<SearchPointer<Waypoint>, WaypointItem*>::const_iterator it;
|
||||
|
||||
_poiSize = size;
|
||||
|
||||
for (it = _pois.constBegin(); it != _pois.constEnd(); it++)
|
||||
for (POIHash::const_iterator it = _pois.constBegin();
|
||||
it != _pois.constEnd(); it++)
|
||||
it.value()->setSize(size);
|
||||
}
|
||||
|
||||
void MapView::setPOIColor(const QColor &color)
|
||||
{
|
||||
QHash<SearchPointer<Waypoint>, WaypointItem*>::const_iterator it;
|
||||
|
||||
_poiColor = color;
|
||||
|
||||
for (it = _pois.constBegin(); it != _pois.constEnd(); it++)
|
||||
for (POIHash::const_iterator it = _pois.constBegin();
|
||||
it != _pois.constEnd(); it++)
|
||||
it.value()->setColor(color);
|
||||
}
|
||||
|
||||
@ -1003,8 +999,8 @@ void MapView::setDevicePixelRatio(qreal deviceRatio, qreal mapRatio)
|
||||
for (int i = 0; i < _waypoints.size(); i++)
|
||||
_waypoints.at(i)->setMap(_map);
|
||||
|
||||
QHash<SearchPointer<Waypoint>, WaypointItem*>::const_iterator it;
|
||||
for (it = _pois.constBegin(); it != _pois.constEnd(); it++)
|
||||
for (POIHash::const_iterator it = _pois.constBegin();
|
||||
it != _pois.constEnd(); it++)
|
||||
it.value()->setMap(_map);
|
||||
updatePOIVisibility();
|
||||
|
||||
@ -1021,13 +1017,17 @@ void MapView::setDevicePixelRatio(qreal deviceRatio, qreal mapRatio)
|
||||
|
||||
void MapView::setProjection(int id)
|
||||
{
|
||||
Projection projection(PCS::pcs(id));
|
||||
if (!projection.isValid())
|
||||
return;
|
||||
|
||||
_projection = projection;
|
||||
|
||||
const PCS *pcs;
|
||||
const GCS *gcs;
|
||||
Coordinates center = _map->xy2ll(mapToScene(viewport()->rect().center()));
|
||||
|
||||
if ((pcs = PCS::pcs(id)))
|
||||
_projection = Projection(pcs);
|
||||
else if ((gcs = GCS::gcs(id)))
|
||||
_projection = Projection(gcs);
|
||||
else
|
||||
qWarning("%d: Unknown PCS/GCS id", id);
|
||||
|
||||
_map->setProjection(_projection);
|
||||
rescale();
|
||||
centerOn(_map->ll2xy(center));
|
||||
|
@ -92,6 +92,8 @@ private slots:
|
||||
void reloadMap();
|
||||
|
||||
private:
|
||||
typedef QHash<SearchPointer<Waypoint>, WaypointItem*> POIHash;
|
||||
|
||||
PathItem *addTrack(const Track &track);
|
||||
PathItem *addRoute(const Route &route);
|
||||
void addArea(const Area &area);
|
||||
@ -125,7 +127,7 @@ private:
|
||||
QList<RouteItem*> _routes;
|
||||
QList<WaypointItem*> _waypoints;
|
||||
QList<AreaItem*> _areas;
|
||||
QHash<SearchPointer<Waypoint>, WaypointItem*> _pois;
|
||||
POIHash _pois;
|
||||
|
||||
RectC _tr, _rr, _wr, _ar;
|
||||
qreal _res;
|
||||
|
@ -36,15 +36,18 @@ static QFrame *line()
|
||||
}
|
||||
#endif // Q_OS_MAC
|
||||
|
||||
|
||||
QWidget *OptionsDialog::createMapPage()
|
||||
{
|
||||
_projection = new LimitedComboBox(200);
|
||||
QList<PCS::Info> projections(PCS::pcsList());
|
||||
|
||||
QList<KV<int, QString> > projections(GCS::list() + PCS::list());
|
||||
qSort(projections);
|
||||
|
||||
for (int i = 0; i < projections.size(); i++) {
|
||||
QString text = QString::number(projections.at(i).id()) + " - "
|
||||
+ projections.at(i).name();
|
||||
_projection->addItem(text, QVariant(projections.at(i).id()));
|
||||
QString text = QString::number(projections.at(i).key()) + " - "
|
||||
+ projections.at(i).value();
|
||||
_projection->addItem(text, QVariant(projections.at(i).key()));
|
||||
}
|
||||
_projection->setCurrentIndex(_projection->findData(_options->projection));
|
||||
|
||||
|
@ -6,7 +6,7 @@
|
||||
|
||||
void ToolTip::insert(const QString &key, const QString &value)
|
||||
{
|
||||
_list.append(KV(key, value));
|
||||
_list.append(KV<QString, QString>(key, value));
|
||||
}
|
||||
|
||||
QString ToolTip::toString() const
|
||||
|
@ -14,7 +14,7 @@ public:
|
||||
QString toString() const;
|
||||
|
||||
private:
|
||||
QList<KV> _list;
|
||||
QList<KV<QString, QString> > _list;
|
||||
ImageInfo _img;
|
||||
};
|
||||
|
||||
|
@ -1,21 +1,20 @@
|
||||
#ifndef KV_H
|
||||
#define KV_H
|
||||
|
||||
#include <QString>
|
||||
|
||||
template <class KEY, class VALUE>
|
||||
class KV {
|
||||
public:
|
||||
KV(const QString &key, const QString &value) : _key(key), _value(value) {}
|
||||
KV(const KEY &key, const VALUE &value) : _key(key), _value(value) {}
|
||||
|
||||
const QString &key() const {return _key;}
|
||||
const QString &value() const {return _value;}
|
||||
const KEY &key() const {return _key;}
|
||||
const VALUE &value() const {return _value;}
|
||||
|
||||
bool operator==(const KV &other) const
|
||||
{return this->key() == other.key();}
|
||||
bool operator==(const KV &other) const {return _key == other._key;}
|
||||
bool operator<(const KV &other) const {return _key < other._key;}
|
||||
|
||||
private:
|
||||
QString _key;
|
||||
QString _value;
|
||||
KEY _key;
|
||||
VALUE _value;
|
||||
};
|
||||
|
||||
#endif // KV_H
|
||||
|
@ -17,6 +17,7 @@ public:
|
||||
TIFFFile(QIODevice *device);
|
||||
|
||||
bool isValid() const {return _ifd != 0;}
|
||||
bool isBE() const {return _be;}
|
||||
quint32 ifd() const {return _ifd;}
|
||||
|
||||
bool seek(qint64 pos) {return _device->seek(_offset + pos);}
|
||||
|
67
src/data/csv.cpp
Normal file
67
src/data/csv.cpp
Normal file
@ -0,0 +1,67 @@
|
||||
#include <QStringList>
|
||||
#include "csv.h"
|
||||
|
||||
/*
|
||||
RFC 4180 parser with the following enchancements:
|
||||
- allows an arbitrary delimiter
|
||||
- allows LF line ends in addition to CRLF line ends
|
||||
*/
|
||||
|
||||
bool CSV::readEntry(QStringList &list)
|
||||
{
|
||||
int state = 0;
|
||||
char c;
|
||||
QByteArray field;
|
||||
|
||||
while (_device->getChar(&c)) {
|
||||
switch (state) {
|
||||
case 0:
|
||||
if (c == '\r')
|
||||
state = 3;
|
||||
else if (c == '\n') {
|
||||
list.append(field);
|
||||
_line++;
|
||||
return true;
|
||||
} else if (c == _delimiter) {
|
||||
list.append(field);
|
||||
field.clear();
|
||||
} else if (c == '"') {
|
||||
if (!field.isEmpty())
|
||||
return false;
|
||||
state = 1;
|
||||
} else
|
||||
field.append(c);
|
||||
break;
|
||||
case 1:
|
||||
if (c == '"')
|
||||
state = 2;
|
||||
else {
|
||||
field.append(c);
|
||||
if (c == '\n')
|
||||
_line++;
|
||||
}
|
||||
break;
|
||||
case 2:
|
||||
if (c == '"') {
|
||||
field.append('"');
|
||||
state = 1;
|
||||
} else if (c == _delimiter || c == '\r' || c == '\n') {
|
||||
_device->ungetChar(c);
|
||||
state = 0;
|
||||
} else
|
||||
return false;
|
||||
break;
|
||||
case 3:
|
||||
if (c == '\n') {
|
||||
_device->ungetChar(c);
|
||||
state = 0;
|
||||
} else
|
||||
return false;
|
||||
break;
|
||||
}
|
||||
}
|
||||
|
||||
list.append(field);
|
||||
|
||||
return (state == 0);
|
||||
}
|
22
src/data/csv.h
Normal file
22
src/data/csv.h
Normal file
@ -0,0 +1,22 @@
|
||||
#ifndef CSV_H
|
||||
#define CSV_H
|
||||
|
||||
#include <QIODevice>
|
||||
|
||||
class CSV
|
||||
{
|
||||
public:
|
||||
CSV(QIODevice *device, char delimiter = ',')
|
||||
: _device(device), _delimiter(delimiter), _line(1) {}
|
||||
|
||||
bool readEntry(QStringList &list);
|
||||
bool atEnd() const {return _device->atEnd();}
|
||||
int line() const {return _line;}
|
||||
|
||||
private:
|
||||
QIODevice *_device;
|
||||
char _delimiter;
|
||||
int _line;
|
||||
};
|
||||
|
||||
#endif // CSV_H
|
@ -1,3 +1,5 @@
|
||||
#include <QStringList>
|
||||
#include "csv.h"
|
||||
#include "csvparser.h"
|
||||
|
||||
bool CSVParser::parse(QFile *file, QList<TrackData> &tracks,
|
||||
@ -7,42 +9,38 @@ bool CSVParser::parse(QFile *file, QList<TrackData> &tracks,
|
||||
Q_UNUSED(tracks);
|
||||
Q_UNUSED(routes);
|
||||
Q_UNUSED(polygons);
|
||||
bool res;
|
||||
CSV csv(file);
|
||||
QStringList entry;
|
||||
bool ok;
|
||||
|
||||
_errorLine = 1;
|
||||
_errorString.clear();
|
||||
|
||||
while (!file->atEnd()) {
|
||||
QByteArray line = file->readLine();
|
||||
QList<QByteArray> list = line.split(',');
|
||||
if (list.size() < 3) {
|
||||
while (!csv.atEnd()) {
|
||||
if (!csv.readEntry(entry) || entry.size() < 3) {
|
||||
_errorString = "Parse error";
|
||||
_errorLine = csv.line();
|
||||
return false;
|
||||
}
|
||||
|
||||
qreal lon = list[0].trimmed().toDouble(&res);
|
||||
if (!res || (lon < -180.0 || lon > 180.0)) {
|
||||
double lon = entry.at(0).trimmed().toDouble(&ok);
|
||||
if (!ok || (lon < -180.0 || lon > 180.0)) {
|
||||
_errorString = "Invalid longitude";
|
||||
_errorLine = csv.line();
|
||||
return false;
|
||||
}
|
||||
qreal lat = list[1].trimmed().toDouble(&res);
|
||||
if (!res || (lat < -90.0 || lat > 90.0)) {
|
||||
double lat = entry.at(1).trimmed().toDouble(&ok);
|
||||
if (!ok || (lat < -90.0 || lat > 90.0)) {
|
||||
_errorString = "Invalid latitude";
|
||||
_errorLine = csv.line();
|
||||
return false;
|
||||
}
|
||||
Waypoint wp(Coordinates(lon, lat));
|
||||
|
||||
QByteArray ba = list[2].trimmed();
|
||||
QString name = QString::fromUtf8(ba.data(), ba.size());
|
||||
wp.setName(name);
|
||||
|
||||
if (list.size() > 3) {
|
||||
ba = list[3].trimmed();
|
||||
wp.setDescription(QString::fromUtf8(ba.data(), ba.size()));
|
||||
}
|
||||
wp.setName(entry.at(2).trimmed());
|
||||
if (entry.size() > 3)
|
||||
wp.setDescription(entry.at(3).trimmed());
|
||||
|
||||
waypoints.append(wp);
|
||||
_errorLine++;
|
||||
|
||||
entry.clear();
|
||||
}
|
||||
|
||||
return true;
|
||||
|
167
src/data/cupparser.cpp
Normal file
167
src/data/cupparser.cpp
Normal file
@ -0,0 +1,167 @@
|
||||
#include <cmath>
|
||||
#include <QStringList>
|
||||
#include "csv.h"
|
||||
#include "cupparser.h"
|
||||
|
||||
|
||||
enum SegmentType {
|
||||
Header, Waypoints, Tasks
|
||||
};
|
||||
|
||||
static double latitude(const QString &str)
|
||||
{
|
||||
bool ok;
|
||||
|
||||
if (str.length() != 9)
|
||||
return NAN;
|
||||
int deg = str.left(2).toInt(&ok);
|
||||
if (!ok || deg > 90)
|
||||
return NAN;
|
||||
double min = str.mid(2, 6).toDouble(&ok);
|
||||
if (!ok || min > 60)
|
||||
return NAN;
|
||||
|
||||
double dd = deg + min/60.0;
|
||||
return (str.right(1) == "S") ? -dd : dd;
|
||||
}
|
||||
|
||||
static double longitude(const QString &str)
|
||||
{
|
||||
bool ok;
|
||||
|
||||
if (str.length() != 10)
|
||||
return NAN;
|
||||
int deg = str.left(3).toInt(&ok);
|
||||
if (!ok || deg > 180)
|
||||
return NAN;
|
||||
double min = str.mid(3, 6).toDouble(&ok);
|
||||
if (!ok || min > 60)
|
||||
return NAN;
|
||||
|
||||
double dd = deg + min/60.0;
|
||||
return (str.right(1) == "W") ? -dd : dd;
|
||||
}
|
||||
|
||||
static double elevation(const QString &str)
|
||||
{
|
||||
bool ok;
|
||||
double ele;
|
||||
|
||||
if (str.right(2) == "ft")
|
||||
ele = str.left(str.length() - 2).toDouble(&ok) * 0.3048;
|
||||
else if (str.right(1) == "m")
|
||||
ele = str.left(str.length() - 1).toDouble(&ok);
|
||||
else
|
||||
return NAN;
|
||||
|
||||
return ok ? ele : NAN;
|
||||
}
|
||||
|
||||
|
||||
bool CUPParser::waypoint(const QStringList &entry, QVector<Waypoint> &waypoints)
|
||||
{
|
||||
if (entry.size() < 11) {
|
||||
_errorString = "Invalid number of fields";
|
||||
return false;
|
||||
}
|
||||
|
||||
double lon = longitude(entry.at(4));
|
||||
if (std::isnan(lon)) {
|
||||
_errorString = "Invalid longitude";
|
||||
return false;
|
||||
}
|
||||
double lat = latitude(entry.at(3));
|
||||
if (std::isnan(lat)) {
|
||||
_errorString = "Invalid latitude";
|
||||
return false;
|
||||
}
|
||||
|
||||
Waypoint wp(Coordinates(lon, lat));
|
||||
wp.setName(entry.at(0));
|
||||
wp.setDescription(entry.at(10));
|
||||
wp.setElevation(elevation(entry.at(5)));
|
||||
waypoints.append(wp);
|
||||
|
||||
return true;
|
||||
}
|
||||
|
||||
bool CUPParser::task(const QStringList &entry,
|
||||
const QVector<Waypoint> &waypoints, QList<RouteData> &routes)
|
||||
{
|
||||
if (entry.size() < 3) {
|
||||
_errorString = "Invalid number of fields";
|
||||
return false;
|
||||
}
|
||||
|
||||
RouteData r;
|
||||
r.setName(entry.at(0));
|
||||
for (int i = 1; i < entry.size(); i++) {
|
||||
if (entry.at(i) == "???")
|
||||
continue;
|
||||
|
||||
Waypoint w;
|
||||
for (int j = 0; j < waypoints.size(); j++) {
|
||||
if (waypoints.at(j).name() == entry.at(i)) {
|
||||
w = waypoints.at(j);
|
||||
break;
|
||||
}
|
||||
}
|
||||
if (w.coordinates().isNull()) {
|
||||
_errorString = entry.at(i) + ": unknown turnpoint";
|
||||
return false;
|
||||
}
|
||||
r.append(w);
|
||||
}
|
||||
|
||||
routes.append(r);
|
||||
|
||||
return true;
|
||||
}
|
||||
|
||||
bool CUPParser::parse(QFile *file, QList<TrackData> &tracks,
|
||||
QList<RouteData> &routes, QList<Area> &polygons,
|
||||
QVector<Waypoint> &waypoints)
|
||||
{
|
||||
Q_UNUSED(tracks);
|
||||
Q_UNUSED(polygons);
|
||||
CSV csv(file);
|
||||
QStringList entry;
|
||||
SegmentType segment = Header;
|
||||
|
||||
|
||||
while (!csv.atEnd()) {
|
||||
if (!csv.readEntry(entry)) {
|
||||
_errorString = "CSV parse error";
|
||||
_errorLine = csv.line();
|
||||
return false;
|
||||
}
|
||||
|
||||
if (segment == Header) {
|
||||
segment = Waypoints;
|
||||
if (entry.size() >= 11 && entry.at(3) == "lat"
|
||||
&& entry.at(4) == "lon") {
|
||||
entry.clear();
|
||||
continue;
|
||||
}
|
||||
} else if (segment == Waypoints && entry.size() == 1
|
||||
&& entry.at(0) == "-----Related Tasks-----") {
|
||||
segment = Tasks;
|
||||
entry.clear();
|
||||
continue;
|
||||
}
|
||||
|
||||
if (segment == Waypoints) {
|
||||
if (!waypoint(entry, waypoints))
|
||||
return false;
|
||||
} else if (segment == Tasks) {
|
||||
if (entry.at(0) != "Options" && !entry.at(0).startsWith("ObsZone=")
|
||||
&& !task(entry, waypoints, routes))
|
||||
return false;
|
||||
}
|
||||
|
||||
entry.clear();
|
||||
_errorLine = csv.line();
|
||||
}
|
||||
|
||||
return true;
|
||||
}
|
25
src/data/cupparser.h
Normal file
25
src/data/cupparser.h
Normal file
@ -0,0 +1,25 @@
|
||||
#ifndef CUPPARSER_H
|
||||
#define CUPPARSER_H
|
||||
|
||||
#include "parser.h"
|
||||
|
||||
class CUPParser : public Parser
|
||||
{
|
||||
public:
|
||||
CUPParser() : _errorLine(0) {}
|
||||
|
||||
bool parse(QFile *file, QList<TrackData> &tracks, QList<RouteData> &routes,
|
||||
QList<Area> &polygons, QVector<Waypoint> &waypoints);
|
||||
QString errorString() const {return _errorString;}
|
||||
int errorLine() const {return _errorLine;}
|
||||
|
||||
private:
|
||||
bool waypoint(const QStringList &entry, QVector<Waypoint> &waypoints);
|
||||
bool task(const QStringList &entry, const QVector<Waypoint> &waypoints,
|
||||
QList<RouteData> &routes);
|
||||
|
||||
QString _errorString;
|
||||
int _errorLine;
|
||||
};
|
||||
|
||||
#endif // CUPPARSER_H
|
@ -17,6 +17,7 @@
|
||||
#include "geojsonparser.h"
|
||||
#endif // ENABLE_GEOJSON
|
||||
#include "exifparser.h"
|
||||
#include "cupparser.h"
|
||||
#include "dem.h"
|
||||
#include "data.h"
|
||||
|
||||
@ -37,6 +38,7 @@ static SLFParser slf;
|
||||
static GeoJSONParser geojson;
|
||||
#endif // ENABLE_GEOJSON
|
||||
static EXIFParser exif;
|
||||
static CUPParser cup;
|
||||
|
||||
static QHash<QString, Parser*> parsers()
|
||||
{
|
||||
@ -60,6 +62,7 @@ static QHash<QString, Parser*> parsers()
|
||||
#endif // ENABLE_GEOJSON
|
||||
hash.insert("jpeg", &exif);
|
||||
hash.insert("jpg", &exif);
|
||||
hash.insert("cup", &cup);
|
||||
|
||||
return hash;
|
||||
}
|
||||
@ -147,6 +150,7 @@ QString Data::formats()
|
||||
return
|
||||
qApp->translate("Data", "Supported files") + " (" + supported + ");;"
|
||||
+ qApp->translate("Data", "CSV files") + " (*.csv);;"
|
||||
+ qApp->translate("Data", "CUP files") + " (*.cup);;"
|
||||
+ qApp->translate("Data", "FIT files") + " (*.fit);;"
|
||||
#ifdef ENABLE_GEOJSON
|
||||
+ qApp->translate("Data", "GeoJSON files") + " (*.geojson *.json);;"
|
||||
|
@ -113,9 +113,12 @@ Coordinates EXIFParser::coordinates(TIFFFile &file, const IFDEntry &lon,
|
||||
if (!c.isValid())
|
||||
return Coordinates();
|
||||
|
||||
if (lonRef.offset == 'W')
|
||||
char ew = file.isBE() ? lonRef.offset >> 24 : lonRef.offset;
|
||||
char ns = file.isBE() ? latRef.offset >> 24 : latRef.offset;
|
||||
|
||||
if (ew == 'W')
|
||||
c.rlon() = -c.lon();
|
||||
if (latRef.offset == 'S')
|
||||
if (ns == 'S')
|
||||
c.rlat() = -c.lat();
|
||||
|
||||
return c;
|
||||
|
@ -87,13 +87,10 @@ template<class T> bool FITParser::readValue(CTX &ctx, T &val)
|
||||
|
||||
ctx.len -= sizeof(T);
|
||||
|
||||
if (sizeof(T) > 1) {
|
||||
if (ctx.endian)
|
||||
val = qFromBigEndian(data);
|
||||
else
|
||||
val = qFromLittleEndian(data);
|
||||
} else
|
||||
val = data;
|
||||
if (ctx.endian)
|
||||
val = qFromBigEndian(data);
|
||||
else
|
||||
val = qFromLittleEndian(data);
|
||||
|
||||
return true;
|
||||
}
|
||||
|
@ -91,7 +91,7 @@ IMG::IMG(const QString &fileName)
|
||||
}
|
||||
|
||||
QString fn(QByteArray(name, sizeof(name)));
|
||||
if (VectorTile::isTileFile(tt)) {
|
||||
if (SubFile::isTileFile(tt)) {
|
||||
VectorTile *tile;
|
||||
QMap<QString, VectorTile*>::iterator it = tileMap.find(fn);
|
||||
if (it == tileMap.end()) {
|
||||
@ -227,10 +227,7 @@ template<class T> bool IMG::readValue(T &val)
|
||||
if (read((char*)&data, sizeof(T)) < (qint64)sizeof(T))
|
||||
return false;
|
||||
|
||||
if (sizeof(T) > 1)
|
||||
val = qFromLittleEndian(data);
|
||||
else
|
||||
val = data;
|
||||
val = qFromLittleEndian(data);
|
||||
|
||||
return true;
|
||||
}
|
||||
|
@ -35,7 +35,8 @@ static QString capitalize(const QString &str)
|
||||
if (str.isEmpty())
|
||||
return str;
|
||||
for (int i = 0; i < str.size(); i++)
|
||||
if (str.at(i).isLetter() && !str.at(i).isUpper())
|
||||
if (str.at(i).isLetter() && !(str.at(i).isUpper()
|
||||
|| str.at(i) == QChar(0x00DF)))
|
||||
return str;
|
||||
|
||||
QString ret(str);
|
||||
@ -53,15 +54,18 @@ bool LBLFile::init()
|
||||
{
|
||||
Handle hdl;
|
||||
quint16 codepage;
|
||||
quint8 multiplier, poiMultiplier;
|
||||
|
||||
if (!(seek(hdl, 0x15) && readUInt32(hdl, _offset)
|
||||
&& readUInt32(hdl, _size) && readByte(hdl, _multiplier)
|
||||
&& readUInt32(hdl, _size) && readByte(hdl, multiplier)
|
||||
&& readByte(hdl, _encoding) && seek(hdl, 0x57)
|
||||
&& readUInt32(hdl, _poiOffset) && readUInt32(hdl, _poiSize)
|
||||
&& seek(hdl, 0xAA) && readUInt16(hdl, codepage)))
|
||||
&& readByte(hdl, poiMultiplier) && seek(hdl, 0xAA)
|
||||
&& readUInt16(hdl, codepage)))
|
||||
return false;
|
||||
|
||||
_multiplier = 1<<_multiplier;
|
||||
_multiplier = 1<<multiplier;
|
||||
_poiMultiplier = 1<<poiMultiplier;
|
||||
|
||||
if (codepage == 65001)
|
||||
_codec = QTextCodec::codecForName("UTF-8");
|
||||
@ -161,14 +165,15 @@ Label LBLFile::label8b(Handle &hdl, quint32 offset) const
|
||||
|
||||
Label LBLFile::label(Handle &hdl, quint32 offset, bool poi)
|
||||
{
|
||||
if (!_size && !init())
|
||||
if (!_multiplier && !init())
|
||||
return QString();
|
||||
|
||||
quint32 labelOffset;
|
||||
if (poi) {
|
||||
quint32 poiOffset;
|
||||
if (!(seek(hdl, _poiOffset + offset) && readUInt24(hdl, poiOffset)
|
||||
&& (poiOffset & 0x3FFFFF)))
|
||||
if (!(_poiSize >= offset * _poiMultiplier
|
||||
&& seek(hdl, _poiOffset + offset * _poiMultiplier)
|
||||
&& readUInt24(hdl, poiOffset) && (poiOffset & 0x3FFFFF)))
|
||||
return QString();
|
||||
labelOffset = _offset + (poiOffset & 0x3FFFFF) * _multiplier;
|
||||
} else
|
||||
|
@ -10,8 +10,8 @@ class LBLFile : public SubFile
|
||||
{
|
||||
public:
|
||||
LBLFile(IMG *img, quint32 size)
|
||||
: SubFile(img, size), _offset(0), _size(0), _poiOffset(0), _poiSize(0),
|
||||
_multiplier(0), _encoding(0), _codec(0) {}
|
||||
: SubFile(img, size), _codec(0), _offset(0), _size(0), _poiOffset(0),
|
||||
_poiSize(0), _poiMultiplier(0), _multiplier(0), _encoding(0) {}
|
||||
|
||||
Label label(Handle &hdl, quint32 offset, bool poi = false);
|
||||
|
||||
@ -21,13 +21,14 @@ private:
|
||||
Label label6b(Handle &hdl, quint32 offset) const;
|
||||
Label label8b(Handle &hdl, quint32 offset) const;
|
||||
|
||||
QTextCodec *_codec;
|
||||
quint32 _offset;
|
||||
quint32 _size;
|
||||
quint32 _poiOffset;
|
||||
quint32 _poiSize;
|
||||
quint8 _poiMultiplier;
|
||||
quint8 _multiplier;
|
||||
quint8 _encoding;
|
||||
QTextCodec *_codec;
|
||||
};
|
||||
|
||||
#endif // LBLFILE_H
|
||||
|
@ -3,22 +3,21 @@
|
||||
bool NETFile::init()
|
||||
{
|
||||
Handle hdl;
|
||||
quint8 multiplier;
|
||||
|
||||
if (!(seek(hdl, 0x15) && readUInt32(hdl, _offset)
|
||||
&& readUInt32(hdl, _size) && readByte(hdl, _multiplier)))
|
||||
&& readUInt32(hdl, _size) && readByte(hdl, multiplier)))
|
||||
return false;
|
||||
|
||||
_multiplier = 1<<_multiplier;
|
||||
_multiplier = 1<<multiplier;
|
||||
|
||||
return true;
|
||||
}
|
||||
|
||||
bool NETFile::lblOffset(Handle &hdl, quint32 netOffset, quint32 &lblOffset)
|
||||
{
|
||||
if (!_init) {
|
||||
if (!(_init = init()))
|
||||
return false;
|
||||
}
|
||||
if (!_multiplier && !init())
|
||||
return false;
|
||||
|
||||
if (!(seek(hdl, _offset + netOffset * _multiplier)
|
||||
&& readUInt24(hdl, lblOffset)))
|
||||
|
@ -6,7 +6,8 @@
|
||||
class NETFile : public SubFile
|
||||
{
|
||||
public:
|
||||
NETFile(IMG *img, quint32 size) : SubFile(img, size), _init(false) {}
|
||||
NETFile(IMG *img, quint32 size)
|
||||
: SubFile(img, size), _offset(0), _size(0), _multiplier(0) {}
|
||||
|
||||
bool lblOffset(Handle &hdl, quint32 netOffset, quint32 &lblOffset);
|
||||
|
||||
@ -16,8 +17,6 @@ private:
|
||||
quint32 _offset;
|
||||
quint32 _size;
|
||||
quint8 _multiplier;
|
||||
|
||||
bool _init;
|
||||
};
|
||||
|
||||
#endif // NETFILE_H
|
||||
|
@ -76,12 +76,12 @@ bool SubFile::readByte(Handle &handle, quint8 &val) const
|
||||
|
||||
quint32 SubFile::size() const
|
||||
{
|
||||
return _img ? _size : (quint32)_file->size();
|
||||
return _file ? (quint32)_file->size() : _size;
|
||||
}
|
||||
|
||||
QString SubFile::fileName() const
|
||||
{
|
||||
return _img ? _img->fileName() : _file->fileName();
|
||||
return _file ? _file->fileName() : _img->fileName();
|
||||
}
|
||||
|
||||
#ifndef QT_NO_DEBUG
|
||||
|
@ -84,6 +84,8 @@ public:
|
||||
QString fileName() const;
|
||||
|
||||
static Type type(const char str[3]);
|
||||
static bool isTileFile(Type type)
|
||||
{return (type == TRE || type == LBL || type == RGN || type == NET);}
|
||||
|
||||
friend QDebug operator<<(QDebug dbg, const SubFile &file);
|
||||
|
||||
|
@ -26,12 +26,6 @@ public:
|
||||
|
||||
friend QDebug operator<<(QDebug dbg, const VectorTile &tile);
|
||||
|
||||
static bool isTileFile(SubFile::Type type)
|
||||
{
|
||||
return (type == SubFile::TRE || type == SubFile::LBL
|
||||
|| type == SubFile::RGN || type == SubFile::NET);
|
||||
}
|
||||
|
||||
private:
|
||||
TREFile *_tre;
|
||||
RGNFile *_rgn;
|
||||
|
@ -229,6 +229,18 @@ Coordinates GCS::fromWGS84(const Coordinates &c) const
|
||||
return Coordinates(_primeMeridian.fromGreenwich(ds.lon()), ds.lat());
|
||||
}
|
||||
|
||||
QList<KV<int, QString> > GCS::list()
|
||||
{
|
||||
QList<KV<int, QString> > list;
|
||||
|
||||
for (int i = 0; i < _gcss.size(); i++)
|
||||
if (_gcss.at(i).id())
|
||||
list.append(KV<int, QString>(_gcss.at(i).id(), _gcss.at(i).name()
|
||||
+ " / Geographic 2D"));
|
||||
|
||||
return list;
|
||||
}
|
||||
|
||||
#ifndef QT_NO_DEBUG
|
||||
QDebug operator<<(QDebug dbg, const GCS &gcs)
|
||||
{
|
||||
|
@ -1,6 +1,7 @@
|
||||
#ifndef GCS_H
|
||||
#define GCS_H
|
||||
|
||||
#include "common/kv.h"
|
||||
#include "datum.h"
|
||||
#include "angularunits.h"
|
||||
#include "primemeridian.h"
|
||||
@ -32,6 +33,7 @@ public:
|
||||
static const GCS &WGS84();
|
||||
|
||||
static void loadList(const QString &path);
|
||||
static QList<KV<int, QString> > list();
|
||||
|
||||
private:
|
||||
class Entry;
|
||||
|
@ -73,12 +73,12 @@ private:
|
||||
};
|
||||
|
||||
|
||||
static Range zooms(12, 28);
|
||||
static const Range zooms(12, 28);
|
||||
|
||||
static QColor shieldColor(Qt::white);
|
||||
static QColor shieldBgColor1("#dd3e3e");
|
||||
static QColor shieldBgColor2("#379947");
|
||||
static QColor shieldBgColor3("#4a7fc1");
|
||||
static const QColor shieldColor(Qt::white);
|
||||
static const QColor shieldBgColor1("#dd3e3e");
|
||||
static const QColor shieldBgColor2("#379947");
|
||||
static const QColor shieldBgColor3("#4a7fc1");
|
||||
|
||||
static QString convertUnits(const QString &str)
|
||||
{
|
||||
@ -259,7 +259,8 @@ void IMGMap::setZoom(int zoom)
|
||||
|
||||
Transform IMGMap::transform(int zoom) const
|
||||
{
|
||||
double scale = (2.0 * M_PI * WGS84_RADIUS) / (1<<zoom);
|
||||
double scale = _projection.isGeographic()
|
||||
? 360.0 / (1<<zoom) : (2.0 * M_PI * WGS84_RADIUS) / (1<<zoom);
|
||||
PointD topLeft(_projection.ll2xy(_img.bounds().topLeft()));
|
||||
return Transform(ReferencePoint(PointD(0, 0), topLeft),
|
||||
PointD(scale, scale));
|
||||
|
@ -34,10 +34,7 @@ template<class T> bool JNXMap::readValue(T &val)
|
||||
if (_file.read((char*)&data, sizeof(T)) < (qint64)sizeof(T))
|
||||
return false;
|
||||
|
||||
if (sizeof(T) > 1)
|
||||
val = qFromLittleEndian(data);
|
||||
else
|
||||
val = data;
|
||||
val = qFromLittleEndian(data);
|
||||
|
||||
return true;
|
||||
}
|
||||
|
@ -196,8 +196,8 @@ void MapSource::map(QXmlStreamReader &reader, Config &config)
|
||||
if (!attr.hasAttribute("id"))
|
||||
reader.raiseError("Missing dimension id");
|
||||
else
|
||||
config.dimensions.append(KV(attr.value("id").toString(),
|
||||
reader.readElementText()));
|
||||
config.dimensions.append(KV<QString, QString>
|
||||
(attr.value("id").toString(), reader.readElementText()));
|
||||
} else if (reader.name() == "crs") {
|
||||
config.coordinateSystem = coordinateSystem(reader);
|
||||
config.crs = reader.readElementText();
|
||||
|
@ -38,7 +38,7 @@ private:
|
||||
QString crs;
|
||||
CoordinateSystem coordinateSystem;
|
||||
bool rest;
|
||||
QList<KV> dimensions;
|
||||
QList<KV<QString, QString> > dimensions;
|
||||
Authorization authorization;
|
||||
qreal tileRatio;
|
||||
int tileSize;
|
||||
|
@ -32,10 +32,7 @@ template<class T> bool OZF::readValue(T &val)
|
||||
if (_decrypt)
|
||||
decrypt(&data, sizeof(T), _key);
|
||||
|
||||
if (sizeof(T) > 1)
|
||||
val = qFromLittleEndian(data);
|
||||
else
|
||||
val = data;
|
||||
val = qFromLittleEndian(data);
|
||||
|
||||
return true;
|
||||
}
|
||||
|
@ -223,12 +223,12 @@ void PCS::loadList(const QString &path)
|
||||
}
|
||||
}
|
||||
|
||||
QList<PCS::Info> PCS::pcsList()
|
||||
QList<KV<int, QString> > PCS::list()
|
||||
{
|
||||
QList<Info> list;
|
||||
QList<KV<int, QString> > list;
|
||||
|
||||
for (int i = 0; i < _pcss.size(); i++)
|
||||
list.append(Info(_pcss.at(i).id(), _pcss.at(i).name()));
|
||||
list.append(KV<int, QString>(_pcss.at(i).id(), _pcss.at(i).name()));
|
||||
|
||||
return list;
|
||||
}
|
||||
|
@ -3,6 +3,7 @@
|
||||
|
||||
#include <QDebug>
|
||||
#include <QList>
|
||||
#include "common/kv.h"
|
||||
#include "gcs.h"
|
||||
#include "linearunits.h"
|
||||
#include "coordinatesystem.h"
|
||||
@ -11,20 +12,6 @@
|
||||
class PCS
|
||||
{
|
||||
public:
|
||||
class Info {
|
||||
public:
|
||||
Info(int id, const QString &name) : _id(id), _name(name) {}
|
||||
|
||||
int id() const {return _id;}
|
||||
const QString &name() const {return _name;}
|
||||
|
||||
bool operator<(const Info &other) const {return _id < other._id;}
|
||||
|
||||
private:
|
||||
int _id;
|
||||
QString _name;
|
||||
};
|
||||
|
||||
PCS() : _gcs(0) {}
|
||||
PCS(const GCS *gcs, const Projection::Method &method,
|
||||
const Projection::Setup &setup, const LinearUnits &units,
|
||||
@ -48,7 +35,7 @@ public:
|
||||
static void loadList(const QString &path);
|
||||
static const PCS *pcs(int id);
|
||||
static const PCS *pcs(const GCS *gcs, int proj);
|
||||
static QList<Info> pcsList();
|
||||
static QList<KV<int, QString> > list();
|
||||
|
||||
private:
|
||||
class Entry;
|
||||
|
@ -20,7 +20,7 @@ public:
|
||||
public:
|
||||
Setup(const QString &url, const QString &layer, const QString &style,
|
||||
const QString &format, const QString &crs, const CoordinateSystem &cs,
|
||||
const QList<KV> &dimensions,
|
||||
const QList<KV<QString, QString> > &dimensions,
|
||||
const Authorization &authorization = Authorization())
|
||||
: _url(url), _layer(layer), _style(style), _format(format),
|
||||
_crs(crs), _cs(cs), _dimensions(dimensions),
|
||||
@ -33,7 +33,8 @@ public:
|
||||
const QString &format() const {return _format;}
|
||||
const QString &crs() const {return _crs;}
|
||||
const CoordinateSystem &coordinateSystem() const {return _cs;}
|
||||
const QList<KV> &dimensions() const {return _dimensions;}
|
||||
const QList<KV<QString, QString> > &dimensions() const
|
||||
{return _dimensions;}
|
||||
|
||||
private:
|
||||
QString _url;
|
||||
@ -42,7 +43,7 @@ public:
|
||||
QString _format;
|
||||
QString _crs;
|
||||
CoordinateSystem _cs;
|
||||
QList<KV> _dimensions;
|
||||
QList<KV<QString, QString> > _dimensions;
|
||||
Authorization _authorization;
|
||||
};
|
||||
|
||||
|
@ -34,7 +34,7 @@ QString WMSMap::tileUrl(const QString &version) const
|
||||
url.append(QString("&SRS=%1").arg(_setup.crs()));
|
||||
|
||||
for (int i = 0; i < _setup.dimensions().size(); i++) {
|
||||
const KV &dim = _setup.dimensions().at(i);
|
||||
const KV<QString, QString> &dim = _setup.dimensions().at(i);
|
||||
url.append(QString("&%1=%2").arg(dim.key(), dim.value()));
|
||||
}
|
||||
|
||||
|
@ -335,7 +335,7 @@ WMTS::WMTS(const QString &file, const WMTS::Setup &setup) : _valid(false)
|
||||
setup.url().contains('?') ? "&" : "?" , setup.format(),
|
||||
setup.layer(), style, setup.set());
|
||||
for (int i = 0; i < setup.dimensions().size(); i++) {
|
||||
const KV &dim = setup.dimensions().at(i);
|
||||
const KV<QString, QString> &dim = setup.dimensions().at(i);
|
||||
_tileUrl.append(QString("&%1=%2").arg(dim.key(), dim.value()));
|
||||
}
|
||||
} else {
|
||||
@ -345,7 +345,7 @@ WMTS::WMTS(const QString &file, const WMTS::Setup &setup) : _valid(false)
|
||||
_tileUrl.replace("{TileRow}", "$y", Qt::CaseInsensitive);
|
||||
_tileUrl.replace("{TileCol}", "$x", Qt::CaseInsensitive);
|
||||
for (int i = 0; i < setup.dimensions().size(); i++) {
|
||||
const KV &dim = setup.dimensions().at(i);
|
||||
const KV<QString, QString> &dim = setup.dimensions().at(i);
|
||||
_tileUrl.replace(QString("{%1}").arg(dim.key()), dim.value(),
|
||||
Qt::CaseInsensitive);
|
||||
}
|
||||
|
@ -22,7 +22,8 @@ public:
|
||||
public:
|
||||
Setup(const QString &url, const QString &layer, const QString &set,
|
||||
const QString &style, const QString &format, bool rest,
|
||||
const CoordinateSystem &cs, const QList<KV> &dimensions,
|
||||
const CoordinateSystem &cs,
|
||||
const QList<KV<QString, QString> > &dimensions,
|
||||
const Authorization &authorization = Authorization())
|
||||
: _url(url), _layer(layer), _set(set), _style(style),
|
||||
_format(format), _rest(rest), _cs(cs), _dimensions(dimensions),
|
||||
@ -36,7 +37,8 @@ public:
|
||||
const QString &format() const {return _format;}
|
||||
bool rest() const {return _rest;}
|
||||
const CoordinateSystem &coordinateSystem() const {return _cs;}
|
||||
const QList<KV> &dimensions() const {return _dimensions;}
|
||||
const QList<KV<QString, QString> > &dimensions() const
|
||||
{return _dimensions;}
|
||||
|
||||
private:
|
||||
QString _url;
|
||||
@ -46,7 +48,7 @@ public:
|
||||
QString _format;
|
||||
bool _rest;
|
||||
CoordinateSystem _cs;
|
||||
QList<KV> _dimensions;
|
||||
QList<KV<QString, QString> > _dimensions;
|
||||
Authorization _authorization;
|
||||
};
|
||||
|
||||
|
Reference in New Issue
Block a user