From 72b5bbce6e2f177af0b769dbafd0db17dd6a1899 Mon Sep 17 00:00:00 2001 From: Tomaz Canabrava Date: Sun, 19 Jan 2014 16:16:04 -0200 Subject: Remove the plotText function, standardize with the TextItem. Removed the plotText function and replaced it with the DiveTextItem class - this way there's just one way to add text on screen, and it also makes it easy to fix positioning of stuff there. Which is what I'll try to fix on the next commit. Signed-off-by: Tomaz Canabrava Signed-off-by: Dirk Hohndel --- qt-ui/profile/diveprofileitem.cpp | 29 +---------------------------- 1 file changed, 1 insertion(+), 28 deletions(-) (limited to 'qt-ui/profile/diveprofileitem.cpp') diff --git a/qt-ui/profile/diveprofileitem.cpp b/qt-ui/profile/diveprofileitem.cpp index 32679b565..b88ff6abb 100644 --- a/qt-ui/profile/diveprofileitem.cpp +++ b/qt-ui/profile/diveprofileitem.cpp @@ -220,32 +220,5 @@ void DiveGasPressureItem::paint(QPainter* painter, const QStyleOptionGraphicsIte QGraphicsItemGroup *plotText(text_render_options_t* tro, const QPointF& pos, const QString& text, QGraphicsItem *parent) { - QFont fnt(qApp->font()); - QFontMetrics fm(fnt); - - /* - if (printMode) - fnt.setPixelSize(tro->size); - */ - - QGraphicsItemGroup *group = new QGraphicsItemGroup(parent); - QPainterPath textPath; - /* addText() uses bottom-left text baseline and the -3 offset is probably slightly off - * for different font sizes. */ - textPath.addText(0, fm.height() - 3, fnt, text); - QPainterPathStroker stroker; - stroker.setWidth(3); - QGraphicsPathItem *strokedItem = new QGraphicsPathItem(stroker.createStroke(textPath), group); - strokedItem->setBrush(QBrush(getColor(TEXT_BACKGROUND))); - strokedItem->setPen(Qt::NoPen); - - QGraphicsPathItem *textItem = new QGraphicsPathItem(textPath, group); - textItem->setBrush(QBrush(getColor(tro->color))); - textItem->setPen(Qt::NoPen); - - group->setPos(pos); - //group->setPos(pos.x() + dx, pos.y() + dy); -// if (!printMode) - group->setFlag(QGraphicsItem::ItemIgnoresTransformations); - return group; + } -- cgit v1.2.3-70-g09d2