HG_REPOSITORIES/LPP/INSTRUMENTATION/USERS/JEANDET/qtcharts Commit - r1280:dde538c774a3

pie: make it impossible to add negative slice values

Jani Honkonen -

r1280:dde538c774a3

parent child

Context file:

r1280:dde538c774a3

src/piechart/qpieslice.cpp +5 -2

                 Value of the slice.
+                Note that if users sets a negative value it is converted to a positive value.
                 \sa percentage(), QPieSeries::sum()
             */
                 :QObject(parent),
                 d_ptr(new QPieSlicePrivate(this))
             {
-                d_ptr->m_data.m_value = value;
+                setValue(value);
-                d_ptr->m_data.m_labelText = label;
+                setLabel(label);
             }
             /*!
             void QPieSlice::setValue(qreal value)
             {
+                value = qAbs(value); // negative values not allowed
                 if (!qFuzzyIsNull(d_ptr->m_data.m_value - value)) {
                     d_ptr->m_data.m_value = value;
                     emit valueChanged();

tests/auto/qpieslice/tst_qpieslice.cpp +3 -2

                 // percentageChanged(), startAngleChanged() and angleSpanChanged() signals tested at tst_qpieseries::calculatedValues()
                 // set everything twice to see we do not get unnecessary signals
-                slice.setValue(1);
+                slice.setValue(1.0);
-                slice.setValue(1);
+                slice.setValue(-1.0);
+                QCOMPARE(slice.value(), 1.0);
                 slice.setLabel("foobar");
                 slice.setLabel("foobar");
                 slice.setLabelVisible();

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