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

Alittle bit more sane API...

Browse Source
This commit is contained in:
Martin Tůma 2019-05-04 12:50:16 +02:00
parent c28d10eafc
commit df4134c03a
1 changed files with 14 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

29
src/textpathitem.cpp
View File

@ -3,23 +3,23 @@
#include "textpathitem.h" #include "textpathitem.h"
static QPointF intersection(const QLineF &line, const QRectF &rect) static bool intersection(const QLineF &line, const QRectF &rect,
QPointF *p)
{ {
QPointF p; if (line.intersect(QLineF(rect.topLeft(), rect.topRight()), p)
if (line.intersect(QLineF(rect.topLeft(), rect.topRight()), &p)
== QLineF::BoundedIntersection) == QLineF::BoundedIntersection)
return p; return true;
if (line.intersect(QLineF(rect.topLeft(), rect.bottomLeft()), &p) if (line.intersect(QLineF(rect.topLeft(), rect.bottomLeft()), p)
== QLineF::BoundedIntersection) == QLineF::BoundedIntersection)
return p; return true;
if (line.intersect(QLineF(rect.bottomRight(), rect.bottomLeft()), &p) if (line.intersect(QLineF(rect.bottomRight(), rect.bottomLeft()), p)
== QLineF::BoundedIntersection) == QLineF::BoundedIntersection)
return p; return true;
if (line.intersect(QLineF(rect.bottomRight(), rect.topRight()), &p) if (line.intersect(QLineF(rect.bottomRight(), rect.topRight()), p)
== QLineF::BoundedIntersection) == QLineF::BoundedIntersection)
return p; return true;
return rect.center(); return false;
} }
static QPainterPath subpath(const QList<QLineF> &lines, int start, int end, static QPainterPath subpath(const QList<QLineF> &lines, int start, int end,
@ -63,6 +63,7 @@ static QList<QLineF> lineString(const QPainterPath &path,
{ {
QList<QLineF> lines; QList<QLineF> lines;
int start = 0, end = path.elementCount() - 1; int start = 0, end = path.elementCount() - 1;
QPointF p;
for (int i = 0; i < path.elementCount(); i++) { for (int i = 0; i < path.elementCount(); i++) {
if (boundingRect.contains(path.elementAt(i))) { if (boundingRect.contains(path.elementAt(i))) {
@ -79,16 +80,14 @@ static QList<QLineF> lineString(const QPainterPath &path,
if (start > 0) { if (start > 0) {
QLineF l(path.elementAt(start-1), path.elementAt(start)); QLineF l(path.elementAt(start-1), path.elementAt(start));
QPointF p(intersection(l, boundingRect)); if (intersection(l, boundingRect, &p))
if (p != boundingRect.center())
lines.append(QLineF(p, path.elementAt(start))); lines.append(QLineF(p, path.elementAt(start)));
} }
for (int i = start + 1; i <= end; i++) for (int i = start + 1; i <= end; i++)
lines.append(QLineF(path.elementAt(i-1), path.elementAt(i))); lines.append(QLineF(path.elementAt(i-1), path.elementAt(i)));
if (end < path.elementCount() - 1) { if (end < path.elementCount() - 1) {
QLineF l(path.elementAt(end), path.elementAt(end+1)); QLineF l(path.elementAt(end), path.elementAt(end+1));
QPointF p(intersection(l, boundingRect)); if (intersection(l, boundingRect, &p))
if (p != boundingRect.center())
lines.append(QLineF(path.elementAt(end), p)); lines.append(QLineF(path.elementAt(end), p));
} }