HG_REPOSITORIES/LPP/INSTRUMENTATION/USERS/JEANDET/qtcharts Commit - r765:eecdecc834b2

Fix issues with comparing equality of floating values in pie

Jani Honkonen -

r765:eecdecc834b2

parent child

Context file:

r765:eecdecc834b2

Collapse all files

src/piechart/pieslicedata_p.h +6 -6

                         return true;
                     if (m_isExploded != other.m_isExploded ||
-                        m_explodeDistanceFactor != other.m_explodeDistanceFactor)
+                        !qFuzzyIsNull(m_explodeDistanceFactor - other.m_explodeDistanceFactor))
                         return true;
                     if (m_isLabelVisible != other.m_isLabelVisible ||
                         m_labelText != other.m_labelText ||
                         m_labelFont != other.m_labelFont ||
-                        m_labelArmLengthFactor != other.m_labelArmLengthFactor ||
+                        !qFuzzyIsNull(m_labelArmLengthFactor - other.m_labelArmLengthFactor) ||
                         m_labelPen != other.m_labelPen)
                         return true;
-                    if (m_percentage != other.m_percentage ||
+                    if (!qFuzzyIsNull(m_percentage - other.m_percentage) ||
                         m_center != other.m_center ||
-                        m_radius != other.m_radius ||
+                        !qFuzzyIsNull(m_radius - other.m_radius) ||
-                        m_startAngle != other.m_startAngle ||
+                        !qFuzzyIsNull(m_startAngle - other.m_startAngle) ||
-                        m_angleSpan != other.m_angleSpan)
+                        !qFuzzyIsNull(m_angleSpan - other.m_angleSpan))
                         return true;
                     return false;

src/piechart/qpieseries.cpp +22 -25

                     m_total += s->value();
                 // nothing to show..
-                if (m_total == 0)
+                if (qFuzzyIsNull(m_total))
                     return;
                 // update slice attributes
                 QVector<QPieSlice*> changed;
                 foreach (QPieSlice* s, m_slices) {
-                    bool isChanged = false;
+                    PieSliceData data = s->data_ptr()->m_data;
+                    data.m_percentage = s->value() / m_total;
+                    data.m_angleSpan = pieSpan * data.m_percentage;
+                    data.m_startAngle = sliceAngle;
+                    sliceAngle += data.m_angleSpan;
-                    qreal percentage = s->value() / m_total;
+                    if (s->data_ptr()->m_data != data) {
-                    if (s->data_ptr()->m_data.m_percentage != percentage) {
+                        s->data_ptr()->m_data = data;
-                        s->data_ptr()->m_data.m_percentage = percentage;
-                        isChanged = true;
-                    qreal sliceSpan = pieSpan * percentage;
-                    if (s->data_ptr()->m_data.m_angleSpan != sliceSpan) {
-                        s->data_ptr()->m_data.m_angleSpan = sliceSpan;
-                        isChanged = true;
-                    if (s->data_ptr()->m_data.m_startAngle != sliceAngle) {
-                        s->data_ptr()->m_data.m_startAngle = sliceAngle;
-                        isChanged = true;
-                    sliceAngle += sliceSpan;
-                    if (isChanged)
                         changed << s;
+                    }
                 }
                 // emit signals
                         relativeVerticalPosition < 0.0 || relativeVerticalPosition > 1.0)
                     return;
-                if (d->m_pieRelativeHorPos != relativeHorizontalPosition || d->m_pieRelativeVerPos != relativeVerticalPosition) {
+                if (!qFuzzyIsNull(d->m_pieRelativeHorPos - relativeHorizontalPosition) ||
+                    !qFuzzyIsNull(d->m_pieRelativeVerPos - relativeVerticalPosition)) {
                     d->m_pieRelativeHorPos = relativeHorizontalPosition;
                     d->m_pieRelativeVerPos = relativeVerticalPosition;
                     emit piePositionChanged();
                 if (relativeSize < 0.0 || relativeSize > 1.0)
                     return;
-                if (d->m_pieRelativeSize != relativeSize) {
+                if (!qFuzzyIsNull(d->m_pieRelativeSize- relativeSize)) {
                     d->m_pieRelativeSize = relativeSize;
                     emit pieSizeChanged();
                 }
             void QPieSeries::setPieStartAngle(qreal angle)
             {
                 Q_D(QPieSeries);
-                if (angle >= 0 && angle <= 360 && angle != d->m_pieStartAngle && angle <= d->m_pieEndAngle) {
+                if (angle < 0 || angle > 360 || angle > d->m_pieEndAngle)
+                    return;
+                if (!qFuzzyIsNull(angle - d->m_pieStartAngle)) {
                     d->m_pieStartAngle = angle;
                     d->updateDerivativeData();
                 }
             void QPieSeries::setPieEndAngle(qreal angle)
             {
                 Q_D(QPieSeries);
-                if (angle >= 0 && angle <= 360 && angle != d->m_pieEndAngle && angle >= d->m_pieStartAngle) {
+                if (angle < 0 || angle > 360 || angle < d->m_pieStartAngle)
+                    return;
+                if (!qFuzzyIsNull(angle - d->m_pieEndAngle)) {
                     d->m_pieEndAngle = angle;
                     d->updateDerivativeData();
                 }

src/piechart/qpieslice.cpp +3 -3

             void QPieSlice::setValue(qreal value)
             {
                 Q_D(QPieSlice);
-                if (d->m_data.m_value != value) {
+                if (!qFuzzyIsNull(d->m_data.m_value - value)) {
                     d->m_data.m_value = value;
                     QPieSeries *series = qobject_cast<QPieSeries*>(parent());
             void QPieSlice::setExplodeDistanceFactor(qreal factor)
             {
                 Q_D(QPieSlice);
-                if (d->m_data.m_explodeDistanceFactor != factor) {
+                if (!qFuzzyIsNull(d->m_data.m_explodeDistanceFactor - factor)) {
                     d->m_data.m_explodeDistanceFactor = factor;
                     emit changed();
                 }
             void QPieSlice::setLabelArmLengthFactor(qreal factor)
             {
                 Q_D(QPieSlice);
-                if (d->m_data.m_labelArmLengthFactor != factor) {
+                if (!qFuzzyIsNull(d->m_data.m_labelArmLengthFactor - factor)) {
                     d->m_data.m_labelArmLengthFactor = factor;
                     emit changed();
                 }

General Comments 0

Write
Preview

You need to be logged in to leave comments. Login now

No TODOs yet

	Site-wide shortcuts
/	Use quick search box
g h	Goto home page
g g	Goto my private gists page
g G	Goto my public gists page
g 0-9	Goto bookmarked items from 0-9
n r	New repository page
n g	New gist page

	Repositories
g s	Goto summary page
g c	Goto changelog page
g f	Goto files page
g F	Goto files page with file search activated
g p	Goto pull requests page
g o	Goto repository settings
g O	Goto repository access permissions settings
t s	Toggle sidebar on some pages