HG_REPOSITORIES/LPP/INSTRUMENTATION/USERS/JEANDET/qtcharts Commit - r71:1f789ed92d7b

Improved bar chart series

sauimone -

r71:1f789ed92d7b

parent child

Context file:

r71:1f789ed92d7b

Collapse all files

src/barchart/barchartseries.cpp +52 -17

@@ -1,3 +1,4
		1	#include <QDebug>
1	#include "barchartseries.h"	2	#include "barchartseries.h"
2	QTCOMMERCIALCHART_BEGIN_NAMESPACE	3	QTCOMMERCIALCHART_BEGIN_NAMESPACE
3		4
@@ -6,23 +7,29 BarChartSeries::BarChartSeries(QObject *parent)
6	{	7	{
7	}	8	}
8		9
9	bool BarChartSeries::setData(Q~~List~~<~~int~~> ~~data~~)	10	bool BarChartSeries::setData(QAbstractItemModel* model)
10	{	11	{
11	mData = data;	12	mModel = model;
12	return true;
13	}	13	}
14		14
		15
15	int BarChartSeries::min()	16	int BarChartSeries::min()
16	{	17	{
17	Q_ASSERT(m~~Data~~.count() > 0);	18	Q_ASSERT(mModel->rowCount() > 0);
		19	Q_ASSERT(mModel->columnCount() > 0);
18		20
19	// TODO: make min and max members and update them when data changes.	21	// TODO: make min and max members and update them when data changes.
20	// This is slower since they are checked every time, even if data is same since previous call.	22	// This is slower since they are checked every time, even if data is same since previous call.
21	int min = mData.at(0);	23	QModelIndex modelIndex = mModel->index(0,0);
		24	int min = mModel->data(modelIndex).toInt();
22		25
23	for (int i=0; i <m~~Data~~.count(); i++) {	26	for (int i=0; i <mModel->rowCount(); i++) {
24	if (mData.at(i) < min) {	27	for(int j=0; j<mModel->columnCount(); j++) {
25	min = mData.at(i);	28	modelIndex = mModel->index(i,j);
		29	int temp = mModel->data(modelIndex).toInt();
		30	if (temp < min) {
		31	min = temp;
		32	}
26	}	33	}
27	}	34	}
28	return min;	35	return min;
@@ -30,26 +37,54 int BarChartSeries::min()
30		37
31	int BarChartSeries::max()	38	int BarChartSeries::max()
32	{	39	{
33	Q_ASSERT(m~~Data~~.count() > 0);	40	Q_ASSERT(mModel->rowCount() > 0);
		41	Q_ASSERT(mModel->columnCount() > 0);
34		42
35	int max = mData.at(0);	43	// TODO: make min and max members and update them when data changes.
		44	// This is slower since they are checked every time, even if data is same since previous call.
		45	QModelIndex modelIndex = mModel->index(0,0);
		46	int max = mModel->data(modelIndex).toInt();
36		47
37	for (int i=0; i <m~~Data~~.count(); i++) {	48	for (int i=0; i <mModel->rowCount(); i++) {
38	if (mData.at(i) > max) {	49	for(int j=0; j<mModel->columnCount(); j++) {
39	max = mData.at(i);	50	modelIndex = mModel->index(i,j);
		51	int temp = mModel->data(modelIndex).toInt();
		52	if (temp > max) {
		53	max = temp;
		54	}
40	}	55	}
41	}	56	}
42	return max;	57	return max;
43	}	58	}
44		59
45	int BarChartSeries::count()	60
		61	int BarChartSeries::countSeries()
		62	{
		63	return mModel->rowCount();
		64	}
		65
		66	int BarChartSeries::countItemsInSeries()
46	{	67	{
47	return m~~Data~~.count();	68	return mModel->columnCount();
48	}	69	}
49		70
50	int BarChartSeries::~~valueAt~~(~~int~~ i)	71	int BarChartSeries::countTotalItems()
51	{	72	{
52	return mData.at(i);	73	return mModel->rowCount() * mModel->columnCount();
53	}	74	}
54		75
		76	int BarChartSeries::valueAt(int series, int item)
		77	{
		78	QModelIndex index = mModel->index(series,item);
		79	return mModel->data(index).toInt();
		80	}
		81
		82
		83	void BarChartSeries::chartSizeChanged(QRectF rect)
		84	{
		85	qDebug() << "barchart size changed:" << rect;
		86	}
		87
		88	#include "moc_barchartseries.cpp"
		89
55	QTCOMMERCIALCHART_END_NAMESPACE	90	QTCOMMERCIALCHART_END_NAMESPACE

src/barchart/barchartseries.h +15 -9

             #define BARCHARTSERIES_H
             #include <QList>
+            #include <QRectF>
+            #include <QAbstractItemModel>
             #include "qchartseries.h"
             #include "qchartglobal.h"
             // Container for series
             class QTCOMMERCIALCHART_EXPORT BarChartSeries : public QChartSeries
             {
-                // TODO:
+                Q_OBJECT
-            //    Q_OBJECT
             public:
                 BarChartSeries(QObject* parent=0);
                 // from QChartSeries
                 virtual QChartSeriesType type() const { return QChartSeries::SeriesTypeBar; }
-                virtual bool setData(QList<int> data);
+                // TODO: This as dataModel instead of n different setters. (data model itself can accept lists and whatnot)
-                virtual bool setData(QList<qreal> data) {return false;}
+                virtual bool setData(QAbstractItemModel* model);
-                virtual bool setData(QList<qreal> x, QList<qreal> y) {return false;}
                 // Methods to find out minimum and maximum values of data
                 int min();
                 int max();
-                int count();
+                int countSeries();
-                int valueAt(int i);
+                int countItemsInSeries();     // Count items in one series.
+                int countTotalItems();
+                int valueAt(int series, int item);
+            public Q_SLOTS:
+                void chartSizeChanged(QRectF rect);
             private:
-                QList<int> mData;
+                //QList<int> mData;
+                QAbstractItemModel* mModel;
             };
             QTCOMMERCIALCHART_END_NAMESPACE

src/barchart/bargroup.cpp +24 -13

             QTCOMMERCIALCHART_BEGIN_NAMESPACE
+            // TODO: singleton?
+            //BarGroup* BarGroup::mBarGroupInstance = NULL;
+            //BarGroup::BarGroup(QGraphicsItem *parent) :
+            //    QGraphicsItem(parent)
+            //    ,mSeries(series)
             BarGroup::BarGroup(BarChartSeries& series, QGraphicsItem *parent) :
-                QGraphicsItem(parent)
+              QGraphicsItem(parent)
-                ,mSeries(series)
+              ,mSeries(series)
-                ,mLayoutSet(false)
+              ,mLayoutSet(false)
-                ,mLayoutDirty(true)
+              ,mLayoutDirty(true)
             {
                 dataChanged();
             }
                 }
                 // Create new graphic items for bars
-                for (int i=0; i<mSeries.count(); i++) {
+                int totalItems = mSeries.countTotalItems();
+                for (int i=0; i<totalItems; i++) {
                     Bar *bar = new Bar(this);
                     childItems().append(bar);
                 }
             {
                 // Scale bars to new layout
                 // Layout for bars:
-                int count = mSeries.count();
+                int count = mSeries.countSeries();
                 if (count <= 0) {
                     // Nothing to do.
                     return;
                 qDebug() << "startpos" << startPos;
                 // Scaling. TODO: better one.
-                for (int i=0; i<count; i++) {
+                int itemIndex(0);
-                    int barHeight = mSeries.valueAt(i) * mHeight / mMax;
+                for (int series = 0; series < count; series++) {
-                    Bar* bar = reinterpret_cast<Bar*> (childItems().at(i));
+                    for (int item=0; item < count; item++) {
+                        int barHeight = mSeries.valueAt(series, item) * mHeight / mMax;
-                    bar->resize(mBarDefaultWidth, barHeight);        // TODO: width settable per bar
+                        Bar* bar = reinterpret_cast<Bar*> (childItems().at(itemIndex));
-                    bar->setColor(mColor);
-                    bar->setPos(i*posStep+startPos, 0);
+                        bar->resize(mBarDefaultWidth, barHeight);        // TODO: width settable per bar
+                        bar->setColor(mColor);
+                        bar->setPos(itemIndex*posStep+startPos, 0);
+                        itemIndex++;
+                    }
                 }
                 mLayoutDirty = true;
             }

src/barchart/bargroup.h +16 -2

             #ifndef QBARCHART_H
             #define QBARCHART_H
-            #include <QGraphicsItem>
+            #include <QGraphicsObject>
             #include "bar.h"
             //#include "qbarchartview.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 has knowledge of single series of data (owns vs reference?)
+            //class BarGroup : public QGraphicsItemGroup
             class BarGroup : public QGraphicsItem
             {
+            /* // TODO: implement as singleton?
+            private:
+                static BarGroup* mBarGroupInstance;
             public:
+                static BarGroup* instance()
+                {
+                    if (mBarGroupInstance == NULL) {
+                        mBarGroupInstance = new BarGroup();
+                    }
+                    return mBarGroupInstance;
+                }
+            private:
+            */
+            public:
                 explicit BarGroup(BarChartSeries& series, QGraphicsItem *parent = 0);
                 // Layout "api"

src/qchart.cpp +2 -4

                     qDebug() << "barSeries added";
                     BarChartSeries* barSeries = static_cast<BarChartSeries*>(series);
+                    connect(this, SIGNAL(sizeChanged(QRectF)),
+                            barSeries, SLOT(chartSizeChanged(QRectF)));
-                    // Who owns the series?
-                    BarGroup* group = new BarGroup(*barSeries, this);
-                    scene()->addItem(group);
-                    m_BarGroupItems.append(group); // If we need to access group later
                     break;
                     }
                 case QChartSeries::SeriesTypeScatter: {

src/qchart.h 0 -1

                 int m_plotDataIndex;
                 int m_marginSize;
                 QList<QColor> m_themeColors;
-                QList<BarGroup*> m_BarGroupItems;
             };
             QTCOMMERCIALCHART_END_NAMESPACE

src/qchartseries.cpp +2 0

             QChartSeries* QChartSeries::create(QChartSeriesType type, QObject* parent)
             {
+                qDebug() << "QChartSeries::create";
                 // TODO: Other types
                 switch (type) {
                 case QChartSeries::SeriesTypeLine: {
                 }
             }
+            #include "moc_qchartseries.cpp"
             QTCOMMERCIALCHART_END_NAMESPACE

src/qchartseries.h +6 -2

             #include "qchartglobal.h"
             #include <QObject>
+            #include <QAbstractItemModel>
             QTCOMMERCIALCHART_BEGIN_NAMESPACE
             class QTCOMMERCIALCHART_EXPORT QChartSeries : public QObject
             {
-                //TODO:
+                Q_OBJECT
-                //Q_OBJECT
             public:
                 enum QChartSeriesType {
                     SeriesTypeLine = 0,
                 virtual bool setData(QList<int> data) { return false; }
                 virtual bool setData(QList<qreal> data) { return false; }
                 virtual bool setData(QList<qreal> x, QList<qreal> y){ return false; }
+                // Prototype for data model. TODO: remove the other setData methods and use something like this for now?
+                virtual bool setData(QAbstractItemModel* model) { return false; }
             };
             QTCOMMERCIALCHART_END_NAMESPACE

test/chartwidgettest/mainwidget.cpp +1 -1

             void MainWidget::changeChartTheme(int themeIndex)
             {
                 qDebug() << "changeChartTheme: " << themeIndex;
-                m_chartWidget->setTheme((QChart::ChartTheme) themeIndex);
+            //    m_chartWidget->setTheme((QChart::ChartTheme) themeIndex);
             }
             void MainWidget::setPieSizeFactor(double size)

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