HG_REPOSITORIES/LPP/INSTRUMENTATION/USERS/JEANDET/qtcharts Commit - r1838:886026b75e22

Donut support simplified. Examples updated

Marek Rosa -

r1838:886026b75e22

parent child

Context file:

r1838:886026b75e22

Collapse all files

demos/piechartcustomization/mainwidget.cpp +10 -14

             MainWidget::MainWidget(QWidget* parent)
                 :QWidget(parent),
-                m_slice(0)
+                  m_slice(0)
             {
                 // create chart
                 QChart *chart = new QChart;
                 m_endAngle->setValue(m_series->pieEndAngle());
                 m_endAngle->setSingleStep(1);
-                m_isDonut = new QCheckBox();
+                m_holeSize = new QDoubleSpinBox();
+                m_holeSize->setMinimum(0.0);
-                m_donutInnerSize = new QDoubleSpinBox();
+                m_holeSize->setMaximum(1.0);
-                m_donutInnerSize->setMinimum(0.0);
+                m_holeSize->setSingleStep(0.1);
-                m_donutInnerSize->setMaximum(1.0);
+                m_holeSize->setValue(m_series->holeSize());
-                m_donutInnerSize->setSingleStep(0.1);
-                m_donutInnerSize->setValue(m_series->donutInnerSize());
                 QPushButton *appendSlice = new QPushButton("Append slice");
                 QPushButton *insertSlice = new QPushButton("Insert slice");
                 seriesSettingsLayout->addRow("Size factor", m_sizeFactor);
                 seriesSettingsLayout->addRow("Start angle", m_startAngle);
                 seriesSettingsLayout->addRow("End angle", m_endAngle);
-                seriesSettingsLayout->addRow("Is donut", m_isDonut);
+                seriesSettingsLayout->addRow("Hole size", m_holeSize);
-                seriesSettingsLayout->addRow("Donut inner size", m_donutInnerSize);
                 seriesSettingsLayout->addRow(appendSlice);
                 seriesSettingsLayout->addRow(insertSlice);
                 seriesSettingsLayout->addRow(removeSlice);
                 connect(m_sizeFactor, SIGNAL(valueChanged(double)), this, SLOT(updateSerieSettings()));
                 connect(m_startAngle, SIGNAL(valueChanged(double)), this, SLOT(updateSerieSettings()));
                 connect(m_endAngle, SIGNAL(valueChanged(double)), this, SLOT(updateSerieSettings()));
-                connect(m_isDonut, SIGNAL(toggled(bool)), this, SLOT(updateSerieSettings()));
+                connect(m_holeSize, SIGNAL(valueChanged(double)), this, SLOT(updateSerieSettings()));
-                connect(m_donutInnerSize, SIGNAL(valueChanged(double)), this, SLOT(updateSerieSettings()));
                 connect(appendSlice, SIGNAL(clicked()), this, SLOT(appendSlice()));
                 connect(insertSlice, SIGNAL(clicked()), this, SLOT(insertSlice()));
                 connect(removeSlice, SIGNAL(clicked()), this, SLOT(removeSlice()));
                 m_series->setHorizontalPosition(m_hPosition->value());
                 m_series->setVerticalPosition(m_vPosition->value());
                 m_series->setPieSize(m_sizeFactor->value());
+                m_holeSize->setMaximum(m_sizeFactor->value());
                 m_series->setPieStartAngle(m_startAngle->value());
                 m_series->setPieEndAngle(m_endAngle->value());
-                m_series->setDonut(m_isDonut->isChecked());
+                m_series->setHoleSize(m_holeSize->value());
-                m_series->setDonutInnerSize(m_donutInnerSize->value());
             }
             void MainWidget::updateSliceSettings()

demos/piechartcustomization/mainwidget.h +1 -2

                 QDoubleSpinBox* m_sizeFactor;
                 QDoubleSpinBox* m_startAngle;
                 QDoubleSpinBox* m_endAngle;
-                QCheckBox* m_isDonut;
+                QDoubleSpinBox* m_holeSize;
-                QDoubleSpinBox* m_donutInnerSize;
                 QLineEdit* m_sliceName;
                 QDoubleSpinBox* m_sliceValue;

examples/donut/widget.cpp +9 -6

             #include "widget.h"
             #include <QChartView>
+            #include <QChart>
+            #include <QLegend>
             #include <QPieSeries>
             #include <QPieSlice>
             #include <QTime>
                 //! [1]
                 QChartView *chartView = new QChartView;
                 chartView->setRenderHint(QPainter::Antialiasing);
