HG_REPOSITORIES/LPP/INSTRUMENTATION/USERS/JEANDET/qtcharts Commit - r74:5412c444e1e8

BarGroup and Bar as ChartItems instead of GraphicItems

sauimone -

r74:5412c444e1e8

parent child

Context file:

r74:5412c444e1e8

src/barchart/bar.cpp +14 -2

@@ -4,11 +4,23
4		4
5	QTCOMMERCIALCHART_BEGIN_NAMESPACE	5	QTCOMMERCIALCHART_BEGIN_NAMESPACE
6		6
7	Bar::Bar(~~QGraphics~~Item *parent)	7	Bar::Bar(ChartItem *parent)
8	: ~~QGraphics~~Item(parent)	8	: ChartItem(parent)
9	{	9	{
10	}	10	}
11		11
		12	void Bar::setSize(const QSize& size)
		13	{
		14	//mSize = size;
		15	mWidth = size.width();
		16	mHeight = size.height();
		17	}
		18
		19	void Bar::setPlotDomain(const PlotDomain& data)
		20	{
		21	mPlotDomain = data;
		22	}
		23
12	void Bar::resize( int w, int h )	24	void Bar::resize( int w, int h )
13	{	25	{
14	mWidth = w;	26	mWidth = w;

src/barchart/bar.h +9 -3

             #ifndef BAR_H
             #define BAR_H
-            #include <QGraphicsItem>
+            #include "chartitem_p.h"
             #include "qchartglobal.h"
             QTCOMMERCIALCHART_BEGIN_NAMESPACE
             // Single bar item of chart
-            class Bar : public QGraphicsItem
+            class Bar : public ChartItem
             {
             public:
-                Bar(QGraphicsItem *parent=0);
+                Bar(ChartItem *parent=0);
+                // From ChartItem
+                virtual void setSize(const QSize& size);
+                virtual void setPlotDomain(const PlotDomain& data);
                 // Layout Stuff
                 void resize( int w, int h );       // Size of bar. in screen coordinates.
                 qreal mXpos;
                 qreal mYpos;
                 QColor mColor;
+                PlotDomain mPlotDomain;
             };
             QTCOMMERCIALCHART_END_NAMESPACE

src/barchart/barchartseries.cpp +2 -2

             #include <QDebug>
             #include "barchartseries.h"
+            #include "bargroup.h"
             QTCOMMERCIALCHART_BEGIN_NAMESPACE
             BarChartSeries::BarChartSeries(QObject *parent)
                 mModel = model;
             }
             int BarChartSeries::min()
             {
                 Q_ASSERT(mModel->rowCount() > 0);
                 return mModel->data(index).toInt();
             }
             void BarChartSeries::chartSizeChanged(QRectF rect)
             {
                 qDebug() << "barchart size changed:" << rect;
+            //    mBarGroup->resize(rect.toRect().width(), rect.toRect().height());
             }
             #include "moc_barchartseries.cpp"

src/barchart/barchartseries.h +4 -1

             #include "qchartseries.h"
             #include "qchartglobal.h"
+            // TODO: Can this class be combined with series?
+            class BarGroup;
             QTCOMMERCIALCHART_BEGIN_NAMESPACE
             // Container for series
             private:
-                //QList<int> mData;
                 QAbstractItemModel* mModel;
+                BarGroup* mBarGroup;
             };
             QTCOMMERCIALCHART_END_NAMESPACE

src/barchart/bargroup.cpp +2 -2

             //BarGroup::BarGroup(QGraphicsItem *parent) :
             //    QGraphicsItem(parent)
             //    ,mSeries(series)
-            BarGroup::BarGroup(BarChartSeries& series, QGraphicsItem *parent) :
+            BarGroup::BarGroup(BarChartSeries& series, ChartItem *parent) :
-              QGraphicsItem(parent)
+              ChartItem(parent)
               ,mSeries(series)
               ,mLayoutSet(false)
               ,mLayoutDirty(true)

src/barchart/bargroup.h +3 -5

             #ifndef QBARCHART_H
             #define QBARCHART_H
-            #include <QGraphicsObject>
+            #include "chartitem_p.h"
             #include "bar.h"
-            //#include "qbarchartview.h"
             #include "barchartseries.h"
             QTCOMMERCIALCHART_BEGIN_NAMESPACE
             // TODO: Better name for this? The function of this class is to know where each bar in series is laid out.
             //class BarGroup : public QGraphicsItemGroup
-            class BarGroup : public QGraphicsItem
+            class BarGroup : public ChartItem
             {
             /* // TODO: implement as singleton?
             private:
             private:
             */
             public:
-                explicit BarGroup(BarChartSeries& series, QGraphicsItem *parent = 0);
+                explicit BarGroup(BarChartSeries& series, ChartItem *parent = 0);
                 // Layout "api"
                 void resize( int w, int h );        // Size for whole series. Single bars are drawn inside this area

General Comments 0

You need to be logged in to leave comments. Login now

No TODOs yet

	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