summaryrefslogtreecommitdiffstats
path: root/src/datavisualization/utils
diff options
context:
space:
mode:
Diffstat (limited to 'src/datavisualization/utils')
-rw-r--r--src/datavisualization/utils/utils.cpp13
-rw-r--r--src/datavisualization/utils/utils_p.h3
2 files changed, 12 insertions, 4 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,
diff --git a/src/datavisualization/utils/utils_p.h b/src/datavisualization/utils/utils_p.h
index c89a299c..46df980f 100644
--- a/src/datavisualization/utils/utils_p.h
+++ b/src/datavisualization/utils/utils_p.h
@@ -52,8 +52,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 QColor colorFromVector(const QVector4D &colorVector);
static void printText(QPainter *painter, const QString &text, const QSize &position,
bool absoluteCoords = true, float rotation = 0.0f, float scale = 1.0f);
static QImage printTextToImage(const QFont &font,