root/QtPBFImagePlugin
1
0
Fork 0
mirror of https://github.com/tumic0/QtPBFImagePlugin.git synced 2024-11-24 03:35:54 +01:00
Code Issues Projects Releases Wiki Activity

Optimizations

Browse Source
This commit is contained in:
Martin Tůma 2024-02-05 10:08:58 +01:00
parent 97d5748d11
commit ee1b91329e
2 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
src/style.cpp
View File

@ -204,7 +204,7 @@ bool Style::Layer::Filter::match(const PBF::Feature &feature) const
QString Style::Layer::Template::value(int zoom, const PBF::Feature &feature) const QString Style::Layer::Template::value(int zoom, const PBF::Feature &feature) const
{ {
QRegularExpression rx("\\{[^\\}]*\\}"); static QRegularExpression rx("\\{[^\\}]*\\}");
QString text(_field.value(zoom)); QString text(_field.value(zoom));
QRegularExpressionMatchIterator it = rx.globalMatch(text); QRegularExpressionMatchIterator it = rx.globalMatch(text);
QStringList keys; QStringList keys;
@ -546,11 +546,11 @@ void Style::Layer::setTextProperties(Tile &tile) const
void Style::Layer::addSymbol(Tile &tile, const QPainterPath &path, void Style::Layer::addSymbol(Tile &tile, const QPainterPath &path,
const PBF::Feature &feature, const Sprites &sprites) const const PBF::Feature &feature, const Sprites &sprites) const
{ {
QString text = _layout.text(tile.zoom(), feature); QString text(_layout.text(tile.zoom(), feature));
if (text.isEmpty()) if (text.isEmpty())
return; return;
QString icon = _layout.icon(tile.zoom(), feature); QString icon(_layout.icon(tile.zoom(), feature));
tile.text().addLabel(text, sprites.icon(icon), path); tile.text().addLabel(text, sprites.icon(icon), path);
} }
@ -597,7 +597,7 @@ bool Style::load(const QString &fileName)
_layers.append(Layer(layers[i].toObject())); _layers.append(Layer(layers[i].toObject()));
} }
QDir styleDir = QFileInfo(fileName).absoluteDir(); QDir styleDir(QFileInfo(fileName).absoluteDir());
loadSprites(styleDir, "sprite.json", "sprite.png", _sprites); loadSprites(styleDir, "sprite.json", "sprite.png", _sprites);
loadSprites(styleDir, "sprite@2x.json", "sprite@2x.png", _sprites2x); loadSprites(styleDir, "sprite@2x.json", "sprite@2x.png", _sprites2x);

2
src/text.cpp
View File

@ -73,7 +73,7 @@ void Text::addLabel(const QString &text, const QImage &icon,
ti->setHalo(_halo); ti->setHalo(_halo);
addItem(ti); addItem(ti);
QList<TextItem*> ci = collidingItems(ti); QList<TextItem*> ci(collidingItems(ti));
for (int i = 0; i < ci.size(); i++) for (int i = 0; i < ci.size(); i++)
ci[i]->setVisible(false); ci[i]->setVisible(false);
} }