HG_REPOSITORIES/LPP/INSTRUMENTATION/USERS/JEANDET/qtcharts Commit - r1758:ef94aea95359

pie: finetuning donut animations...

Jani Honkonen -

r1758:ef94aea95359

parent child

Context file:

r1758:ef94aea95359

Collapse all files

demos/piechartcustomization/mainwidget.cpp +14 0

                 m_endAngle->setValue(m_series->pieEndAngle());
                 m_endAngle->setSingleStep(1);
+                m_isDonut = new QCheckBox();
+                m_donutInnerSize = new QDoubleSpinBox();
+                m_donutInnerSize->setMinimum(0.0);
+                m_donutInnerSize->setMaximum(1.0);
+                m_donutInnerSize->setSingleStep(0.1);
+                m_donutInnerSize->setValue(m_series->donutInnerSize());
                 QPushButton *appendSlice = new QPushButton("Append slice");
                 QPushButton *insertSlice = new QPushButton("Insert slice");
                 QPushButton *removeSlice = new QPushButton("Remove selected 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("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_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->setPieSize(m_sizeFactor->value());
                 m_series->setPieStartAngle(m_startAngle->value());
                 m_series->setPieEndAngle(m_endAngle->value());
+                m_series->setDonut(m_isDonut->isChecked());
+                m_series->setDonutInnerSize(m_donutInnerSize->value());
             }
             void MainWidget::updateSliceSettings()

demos/piechartcustomization/mainwidget.h +2 0

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

src/animations/pieanimation.cpp +8 -2

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

src/animations/piesliceanimation.cpp +1 0

                 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);
                 return qVariantFromValue(result);
             }

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