HG_REPOSITORIES/LPP/INSTRUMENTATION/USERS/JEANDET/qtcharts Commit - r104:192e41096b68

Refactoring continued: restored ChartItem class

Tero Ahola -

r104:192e41096b68

parent child

Context file:

r104:192e41096b68

Expand all files

src/chartitem_p.h created 644 +22 0

@@ -0,0 +1,22
	1	#ifndef CHARTITEM_H_
	2	#define CHARTITEM_H_
	3
	4	#include "plotdomain_p.h"
	5	#include "chartobjectinterface_p.h"
	6	#include <QGraphicsItem>
	7
	8	QTCOMMERCIALCHART_BEGIN_NAMESPACE
	9
	10	class ChartItem : public QGraphicsItem, public ChartObjectInterface
	11	{
	12	enum ChartItemTypes{ AXIS_ITEM = UserType+1, XYLINE_ITEM};
	13	public:
	14	ChartItem(QGraphicsItem* parent = 0):QGraphicsItem(parent){};
	15	virtual ~ChartItem(){};
	16	// TODO: this is a hack; integration ongoing:
	17	QGraphicsItem *graphicsItem() { return this; }
	18	};
	19
	20	QTCOMMERCIALCHART_END_NAMESPACE
	21
	22	#endif /* CHARTITEM_H_ */

src/axisitem.cpp +2 -7

             QTCOMMERCIALCHART_BEGIN_NAMESPACE
             AxisItem::AxisItem(AxisType type,QGraphicsItem* parent) :
-                QGraphicsItem(parent),
+                ChartItem(parent),
                 m_ticks(4),
                 m_type(type)
             {
                 createItems();
             }
