HG_REPOSITORIES/LPP/INSTRUMENTATION/USERS/JEANDET/qtcharts Commit - r1670:5a9ca9e911f7

Added initial donut chart support to Pie series

Marek Rosa -

r1670:5a9ca9e911f7

parent child

Context file:

r1670:5a9ca9e911f7

Collapse all files

src/piechart/piechartitem.cpp +1 0

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

src/piechart/pieslicedata_p.h +2 0

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

src/piechart/piesliceitem.cpp +17 -9

              PieSliceItem::PieSliceItem(QGraphicsItem* parent)
                  :QGraphicsObject(parent),
-                 m_hovered(false)
+                   m_hovered(false)
              {
                  setAcceptHoverEvents(true);
                  setAcceptedMouseButtons(Qt::MouseButtonMask);
                  QRectF rect(center.x()-radius, center.y()-radius, radius*2, radius*2);
                  // slice path
-                 // TODO: draw the shape so that it might have a hole in the center
                  QPainterPath path;
-                 path.moveTo(rect.center());
-                 path.arcTo(rect, -startAngle + 90, -angleSpan);
-                 path.closeSubpath();
+                 if (m_data.m_donut) {
+                     qreal donutFraction = 5.0;
+                     QRectF insideRect = rect.adjusted(rect.width() / donutFraction, rect.height() / donutFraction, -rect.width() / donutFraction, -rect.height() / donutFraction);
+                     path.arcMoveTo(rect, -startAngle + 90);
+                     path.arcTo(rect, -startAngle + 90, -angleSpan);
+                     path.arcTo(insideRect, -startAngle + 90 - angleSpan, angleSpan);
+                     path.closeSubpath();
+                 } else {
+                     path.moveTo(rect.center());
+                     path.arcTo(rect, -startAngle + 90, -angleSpan);
+                     path.closeSubpath();
+                 }
                  // calculate label arm start point
                  *armStart = center;
                  // line to underline the label
                  QPointF parm2 = parm1;
                  if (angle < 180) { // arm swings the other way on the left side
-                      parm2 += QPointF(textWidth, 0);
-                      *textStart = parm1;
+                     parm2 += QPointF(textWidth, 0);
+                     *textStart = parm1;
                  }
                  else {
-                      parm2 += QPointF(-textWidth,0);
-                      *textStart = parm2;
+                     parm2 += QPointF(-textWidth,0);
+                     *textStart = parm2;
                  }
                  QPainterPath path;

src/piechart/qpieseries.cpp +16 -1

                  return d->m_sum;
              }
+             void QPieSeries::setDonut(bool donut)
+             {
+                 Q_D(QPieSeries);
+                 d->m_donutChart = donut;
+                 d->updateDerivativeData();
+             }
+             bool QPieSeries::donut() const
+             {
+                 Q_D(const QPieSeries);
+                 return d->m_donutChart;
+             }
              void QPieSeries::setHorizontalPosition(qreal relativePosition)
              {
                  Q_D(QPieSeries);
                  m_pieRelativeSize(0.7),
                  m_pieStartAngle(0),
                  m_pieEndAngle(360),
-                 m_sum(0)
+                 m_sum(0),
+                 m_donutChart(false)
              {
              }
                      d->setPercentage(s->value() / m_sum);
                      d->setStartAngle(sliceAngle);
                      d->setAngleSpan(pieSpan * s->percentage());
+                     d->m_data.m_donut = m_donutChart;
                      sliceAngle += s->angleSpan();
                  }

src/piechart/qpieseries.h +3 0

                  qreal sum() const;
+                 void setDonut(bool donut = true);
+                 bool donut() const;
                  void setHorizontalPosition(qreal relativePosition);
                  qreal horizontalPosition() const;

src/piechart/qpieseries_p.h +1 0

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

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