HG_REPOSITORIES/LPP/INSTRUMENTATION/USERS/JEANDET/qtcharts Commit - r2424:4543a29c8891

Fix to discard NaN, Inf and -Inf values from chart....

Mika Salmela -

r2424:4543a29c8891

parent child

Context file:

r2424:4543a29c8891

Collapse all files

src/charthelpers_p.h created 644 +26 0

@@ -0,0 +1,26
	1	#ifndef CHARTHELPERS_P_H
	2	#define CHARTHELPERS_P_H
	3
	4	#include <qnumeric.h>
	5	#include <QPointF>
	6
	7	static inline bool isValidValue(qreal value)
	8	{
	9	if (qIsNaN(value) \|\| qIsInf(value)) {
	10	qWarning("Ignored NaN, Inf, or -Inf value.");
	11	return false;
	12	}
	13	return true;
	14	}
	15
	16	static inline bool isValidValue(qreal x, qreal y)
	17	{
	18	return (isValidValue(x) && isValidValue(y));
	19	}
	20
	21	static inline bool isValidValue(const QPointF point)
	22	{
	23	return (isValidValue(point.x()) && isValidValue(point.y()));
	24	}
	25
	26	#endif // CHARTHELPERS_P_H

src/barchart/qbarset.cpp +12 -6

             void QBarSetPrivate::append(QPointF value)
             {
-                m_values.append(value);
+                if (isValidValue(value)) {
-                emit restructuredBars();
+                    m_values.append(value);
+                    emit restructuredBars();
+                }
             }
             void QBarSetPrivate::append(QList<QPointF> values)
             {
-                for (int i = 0; i < values.count(); i++)
+                for (int i = 0; i < values.count(); i++) {
-                    m_values.append(values.at(i));
+                    if (isValidValue(values.at(i)))
+                        m_values.append(values.at(i));
+                }
                 emit restructuredBars();
             }
             {
                 int index = m_values.count();
                 for (int i = 0; i < values.count(); i++) {
-                    m_values.append(QPointF(index, values.at(i)));
+                    if (isValidValue(values.at(i))) {
-                    index++;
+                        m_values.append(QPointF(index, values.at(i)));
+                        index++;
+                    }
                 }
                 emit restructuredBars();
             }

src/barchart/qbarset.h +1 0

             #include <QPen>
             #include <QBrush>
             #include <QFont>
+            #include "charthelpers_p.h"
             QTCOMMERCIALCHART_BEGIN_NAMESPACE
             class QBarSetPrivate;

src/piechart/qpieseries.cpp +14 -3

             #include "charttheme_p.h"
             #include "qabstractaxis.h"
             #include "pieanimation_p.h"
+            #include "charthelpers_p.h"
             #include "qpielegendmarker.h"
                         return false;
                     if (s->series()) // already added to some series
                         return false;
+                    if (!isValidValue(s->value()))
+                        return false;
                 }
                 foreach (QPieSlice *s, slices) {
             /*!
                 Appends a single slice to the series with give \a value and \a label.
                 Slice ownership is passed to the series.
+                Returns NULL if value is NaN, Inf or -Inf and no slice is added to the series.
             */
             QPieSlice *QPieSeries::append(QString label, qreal value)
             {
-                QPieSlice *slice = new QPieSlice(label, value);
+                if (isValidValue(value)) {
-                append(slice);
+                    QPieSlice *slice = new QPieSlice(label, value);
-                return slice;
+                    append(slice);
+                    return slice;
+                } else {
+                    return 0;
+                }
             }
             /*!
                 if (slice->series()) // already added to some series
                     return false;
+                if (!isValidValue(slice->value()))
+                    return false;
                 slice->setParent(this);
                 QPieSlicePrivate::fromSlice(slice)->m_series = this;
                 d->m_slices.insert(index, slice);

src/src.pro +2 -1

                 $$PWD/scroller_p.h \
                 $$PWD/qabstractseries_p.h \
                 $$PWD/chartlayout_p.h \
-                $$PWD/charttitle_p.h
+                $$PWD/charttitle_p.h \
+                $$PWD/charthelpers_p.h
             PUBLIC_HEADERS += \
                 $$PWD/qchart.h \
                 $$PWD/qchartglobal.h \

src/xychart/qxyseries.cpp +14 -6

             #include "qvalueaxis.h"
             #include "xychart_p.h"
             #include "qxylegendmarker.h"
+            #include "charthelpers_p.h"
             QTCOMMERCIALCHART_BEGIN_NAMESPACE
             void QXYSeries::append(const QPointF &point)
             {
                 Q_D(QXYSeries);
-                d->m_points << point;
-                emit pointAdded(d->m_points.count() - 1);
+                if (isValidValue(point)) {
+                    d->m_points << point;
+                    emit pointAdded(d->m_points.count() - 1);
+                }
             }
             /*!
                 int index = d->m_points.indexOf(oldPoint);
                 if (index == -1)
                     return;
-                d->m_points[index] = newPoint;
+                if (isValidValue(newPoint)) {
-                emit pointReplaced(index);
+                    d->m_points[index] = newPoint;
+                    emit pointReplaced(index);
+                }
             }
             /*!
             void QXYSeries::insert(int index, const QPointF &point)
             {
                 Q_D(QXYSeries);
-                d->m_points.insert(index, point);
+                if (isValidValue(point)) {
-                emit pointAdded(index);
+                    d->m_points.insert(index, point);
+                    emit pointAdded(index);
+                }
             }
             /*!

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