root/GPXSee
1
0
Fork 0
mirror of https://github.com/tumic0/GPXSee.git synced 2025-02-26 04:00:49 +01:00
Code Issues Projects Releases Activity

Added support for curved lines

Browse Source
This commit is contained in:
Martin Tůma 2023-04-03 23:53:57 +02:00
parent 81f695a672
commit d794de5818
4 changed files with 30 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

27
src/map/mapsforge/rastertile.cpp
View File

@ -171,7 +171,7 @@ void RasterTile::processAreaLabels(QList<TextItem*> &textItems)
continue; continue;
if (!path.path.elementCount()) if (!path.path.elementCount())
path.path = painterPath(path.poly); path.path = painterPath(path.poly, false);
const QImage *img = si ? &si->img() : 0; const QImage *img = si ? &si->img() : 0;
const QFont *font = ti ? &ti->font() : 0; const QFont *font = ti ? &ti->font() : 0;
@ -232,16 +232,31 @@ void RasterTile::drawTextItems(QPainter *painter,
textItems.at(i)->paint(painter); textItems.at(i)->paint(painter);
} }
QPainterPath RasterTile::painterPath(const Polygon &polygon) const QPainterPath RasterTile::painterPath(const Polygon &polygon, bool curve) const
{ {
QPainterPath path; QPainterPath path;
for (int i = 0; i < polygon.size(); i++) { for (int i = 0; i < polygon.size(); i++) {
const QVector<Coordinates> &subpath = polygon.at(i); const QVector<Coordinates> &subpath = polygon.at(i);
path.moveTo(ll2xy(subpath.first())); if (curve) {
for (int j = 1; j < subpath.size(); j++) QPointF p1(ll2xy(subpath.first()));
path.lineTo(ll2xy(subpath.at(j))); QPointF p2(0, 0);
QPointF p3(0, 0);
path.moveTo(p1);
for (int j = 1; j < subpath.size(); j++) {
p3 = ll2xy(subpath.at(j));
p2 = QPointF((p1.x() + p3.x()) / 2.0, (p1.y() + p3.y()) / 2.0);
path.quadTo(p1, p2);
p1 = p3;
}
path.quadTo(p2, p3);
} else {
path.moveTo(ll2xy(subpath.first()));
for (int j = 1; j < subpath.size(); j++)
path.lineTo(ll2xy(subpath.at(j)));
}
} }
return path; return path;
@ -300,7 +315,7 @@ void RasterTile::drawPaths(QPainter *painter)
} }
if (!is.path()->path.elementCount()) if (!is.path()->path.elementCount())
is.path()->path = painterPath(is.path()->poly); is.path()->path = painterPath(is.path()->poly, ri->curve());
if (ri->area()) { if (ri->area()) {
lp.setPen(ri->pen(_zoom)); lp.setPen(ri->pen(_zoom));

2
src/map/mapsforge/rastertile.h
View File

@ -76,7 +76,7 @@ private:
void processPointLabels(QList<TextItem*> &textItems); void processPointLabels(QList<TextItem*> &textItems);
void processAreaLabels(QList<TextItem*> &textItems); void processAreaLabels(QList<TextItem*> &textItems);
void processLineLabels(QList<TextItem*> &textItems); void processLineLabels(QList<TextItem*> &textItems);
QPainterPath painterPath(const Polygon &polygon) const; QPainterPath painterPath(const Polygon &polygon, bool curve) const;
void drawTextItems(QPainter *painter, const QList<TextItem*> &textItems); void drawTextItems(QPainter *painter, const QList<TextItem*> &textItems);
void drawPaths(QPainter *painter); void drawPaths(QPainter *painter);

5
src/map/mapsforge/style.cpp
View File

@ -169,6 +169,11 @@ void Style::line(QXmlStreamReader &reader, const Rule &rule)
else if (join == "bevel") else if (join == "bevel")
ri._strokeJoin = Qt::BevelJoin; ri._strokeJoin = Qt::BevelJoin;
} }
if (attr.hasAttribute("curve")) {
QString curve(attr.value("curve").toString());
if (curve == "cubic")
ri._curve = true;
}
_paths.append(ri); _paths.append(ri);

5
src/map/mapsforge/style.h
View File

@ -163,12 +163,13 @@ public:
public: public:
PathRender(const Rule &rule, int zOrder) : Render(rule), PathRender(const Rule &rule, int zOrder) : Render(rule),
_zOrder(zOrder), _strokeWidth(0), _strokeCap(Qt::RoundCap), _zOrder(zOrder), _strokeWidth(0), _strokeCap(Qt::RoundCap),
_strokeJoin(Qt::RoundJoin), _area(false) {} _strokeJoin(Qt::RoundJoin), _area(false), _curve(false) {}
int zOrder() const {return _zOrder;} int zOrder() const {return _zOrder;}
QPen pen(int zoom) const; QPen pen(int zoom) const;
QBrush brush() const; QBrush brush() const;
bool area() const {return _area;} bool area() const {return _area;}
bool curve() const {return _curve;}
private: private:
friend class Style; friend class Style;
@ -180,7 +181,7 @@ public:
Qt::PenCapStyle _strokeCap; Qt::PenCapStyle _strokeCap;
Qt::PenJoinStyle _strokeJoin; Qt::PenJoinStyle _strokeJoin;
QImage _fillImage; QImage _fillImage;
bool _area; bool _area, _curve;
}; };
class TextRender : public Render class TextRender : public Render