diff options
| author | Tomi Korpipää <tomi.korpipaa@digia.com> | 2014-04-24 07:37:58 +0300 |
|---|---|---|
| committer | Tomi Korpipää <tomi.korpipaa@digia.com> | 2014-04-24 09:22:01 +0300 |
| commit | 2b19a3ae8b8c34ea674058c7b82de44397e29df2 (patch) | |
| tree | c910d61096b99cf2271b61ac3050644b302cf299 /src/datavisualization/utils/utils.cpp | |
| parent | 555acef736a72cdc92113a268826a6bba77fbe40 (diff) | |
Color problem fixed
Task-number: QTRD-3001
Changed all colors to QVector4Ds to avoid mixups with vec4 and vec3 colors
in shaders.
Change-Id: I8b44b4d711befca900dd35b3386881f7c31d7dd5
Change-Id: I8b44b4d711befca900dd35b3386881f7c31d7dd5
Reviewed-by: Mika Salmela <mika.salmela@digia.com>
Diffstat (limited to 'src/datavisualization/utils/utils.cpp')
| -rw-r--r-- | src/datavisualization/utils/utils.cpp | 13 |
1 files changed, 10 insertions, 3 deletions
diff --git a/src/datavisualization/utils/utils.cpp b/src/datavisualization/utils/utils.cpp index eb84f162..b00d1251 100644 --- a/src/datavisualization/utils/utils.cpp +++ b/src/datavisualization/utils/utils.cpp @@ -38,14 +38,21 @@ GLuint Utils::getNearestPowerOfTwo(GLuint value, GLuint &padding) return powOfTwoValue; } -QVector3D Utils::vectorFromColor(const QColor &color) +QVector4D Utils::vectorFromColor(const QColor &color) { - return QVector3D(color.redF(), color.greenF(), color.blueF()); + return QVector4D(color.redF(), color.greenF(), color.blueF(), color.alphaF()); } QColor Utils::colorFromVector(const QVector3D &colorVector) { - return QColor(colorVector.x() * 255.0f, colorVector.y() * 255.0f, colorVector.z() * 255.0f); + return QColor(colorVector.x() * 255.0f, colorVector.y() * 255.0f, + colorVector.z() * 255.0f, 255.0f); +} + +QColor Utils::colorFromVector(const QVector4D &colorVector) +{ + return QColor(colorVector.x() * 255.0f, colorVector.y() * 255.0f, + colorVector.z() * 255.0f, colorVector.w() * 255.0f); } QImage Utils::printTextToImage(const QFont &font, const QString &text, const QColor &bgrColor, |