Move series specific visual elements to series, part 4

Colors to series

- Multiselection labels in bar slices still buggy
- Selection in bars doesn't work correctly if not all
  series have items in that grid

Task-number: QTRD-2557
Change-Id: Icd38428e5337a26b8410476104bb1f1f784cdc7f
Reviewed-by: Tomi Korpipää <tomi.korpipaa@digia.com>

2 files changed, 6 insertions, 0 deletions

diff --git a/src/datavisualization/utils/utils.cpp b/src/datavisualization/utils/utils.cpp
index 2adc9409..bb280504 100644
--- a/src/datavisualization/utils/utils.cpp
+++ b/src/datavisualization/utils/utils.cpp
@@ -44,6 +44,11 @@ QVector3D Utils::vectorFromColor(const QColor &color)
     return QVector3D(color.redF(), color.greenF(), color.blueF());
 }
 
+QColor Utils::colorFromVector(const QVector3D &colorVector)
+{
+    return QColor(colorVector.x(), colorVector.y(), colorVector.z());
+}
+
 QImage Utils::printTextToImage(const QFont &font, const QString &text, const QColor &bgrColor,
                                const QColor &txtColor, bool labelBackground,
                                bool borders, int maxLabelWidth)
diff --git a/src/datavisualization/utils/utils_p.h b/src/datavisualization/utils/utils_p.h
index b713db94..3142e4c2 100644
--- a/src/datavisualization/utils/utils_p.h
+++ b/src/datavisualization/utils/utils_p.h
@@ -53,6 +53,7 @@ public:
 
     static GLuint getNearestPowerOfTwo(GLuint value, GLuint &padding);
     static QVector3D 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 QImage printTextToImage(const QFont &font,