HG_REPOSITORIES/LPP/INSTRUMENTATION/USERS/JEANDET/qtcharts Commit - r1741:5e93b5bfe418

Inner pie (donut) size cannot be smaller than the outer pie size

Marek Rosa -

r1741:5e93b5bfe418

parent child

Context file:

r1741:5e93b5bfe418

Collapse all files

examples/datetimeaxis/main.cpp +3 -9

                 //![2]
                 QDateTime momentInTime;
-                for (int i = 0; i < 100; i++) {
+                for (int i = 0; i < 200; i++) {
                     momentInTime.setDate(QDate(2012, 1 , (1 + i / 9) % 28));
                     momentInTime.setTime(QTime(9 + i % 9, 0));
                     if (i > 0)
-                        series->append(momentInTime.toMSecsSinceEpoch(), series->points().at(i - 1).y() *  (0.95 + (qrand() % 11) / 100.0));
+                        series->append(momentInTime.toMSecsSinceEpoch(), series->points().at(i - 1).y() *  (0.99 + (qrand() % 3) / 100.0));
                     else
                         series->append(momentInTime.toMSecsSinceEpoch(), 45);
                 }
                 chart->addSeries(series);
                 chart->createDefaultAxes();
                 QDateTimeAxis *axisX = new QDateTimeAxis;
-                axisX->setTicksCount(20);
+            //    axisX->setTicksCount(10);
-                momentInTime.setDate(QDate(2012,1,1));
-                momentInTime.setTime(QTime(6, 0));
-                axisX->setMin(momentInTime);
-                momentInTime.setDate(QDate(2012,1,7));
-                momentInTime.setTime(QTime(18, 0));
-                axisX->setMax(momentInTime);
                 chart->setAxisX(axisX, series);
                 chart->setTitle("Date and Time axis chart example");
                 //![3]

src/piechart/qpieseries.cpp +26 -19

                 \o 1.0 is the maximum size that can fit the chart.
                 \endlist
+                When setting this property the donutInnerSize property is adjusted if necessary, to ensure that the inner size is not greater than the outer size.
                 Default value is 0.7.
             */
                 \o 1.0 is the maximum size that can fit the chart. (donut has no width)
                 \endlist
-                The value is never greater then size property.
+                When setting this property the size property is adjusted if necessary, to ensure that the inner size is not greater than the outer size.
                 Default value is 0.5.
             */
             void QPieSeries::setDonutInnerSize(qreal innerSize)
             {
                 Q_D(QPieSeries);
+                innerSize = qBound(0.0, innerSize, 1.0);
-                if (innerSize < 0.0)
+                d->setSizes(innerSize, qMax(d->m_pieRelativeSize, innerSize));
-                    innerSize = 0.0;
-                if (innerSize > d->m_pieRelativeSize)
-                    innerSize = d->m_pieRelativeSize;
-                d->m_donutRelativeInnerSize = innerSize;
-                d->updateDerivativeData();
-                emit d->pieSizeChanged();
             }
             qreal QPieSeries::donutInnerSize() const
             void QPieSeries::setPieSize(qreal relativeSize)
             {
                 Q_D(QPieSeries);
+                relativeSize = qBound(0.0, relativeSize, 1.0);
+                d->setSizes(qMin(d->m_donutRelativeInnerSize, relativeSize), relativeSize);
-                if (relativeSize < 0.0)
-                    relativeSize = 0.0;
-                if (relativeSize > 1.0)
-                    relativeSize = 1.0;
-                if (!qFuzzyIsNull(d->m_pieRelativeSize - relativeSize)) {
-                    d->m_pieRelativeSize = relativeSize;
-                    emit d->pieSizeChanged();
             }
             qreal QPieSeries::pieSize() const
                 emit calculatedDataChanged();
             }
+            void QPieSeriesPrivate::setSizes(qreal innerSize, qreal outerSize)
+            {
+                bool changed = false;
+                if (!qFuzzyIsNull(m_donutRelativeInnerSize - innerSize)) {
+                    m_donutRelativeInnerSize = innerSize;
+                    changed = true;
+                }
+                if (!qFuzzyIsNull(m_pieRelativeSize - outerSize)) {
+                    m_pieRelativeSize = outerSize;
+                    changed = true;
+                }
+                if (changed)
+                    emit pieSizeChanged();
+            }
             QPieSeriesPrivate* QPieSeriesPrivate::fromSeries(QPieSeries *series)
             {
                 return series->d_func();

src/piechart/qpieseries_p.h +1 0

                 QAbstractAxis::AxisType defaultAxisType(Qt::Orientation orientation) const;
                 void updateDerivativeData();
+                void setSizes(qreal innerSize, qreal outerSize);
                 static QPieSeriesPrivate* fromSeries(QPieSeries *series);

src/piechart/qpieslice.h +2 -2

                 enum LabelPosition {
                     LabelOutside,
                     LabelInside,
-                    LabelInsideTangential,
+                    LabelInsideTangential, // better name needed
-                    LabelInsideNormal
+                    LabelInsideNormal // better name needed
                 };
             public:

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