root/GPXSee
1
0
Fork 0
mirror of https://github.com/tumic0/GPXSee.git synced 2025-07-19 21:34:24 +02:00
Code Issues Projects Releases Activity

Added support for Qt6

Browse Source 
Removed support for Qt4 and Qt5 < 5.12
This commit is contained in:
Martin Tůma
2020-12-22 22:09:09 +01:00
parent b5972c8328
commit 97bea8c56c
81 changed files with 773 additions and 989 deletions
Download Patch File Download Diff File Expand all files Collapse all files

27
src/map/rmap.cpp
View File

@ -2,11 +2,10 @@
#include <QDataStream>
#include <QPixmapCache>
#include <QPainter>
#include <QRegExp>
#include <QRegularExpression>
#include <QtEndian>
#include "common/rectc.h"
#include "common/wgs84.h"
#include "common/config.h"
#include "calibrationpoint.h"
#include "utm.h"
#include "pcs.h"
@ -116,7 +115,7 @@ bool RMap::parseIMP(const QByteArray &data)
QVector<CalibrationPoint> calibrationPoints;
const GCS *gcs = 0;
QString projection, datum;
QRegExp re("^P[0-9]+=");
QRegularExpression re("^P[0-9]+=");
for (int i = 0; i < lines.count(); i++) {
const QString &line = lines.at(i);
@ -161,16 +160,15 @@ bool RMap::parseIMP(const QByteArray &data)
}
RMap::RMap(const QString &fileName, QObject *parent)
: Map(fileName, parent), _mapRatio(1.0), _fileName(fileName), _zoom(0),
: Map(fileName, parent), _file(fileName), _mapRatio(1.0), _zoom(0),
_valid(false)
{
QFile file(fileName);
if (!file.open(QIODevice::ReadOnly)) {
_errorString = file.errorString();
if (!_file.open(QIODevice::ReadOnly)) {
_errorString = _file.errorString();
return;
}
QDataStream stream(&file);
QDataStream stream(&_file);
stream.setByteOrder(QDataStream::LittleEndian);
char magic[sizeof(MAGIC) - 1];
@ -229,7 +227,7 @@ RMap::RMap(const QString &fileName, QObject *parent)
_zooms.append(Zoom());
Zoom &zoom = _zooms.last();
CHECK(file.seek(zoomOffsets.at(i)));
CHECK(_file.seek(zoomOffsets.at(i)));
quint32 width, height;
stream >> width >> height;
@ -246,7 +244,7 @@ RMap::RMap(const QString &fileName, QObject *parent)
CHECK(stream.status() == QDataStream::Ok);
}
CHECK(file.seek(IMPOffset));
CHECK(_file.seek(IMPOffset));
quint32 IMPSize;
stream >> unknown >> IMPSize;
CHECK(stream.status() == QDataStream::Ok);
@ -254,11 +252,13 @@ RMap::RMap(const QString &fileName, QObject *parent)
QByteArray IMP(IMPSize + 1, 0);
stream.readRawData(IMP.data(), IMP.size());
_valid = parseIMP(IMP);
_file.close();
}
QString RMap::name() const
{
QFileInfo fi(_fileName);
QFileInfo fi(path());
return fi.baseName();
}
@ -316,7 +316,6 @@ Coordinates RMap::xy2ll(const QPointF &p)
void RMap::load()
{
_file.setFileName(_fileName);
_file.open(QIODevice::ReadOnly);
}
@ -396,7 +395,7 @@ void RMap::draw(QPainter *painter, const QRectF &rect, Flags flags)
int y = round(tl.y() * _mapRatio + j * _tileSize.height());
QPixmap pixmap;
QString key = _fileName + "/" + QString::number(_zoom) + "_"
QString key = path() + "/" + QString::number(_zoom) + "_"
+ QString::number(x) + "_" + QString::number(y);
if (!QPixmapCache::find(key, &pixmap)) {
pixmap = tile(x, y);
@ -407,9 +406,7 @@ void RMap::draw(QPainter *painter, const QRectF &rect, Flags flags)
if (pixmap.isNull())
qWarning("%s: error loading tile image", qPrintable(key));
else {
#ifdef ENABLE_HIDPI
pixmap.setDevicePixelRatio(_mapRatio);
#endif // ENABLE_HIDPI
QPointF tp(tl.x() + i * ts.width(), tl.y() + j * ts.height());
painter->drawPixmap(tp, pixmap);
}