-                chartView->chart()->setAnimationOptions(QChart::AllAnimations);
+                QChart *chart = chartView->chart();
+                chart->setAnimationOptions(QChart::AllAnimations);
+                chart->legend()->setVisible(false);
                 //! [1]
                 //! [2]
                 qreal minSize = 0.1;
                 qreal maxSize = 0.9;
-                int donutsCount = 5;
+                int donutCount = 5;
                 //! [2]
                 //! [3]
-                for (int i = 0; i < donutsCount; i++) {
+                for (int i = 0; i < donutCount; i++) {
                     QPieSeries *donut = new QPieSeries;
-                    donut->setDonut();
                     int sliceCount =  3 + qrand() % 3;
                     for (int j = 0; j < sliceCount; j++) {
                         qreal value = 100 + qrand() % 100;
                         slice->setLabelPosition(QPieSlice::LabelInsideTangential);
                         connect(slice, SIGNAL(hovered(bool)), this, SLOT(explodeSlice(bool)));
                         donut->append(slice);
-                        donut->setDonutInnerSize(minSize + i * (maxSize - minSize) / donutsCount);
+                        donut->setHoleSize(minSize + i * (maxSize - minSize) / donutCount);
-                        donut->setPieSize(minSize + (i + 1) * (maxSize - minSize) / donutsCount);
+                        donut->setPieSize(minSize + (i + 1) * (maxSize - minSize) / donutCount);
                     }
                     m_donuts.append(donut);
                     chartView->chart()->addSeries(donut);

examples/donutbreakdown/widget.cpp +6 -4

             #include "widget.h"
             #include <QGridLayout>
             #include <QPieSlice>
             #include <QTime>
             #include <QChartView>
+            #include <QChart>
+            #include <QLegend>
             #include <QTimer>
             QTCOMMERCIALCHART_USE_NAMESPACE
                 //! [1]
                 QChartView *chartView = new QChartView;
                 chartView->setRenderHint(QPainter::Antialiasing);
-                chartView->chart()->setAnimationOptions(QChart::AllAnimations);
+                QChart *chart = chartView->chart();
+                chart->setAnimationOptions(QChart::AllAnimations);
+                chart->legend()->setVisible(false);
                 //! [1]
                 //! [2]
                     // create a new detailed data for the slice
                     QPieSeries *donut = new QPieSeries;
-                    donut->setDonut();
+                    donut->setHoleSize(mainData->pieSize());
-                    donut->setDonutInnerSize(mainData->pieSize());
                     donut->setPieSize(mainData->pieSize() + 0.15);
                     // when mainData slice is redrawn make sure the detailed data slices are aligned with it

src/animations/pieanimation.cpp +4 -4

                     startValue.m_startAngle = sliceData.m_startAngle + (sliceData.m_angleSpan / 2);
                 startValue.m_angleSpan = 0;
-                if (sliceData.m_donut)
+                if (sliceData.m_holeRadius > 0)
-                    startValue.m_radius = sliceData.m_innerRadius;
+                    startValue.m_radius = sliceData.m_holeRadius;
                 animation->setValue(startValue, sliceData);
                 animation->setDuration(ChartAnimationDuration);
                 animation->stop();
                 PieSliceData endValue = animation->currentSliceValue();
-                if (endValue.m_donut)
+                if (endValue.m_holeRadius > 0)
-                    endValue.m_radius = endValue.m_innerRadius;
+                    endValue.m_radius = endValue.m_holeRadius;
                 else
                     endValue.m_radius = 0;
                 endValue.m_startAngle = endValue.m_startAngle + endValue.m_angleSpan;

src/animations/piesliceanimation.cpp +1 -1

                 result.m_angleSpan = linearPos(startValue.m_angleSpan, endValue.m_angleSpan, progress);
                 result.m_slicePen = linearPos(startValue.m_slicePen, endValue.m_slicePen, progress);
                 result.m_sliceBrush = linearPos(startValue.m_sliceBrush, endValue.m_sliceBrush, progress);
-                result.m_innerRadius = linearPos(startValue.m_innerRadius, endValue.m_innerRadius, progress);
+                result.m_holeRadius = linearPos(startValue.m_holeRadius, endValue.m_holeRadius, progress);
                 return qVariantFromValue(result);
             }

src/piechart/piechartitem.cpp +3 -4

                 if (m_rect.width() < m_rect.height())
                     m_pieRadius = m_rect.width() / 2;
-                m_donutInnerRadius = m_pieRadius;
+                m_holeSize = m_pieRadius;
                 // apply size factor
                 m_pieRadius *= m_series->pieSize();
-                m_donutInnerRadius *= m_series->donutInnerSize();
+                m_holeSize *= m_series->holeSize();
                 // set layouts for existing slice items
                 foreach (QPieSlice* slice, m_series->slices()) {
                 PieSliceData &sliceData = QPieSlicePrivate::fromSlice(slice)->m_data;
                 sliceData.m_center = PieSliceItem::sliceCenter(m_pieCenter, m_pieRadius, slice);
                 sliceData.m_radius = m_pieRadius;
-                sliceData.m_donut = m_series->donut();
+                sliceData.m_holeRadius = m_holeSize;
-                sliceData.m_innerRadius = m_donutInnerRadius;
                 return sliceData;
             }

src/piechart/piechartitem_p.h +1 -1

                 QRectF m_rect;
                 QPointF m_pieCenter;
                 qreal m_pieRadius;
-                qreal m_donutInnerRadius;
+                qreal m_holeSize;
                 PieAnimation* m_animation;
             };

