HG_REPOSITORIES/LPP/INSTRUMENTATION/USERS/JEANDET/qtcharts Commit - r1671:86eb2ea7496a

src/piechart/qdonutgroup.cpp created 644 +39 0

			@@ -0,0 +1,39
		1	#include "qdonutgroup.h"
		2	#include "qdonutgroup_p.h"
		3
		4	QTCOMMERCIALCHART_BEGIN_NAMESPACE
		5
		6	QDonutGroup::QDonutGroup(QObject *parent) :
		7	QObject(parent),
		8	d_ptr(new QDonutGroupPrivate(this))
		9	{
		10	}
		11
		12	void QDonutGroup::append(QPieSeries *donut)
		13	{
		14	if (donut == 0)
		15	return;
		16
		17	donut->setDonut();
		18	Q_D(QDonutGroup);
		19	d->m_donuts.append(donut);
		20	qreal donutFraction = 1.0 / (d->m_donuts.count() + 1);
		21	for(int i = 0; i < d->m_donuts.count(); i++) {
		22	d->m_donuts[i]->setPieSize( (i + 2) * donutFraction);
		23	d->m_donuts[i]->setDonutInnerSize( (i + 1) * donutFraction);
		24	}
		25	}
		26
		27	///////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////
		28
		29	QDonutGroupPrivate::QDonutGroupPrivate(QDonutGroup *q):
		30	QObject(q),
		31	q_ptr(q)
		32	{
		33	//
		34	}
		35
		36	#include "moc_qdonutgroup.cpp"
		37	#include "moc_qdonutgroup_p.cpp"
		38
		39	QTCOMMERCIALCHART_END_NAMESPACE

src/piechart/qdonutgroup.h created 644 +27 0

			@@ -0,0 +1,27
		1	#ifndef QDONUTGROUP_H
		2	#define QDONUTGROUP_H
		3
		4	#include <QObject>
		5	#include <QPieSeries>
		6
		7	QTCOMMERCIALCHART_BEGIN_NAMESPACE
		8
		9	//class QPieSeries;
		10	class QDonutGroupPrivate;
		11
		12	class QTCOMMERCIALCHART_EXPORT QDonutGroup : public QObject
		13	{
		14	Q_OBJECT
		15	public:
		16	explicit QDonutGroup(QObject *parent = 0);
		17
		18	void append(QPieSeries *donut);
		19
		20	protected:
		21	QDonutGroupPrivate * const d_ptr;
		22	Q_DECLARE_PRIVATE(QDonutGroup)
		23	};
		24
		25	QTCOMMERCIALCHART_END_NAMESPACE
		26
		27	#endif // QDONUTGROUP_H

src/piechart/qdonutgroup_p.h created 644 +29 0

			@@ -0,0 +1,29
		1	#ifndef QDONUTGROUP_P_H
		2	#define QDONUTGROUP_P_H
		3
		4	#include <QObject>
		5	#include <qdonutgroup.h>
		6
		7	QTCOMMERCIALCHART_BEGIN_NAMESPACE
		8
		9	class QPieSeries;
		10
		11	class QDonutGroupPrivate : public QObject
		12	{
		13	Q_OBJECT
		14	public:
		15	explicit QDonutGroupPrivate(QDonutGroup *q);
		16
		17	void append(QPieSeries *donut);
		18
		19	private:
		20	QList<QPieSeries *> m_donuts;
		21
		22	private:
		23	QDonutGroup *q_ptr;
		24	Q_DECLARE_PUBLIC(QDonutGroup)
		25	};
		26
		27	QTCOMMERCIALCHART_END_NAMESPACE
		28
		29	#endif // QDONUTGROUP_P_H

src/barchart/qbarmodelmapper.cpp +1 0

              ///////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////
              QBarModelMapperPrivate::QBarModelMapperPrivate(QBarModelMapper *q) :
+                 QObject(q),
                  m_series(0),
                  m_model(0),
                  m_first(0),

