mirror of
https://github.com/tumic0/GPXSee.git
synced 2025-02-21 10:10:49 +01:00
Compare commits
No commits in common. "6e40d8cbc73fc37ded3d4980dd915f71c68d584d" and "1b83f88b27e88424f698e4b32ba1b01cef1f2479" have entirely different histories.
6e40d8cbc7
...
1b83f88b27
@ -206,7 +206,7 @@ void OruxMap::calibrationPoints(QXmlStreamReader &reader, const QSize &size,
|
||||
void OruxMap::mapCalibration(QXmlStreamReader &reader, int level)
|
||||
{
|
||||
int zoom;
|
||||
QSize tileSize, size, calibrationSize;
|
||||
QSize tileSize, size;
|
||||
QString datum, projection;
|
||||
QList<CalibrationPoint> points;
|
||||
Projection proj;
|
||||
@ -241,8 +241,6 @@ void OruxMap::mapCalibration(QXmlStreamReader &reader, int level)
|
||||
|
||||
tileSize = QSize(width, height);
|
||||
size = QSize(xMax * width, yMax * height);
|
||||
calibrationSize = size;
|
||||
|
||||
GCS gcs(createGCS(datum));
|
||||
if (!gcs.isValid()) {
|
||||
reader.raiseError(QString("%1: invalid/unknown datum")
|
||||
@ -256,22 +254,9 @@ void OruxMap::mapCalibration(QXmlStreamReader &reader, int level)
|
||||
return;
|
||||
}
|
||||
|
||||
reader.readElementText();
|
||||
|
||||
} else if (reader.name() == QLatin1String("MapDimensions")) {
|
||||
int height, width;
|
||||
|
||||
QXmlStreamAttributes attr = reader.attributes();
|
||||
if (!intAttr(reader, attr, "height", height))
|
||||
return;
|
||||
if (!intAttr(reader, attr, "width", width))
|
||||
return;
|
||||
|
||||
calibrationSize = QSize(width, height);
|
||||
|
||||
reader.readElementText();
|
||||
} else if (reader.name() == QLatin1String("CalibrationPoints"))
|
||||
calibrationPoints(reader, calibrationSize, points);
|
||||
calibrationPoints(reader, size, points);
|
||||
else
|
||||
reader.skipCurrentElement();
|
||||
}
|
||||
@ -482,7 +467,7 @@ Coordinates OruxMap::xy2ll(const QPointF &p)
|
||||
Map *OruxMap::create(const QString &path, const Projection &, bool *isDir)
|
||||
{
|
||||
if (isDir)
|
||||
*isDir = true;
|
||||
*isDir = false;
|
||||
|
||||
return new OruxMap(path);
|
||||
}
|
||||
|
Loading…
x
Reference in New Issue
Block a user