root/GPXSee
1
0
Fork 0
mirror of https://github.com/tumic0/GPXSee.git synced 2024-11-30 22:51:16 +01:00
Code Issues Projects Releases Activity

The default constructor is required with some C++ compilers

Browse Source
This commit is contained in:
Martin Tůma 2018-11-11 18:54:21 +01:00
parent 9842214bb6
commit bf6d7616ba
1 changed files with 12 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
src/map/tileloader.cpp
View File

@ -13,25 +13,26 @@
class TileImage class TileImage
{ {
public: public:
TileImage(const QString &file, Tile &tile) TileImage() : _tile(0) {}
TileImage(const QString &file, Tile *tile)
: _file(file), _tile(tile) {} : _file(file), _tile(tile) {}
void createPixmap() void createPixmap()
{ {
_tile.pixmap().convertFromImage(_image); _tile->pixmap().convertFromImage(_image);
} }
void load() void load()
{ {
QByteArray z(_tile.zoom().toString().toLatin1()); QByteArray z(_tile->zoom().toString().toLatin1());
_image.load(_file, z); _image.load(_file, z);
} }
const QString &file() const {return _file;} const QString &file() const {return _file;}
Tile &tile() {return _tile;} Tile *tile() {return _tile;}
private: private:
QString _file; QString _file;
Tile &_tile; Tile *_tile;
QImage _image; QImage _image;
}; };
@ -65,11 +66,11 @@ void TileLoader::loadTilesAsync(QVector<Tile> &list)
QFileInfo fi(file); QFileInfo fi(file);
if (fi.exists()) if (fi.exists())
imgs.append(TileImage(file, t)); imgs.append(TileImage(file, &t));
else { else {
QUrl url(tileUrl(t)); QUrl url(tileUrl(t));
if (url.isLocalFile()) if (url.isLocalFile())
imgs.append(TileImage(url.toLocalFile(), t)); imgs.append(TileImage(url.toLocalFile(), &t));
else else
dl.append(Download(url, file)); dl.append(Download(url, file));
} }
@ -84,7 +85,7 @@ void TileLoader::loadTilesAsync(QVector<Tile> &list)
for (int i = 0; i < imgs.size(); i++) { for (int i = 0; i < imgs.size(); i++) {
TileImage &ti = imgs[i]; TileImage &ti = imgs[i];
ti.createPixmap(); ti.createPixmap();
QPixmapCache::insert(ti.file(), ti.tile().pixmap()); QPixmapCache::insert(ti.file(), ti.tile()->pixmap());
} }
} }
@ -104,11 +105,11 @@ void TileLoader::loadTilesSync(QVector<Tile> &list)
QFileInfo fi(file); QFileInfo fi(file);
if (fi.exists()) if (fi.exists())
imgs.append(TileImage(file, t)); imgs.append(TileImage(file, &t));
else { else {
QUrl url(tileUrl(t)); QUrl url(tileUrl(t));
if (url.isLocalFile()) if (url.isLocalFile())
imgs.append(TileImage(url.toLocalFile(), t)); imgs.append(TileImage(url.toLocalFile(), &t));
else { else {
dl.append(Download(url, file)); dl.append(Download(url, file));
tl.append(&t); tl.append(&t);
@ -126,7 +127,7 @@ void TileLoader::loadTilesSync(QVector<Tile> &list)
Tile *t = tl[i]; Tile *t = tl[i];
QString file = tileFile(*t); QString file = tileFile(*t);
if (QFileInfo(file).exists()) if (QFileInfo(file).exists())
imgs.append(TileImage(file, *t)); imgs.append(TileImage(file, t));
} }
} }