src/piechart/piechart.pri +6 -4

                  $$PWD/qpieslice.cpp \
                  $$PWD/qpiemodelmapper.cpp \
                  $$PWD/qvpiemodelmapper.cpp \
-                 $$PWD/qhpiemodelmapper.cpp
+                 $$PWD/qhpiemodelmapper.cpp \
+                 piechart/qdonutgroup.cpp
              PRIVATE_HEADERS += \
                  $$PWD/pieslicedata_p.h \
                  $$PWD/piesliceitem_p.h \
                  $$PWD/qpieslice_p.h \
                  $$PWD/qpieseries_p.h \
-                 $$PWD/qpiemodelmapper_p.h
+                 $$PWD/qpiemodelmapper_p.h \
+                 $$PWD/qdonutgroup_p.h
              PUBLIC_HEADERS += \
                  $$PWD/qpieseries.h \
                  $$PWD/qpieslice.h \
                  $$PWD/qpiemodelmapper.h \
                  $$PWD/qvpiemodelmapper.h \
-                 $$PWD/qhpiemodelmapper.h
+                 $$PWD/qhpiemodelmapper.h \
+                 $$PWD/qdonutgroup.h

src/piechart/piechartitem.cpp +3 0

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

src/piechart/piechartitem_p.h +1 0

                  QRectF m_rect;
                  QPointF m_pieCenter;
                  qreal m_pieRadius;
+                 qreal m_donutInnerRadius;
              };
              QTCOMMERCIALCHART_END_NAMESPACE

src/piechart/pieslicedata_p.h +4 0

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

src/piechart/piesliceitem.cpp +1 -2

                  // slice path
                  QPainterPath path;
                  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);
+                     QRectF insideRect(center.x() - m_data.m_innerRadius, center.y()-m_data.m_innerRadius, m_data.m_innerRadius*2, m_data.m_innerRadius*2);
                      path.arcMoveTo(rect, -startAngle + 90);
                      path.arcTo(rect, -startAngle + 90, -angleSpan);
                      path.arcTo(insideRect, -startAngle + 90 - angleSpan, angleSpan);

src/piechart/qpiemodelmapper.cpp +1 0

              ///////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////
              QPieModelMapperPrivate::QPieModelMapperPrivate(QPieModelMapper *q) :
+                 QObject(q),
                  m_series(0),
                  m_model(0),
                  m_first(0),

src/piechart/qpieseries.cpp +22 -2

                  return d->m_donutChart;
              }
+             void QPieSeries::setDonutInnerSize(qreal innerSize)
+             {
+                 Q_D(QPieSeries);
+                 if (innerSize < 0.0)
+                     innerSize = 0.0;
+                 if (innerSize > 1.0)
+                     innerSize = 1.0;
+                 d->m_donutRelativeInnerSize = innerSize;
+                 d->updateDerivativeData();
+                 emit d->pieSizeChanged();
+             }
+             qreal QPieSeries::donutInnerSize() const
+             {
+                 Q_D(const QPieSeries);
+                 return d->m_donutRelativeInnerSize;
+             }
              void QPieSeries::setHorizontalPosition(qreal relativePosition)
              {
                  Q_D(QPieSeries);
                  m_pieStartAngle(0),
                  m_pieEndAngle(360),
                  m_sum(0),
-                 m_donutChart(false)
+                 m_donutChart(false),
+                 m_donutRelativeInnerSize(0.5)
              {
              }
                      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

                  void setDonut(bool donut = true);
                  bool donut() const;
+                 void setDonutInnerSize(qreal innerSize);
+                 qreal donutInnerSize() const;
                  void setHorizontalPosition(qreal relativePosition);
                  qreal horizontalPosition() const;

src/piechart/qpieseries_p.h +1 0

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

src/xychart/qxymodelmapper.cpp +1 0

              ///////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////
              QXYModelMapperPrivate::QXYModelMapperPrivate(QXYModelMapper *q) :
+                 QObject(q),
                  m_series(0),
                  m_model(0),
                  m_first(0),

	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