root/QtPBFImagePlugin
1
0
Fork 0
mirror of https://github.com/tumic0/QtPBFImagePlugin.git synced 2024-10-06 06:53:21 +02:00
Code Issues Projects Releases Wiki Activity

Added support for fill-pattern property

Browse Source
This commit is contained in:
Martin Tůma 2018-11-23 23:35:28 +01:00
parent a0c5de0dbf
commit 4cab88d79a
4 changed files with 103 additions and 35 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

34
src/function.cpp
View File

@ -150,3 +150,37 @@ bool FunctionB::value(qreal x) const
return _stops.last().second;
}
FunctionS::FunctionS(const QJsonObject &json, const QString &dflt)
: _default(dflt)
{
if (!(json.contains("stops") && json["stops"].isArray()))
return;
QJsonArray stops = json["stops"].toArray();
for (int i = 0; i < stops.size(); i++) {
if (!stops.at(i).isArray())
return;
QJsonArray stop = stops.at(i).toArray();
if (stop.size() != 2)
return;
_stops.append(QPair<qreal, QString>(stop.at(0).toDouble(),
stop.at(1).toString()));
}
}
const QString FunctionS::value(qreal x) const
{
if (_stops.isEmpty())
return _default;
QPair<qreal, QString> v0(_stops.first());
for (int i = 0; i < _stops.size(); i++) {
if (x < _stops.at(i).first)
return v0.second;
else
v0 = _stops.at(i);
}
return _stops.last().second;
}

12
src/function.h
View File

