summaryrefslogtreecommitdiffstats
path: root/src/datavisualization/utils
diff options
context:
space:
mode:
authorMika Salmela <mika.salmela@digia.com>2014-08-29 10:15:18 +0300
committerMika Salmela <mika.salmela@digia.com>2014-08-29 11:16:38 +0300
commitcd1a66a8fcdcc6870656a924bf55ffbcd6ea1162 (patch)
tree9a2e3576e005f626d4d0ecb17927807caac38f30 /src/datavisualization/utils
parent9a40207d83b66072fff4aaa03eca15b02f8a11c1 (diff)
Unified gradient for points
Made gradient image same size as the texture and similar calculation for the pixel. Result should be more coherent for all. Task-number: QTRD-3295 Change-Id: I666dacc6f525258ccefda288e26cac480cb385cb Reviewed-by: Miikka Heikkinen <miikka.heikkinen@digia.com> Reviewed-by: Tomi Korpipää <tomi.korpipaa@digia.com>
Diffstat (limited to 'src/datavisualization/utils')
-rw-r--r--src/datavisualization/utils/utils.cpp9
-rw-r--r--src/datavisualization/utils/utils_p.h2
2 files changed, 7 insertions, 4 deletions
diff --git a/src/datavisualization/utils/utils.cpp b/src/datavisualization/utils/utils.cpp
index 2368d86a..d7b8dae8 100644
--- a/src/datavisualization/utils/utils.cpp
+++ b/src/datavisualization/utils/utils.cpp
@@ -139,13 +139,16 @@ QVector4D Utils::getSelection(QPoint mousepos, int height)
return selectedColor;
}
-QImage Utils::getGradientImage(const QLinearGradient &gradient)
+QImage Utils::getGradientImage(QLinearGradient &gradient)
{
- QImage image(QSize(1, 101), QImage::Format_RGB32);
+ QImage image(QSize(gradientTextureWidth, gradientTextureHeight), QImage::Format_RGB32);
+ gradient.setFinalStop(qreal(gradientTextureWidth), qreal(gradientTextureHeight));
+ gradient.setStart(0.0, 0.0);
+
QPainter pmp(&image);
pmp.setBrush(QBrush(gradient));
pmp.setPen(Qt::NoPen);
- pmp.drawRect(0, 0, 1, 101);
+ pmp.drawRect(0, 0, int(gradientTextureWidth), int(gradientTextureHeight));
return image;
}
diff --git a/src/datavisualization/utils/utils_p.h b/src/datavisualization/utils/utils_p.h
index d7187c16..55707fdb 100644
--- a/src/datavisualization/utils/utils_p.h
+++ b/src/datavisualization/utils/utils_p.h
@@ -57,7 +57,7 @@ public:
bool borders = false,
int maxLabelWidth = 0);
static QVector4D getSelection(QPoint mousepos, int height);
- static QImage getGradientImage(const QLinearGradient &gradient);
+ static QImage getGradientImage(QLinearGradient &gradient);
static ParamType findFormatParamType(const QString &format);
static QString formatLabel(const QByteArray &format, ParamType paramType, qreal value);