summaryrefslogtreecommitdiffstats
path: root/src/datavisualization/utils
diff options
context:
space:
mode:
authorMiikka Heikkinen <miikka.heikkinen@digia.com>2013-11-25 12:19:18 +0200
committerMiikka Heikkinen <miikka.heikkinen@digia.com>2013-11-25 14:22:32 +0200
commite029d0ea1d486dd3dbbfa4519a2125da202f22e4 (patch)
treefc9f87f637a9adcca5a555355d96717d43eddc77 /src/datavisualization/utils
parente7e01ec065d3874d28e9e28d213783c4275d8813 (diff)
Change qreals to floats
+ Fix default axes to sensible + Fix some rounding errors in surface creation Task-number: QTRD-2622 Change-Id: I44450efc1e77ac8d8dbefc75814345949b8fb1f1 Reviewed-by: Mika Salmela <mika.salmela@digia.com>
Diffstat (limited to 'src/datavisualization/utils')
-rw-r--r--src/datavisualization/utils/surfaceobject.cpp8
-rw-r--r--src/datavisualization/utils/texturehelper.cpp4
-rw-r--r--src/datavisualization/utils/utils.cpp4
-rw-r--r--src/datavisualization/utils/utils_p.h6
4 files changed, 11 insertions, 11 deletions
diff --git a/src/datavisualization/utils/surfaceobject.cpp b/src/datavisualization/utils/surfaceobject.cpp
index d9a32ec6..c4d8532e 100644
--- a/src/datavisualization/utils/surfaceobject.cpp
+++ b/src/datavisualization/utils/surfaceobject.cpp
@@ -53,8 +53,8 @@ void SurfaceObject::setUpSmoothData(const QSurfaceDataArray &dataArray, const QR
GLfloat xNormalizer = (dataArray.at(0)->last().x() - xMin) / 2.0f;
GLfloat yNormalizer = yRange / 2.0f;
GLfloat zNormalizer = (dataArray.last()->at(0).z() - zMin) / -2.0f;
- GLfloat uvX = 1.0 / GLfloat(m_columns - 1);
- GLfloat uvY = 1.0 / GLfloat(m_rows - 1);
+ GLfloat uvX = 1.0f / GLfloat(m_columns - 1);
+ GLfloat uvY = 1.0f / GLfloat(m_rows - 1);
m_surfaceType = SurfaceSmooth;
@@ -169,8 +169,8 @@ void SurfaceObject::setUpData(const QSurfaceDataArray &dataArray, const QRect &s
GLfloat xNormalizer = (dataArray.at(0)->last().x() - xMin) / 2.0f;
GLfloat yNormalizer = yRange / 2.0f;
GLfloat zNormalizer = (dataArray.last()->at(0).z() - zMin) / -2.0f;
- GLfloat uvX = 1.0 / GLfloat(m_columns - 1);
- GLfloat uvY = 1.0 / GLfloat(m_rows - 1);
+ GLfloat uvX = 1.0f / GLfloat(m_columns - 1);
+ GLfloat uvY = 1.0f / GLfloat(m_rows - 1);
m_surfaceType = SurfaceFlat;
diff --git a/src/datavisualization/utils/texturehelper.cpp b/src/datavisualization/utils/texturehelper.cpp
index 41c5b452..c88fc8dc 100644
--- a/src/datavisualization/utils/texturehelper.cpp
+++ b/src/datavisualization/utils/texturehelper.cpp
@@ -257,8 +257,8 @@ void TextureHelper::convertToGLFormatHelper(QImage &dstImage, const QImage &srcI
if (dstImage.size() != srcImage.size()) {
int target_width = dstImage.width();
int target_height = dstImage.height();
- qreal sx = target_width / qreal(srcImage.width());
- qreal sy = target_height / qreal(srcImage.height());
+ float sx = target_width / float(srcImage.width());
+ float sy = target_height / float(srcImage.height());
quint32 *dest = (quint32 *) dstImage.scanLine(0); // NB! avoid detach here
uchar *srcPixels = (uchar *) srcImage.scanLine(srcImage.height() - 1);
diff --git a/src/datavisualization/utils/utils.cpp b/src/datavisualization/utils/utils.cpp
index eb74d1a3..ce033dc0 100644
--- a/src/datavisualization/utils/utils.cpp
+++ b/src/datavisualization/utils/utils.cpp
@@ -219,7 +219,7 @@ Utils::ParamType Utils::findFormatParamType(const QString &format)
return ParamTypeUnknown;
}
-QString Utils::formatLabel(const QByteArray &format, ParamType paramType, qreal value)
+QString Utils::formatLabel(const QByteArray &format, ParamType paramType, float value)
{
switch (paramType) {
case ParamTypeInt:
@@ -239,7 +239,7 @@ QString Utils::defaultLabelFormat()
return defaultFormat;
}
-qreal Utils::wrapValue(qreal value, qreal min, qreal max)
+float Utils::wrapValue(float value, float min, float max)
{
if (value > max) {
value = min + (value - max);
diff --git a/src/datavisualization/utils/utils_p.h b/src/datavisualization/utils/utils_p.h
index e74b590d..4d09a639 100644
--- a/src/datavisualization/utils/utils_p.h
+++ b/src/datavisualization/utils/utils_p.h
@@ -54,7 +54,7 @@ public:
static GLuint getNearestPowerOfTwo(GLuint value, GLuint &padding);
static QVector3D vectorFromColor(const QColor &color);
static void printText(QPainter *painter, const QString &text, const QSize &position,
- bool absoluteCoords = true, qreal rotation = 0, qreal scale = 1.0f);
+ bool absoluteCoords = true, float rotation = 0.0f, float scale = 1.0f);
static QImage printTextToImage(const QFont &font,
const QString &text,
const QColor &bgrColor,
@@ -65,10 +65,10 @@ public:
static QVector3D getSelection(QPoint mousepos, int height);
static ParamType findFormatParamType(const QString &format);
- static QString formatLabel(const QByteArray &format, ParamType paramType, qreal value);
+ static QString formatLabel(const QByteArray &format, ParamType paramType, float value);
static QString defaultLabelFormat();
- static qreal wrapValue(qreal value, qreal min, qreal max);
+ static float wrapValue(float value, float min, float max);
private:
static ParamType mapFormatCharToParamType(const QChar &formatChar);