@ -19,6 +19,18 @@ private:
bool _default;
};
class FunctionS {
public:
FunctionS(const QString &deflt = QString()) : _default(deflt) {}
FunctionS(const QJsonObject &json, const QString &dflt = QString());
const QString value(qreal x) const;
private:
QList<QPair<qreal, QString> > _stops;
QString _default;
};
class FunctionF {
public:
FunctionF(qreal deflt = 0) : _default(deflt), _base(1.0) {}

70
src/style.cpp
View File

@ -46,6 +46,16 @@ static void jsonBool(const QJsonObject &json, const char *name, FunctionB &var)
}
}
static void jsonString(const QJsonObject &json, const char *name, FunctionS &var)
{
if (json.contains(name)) {
QJsonValue value = json[name];
if (value.isString())
var = FunctionS(value.toString());
else if (value.isObject())
var = FunctionS(value.toObject());
}
}
Style::Layer::Filter::Filter(const QJsonArray &json)
: _type(Unknown), _not(false)
@ -170,23 +180,20 @@ bool Style::Layer::Filter::match(const QVariantHash &tags) const
}
}
Style::Layer::Template::Template(const QString &str) : _field(str)
QString Style::Layer::Template::value(int zoom, const QVariantHash &tags) const
{
QRegExp rx = QRegExp("\\{[^\\}]*\\}");
QString text(_field.value(zoom));
QStringList keys;
int pos = 0;
while ((pos = _rx.indexIn(_field, pos)) != -1) {
QString match = _rx.capturedTexts().first();
_keys.append(match.mid(1, match.size() - 2));
pos += _rx.matchedLength();
while ((pos = rx.indexIn(text, pos)) != -1) {
QString match = rx.capturedTexts().first();
keys.append(match.mid(1, match.size() - 2));
pos += rx.matchedLength();
}
}
QString Style::Layer::Template::value(const QVariantHash &tags) const
{
QString text(_field);
for (int i = 0; i < _keys.size(); i++) {
const QString &key = _keys.at(i);
for (int i = 0; i < keys.size(); i++) {
const QString &key = keys.at(i);
const QVariant val = tags.value(key);
text.replace(QString("{%1}").arg(key), val.toString());
}
@ -194,8 +201,6 @@ QString Style::Layer::Template::value(const QVariantHash &tags) const
return text;
}
QRegExp Style::Layer::Template::_rx = QRegExp("\\{[^\\}]*\\}");
Style::Layer::Paint::Paint(const QJsonObject &json)
: _fillOpacity(1.0), _lineOpacity(1.0), _lineWidth(1.0)
{
@ -205,6 +210,7 @@ Style::Layer::Paint::Paint(const QJsonObject &json)
_fillOutlineColor = _fillColor;
jsonColor(json, "fill-outline-color", _fillOutlineColor);
jsonBool(json, "fill-antialias",_fillAntialias);
jsonString(json, "fill-pattern", _fillPattern);
if (json.contains("fill-pattern")) {
_fillColor = FunctionC(QColor());
_fillOutlineColor = FunctionC(QColor());
@ -260,20 +266,34 @@ QPen Style::Layer::Paint::pen(Type type, int zoom) const
return pen;
}
QBrush Style::Layer::Paint::brush(Type type, int zoom) const
QBrush Style::Layer::Paint::brush(Type type, int zoom, const Sprites &sprites) const
{
QColor color;
QBrush brush(Qt::NoBrush);
QString pattern;
switch (type) {
case Fill:
color = _fillColor.value(zoom);
return color.isValid() ? QBrush(color) : QBrush(Qt::NoBrush);
if (color.isValid())
brush = QBrush(color);
pattern = _fillPattern.value(zoom);
if (!pattern.isNull())
brush.setTextureImage(sprites.icon(pattern));
break;
case Background:
color = _backgroundColor.value(zoom);
return color.isValid() ? QBrush(color) : QBrush(Qt::NoBrush);
if (color.isValid())
brush = QBrush(color);
pattern = _fillPattern.value(zoom);
if (!pattern.isNull())
brush.setTextureImage(sprites.icon(pattern));
break;
default:
return QBrush(Qt::NoBrush);
break;
}
return brush;
}
qreal Style::Layer::Paint::opacity(Type type, int zoom) const
@ -409,10 +429,10 @@ bool Style::Layer::match(int zoom, const QVariantHash &tags) const
return _filter.match(tags);
}
void Style::Layer::setPathPainter(Tile &tile) const
void Style::Layer::setPathPainter(Tile &tile, const Sprites &sprites) const
{
QPen pen(_paint.pen(_type, tile.zoom()));
QBrush brush(_paint.brush(_type, tile.zoom()));
QBrush brush(_paint.brush(_type, tile.zoom(), sprites));
pen.setJoinStyle(_layout.lineJoin());
pen.setCapStyle(_layout.lineCap());
@ -447,14 +467,14 @@ void Style::Layer::setTextProperties(Tile &tile) const
void Style::Layer::addSymbol(Tile &tile, const QPainterPath &path,
const QVariantHash &tags, const Sprites &sprites) const
{
QString text = _layout.text().value(tags);
QString text = _layout.text(tile.zoom(), tags);
QString tt(text.trimmed());
if (tt.isEmpty())
return;
if (_layout.capitalize())
tt = tt.toUpper();
QString icon = _layout.icon().value(tags);
QString icon = _layout.icon(tile.zoom(), tags);
if (_layout.viewportAlignment())
tile.text().addLabel(tt, path.elementAt(0), tile.painter(), false,
@ -523,7 +543,7 @@ void Style::setPainter(Tile &tile, int layer) const
const Layer &sl = _layers.at(layer);
if (sl.isPath())
sl.setPathPainter(tile);
sl.setPathPainter(tile, _sprites);
else if (sl.isSymbol())
sl.setSymbolPainter(tile);
}
@ -550,7 +570,7 @@ void Style::drawBackground(Tile &tile) const
tile.painter().setPen(Qt::NoPen);
tile.painter().drawRect(rect);
} else if (_layers.first().isBackground()) {
_layers.first().setPathPainter(tile);
_layers.first().setPathPainter(tile, _sprites);
tile.painter().drawPath(path);
}

22
src/style.h
View File

@ -47,7 +47,7 @@ private:
bool isSymbol() const {return (_type == Symbol);}
bool match(int zoom, const QVariantHash &tags) const;
void setPathPainter(Tile &tile) const;
void setPathPainter(Tile &tile, const Sprites &sprites) const;
void setSymbolPainter(Tile &tile) const;
void setTextProperties(Tile &tile) const;
void addSymbol(Tile &tile, const QPainterPath &path,
@ -86,14 +86,11 @@ private:
class Template {
public:
Template() {}
Template(const QString &str);
QString value(const QVariantHash &tags) const;
Template(const FunctionS &str) : _field(str) {}
QString value(int zoom, const QVariantHash &tags) const;
private:
static QRegExp _rx;
QStringList _keys;
QString _field;
FunctionS _field;
};
class Layout {
@ -109,8 +106,10 @@ private:
{return _textMaxWidth.value(zoom);}
qreal maxTextAngle(int zoom) const
{return _textMaxAngle.value(zoom);}
const Template &text() const {return _text;}
const Template &icon() const {return _icon;}
QString text(int zoom, const QVariantHash &tags) const
{return _text.value(zoom, tags);}
QString icon(int zoom, const QVariantHash &tags) const
{return _icon.value(zoom, tags);}
QFont font(int zoom) const;
Qt::PenCapStyle lineCap() const {return _lineCap;}
Qt::PenJoinStyle lineJoin() const {return _lineJoin;}
@ -137,9 +136,11 @@ private:
Paint(const QJsonObject &json);
QPen pen(Layer::Type type, int zoom) const;
QBrush brush(Layer::Type type, int zoom) const;
QBrush brush(Layer::Type type, int zoom, const Sprites &sprites) const;
qreal opacity(Layer::Type type, int zoom) const;
bool antialias(Layer::Type type, int zoom) const;
QString fillPattern(int zoom) const
{return _fillPattern.value(zoom);}
private:
FunctionC _textColor;
@ -152,6 +153,7 @@ private:
FunctionF _lineWidth;
FunctionB _fillAntialias;
QVector<qreal> _lineDasharray;
FunctionS _fillPattern;
};
Type _type;