-            void AxisItem::setPos(const QPointF & pos)
+            void AxisItem::setSize(const QSize &size)
-                QGraphicsItem::setPos(pos);
-            void AxisItem::resize(const QSize &size)
             {
                 m_rect = QRectF(QPoint(0,0),size);
                 createItems();

src/axisitem_p.h +4 -5

             #define AXISITEM_H_
             #include "plotdomain_p.h"
-            #include "chartitemcontrol.h"
+            #include "chartitem_p.h"
             #include <QGraphicsItem>
             QTCOMMERCIALCHART_BEGIN_NAMESPACE
-            class AxisItem: public QGraphicsItem, public ChartItemControl
+            class AxisItem : public ChartItem
             {
             public:
                 enum AxisType{X_AXIS,Y_AXIS};
                 QRectF boundingRect() const;
                 void paint(QPainter *painter, const QStyleOptionGraphicsItem *option, QWidget *widget){};
-            public: // from ChartItemControl
+            public: // from ChartObjectInterface
-                void setPos (const QPointF & pos);
+                void setSize(const QSize &size);
-                void resize(const QSize &size);
                 void setTheme(ChartTheme *theme);
                 void setPlotDomain(const PlotDomain& data);

src/barchart/bar.cpp +2 -7

             QTCOMMERCIALCHART_BEGIN_NAMESPACE
             Bar::Bar(QGraphicsItem *parent)
-                : QGraphicsItem(parent)
+                : ChartItem(parent)
             {
             }
-            void Bar::setPos(const QPointF & pos)
+            void Bar::setSize(const QSize& size)
-                QGraphicsItem::setPos(pos);
-            void Bar::resize(const QSize& size)
             {
                 mWidth = size.width();
                 mHeight = size.height();

src/barchart/bar.h +3 -4

             #ifndef BAR_H
             #define BAR_H
-            #include "chartitemcontrol.h"
+            #include "chartitem_p.h"
             #include "qchartglobal.h"
             #include <QGraphicsItem>
             QTCOMMERCIALCHART_BEGIN_NAMESPACE
             // Single bar item of chart
-            class Bar : public QGraphicsItem, public ChartItemControl
+            class Bar : public ChartItem
             {
             public:
                 Bar(QGraphicsItem *parent=0);
             public: // from ChartItemControl
-                void setPos (const QPointF & pos);
+                void setSize(const QSize &size);
-                void resize(const QSize &size);
                 void setTheme(ChartTheme *theme);
                 void setPlotDomain(const PlotDomain& data);

src/barchart/bargroup.cpp +6 -11

             QTCOMMERCIALCHART_BEGIN_NAMESPACE
             BarGroup::BarGroup(BarChartSeries& series, QGraphicsItem *parent) :
-              QGraphicsItem(parent)
+                ChartItem(parent)
-              ,mSeries(series)
+                ,mSeries(series)
-              ,mLayoutSet(false)
+                ,mLayoutSet(false)
-              ,mLayoutDirty(true)
+                ,mLayoutDirty(true)
-              ,mBarDefaultWidth(10)
+                ,mBarDefaultWidth(10)
             {
                 dataChanged();
             }
-            void BarGroup::setPos(const QPointF & pos)
+            void BarGroup::setSize(const QSize& size)
-                QGraphicsItem::setPos(pos);
-            void BarGroup::resize(const QSize& size)
             {
                 qDebug() << "BarGroup::setSize";
                 mWidth = size.width();

src/barchart/bargroup.h +4 -5

             #ifndef QBARGROUP_H
             #define QBARGROUP_H
-            #include "chartitemcontrol.h"
+            #include "chartitem_p.h"
             #include "bar.h"
             #include "barchartseries.h"
             #include <QGraphicsItem>
             QTCOMMERCIALCHART_BEGIN_NAMESPACE
-            class BarGroup : public QGraphicsItem, public ChartItemControl
+            class BarGroup : public ChartItem
             {
             public:
                 explicit BarGroup(BarChartSeries& series, QGraphicsItem *parent = 0);
-            public: // from ChartItemControl
+            public: // from ChartObjectInterface
-                void setPos (const QPointF & pos);
+                void setSize(const QSize &size);
-                void resize(const QSize &size);
                 void setTheme(ChartTheme *theme);
                 void setPlotDomain(const PlotDomain& data);

src/barchart/percentbargroup.cpp +3 -10

             QTCOMMERCIALCHART_BEGIN_NAMESPACE
             StackedBarGroup::StackedBarGroup(StackedBarChartSeries& series, QGraphicsItem *parent) :
-                QGraphicsItem(parent)
+                ChartItem(parent)
                 ,mSeries(series)
                 ,mLayoutSet(false)
                 ,mLayoutDirty(true)
                 dataChanged();
             }
+            void StackedBarGroup::setSize(const QSize& size)
-            void StackedBarGroup::setPos(const QPointF & pos)
-                qDebug() << "StackedBarGroup::setPos";
-                // TODO:
-            void StackedBarGroup::resize(const QSize& size)
             {
-                qDebug() << "StackedBarGroup::resize";
+                qDebug() << "StackedBarGroup::setSize";
                 mWidth = size.width();
                 mHeight = size.height();
                 layoutChanged();

src/barchart/percentbargroup.h +4 -5

             #ifndef PERCENTBARGROUP_H
             #define PERCENTBARGROUP_H
-            #include "chartitemcontrol.h"
+            #include "chartitem_p.h"
             #include "bar.h"
             #include "percentbarchartseries.h"
             #include <QGraphicsItem>
             QTCOMMERCIALCHART_BEGIN_NAMESPACE
-            class PercentBarGroup : public QGraphicsItem, public ChartItemControl
+            class PercentBarGroup : public ChartItem
             {
             public:
                 PercentBarGroup(PercentBarChartSeries& series, QGraphicsItem *parent = 0);
-            public: // From ChartItemControl
+            public: // From ChartObjectInterface
-                void setPos(const QPointF & pos);
+                void setSize(const QSize &size);
-                void resize(const QSize &size);
                 void setTheme(ChartTheme *theme);
                 void setPlotDomain(const PlotDomain& data);

src/barchart/stackedbargroup.cpp +3 -9

             QTCOMMERCIALCHART_BEGIN_NAMESPACE
             PercentBarGroup::PercentBarGroup(PercentBarChartSeries& series, QGraphicsItem *parent) :
-                QGraphicsItem(parent)
+                ChartItem(parent)
                 ,mSeries(series)
                 ,mLayoutSet(false)
                 ,mLayoutDirty(true)
                 dataChanged();
             }
-            void PercentBarGroup::setPos(const QPointF & pos)
+            void PercentBarGroup::setSize(const QSize& size)
             {
-                qDebug() << "PercentBarGroup::setPos";
+                qDebug() << "PercentBarGroup::setSize";
-                // TODO:
-            void PercentBarGroup::resize(const QSize& size)
-                qDebug() << "PercentBarGroup::resize";
                 mWidth = size.width();
                 mHeight = size.height();
                 layoutChanged();

src/barchart/stackedbargroup.h +4 -5

             #ifndef STACKEDBARGROUP_H
             #define STACKEDBARGROUP_H
-            #include "chartitemcontrol.h"
+            #include "chartitem_p.h"
             #include "bar.h"
             #include "stackedbarchartseries.h"
             #include <QGraphicsItem>
             QTCOMMERCIALCHART_BEGIN_NAMESPACE
-            class StackedBarGroup : public QGraphicsItem, public ChartItemControl
+            class StackedBarGroup : public ChartItem
             {
             public:
                 StackedBarGroup(StackedBarChartSeries& series, QGraphicsItem *parent = 0);
-            public: // From ChartItemControl
+            public: // From ChartObjectInterface
-                void setPos(const QPointF & pos);
+                void setSize(const QSize &size);
-                void resize(const QSize &size);
                 void setTheme(ChartTheme *theme);
                 void setPlotDomain(const PlotDomain& data);

src/chartobjectinterface_p.h ~~src/chartitemcontrol.h~~ renamed +12 -6

-            #ifndef CHARTITEMCONTROL_H
+            #ifndef CHART_OBJECT_INTERFACE_H
-            #define CHARTITEMCONTROL_H
+            #define CHART_OBJECT_INTERFACE_H
             #include "plotdomain_p.h"
             #include <qchartglobal.h>
             #include <QSize>
+            class QGraphicsItem;
             QTCOMMERCIALCHART_BEGIN_NAMESPACE
             class ChartTheme;
             class PlotDomain;
-            class ChartItemControl
+            /*!
+             * Internal abstract interface for passing updates on chart related properties.
+             */
+            class ChartObjectInterface
             {
             public:
-                virtual void setPos (const QPointF & pos) = 0;
+                virtual void setSize(const QSize &size) = 0;
-                virtual void resize(const QSize &size) = 0;
                 virtual void setTheme(ChartTheme *theme) = 0;
                 virtual void setPlotDomain(const PlotDomain& data) = 0;
+                // TODO: this is a hack; integration ongoing:
+                virtual QGraphicsItem *graphicsItem() { return 0; }
             };
             QTCOMMERCIALCHART_END_NAMESPACE
-            #endif // CHARTITEMCONTROL_H
+            #endif // CHART_OBJECT_INTERFACE_H

src/qchart.cpp +24 -22

             #include "percentbarchartseries.h"
             #include "percentbargroup.h"
             #include "charttheme_p.h"
-            #include "chartitemcontrol.h"
+            #include "chartobjectinterface_p.h"
             #include "xylinechartitem_p.h"
             #include "plotdomain_p.h"
                 PlotDomain domain;
                 m_plotDomainList << domain;
                 m_axisYItem << new AxisItem(AxisItem::Y_AXIS,this);
-                m_chartItemControls << m_axisXItem;
+                m_chartObjectInterfaces << m_axisXItem;
-                m_chartItemControls << m_axisYItem.at(0);
+                m_chartObjectInterfaces << m_axisYItem.at(0);
             }
             QChart::~QChart(){}
                     XYLineChartItem* item = new XYLineChartItem(xyseries,this);
-                    // TODO: combine ChartItemControl and ChartItem apis
+                    // TODO: combine ChartObjectInterface and ChartItem apis
-                    m_chartItemControls << item;
+                    m_chartObjectInterfaces << item;
                     item->setTheme(m_chartTheme);
-                    foreach(ChartItemControl* i, m_chartItemControls)
+                    foreach(ChartObjectInterface* i, m_chartObjectInterfaces)
                         i->setPlotDomain(m_plotDomainList.at(m_plotDataIndex));
                     break;
                     barGroup->addColor(QColor(0,0,255,128));
                     barGroup->addColor(QColor(255,128,0,128));
-                    m_chartItemControls << barGroup;
+                    m_chartObjectInterfaces << barGroup;
                     childItems().append(barGroup);
                     break;
                     }
                     stackedBarGroup->addColor(QColor(0,0,255,128));
                     stackedBarGroup->addColor(QColor(255,128,0,128));
-                    m_chartItemControls << stackedBarGroup;
+                    m_chartObjectInterfaces << stackedBarGroup;
                     childItems().append(stackedBarGroup);
                     break;
                     }
                     percentBarGroup->addColor(QColor(0,0,255,128));
                     percentBarGroup->addColor(QColor(255,128,0,128));
-                    m_chartItemControls << percentBarGroup;
+                    m_chartObjectInterfaces << percentBarGroup;
                     childItems().append(percentBarGroup);
                     break;
                     }
                     QScatterSeries *scatterSeries = qobject_cast<QScatterSeries *>(series);
                     scatterSeries->d->m_theme  = m_chartTheme->themeForSeries();
                     scatterSeries->d->setParentItem(this);
-                    m_chartItemControls << scatterSeries->d;
+                    m_chartObjectInterfaces << scatterSeries->d;
                     //TODO:? scatterSeries->d->m_themeIndex = m_chartSeries.count() - 1;
                     break;
                     }
             //                pieSeries->setSliceColor(i, nextColor());
             //        }
                     pieSeries->d->setTheme(m_chartTheme);
-                    m_chartItemControls << pieSeries->d;
+                    m_chartObjectInterfaces << pieSeries->d;
                     // Set pre-defined colors in case the series has no colors defined
                     // TODO: how to define the color for all the slices of a pie?
                 m_rect = QRect(QPoint(0,0),size);
                 QRect rect = m_rect.adjusted(margin(),margin(), -margin(), -margin());
-                //recaculate title
+                // recalculate title position
-                if(m_titleItem){
+                if (m_titleItem) {
                     QPointF center = m_rect.center() -m_titleItem->boundingRect().center();
                     m_titleItem->setPos(center.x(),m_rect.top()/2 + margin()/2);
                 }
                 //recalculate background gradient
                     m_backgroundItem->setBrush(m_backgroundGradient);
                 }
-                foreach (ChartItemControl *ctrl, m_chartItemControls) {
+                // resize and reposition childs
-                    ctrl->setPos(rect.topLeft());
+                foreach (ChartObjectInterface *ctrl, m_chartObjectInterfaces) {
-                    ctrl->resize(rect.size());
+                    QGraphicsItem *item = ctrl->graphicsItem();
+                    if (item)
+                        item->setPos(rect.topLeft());
+                    ctrl->setSize(rect.size());
                 }
                 update();
                     setBackground(m_chartTheme->d->m_gradientStartColor,
                                   m_chartTheme->d->m_gradientEndColor,
                                   m_bacgroundOrinetation);
-                    foreach (ChartItemControl *ctrl, m_chartItemControls)
+                    foreach (ChartObjectInterface *ctrl, m_chartObjectInterfaces)
                         ctrl->setTheme(m_chartTheme);
                     update();
                 }
                 m_plotDomainList<<domain;
                 m_plotDataIndex++;
-                foreach (ChartItemControl* ctrl, m_chartItemControls)
+                foreach (ChartObjectInterface* ctrl, m_chartObjectInterfaces)
                     ctrl->setPlotDomain(m_plotDomainList[m_plotDataIndex]);
                 update();
             }
             {
                 if (m_plotDataIndex < m_plotDomainList.count() - 1) {
                     m_plotDataIndex++;
-                    foreach (ChartItemControl* item, m_chartItemControls)
+                    foreach (ChartObjectInterface* item, m_chartObjectInterfaces)
                         item->setPlotDomain(m_plotDomainList[m_plotDataIndex]);
                     update();
                 } else {
             {
                 if (m_plotDataIndex > 0) {
                     m_plotDataIndex--;
-                    foreach (ChartItemControl* item, m_chartItemControls)
+                    foreach (ChartObjectInterface* item, m_chartObjectInterfaces)
                         item->setPlotDomain(m_plotDomainList[m_plotDataIndex]);
                     update();
                 }
             {
                 if (m_plotDataIndex > 0) {
                     m_plotDataIndex = 0;
-                    foreach (ChartItemControl* item, m_chartItemControls)
+                    foreach (ChartObjectInterface* item, m_chartObjectInterfaces)
                         item->setPlotDomain(m_plotDomainList[m_plotDataIndex]);
                     update();
                 }

src/qchart.h +2 -2

             class BarGroup;
             class QChartAxis;
             class ChartTheme;
-            class ChartItemControl;
+            class ChartObjectInterface;
             // TODO: We don't need to have QChart tied to QGraphicsItem:
             //class QTCOMMERCIALCHART_EXPORT QChart
                 QList<AxisItem*> m_axisYItem;
                 QRect m_rect;
                 QList<QChartSeries *> m_chartSeries;
-                QList<ChartItemControl *> m_chartItemControls;
+                QList<ChartObjectInterface *> m_chartObjectInterfaces;
                 QVector<PlotDomain> m_plotDomainList;
                 int m_plotDataIndex;
                 int m_marginSize;

src/qpieseries.cpp +1 -6

                 return true;
             }
-            void QPieSeriesPrivate::setPos(const QPointF & pos)
+            void QPieSeriesPrivate::setSize(const QSize &size)
-                // TODO
-            void QPieSeriesPrivate::resize(const QSize &size)
             {
                 // TODO: allow user setting the size?
                 // TODO: allow user defining the margins?

src/qpieseries_p.h +4 -5

             #ifndef PIESERIESPRIVATE_H
             #define PIESERIESPRIVATE_H
-            #include "chartitemcontrol.h"
+            #include "chartobjectinterface_p.h"
             #include "qpieseries.h"
             #include <QRectF>
             #include <QColor>
             QTCOMMERCIALCHART_BEGIN_NAMESPACE
             class PieSlice;
-            class QPieSeriesPrivate : public ChartItemControl
+            class QPieSeriesPrivate : public ChartObjectInterface
             {
             public:
                 // TODO: use a generic data class instead of x and y
                 QPieSeriesPrivate();
                 ~QPieSeriesPrivate();
-            public: // from ChartItemControl
+            public: // from ChartObjectInterface
-                void setPos(const QPointF & pos);
+                void setSize(const QSize &size);
-                void resize(const QSize &size);
                 void setTheme(ChartTheme *theme);
                 void setPlotDomain(const PlotDomain& data);

src/qscatterseries.cpp +19 -23

@@ -10,7 +10,7 QTCOMMERCIALCHART_BEGIN_NAMESPACE
10	//#define QSeriesData QList<qreal>	10	//#define QSeriesData QList<qreal>
11		11
12	QScatterSeriesPrivate::QScatterSeriesPrivate(QGraphicsItem *parent) :	12	QScatterSeriesPrivate::QScatterSeriesPrivate(QGraphicsItem *parent) :
13	~~QGraphics~~Item(parent),	13	ChartItem(parent),
14	m_scalex(100), // TODO: let the use define the scale (or autoscaled)	14	m_scalex(100), // TODO: let the use define the scale (or autoscaled)
15	m_scaley(100),	15	m_scaley(100),
16	m_markerColor(QColor())	16	m_markerColor(QColor())
@@ -29,8 +29,22 void QScatterSeriesPrivate::resize(QRectF rect)
29	m_sceney.append(rect.bottom() - y * (rect.height() / m_scaley));	29	m_sceney.append(rect.bottom() - y * (rect.height() / m_scaley));
30	}	30	}
31		31
32	// TODO:	32	void QScatterSeriesPrivate::setSize(const QSize &size)
33	//void QScatterSeriesPrivate::setAxisScale(qreal xscale, qreal yscale)	33	{
		34	QGraphicsItem *parent = this->parentItem();
		35	if (parent)
		36	resize(QRectF(parent->pos(), size));
		37	}
		38
		39	void QScatterSeriesPrivate::setTheme(ChartTheme *theme)
		40	{
		41	m_theme = theme->themeForSeries();
		42	}
		43
		44	void QScatterSeriesPrivate::setPlotDomain(const PlotDomain& plotDomain)
		45	{
		46	// TODO
		47	}
34		48
35	QRectF QScatterSeriesPrivate::boundingRect() const	49	QRectF QScatterSeriesPrivate::boundingRect() const
36	{	50	{
@@ -62,26 +76,6 void QScatterSeriesPrivate::paint(QPainter *painter, const QStyleOptionGraphicsI
62	}	76	}
63	}	77	}
64		78
65	void QScatterSeriesPrivate::setPos(const QPointF & pos)
66	{
67	// TODO
68	}
69
70	void QScatterSeriesPrivate::resize(const QSize &size)
71	{
72	resize(QRect(0, 0, size.width(), size.height()));
73	}
74
75	void QScatterSeriesPrivate::setTheme(ChartTheme *theme)
76	{
77	m_theme = theme->themeForSeries();
78	}
79
80	void QScatterSeriesPrivate::setPlotDomain(const PlotDomain& plotDomain)
81	{
82	// TODO
83	}
84
85	QScatterSeries::QScatterSeries(QObject *parent) :	79	QScatterSeries::QScatterSeries(QObject *parent) :
86	QChartSeries(parent),	80	QChartSeries(parent),
87	d(new QScatterSeriesPrivate(qobject_cast<QGraphicsItem *> (parent)))	81	d(new QScatterSeriesPrivate(qobject_cast<QGraphicsItem *> (parent)))
@@ -95,6 +89,8 bool QScatterSeries::setData(QList<qreal> x, QList<qreal> y)
95	d->m_y = y;	89	d->m_y = y;
96	QGraphicsItem parentItem = qobject_cast<QGraphicsItem >(parent());	90	QGraphicsItem parentItem = qobject_cast<QGraphicsItem >(parent());
97	Q_ASSERT(parentItem);	91	Q_ASSERT(parentItem);
		92	// d->setPos(parentItem->pos());
		93	// d->setSize(parentItem->boundingRect().size().toSize());
98	d->resize(parentItem->boundingRect());	94	d->resize(parentItem->boundingRect());
99	return true;	95	return true;
100	}	96	}

src/qscatterseries_p.h +9 -9

             #include "qchartseries.h"
             #include "charttheme_p.h"
-            #include "chartitemcontrol.h"
+            #include "chartitem_p.h"
             #include <QGraphicsItem>
             QTCOMMERCIALCHART_BEGIN_NAMESPACE
             /*!
              * The PIMPL class of QScatterSeries.
              */
-            class QScatterSeriesPrivate : public QGraphicsItem, public ChartItemControl
+            class QScatterSeriesPrivate : public ChartItem
             {
             public:
                 QScatterSeriesPrivate(QGraphicsItem *parent);
+            public: // from ChartObjectInterface
+                void setSize(const QSize &size);
+                void setTheme(ChartTheme *theme);
+                void setPlotDomain(const PlotDomain& data);
             public: // from QGraphicsItem
-                void setPos(const QPointF & pos);
-                void resize(QRectF rect);
                 QRectF boundingRect() const;
                 void paint(QPainter *painter, const QStyleOptionGraphicsItem *option, QWidget *widget);
-            public: // from ChartItemControl
-                void resize(const QSize &size);
-                void setTheme(ChartTheme *theme);
-                void setPlotDomain(const PlotDomain& data);
             public:
+                void resize(QRectF rect); // TODO: replace with setSize
                 // TODO: use the chart data class instead of list of x and y values?
                 QList<qreal> m_x;
                 QList<qreal> m_y;

src/src.pro +4 -1

                 qpieseries_p.h \
                 pieslice.h \
                 axisitem_p.h \
+                chartitem_p.h \
                 charttheme_p.h
             PUBLIC_HEADERS += \
                 qchartaxis.h
             HEADERS += $$PUBLIC_HEADERS \
-                chartitemcontrol.h
+                chartobjectinterface_p.h
             HEADERS += $$PRIVATE_HEADERS
             INCLUDEPATH += xylinechart \

src/xylinechart/xylinechartitem.cpp +2 -7

             QTCOMMERCIALCHART_BEGIN_NAMESPACE
             XYLineChartItem::XYLineChartItem(QXYChartSeries* series,QGraphicsItem *parent) :
-                QGraphicsItem(parent),
+                ChartItem(parent),
                 m_series(series),
                 m_pathItem(new QGraphicsPathItem(this))
             {
                 setFlags(QGraphicsItem::ItemClipsChildrenToShape);
             }
-            void XYLineChartItem::setPos(const QPointF & pos)
+            void XYLineChartItem::setSize(const QSize &size)
-                QGraphicsItem::setPos(pos);
-            void XYLineChartItem::resize(const QSize &size)
             {
                 m_rect = QRect(0, 0, size.width(), size.height());
                 prepareGeometryChange();

src/xylinechart/xylinechartitem_p.h +4 -5

             #define XYLINECHARTITEM_H
             #include "qchartglobal.h"
-            #include "chartitemcontrol.h"
+            #include "chartitem_p.h"
             #include "charttheme_p.h"
             #include <QGraphicsItem>
             class QXYChartSeries;
-            class XYLineChartItem : public QGraphicsItem, public ChartItemControl
+            class XYLineChartItem : public ChartItem
             {
             public:
                 void paint(QPainter *painter, const QStyleOptionGraphicsItem *option, QWidget *widget){};
                // virtual QPainterPath shape() const;
-            public: // from ChartItemControl
+            public: // from ChartObjectInterface
-                void setPos(const QPointF & pos);
+                void setSize(const QSize &size);
-                void resize(const QSize &size);
                 void setTheme(ChartTheme *theme);
                 void setPlotDomain(const PlotDomain& data);

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