mifr/subsurface
1
0
Fork 0
mirror of https://github.com/subsurface/subsurface.git synced 2025-02-19 22:16:15 +00:00
Code Issues Projects Releases Packages Wiki Activity

Remove the plotText function, standardize with the TextItem.

Browse source 
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 <tcanabrava@kde.org>
Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
This commit is contained in:
Tomaz Canabrava 2014-01-19 16:16:04 -02:00 • committed by Dirk Hohndel
parent 6a58712270
commit 72b5bbce6e
3 changed files with 67 additions and 53 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

27
qt-ui/profile/diveprofileitem.cpp
View file

@ -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;
}

78
qt-ui/profile/divetextitem.cpp
View file

@ -1,8 +1,17 @@
#include "divetextitem.h"
#include "animationfunctions.h"
#include <QPropertyAnimation>
DiveTextItem::DiveTextItem(QGraphicsItem* parent): QGraphicsSimpleTextItem(parent)
#include <QPropertyAnimation>
#include <QApplication>
#include <QFont>
#include <QFontMetrics>
#include <QBrush>
#include <QPen>
DiveTextItem::DiveTextItem(QGraphicsItem* parent): QGraphicsItemGroup(parent),
textBackgroundItem(NULL),
textItem(NULL),
internalAlignFlags(0)
{
setFlag(ItemIgnoresTransformations);
}
@ -10,31 +19,54 @@ DiveTextItem::DiveTextItem(QGraphicsItem* parent): QGraphicsSimpleTextItem(paren
void DiveTextItem::setAlignment(int alignFlags)
{
internalAlignFlags = alignFlags;
update();
updateText();
}
void DiveTextItem::paint(QPainter* painter, const QStyleOptionGraphicsItem* option, QWidget* widget)
void DiveTextItem::setBrush(const QBrush& b)
{
/* This block of code corrects paints the Text on the
* alignment choosed, but it created artifacts on the screen,
* so I'm leaving this disabled for the time being.
*/
// QRectF rect = boundingRect();
// if (internalAlignFlags & Qt::AlignTop)
// painter->translate(0, -rect.height());
// // else if (internalAlignFlags & Qt::AlignBottom)
// // painter->translate(0, rect.height()); this is the default, uneeded.
// else if (internalAlignFlags & Qt::AlignVCenter)
// painter->translate(0, -rect.height() / 2);
//
// // if (internalAlignFlags & Qt::AlignLeft )
// // painter->translate(); // This is the default, uneeded.
// if (internalAlignFlags & Qt::AlignHCenter)
// painter->translate(-rect.width()/2, 0);
// else if (internalAlignFlags & Qt::AlignRight)
// painter->translate(-rect.width(), 0);
brush = b;
updateText();
}
QGraphicsSimpleTextItem::paint(painter, option, widget);
void DiveTextItem::setText(const QString& t)
{
text = t;
updateText();
}
void DiveTextItem::updateText()
{
if(!internalAlignFlags || text.isEmpty())
return;
delete textItem;
delete textBackgroundItem;
QFont fnt(qApp->font());
QFontMetrics fm(fnt);
QPainterPath textPath;
qreal xPos = 0, yPos = 0;
QRectF rect = fm.boundingRect(text);
yPos = (internalAlignFlags & Qt::AlignTop) ? -rect.height() :
(internalAlignFlags & Qt::AlignBottom) ? 0 :
/*(internalAlignFlags & Qt::AlignVCenter ? */ -rect.height() / 2;
yPos = (internalAlignFlags & Qt::AlignLeft ) ? 0 :
(internalAlignFlags & Qt::AlignHCenter) ? -rect.width()/2 :
/* (internalAlignFlags & Qt::AlignRight) */ -rect.width();
textPath.addText( xPos, yPos, fnt, text);
QPainterPathStroker stroker;
stroker.setWidth(3);
textBackgroundItem = new QGraphicsPathItem(stroker.createStroke(textPath), this);
textBackgroundItem->setBrush(QBrush(getColor(TEXT_BACKGROUND)));
textBackgroundItem->setPen(Qt::NoPen);
textItem = new QGraphicsPathItem(textPath, this);
textItem->setBrush(brush);
textItem->setPen(Qt::NoPen);
}
void DiveTextItem::animatedHide()

15
qt-ui/profile/divetextitem.h
View file

@ -2,21 +2,30 @@
#define DIVETEXTITEM_H
#include <QObject>
#include <QGraphicsSimpleTextItem>
#include <QGraphicsItemGroup>
#include "graphicsview-common.h"
#include <QBrush>
/* A Line Item that has animated-properties. */
class DiveTextItem :public QObject, public QGraphicsSimpleTextItem{
class DiveTextItem :public QObject, public QGraphicsItemGroup{
Q_OBJECT
Q_PROPERTY(QPointF pos READ pos WRITE setPos)
Q_PROPERTY(qreal opacity READ opacity WRITE setOpacity)
public:
DiveTextItem(QGraphicsItem* parent = 0);
virtual void paint(QPainter* painter, const QStyleOptionGraphicsItem* option, QWidget* widget);
void setText(const QString& text);
void setAlignment(int alignFlags);
void setBrush(const QBrush& brush);
void animatedHide();
void animateMoveTo(qreal x, qreal y);
private:
void updateText();
int internalAlignFlags;
QGraphicsPathItem *textBackgroundItem;
QGraphicsPathItem *textItem;
QString text;
color_indice_t colorIndex;
QBrush brush;
};
#endif