diff options
author | Miikka Heikkinen <miikka.heikkinen@digia.com> | 2014-06-05 12:00:24 +0300 |
---|---|---|
committer | Miikka Heikkinen <miikka.heikkinen@digia.com> | 2014-06-05 12:03:16 +0300 |
commit | cfbfbea7d932f98c3f541bb4fc3e975ffb7a5658 (patch) | |
tree | bed376368e9611c751cf1dd75b85de2827d67325 /src/datavisualization/utils/utils_p.h | |
parent | 8435c15d224a4e9db0920ecd33c4bea3e70d83bf (diff) | |
parent | c51e0f83ef6dd9e85db6953995585ba0cafb35d7 (diff) |
Merge branch 'develop'
Change-Id: I3d06158cec5e54f69ff3d0606b7d1dfe1a8a2f70
Diffstat (limited to 'src/datavisualization/utils/utils_p.h')
-rw-r--r-- | src/datavisualization/utils/utils_p.h | 18 |
1 files changed, 7 insertions, 11 deletions
diff --git a/src/datavisualization/utils/utils_p.h b/src/datavisualization/utils/utils_p.h index 7288419b..d7187c16 100644 --- a/src/datavisualization/utils/utils_p.h +++ b/src/datavisualization/utils/utils_p.h @@ -31,12 +31,7 @@ #include "datavisualizationglobal_p.h" -class QVector3D; -class QColor; -class QPainter; -class QString; -class QPoint; -class QImage; +class QLinearGradient; QT_BEGIN_NAMESPACE_DATAVISUALIZATION @@ -51,10 +46,9 @@ public: }; static GLuint getNearestPowerOfTwo(GLuint value, GLuint &padding); - static QVector3D vectorFromColor(const QColor &color); + static QVector4D vectorFromColor(const QColor &color); static QColor colorFromVector(const QVector3D &colorVector); - static void printText(QPainter *painter, const QString &text, const QSize &position, - bool absoluteCoords = true, float rotation = 0.0f, float scale = 1.0f); + static QColor colorFromVector(const QVector4D &colorVector); static QImage printTextToImage(const QFont &font, const QString &text, const QColor &bgrColor, @@ -62,13 +56,15 @@ public: bool labelBackground, bool borders = false, int maxLabelWidth = 0); - static QVector3D getSelection(QPoint mousepos, int height); + static QVector4D getSelection(QPoint mousepos, int height); + static QImage getGradientImage(const QLinearGradient &gradient); static ParamType findFormatParamType(const QString &format); - static QString formatLabel(const QByteArray &format, ParamType paramType, float value); + static QString formatLabel(const QByteArray &format, ParamType paramType, qreal value); static QString defaultLabelFormat(); static float wrapValue(float value, float min, float max); + static QQuaternion calculateRotation(const QVector3D &xyzRotations); private: static ParamType mapFormatCharToParamType(const QChar &formatChar); |