diff options
| author | Tomi Korpipää <tomi.korpipaa@digia.com> | 2013-04-15 08:18:09 +0300 |
|---|---|---|
| committer | Mika Salmela <mika.salmela@digia.com> | 2013-04-15 09:16:42 +0300 |
| commit | 28e8ada5e636a4c897358dfd5bad392135fd7f59 (patch) | |
| tree | 413a9b875f0e3cc7d8fcdcb58cdcbbfa95221931 /src/datavis3d/utils/utils.cpp | |
| parent | de431be4a3da6de758a08e1bc63f5b152a66395d (diff) | |
Added drawing the label of selected bar in non-QPainter version
Moved label drawing into it's own function.
Change-Id: I4408e077b28f5d05de2c80adb2a97208271a9c3c
Change-Id: I4408e077b28f5d05de2c80adb2a97208271a9c3c
Reviewed-by: Mika Salmela <mika.salmela@digia.com>
Diffstat (limited to 'src/datavis3d/utils/utils.cpp')
| -rw-r--r-- | src/datavis3d/utils/utils.cpp | 20 |
1 files changed, 10 insertions, 10 deletions
diff --git a/src/datavis3d/utils/utils.cpp b/src/datavis3d/utils/utils.cpp index cf59699c..00d27be0 100644 --- a/src/datavis3d/utils/utils.cpp +++ b/src/datavis3d/utils/utils.cpp @@ -60,7 +60,7 @@ QVector3D Utils::vectorFromColor(const QColor &color) return QVector3D(color.redF(), color.greenF(), color.blueF()); } -void Utils::printText(QPainter *painter, const QString &text, const QPoint &position +void Utils::printText(QPainter *painter, const QString &text, const QSize &position , bool absoluteCoords, qreal rotation, qreal scale) { painter->save(); @@ -91,16 +91,16 @@ void Utils::printText(QPainter *painter, const QString &text, const QPoint &posi // , bgrLen, 30, 10.0, 10.0); #if 0 // Hack solution, as drawRect doesn't work - painter->drawText(position.x() - (bgrStrLen / 2) - , position.y() - bgrHeight + painter->drawText(position.width() - (bgrStrLen / 2) + , position.height() - bgrHeight , bgrStrLen, bgrHeight , Qt::AlignCenter | Qt::AlignVCenter , bgrStr); //painter->setPen(d_ptr->m_textColor); painter->setPen(Qt::lightGray); // TODO: Use lightGray, as nothing works painter->setFont(valueFont); - painter->drawText(position.x() - (valueStrLen / 2) - , position.y() - bgrHeight + painter->drawText(position.width() - (valueStrLen / 2) + , position.height() - bgrHeight , valueStrLen, bgrHeight , Qt::AlignCenter | Qt::AlignVCenter , text); @@ -109,20 +109,20 @@ void Utils::printText(QPainter *painter, const QString &text, const QPoint &posi painter->scale(scale, scale); if (absoluteCoords) { // This assumes absolute screen coordinates - painter->translate(position.x() - (((float)bgrStrLen / 2.0f) * cos(rotation * m_pi / 180.0f)) + painter->translate(position.width() - (((float)bgrStrLen / 2.0f) * cos(rotation * m_pi / 180.0f)) + (((float)bgrHeight / 2.0f) * sin(rotation * m_pi / 180.0f)) - , position.y() + , position.height() - ((((float)bgrHeight / 2.0f) * cos(rotation * m_pi / 180.0f)) + (((float)bgrStrLen / 2.0f) * sin(rotation * m_pi / 180.0f)))); } else { // This calculates y as a distance from screen bottom - painter->translate(position.x() - (((float)bgrStrLen / 2) * cos(rotation * m_pi / 180.0f)) + painter->translate(position.width() - (((float)bgrStrLen / 2) * cos(rotation * m_pi / 180.0f)) + (((float)bgrHeight / 2.0f) * sin(rotation * m_pi / 180.0f)) - , painter->window().height() - position.y() + , painter->window().height() - position.height() - ((((float)bgrHeight / 2.0f) * cos(rotation * m_pi / 180.0f)) + (((float)bgrStrLen / 2.0f) * sin(rotation * m_pi / 180.0f)))); } - //qDebug() << painter->window().height() - position.y() + //qDebug() << painter->window().height() - position.height() // - ((((float)bgrHeight / 2.0f) * cos(rotation * m_pi / 180.0f)) // + (((float)bgrStrLen / 2.0f) * sin(rotation * m_pi / 180.0f))); painter->rotate(rotation); |