HG_REPOSITORIES/LPP/INSTRUMENTATION/USERS/JEANDET/qtcharts Commit - r768:dd9d32f835df

demos/piechartcustomization/main.cpp +1 -1

                 void updateWidth(double width)
                 {
-                    if (width != m_pen.widthF()) {
+                    if (!qFuzzyIsNull(width - m_pen.widthF())) {
                         m_pen.setWidthF(width);
                         emit changed();
                     }

src/axis/axisitem.cpp +3 -2

             bool Axis::isEmpty()
             {
-                return m_rect.isEmpty() || m_min==m_max || m_ticksCount==0;
+                return m_rect.isEmpty() || qFuzzyIsNull(m_min - m_max) || m_ticksCount==0;
             }
             //handlers
             void Axis::handleRangeChanged(qreal min, qreal max,int tickCount)
             {
-                if (min==max || tickCount<2) return;
+                if (qFuzzyIsNull(min - max) || tickCount < 2)
+                    return;
                 m_min = min;
                 m_max = max;

src/axis/qchartaxis.cpp +2 -2

             void QChartAxis::setRange(qreal min, qreal max)
             {
             	bool changed = false;
-                if (m_min != min) {
+                if (!qFuzzyIsNull(m_min - min)) {
                     m_min = min;
                     changed = true;
                     emit minChanged(min);
                 }
-                if (m_max != max) {
+                if (!qFuzzyIsNull(m_max - max)) {
                     m_max = max;
                     changed = true;
                     emit maxChanged(max);

src/barchart/barchartitem.cpp +1 -1

                         value->setPos(xPos, yPos-barHeight / 2);
                         value->setPen(barSet->floatingValuePen());
-                        if (m_series->valueAt(set,category) != 0) {
+                        if (!qFuzzyIsNull(m_series->valueAt(set,category))) {
                             value->setValueString(QString::number(m_series->valueAt(set, category)));
                         } else {
                             value->setValueString(QString(""));

src/barchart/percentbarchartitem.cpp +1 -1

                         value->setPos(xPos, yPos-barHeight / 2);
                         value->setPen(barSet->floatingValuePen());
-                        if (m_series->valueAt(set,category) != 0) {
+                        if (!qFuzzyIsNull(m_series->valueAt(set,category))) {
                             int p = m_series->percentageAt(set,category) * 100;
                             QString vString(QString::number(p));
                             vString.truncate(3);

src/barchart/stackedbarchartitem.cpp +1 -1

                         value->setPos(xPos, yPos-barHeight / 2);
                         value->setPen(barSet->floatingValuePen());
-                        if (m_series->valueAt(set, category) != 0) {
+                        if (!qFuzzyIsNull(m_series->valueAt(set, category))) {
                             value->setValueString(QString::number(m_series->valueAt(set,category)));
                         } else {
                             value->setValueString(QString(""));

src/domain.cpp +7 -7

                     tickYChanged=true;
                 }
-                if(m_minX!=minX || m_maxX!=maxX) {
+                if (!qFuzzyIsNull(m_minX - minX) || !qFuzzyIsNull(m_maxX - maxX)) {
                     if(m_niceNumbers) looseNiceNumbers(minX, maxX, m_tickXCount);
                     m_minX=minX;
                     m_maxX=maxX;
                     emit rangeXChanged(minX,maxX, m_tickXCount);
                 }
-                if(m_minY!=minY || m_maxY!=maxY) {
+                if (!qFuzzyIsNull(m_minY - minY) || !qFuzzyIsNull(m_maxY - maxY)) {
                     if(m_niceNumbers) looseNiceNumbers(minY, maxY, m_tickYCount);
                     m_minY=minY;
                     m_maxY=maxY;
             bool Domain::isEmpty() const
             {
-                return spanX()==0 || spanY()==0;
+                return qFuzzyIsNull(spanX()) || qFuzzyIsNull(spanY());
             }
             void Domain::zoomIn(const QRectF& rect, const QSizeF& size)
             bool operator== (const Domain &domain1, const Domain &domain2)
             {
-                return (domain1.m_maxX == domain2.m_maxX &&
+                return (qFuzzyIsNull(domain1.m_maxX - domain2.m_maxX) &&
-                    domain1.m_maxY == domain2.m_maxY &&
+                    qFuzzyIsNull(domain1.m_maxY - domain2.m_maxY) &&
-                    domain1.m_minX == domain2.m_minX &&
+                    qFuzzyIsNull(domain1.m_minX - domain2.m_minX) &&
-                    domain1.m_minY == domain2.m_minY);
+                    qFuzzyIsNull(domain1.m_minY - domain2.m_minY));
             }
             bool operator!= (const Domain &domain1, const Domain &domain2)

src/piechart/pieslicedata_p.h +1 -1

                 bool operator!=(const PieSliceData &other)
                 {
-                    if (m_value != other.m_value)
+                    if (!qFuzzyIsNull(m_value - other.m_value))
                         return true;
                     if (m_slicePen != other.m_slicePen ||

src/scatterseries/qscatterseries.cpp +1 -1

             */
             void QScatterSeries::setSize(qreal size)
             {
-                if (m_size != size) {
+                if (!qFuzzyIsNull(m_size - size)) {
                     m_size = size;
                     emit updated();
                 }

src/xychart/xychartitem.cpp +1 -1

             bool XYChartItem::isEmpty()
             {
-               return !m_clipRect.isValid() ||  m_maxX - m_minX == 0 || m_maxY - m_minY ==0 ;
+               return !m_clipRect.isValid() || qFuzzyIsNull(m_maxX - m_minX) || qFuzzyIsNull(m_maxY - m_minY);
             }
             void XYChartItem::mousePressEvent(QGraphicsSceneMouseEvent *event)

test/auto/domain/tst_domain.cpp +16 -16

                 domain.handleAxisXChanged(min, max);
                 QList<QVariant> arg0 = spy0.first();
-                QVERIFY(arg0.at(0).toReal() == min);
+                QVERIFY(qFuzzyIsNull(arg0.at(0).toReal() - min));
-                QVERIFY(arg0.at(1).toReal() == max);
+                QVERIFY(qFuzzyIsNull(arg0.at(1).toReal() - max));
                 QList<QVariant> arg1 = spy1.first();
-                QVERIFY(arg1.at(0).toReal() == min);
+                QVERIFY(qFuzzyIsNull(arg1.at(0).toReal() - min));
-                QVERIFY(arg1.at(1).toReal() == max);
+                QVERIFY(qFuzzyIsNull(arg1.at(1).toReal() - max));
                 QCOMPARE(spy0.count(), 1);
                 QCOMPARE(spy1.count(), 1);
                 domain.handleAxisYChanged(min, max,5);
                 QList<QVariant> arg0 = spy0.first();
-                QVERIFY(arg0.at(2).toReal() == min);
+                QVERIFY(qFuzzyIsNull(arg0.at(2).toReal() - min));
-                QVERIFY(arg0.at(3).toReal() == max);
+                QVERIFY(qFuzzyIsNull(arg0.at(3).toReal() - max));
                 QList<QVariant> arg1 = spy2.first();
-                QVERIFY(arg1.at(0).toReal() == min);
+                QVERIFY(qFuzzyIsNull(arg1.at(0).toReal() - min));
-                QVERIFY(arg1.at(1).toReal() == max);
+                QVERIFY(qFuzzyIsNull(arg1.at(1).toReal() - max));
                 QCOMPARE(spy0.count(), 1);
                 QCOMPARE(spy1.count(), 0);
             	domain.setRangeX(min, max);
             	QList<QVariant> arg0 = spy0.first();
-            	QVERIFY(arg0.at(0).toReal() == min);
+                QVERIFY(qFuzzyIsNull(arg0.at(0).toReal() - min));
-            	QVERIFY(arg0.at(1).toReal() == max);
+                QVERIFY(qFuzzyIsNull(arg0.at(1).toReal() - max));
             	QList<QVariant> arg1 = spy1.first();
-            	QVERIFY(arg1.at(0).toReal() == min);
+                QVERIFY(qFuzzyIsNull(arg1.at(0).toReal() - min));
-            	QVERIFY(arg1.at(1).toReal() == max);
+                QVERIFY(qFuzzyIsNull(arg1.at(1).toReal() - max));
             	QCOMPARE(spy0.count(), 1);
             	QCOMPARE(spy1.count(), 1);
             	domain.setRangeY(min, max);
             	QList<QVariant> arg0 = spy0.first();
-            	QVERIFY(arg0.at(2).toReal() == min);
+                QVERIFY(qFuzzyIsNull(arg0.at(2).toReal() - min));
-            	QVERIFY(arg0.at(3).toReal() == max);
+                QVERIFY(qFuzzyIsNull(arg0.at(3).toReal() - max));
             	QList<QVariant> arg1 = spy2.first();
-            	QVERIFY(arg1.at(0).toReal() == min);
+                QVERIFY(qFuzzyIsNull(arg1.at(0).toReal() - min));
-            	QVERIFY(arg1.at(1).toReal() == max);
+                QVERIFY(qFuzzyIsNull(arg1.at(1).toReal() - max));
             	QCOMPARE(spy0.count(), 1);
             	QCOMPARE(spy1.count(), 0);

	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