root/GPXSee
1
0
Fork 0
mirror of https://github.com/tumic0/GPXSee.git synced 2025-02-07 12:05:14 +01:00
Code Issues Projects Releases Activity

Fixed line splitting algorithm

Browse Source
This commit is contained in:
Martin Tůma 2023-10-10 08:11:08 +02:00
parent 197c3b91be
commit 78240787ab
1 changed files with 6 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
src/map/textpathitem.cpp
View File

@ -3,7 +3,7 @@
#include "textpathitem.h" #include "textpathitem.h"
#define CHAR_RATIO 0.55 #define CHAR_RATIO 0.55
#define MAX_TEXT_ANGLE 30 #define MAX_ANGLE 30
#define PADDING 2 #define PADDING 2
#if QT_VERSION < QT_VERSION_CHECK(5, 15, 0) #if QT_VERSION < QT_VERSION_CHECK(5, 15, 0)
@ -149,6 +149,8 @@ static QList<QPolygonF> polyLines(const QPolygonF &path, const QRectF &rect)
if (lastIn) { if (lastIn) {
QPointF p; QPointF p;
if (line.isEmpty())
line.append(path.at(i-1));
if (intersection(l, rect, &p)) if (intersection(l, rect, &p))
line.append(p); line.append(p);
lines.append(line); lines.append(line);
@ -200,6 +202,8 @@ static QList<QPolygonF> polyLines(const QPainterPath &path, const QRectF &rect)
if (lastIn) { if (lastIn) {
QPointF p; QPointF p;
if (line.isEmpty())
line.append(path.elementAt(i-1));
if (intersection(l, rect, &p)) if (intersection(l, rect, &p))
line.append(p); line.append(p);
lines.append(line); lines.append(line);
@ -250,7 +254,7 @@ static QPainterPath textPath(const T &path, qreal textWidth, qreal charWidth,
qreal sl = l.length(); qreal sl = l.length();
qreal a = l.angle(); qreal a = l.angle();
if ((sl < charWidth) || (j > 1 && qAbs(angle - a) > MAX_TEXT_ANGLE)) { if ((sl < charWidth) || (j > 1 && qAbs(angle - a) > MAX_ANGLE)) {
if (length > textWidth) if (length > textWidth)
return subpath(pl, last, j - 1, length - textWidth); return subpath(pl, last, j - 1, length - textWidth);
last = j; last = j;