HG_REPOSITORIES/LPP/INSTRUMENTATION/USERS/JEANDET/qtcharts Commit - r1207:614787b7b70d

Bugfix: remove restrictions from pie start & end angles...

Jani Honkonen -

r1207:614787b7b70d

parent child

Context file:

r1207:614787b7b70d

demos/piechartcustomization/mainwidget.cpp +4 -4

                 m_sizeFactor->setValue(m_series->pieSize());
                 m_startAngle = new QDoubleSpinBox();
-                m_startAngle->setMinimum(0.0);
+                m_startAngle->setMinimum(-720);
-                m_startAngle->setMaximum(360);
+                m_startAngle->setMaximum(720);
                 m_startAngle->setValue(m_series->pieStartAngle());
                 m_startAngle->setSingleStep(1);
                 m_endAngle = new QDoubleSpinBox();
-                m_endAngle->setMinimum(0.0);
+                m_endAngle->setMinimum(-720);
-                m_endAngle->setMaximum(360);
+                m_endAngle->setMaximum(720);
                 m_endAngle->setValue(m_series->pieEndAngle());
                 m_endAngle->setSingleStep(1);

src/piechart/qpieseries.cpp +6 -3

             void QPieSeries::setPieStartAngle(qreal angle)
             {
                 Q_D(QPieSeries);
-                if (d->setRealValue(d->m_pieStartAngle, angle, d->m_pieEndAngle))
+                if (qFuzzyIsNull(d->m_pieStartAngle - angle))
+                    return;
+                d->m_pieStartAngle = angle;
                 d->updateDerivativeData();
             }
             void QPieSeries::setPieEndAngle(qreal angle)
             {
                 Q_D(QPieSeries);
+                if (qFuzzyIsNull(d->m_pieEndAngle - angle))
-                if (d->setRealValue(d->m_pieEndAngle, angle, 360.0, d->m_pieStartAngle))
+                    return;
+                d->m_pieEndAngle = angle;
                 d->updateDerivativeData();
             }

tests/auto/qpieseries/tst_qpieseries.cpp +7 0

                 if (!ok)
                     return;
+                // modify pie angles
+                s.setPieStartAngle(-90);
+                s.setPieEndAngle(90);
+                verifyCalculatedData(s, &ok);
+                if (!ok)
+                    return;
                 // clear all
                 s.clear();
                 verifyCalculatedData(s, &ok);

General Comments 0

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

No TODOs yet

	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