root/QtPBFImagePlugin
1
0
Fork 0
mirror of https://github.com/tumic0/QtPBFImagePlugin.git synced 2025-07-07 08:12:52 +02:00
Code Issues Projects Releases Wiki Activity

Added support for image scaling

Browse Source 
+ improved text path items performance
This commit is contained in:
Martin Tůma
2018-11-12 22:05:55 +01:00
parent f8d5a9b6cd
commit f41ac3bd54
9 changed files with 62 additions and 33 deletions
Download Patch File Download Diff File Expand all files Collapse all files

21
src/text.cpp
View File

@ -155,7 +155,15 @@ void Text::addLabel(const QString &text, const QPointF &pos, const QFont &font,
if (text.isEmpty())
return;
TextPointItem *ti = new TextPointItem(text, pos, font, maxTextWidth);
TextPointItem *ti;
if (_fontScale != 1.0) {
QFont scaledFont(font);
scaledFont.setPixelSize(font.pixelSize() * _fontScale);
ti = new TextPointItem(text, pos, scaledFont, maxTextWidth);
} else
ti = new TextPointItem(text, pos, font, maxTextWidth);
ti->setPen(pen);
addItem(ti);
QList<TextItem*> ci = collidingItems(ti);
@ -171,19 +179,20 @@ void Text::addLabel(const QString &text, const QPainterPath &path,
if (text.isEmpty())
return;
QFontMetrics fm(font);
int textWidth = fm.width(text);
QFont scaledFont(font);
scaledFont.setPixelSize(font.pixelSize() * _fontScale);
int textWidth = text.size() * scaledFont.pixelSize() * 0.6;
if (textWidth > path.length())
return;
QPainterPath tp(textPath(path, textWidth, maxAngle, fm.averageCharWidth(),
_sceneRect));
QPainterPath tp(textPath(path, textWidth, maxAngle,
scaledFont.pixelSize() / 2, _sceneRect));
if (tp.isEmpty())
return;
TextPathItem *pi = new TextPathItem(text, reverse(tp) ? tp.toReversed()
: tp, font);
: tp, scaledFont);
if (!_sceneRect.contains(pi->boundingRect())) {
delete pi;
return;