src/piechart/pieslicedata_p.h +2 -4

                     m_startAngle = 0;
                     m_angleSpan = 0;
-                    m_donut = false;
+                    m_holeRadius = 0;
-                    m_innerRadius = 0;
                 }
                 bool operator!=(const PieSliceData &other) const
                 qreal m_startAngle;
                 qreal m_angleSpan;
-                bool m_donut;
+                qreal m_holeRadius;
-                qreal m_innerRadius;
             };
             QTCOMMERCIALCHART_END_NAMESPACE

src/piechart/piesliceitem.cpp +4 -4

                 case QPieSlice::LabelInsideTangential:
                 case QPieSlice::LabelInsideNormal:{
                     QPointF textCenter;
-                    if (m_data.m_donut)
+                    if (m_data.m_holeRadius > 0)
-                        textCenter = m_data.m_center + offset(centerAngle, m_data.m_innerRadius + (m_data.m_radius - m_data.m_innerRadius) / 2);
+                        textCenter = m_data.m_center + offset(centerAngle, m_data.m_holeRadius + (m_data.m_radius - m_data.m_holeRadius) / 2);
                     else
                         textCenter = m_data.m_center + offset(centerAngle, m_data.m_radius / 2);
                     m_labelTextRect.moveCenter(textCenter);
                 // slice path
                 QPainterPath path;
-                if (m_data.m_donut) {
+                if (m_data.m_holeRadius > 0) {
-                    QRectF insideRect(center.x() - m_data.m_innerRadius, center.y()-m_data.m_innerRadius, m_data.m_innerRadius*2, m_data.m_innerRadius*2);
+                    QRectF insideRect(center.x() - m_data.m_holeRadius, center.y()-m_data.m_holeRadius, m_data.m_holeRadius*2, m_data.m_holeRadius*2);
                     path.arcMoveTo(rect, -startAngle + 90);
                     path.arcTo(rect, -startAngle + 90, -angleSpan);
                     path.arcTo(insideRect, -startAngle + 90 - angleSpan, angleSpan);

src/piechart/qpieseries.cpp +19 -44

                 \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.
+                When setting this property the holeSize property is adjusted if necessary, to ensure that the hole size is not greater than the outer size.
                 Default value is 0.7.
             */
             */
             /*!
-                \property QPieSeries::donutInnerSize
+                \property QPieSeries::holeSize
-                \brief Defines the donut inner size.
+                \brief Defines the donut hole size.
                 The value is a relative value to the chart rectangle where:
                 \list
-                \o 0.0 is the minimum size (pie not drawn).
+                \o 0.0 is the minimum size (full pie drawn, without any hole inside).
                 \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.
-                Default value is 0.5.
+                Default value is 0.0.
             */
             /*!
-                \qmlproperty real PieSeries::donutInnerSize
+                \qmlproperty real PieSeries::holeSize
-                Defines the donut inner size.
+                Defines the donut hole size.
                 The value is a relative value to the chart rectangle where:
                 \list
-                \o 0.0 is the minimum size (donut is a pie).
+                \o 0.0 is the minimum size (full pie drawn, without any hole inside).
                 \o 1.0 is the maximum size that can fit the chart. (donut has no width)
                 \endlist
                 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.
+                Default value is 0.0.
             */
             /*!
             */
             /*!
-                \property QPieSeries::donut
-                Defines whether the series should be drawn as a donut
-            */
-            /*!
-                \qmlproperty int PieSeries::donut
-                Defines whether the series should be drawn as a donut
-            */
-            /*!
                 \fn void QPieSeries::countChanged()
                 Emitted when the slice count has changed.
                 \sa count
                 return d->m_sum;
             }
-            void QPieSeries::setDonut(bool donut)
+            void QPieSeries::setHoleSize(qreal holeSize)
-                Q_D(QPieSeries);
-                d->m_donutChart = donut;
-                d->updateDerivativeData();
-            bool QPieSeries::donut() const
-                Q_D(const QPieSeries);
-                return d->m_donutChart;
-            void QPieSeries::setDonutInnerSize(qreal innerSize)
             {
                 Q_D(QPieSeries);
-                innerSize = qBound((qreal)0.0, innerSize, (qreal)1.0);
+                holeSize = qBound((qreal)0.0, holeSize, (qreal)1.0);
-                d->setSizes(innerSize, qMax(d->m_pieRelativeSize, innerSize));
+                d->setSizes(holeSize, qMax(d->m_pieRelativeSize, holeSize));
             }
-            qreal QPieSeries::donutInnerSize() const
+            qreal QPieSeries::holeSize() const
             {
                 Q_D(const QPieSeries);
-                return d->m_donutRelativeInnerSize;
+                return d->m_holeRelativeSize;
             }
             void QPieSeries::setHorizontalPosition(qreal relativePosition)
             {
                 Q_D(QPieSeries);
                 relativeSize = qBound((qreal)0.0, relativeSize, (qreal)1.0);
-                d->setSizes(qMin(d->m_donutRelativeInnerSize, relativeSize), relativeSize);
+                d->setSizes(qMin(d->m_holeRelativeSize, relativeSize), relativeSize);
             }
                 m_pieStartAngle(0),
                 m_pieEndAngle(360),
                 m_sum(0),
-                m_donutChart(false),
+            //    m_donutChart(false),
-                m_donutRelativeInnerSize(0.5)
+                m_holeRelativeSize(0.0)
             {
             }
             {
                 bool changed = false;
-                if (!qFuzzyIsNull(m_donutRelativeInnerSize - innerSize)) {
+                if (!qFuzzyIsNull(m_holeRelativeSize - innerSize)) {
-                    m_donutRelativeInnerSize = innerSize;
+                    m_holeRelativeSize = innerSize;
                     changed = true;
                 }

src/piechart/qpieseries.h +4 -7

                 Q_PROPERTY(qreal endAngle READ pieEndAngle WRITE setPieEndAngle)
                 Q_PROPERTY(int count READ count NOTIFY countChanged)
                 Q_PROPERTY(qreal sum READ sum NOTIFY sumChanged)
-                Q_PROPERTY(qreal donutInnerSize READ donutInnerSize WRITE setDonutInnerSize)
+                Q_PROPERTY(qreal holeSize READ holeSize WRITE setHoleSize)
-                Q_PROPERTY(bool donut READ donut WRITE setDonut)
+            //    Q_PROPERTY(bool donut READ donut WRITE setDonut)
             public:
                 explicit QPieSeries(QObject *parent = 0);
                 qreal sum() const;
-                void setDonut(bool donut = true);
+                void setHoleSize(qreal holeSize);
-                bool donut() const;
+                qreal holeSize() const;
-                void setDonutInnerSize(qreal innerSize);
-                qreal donutInnerSize() const;
                 void setHorizontalPosition(qreal relativePosition);
                 qreal horizontalPosition() const;

src/piechart/qpieseries_p.h +1 -2

                 qreal m_pieStartAngle;
                 qreal m_pieEndAngle;
                 qreal m_sum;
-                bool m_donutChart;
+                qreal m_holeRelativeSize;
-                qreal m_donutRelativeInnerSize;
             private:
                 friend class QLegendPrivate;

tests/auto/qpieseries/tst_qpieseries.cpp +7 -9

                 m_series->setPieSize(0.7);
                 QCOMPARE(m_series->pieSize(), 0.7);
-                m_series->setDonut();
-                QVERIFY(m_series->donut());
-                m_series->setDonutInnerSize(-1.0);
+                m_series->setHoleSize(-1.0);
-                QCOMPARE(m_series->donutInnerSize(), 0.0);
+                QCOMPARE(m_series->holeSize(), 0.0);
-                m_series->setDonutInnerSize(0.5);
+                m_series->setHoleSize(0.5);
-                QCOMPARE(m_series->donutInnerSize(), 0.5);
+                QCOMPARE(m_series->holeSize(), 0.5);
-                m_series->setDonutInnerSize(0.8);
+                m_series->setHoleSize(0.8);
-                QCOMPARE(m_series->donutInnerSize(), 0.8);
+                QCOMPARE(m_series->holeSize(), 0.8);
                 QCOMPARE(m_series->pieSize(), 0.8);
                 m_series->setPieSize(0.4);
                 QCOMPARE(m_series->pieSize(), 0.4);
-                QCOMPARE(m_series->donutInnerSize(), 0.4);
+                QCOMPARE(m_series->holeSize(), 0.4);
                 m_series->setPieStartAngle(0);
                 m_series->setPieStartAngle(-180);

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