From e029d0ea1d486dd3dbbfa4519a2125da202f22e4 Mon Sep 17 00:00:00 2001 From: Miikka Heikkinen Date: Mon, 25 Nov 2013 12:19:18 +0200 Subject: 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 --- src/datavisualization/axis/q3dabstractaxis.cpp | 54 +++++++++++++------------- src/datavisualization/axis/q3dabstractaxis.h | 16 ++++---- src/datavisualization/axis/q3dabstractaxis_p.h | 10 ++--- src/datavisualization/axis/q3dvalueaxis.cpp | 10 ++--- src/datavisualization/axis/q3dvalueaxis_p.h | 6 +-- 5 files changed, 48 insertions(+), 48 deletions(-) (limited to 'src/datavisualization/axis') diff --git a/src/datavisualization/axis/q3dabstractaxis.cpp b/src/datavisualization/axis/q3dabstractaxis.cpp index b0372adc..82d6e775 100644 --- a/src/datavisualization/axis/q3dabstractaxis.cpp +++ b/src/datavisualization/axis/q3dabstractaxis.cpp @@ -177,7 +177,7 @@ void Q3DAbstractAxis::setTitle(QString title) * When setting the range, the max is adjusted if necessary, to ensure that the range remains valid. * \note For Q3DCategoryAxis this specifies the index range of rows or columns to show. */ -void Q3DAbstractAxis::setRange(qreal min, qreal max) +void Q3DAbstractAxis::setRange(float min, float max) { d_ptr->setRange(min, max); setAutoAdjustRange(false); @@ -191,7 +191,7 @@ void Q3DAbstractAxis::setRange(qreal min, qreal max) * valid. * \note For Q3DCategoryAxis this specifies the index of the first row or column to show. */ -void Q3DAbstractAxis::setMin(qreal min) +void Q3DAbstractAxis::setMin(float min) { d_ptr->setMin(min); setAutoAdjustRange(false); @@ -205,18 +205,18 @@ void Q3DAbstractAxis::setMin(qreal min) * valid. * \note For Q3DCategoryAxis this specifies the index of the last row or column to show. */ -void Q3DAbstractAxis::setMax(qreal max) +void Q3DAbstractAxis::setMax(float max) { d_ptr->setMax(max); setAutoAdjustRange(false); } -qreal Q3DAbstractAxis::min() const +float Q3DAbstractAxis::min() const { return d_ptr->m_min; } -qreal Q3DAbstractAxis::max() const +float Q3DAbstractAxis::max() const { return d_ptr->m_max; } @@ -249,8 +249,8 @@ Q3DAbstractAxisPrivate::Q3DAbstractAxisPrivate(Q3DAbstractAxis *q, Q3DAbstractAx m_orientation(Q3DAbstractAxis::AxisOrientationNone), m_type(type), m_isDefaultAxis(false), - m_min(0.0), - m_max(10.0), + m_min(0.0f), + m_max(10.0f), m_autoAdjust(true), m_onlyPositiveValues(false), m_allowMinMaxSame(false) @@ -274,21 +274,21 @@ void Q3DAbstractAxisPrivate::updateLabels() // Default implementation does nothing } -void Q3DAbstractAxisPrivate::setRange(qreal min, qreal max) +void Q3DAbstractAxisPrivate::setRange(float min, float max) { bool adjusted = false; if (m_onlyPositiveValues) { - if (min < 0.0) { - min = 0.0; + if (min < 0.0f) { + min = 0.0f; adjusted = true; } - if (max < 0.0) { - max = 0.0; + if (max < 0.0f) { + max = 0.0f; adjusted = true; } } // If min >= max, we adjust ranges so that - // m_max becomes (min + 1.0) + // m_max becomes (min + 1.0f) // as axes need some kind of valid range. bool dirty = false; if (m_min != min) { @@ -297,7 +297,7 @@ void Q3DAbstractAxisPrivate::setRange(qreal min, qreal max) } if (m_max != max || min > max || (!m_allowMinMaxSame && min == max)) { if (min > max || (!m_allowMinMaxSame && min == max)) { - m_max = min + 1.0; + m_max = min + 1.0f; adjusted = true; } else { m_max = max; @@ -315,11 +315,11 @@ void Q3DAbstractAxisPrivate::setRange(qreal min, qreal max) } } -void Q3DAbstractAxisPrivate::setMin(qreal min) +void Q3DAbstractAxisPrivate::setMin(float min) { if (m_onlyPositiveValues) { - if (min < 0.0) { - min = 0.0; + if (min < 0.0f) { + min = 0.0f; qWarning() << "Warning: Tried to set negative minimum for an axis that only supports" " positive values:" << min; } @@ -327,8 +327,8 @@ void Q3DAbstractAxisPrivate::setMin(qreal min) if (m_min != min) { if (min > m_max || (!m_allowMinMaxSame && min == m_max)) { - qreal oldMax = m_max; - m_max = min + 1.0; + float oldMax = m_max; + m_max = min + 1.0f; qWarning() << "Warning: Tried to set minimum to equal or larger than maximum for" " value axis. Maximum automatically adjusted to a valid one:" << oldMax << "-->" << m_max; @@ -339,11 +339,11 @@ void Q3DAbstractAxisPrivate::setMin(qreal min) } } -void Q3DAbstractAxisPrivate::setMax(qreal max) +void Q3DAbstractAxisPrivate::setMax(float max) { if (m_onlyPositiveValues) { - if (max < 0.0) { - max = 0.0; + if (max < 0.0f) { + max = 0.0f; qWarning() << "Warning: Tried to set negative maximum for an axis that only supports" " positive values:" << max; } @@ -351,11 +351,11 @@ void Q3DAbstractAxisPrivate::setMax(qreal max) if (m_max != max) { if (m_min > max || (!m_allowMinMaxSame && m_min == max)) { - qreal oldMin = m_min; - m_min = max - 1.0; - if (m_onlyPositiveValues && m_min < 0.0) { - m_min = 0.0; - if (!m_allowMinMaxSame && max == 0.0) { + float oldMin = m_min; + m_min = max - 1.0f; + if (m_onlyPositiveValues && m_min < 0.0f) { + m_min = 0.0f; + if (!m_allowMinMaxSame && max == 0.0f) { m_min = oldMin; qWarning() << "Unable to set maximum value to zero."; return; diff --git a/src/datavisualization/axis/q3dabstractaxis.h b/src/datavisualization/axis/q3dabstractaxis.h index 9e5c426a..c154c3ea 100644 --- a/src/datavisualization/axis/q3dabstractaxis.h +++ b/src/datavisualization/axis/q3dabstractaxis.h @@ -38,8 +38,8 @@ class QT_DATAVISUALIZATION_EXPORT Q3DAbstractAxis : public QObject Q_PROPERTY(QStringList labels READ labels NOTIFY labelsChanged) Q_PROPERTY(AxisOrientation orientation READ orientation) Q_PROPERTY(AxisType type READ type) - Q_PROPERTY(qreal min READ min WRITE setMin NOTIFY rangeChanged) - Q_PROPERTY(qreal max READ max WRITE setMax NOTIFY rangeChanged) + Q_PROPERTY(float min READ min WRITE setMin NOTIFY rangeChanged) + Q_PROPERTY(float max READ max WRITE setMax NOTIFY rangeChanged) Q_PROPERTY(bool autoAdjustRange READ isAutoAdjustRange WRITE setAutoAdjustRange NOTIFY autoAdjustRangeChanged) public: @@ -69,20 +69,20 @@ public: AxisOrientation orientation() const; AxisType type() const; - qreal min() const; - qreal max() const; + float min() const; + float max() const; bool isAutoAdjustRange() const; void setTitle(QString title); - void setRange(qreal min, qreal max); - void setMin(qreal min); - void setMax(qreal max); + void setRange(float min, float max); + void setMin(float min); + void setMax(float max); void setAutoAdjustRange(bool autoAdjust); signals: void titleChanged(QString newTitle); void labelsChanged(); - void rangeChanged(qreal min, qreal max); + void rangeChanged(float min, float max); void autoAdjustRangeChanged(bool autoAdjust); protected: diff --git a/src/datavisualization/axis/q3dabstractaxis_p.h b/src/datavisualization/axis/q3dabstractaxis_p.h index 902f65be..3293e41e 100644 --- a/src/datavisualization/axis/q3dabstractaxis_p.h +++ b/src/datavisualization/axis/q3dabstractaxis_p.h @@ -47,9 +47,9 @@ public: inline bool isDefaultAxis() { return m_isDefaultAxis; } inline void setDefaultAxis(bool isDefault) { m_isDefaultAxis = isDefault; } - virtual void setRange(qreal min, qreal max); - virtual void setMin(qreal min); - virtual void setMax (qreal max); + virtual void setRange(float min, float max); + virtual void setMin(float min); + virtual void setMax (float max); protected: virtual void updateLabels(); @@ -61,8 +61,8 @@ protected: Q3DAbstractAxis::AxisOrientation m_orientation; Q3DAbstractAxis::AxisType m_type; bool m_isDefaultAxis; - qreal m_min; - qreal m_max; + float m_min; + float m_max; bool m_autoAdjust; bool m_onlyPositiveValues; bool m_allowMinMaxSame; diff --git a/src/datavisualization/axis/q3dvalueaxis.cpp b/src/datavisualization/axis/q3dvalueaxis.cpp index 9865625c..746c8617 100644 --- a/src/datavisualization/axis/q3dvalueaxis.cpp +++ b/src/datavisualization/axis/q3dvalueaxis.cpp @@ -197,7 +197,7 @@ Q3DValueAxisPrivate::~Q3DValueAxisPrivate() { } -void Q3DValueAxisPrivate::setRange(qreal min, qreal max) +void Q3DValueAxisPrivate::setRange(float min, float max) { bool dirty = (min != m_min || max != m_max); @@ -207,7 +207,7 @@ void Q3DValueAxisPrivate::setRange(qreal min, qreal max) emitLabelsChanged(); } -void Q3DValueAxisPrivate::setMin(qreal min) +void Q3DValueAxisPrivate::setMin(float min) { bool dirty = (min != m_min); @@ -217,7 +217,7 @@ void Q3DValueAxisPrivate::setMin(qreal min) emitLabelsChanged(); } -void Q3DValueAxisPrivate::setMax(qreal max) +void Q3DValueAxisPrivate::setMax(float max) { bool dirty = (max != m_max); @@ -244,14 +244,14 @@ void Q3DValueAxisPrivate::updateLabels() newLabels.reserve(m_segmentCount + 1); // First label is at axis min, which is an extra segment - qreal segmentStep = (m_max - m_min) / m_segmentCount; + float segmentStep = (m_max - m_min) / m_segmentCount; QString formatString(m_labelFormat); Utils::ParamType paramType = Utils::findFormatParamType(formatString); QByteArray formatArray = formatString.toUtf8(); for (int i = 0; i < m_segmentCount; i++) { - qreal value = m_min + (segmentStep * i); + float value = m_min + (segmentStep * i); newLabels.append(Utils::formatLabel(formatArray, paramType, value)); } diff --git a/src/datavisualization/axis/q3dvalueaxis_p.h b/src/datavisualization/axis/q3dvalueaxis_p.h index 5d0084e6..0a98bb04 100644 --- a/src/datavisualization/axis/q3dvalueaxis_p.h +++ b/src/datavisualization/axis/q3dvalueaxis_p.h @@ -42,9 +42,9 @@ public: Q3DValueAxisPrivate(Q3DValueAxis *q); virtual ~Q3DValueAxisPrivate(); - virtual void setRange(qreal min, qreal max); - virtual void setMin(qreal min); - virtual void setMax (qreal max); + virtual void setRange(float min, float max); + virtual void setMin(float min); + virtual void setMax (float max); protected: void emitLabelsChanged(); -- cgit v1.2.3