HG_REPOSITORIES/LPP/INSTRUMENTATION/USERS/JEANDET/qtcharts Commit - r94:6732dc48e5e9

added stacked bar chart

sauimone -

r94:6732dc48e5e9

parent child

Context file:

r94:6732dc48e5e9

Collapse all files

src/barchart/barchartseries.cpp +7 -19

                 // TODO: make min and max members and update them when data changes.
                 // This is slower since they are checked every time, even if data is same since previous call.
-                QModelIndex modelIndex = mModel->index(0,0);
+                int min = INT_MAX;
-                int min = mModel->data(modelIndex).toInt();
                 for (int i=0; i <mModel->rowCount(); i++) {
                     for(int j=0; j<mModel->columnCount(); j++) {
-                        modelIndex = mModel->index(i,j);
+                        int temp = mModel->data(mModel->index(i,j)).toInt();
-                        int temp = mModel->data(modelIndex).toInt();
                         if (temp < min) {
                             min = temp;
                         }
                 // TODO: make min and max members and update them when data changes.
                 // This is slower since they are checked every time, even if data is same since previous call.
-                QModelIndex modelIndex = mModel->index(0,0);
+                int max = INT_MIN;
-                int max = mModel->data(modelIndex).toInt();
                 for (int i=0; i <mModel->rowCount(); i++) {
                     for(int j=0; j<mModel->columnCount(); j++) {
-                        modelIndex = mModel->index(i,j);
+                        int temp = mModel->data(mModel->index(i,j)).toInt();
-                        int temp = mModel->data(modelIndex).toInt();
                         if (temp > max) {
                             max = temp;
                         }
                 return mModel->rowCount();
             }
-            int BarChartSeries::countItemsInSeries()
+            int BarChartSeries::countColumns()
             {
                 return mModel->columnCount();
             }
                 return mModel->rowCount() * mModel->columnCount();
             }
-            int BarChartSeries::valueAt(int series, int item)
+            int BarChartSeries::valueAt(int row, int column)
             {
-                QModelIndex index = mModel->index(series,item);
+                return mModel->data(mModel->index(row,column)).toInt();
-                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"
             QTCOMMERCIALCHART_END_NAMESPACE

src/barchart/barchartseries.h +3 -3

             #define BARCHARTSERIES_H
             #include <QList>
-            #include <QRectF>
+            //#include <QRectF>
             #include <QAbstractItemModel>
             #include "qchartseries.h"
             #include "qchartglobal.h"
                 int min();
                 int max();
                 int countSeries();
-                int countItemsInSeries();     // Count items in one series.
+                int countColumns();     // Count items in one series.
                 int countTotalItems();
-                int valueAt(int series, int item);
+                int valueAt(int row, int column);
             public Q_SLOTS:

src/barchart/bargroup.cpp +2 -8

             QTCOMMERCIALCHART_BEGIN_NAMESPACE
-            // TODO: singleton?
-            //BarGroup* BarGroup::mBarGroupInstance = NULL;
-            //BarGroup::BarGroup(QGraphicsItem *parent) :
-            //    QGraphicsItem(parent)
-            //    ,mSeries(series)
             BarGroup::BarGroup(BarChartSeries& series, QGraphicsItem *parent) :
               ChartItem(parent)
               ,mSeries(series)
                 }
                 // TODO: better way to auto-layout
-                int count = mSeries.countItemsInSeries();
+                int count = mSeries.countColumns();
                 int posStep = (mWidth / (count+1));
                 int startPos = (mWidth / (count+1)) - mSeries.countSeries() * mBarDefaultWidth /2;
                 qDebug() << "startpos" << startPos;
                 // Scaling.
                 int itemIndex(0);
                 for (int series = 0; series < mSeries.countSeries(); series++) {
-                    for (int item=0; item < mSeries.countItemsInSeries(); item++) {
+                    for (int item=0; item < mSeries.countColumns(); item++) {
                         qDebug() << itemIndex;
                         int barHeight = mSeries.valueAt(series, item) * mHeight / mMax;
                         Bar* bar = reinterpret_cast<Bar*> (childItems().at(itemIndex));

src/barchart/bargroup.h +3 -20

@@ -1,5 +1,5
1	#ifndef QBAR~~CHART~~_H	1	#ifndef QBARGROUP_H
2	#define QBAR~~CHART~~_H	2	#define QBARGROUP_H
3		3
4	#include "chartitem_p.h"	4	#include "chartitem_p.h"
5	#include "bar.h"	5	#include "bar.h"
@@ -7,25 +7,8
7		7
8	QTCOMMERCIALCHART_BEGIN_NAMESPACE	8	QTCOMMERCIALCHART_BEGIN_NAMESPACE
9		9
10	// TODO: Better name for this? The function of this class is to know where each bar in series is laid out.
11	//class BarGroup : public QGraphicsItemGroup
12
13	class BarGroup : public ChartItem	10	class BarGroup : public ChartItem
14	{	11	{
15	/* // TODO: implement as singleton?
16	private:
17	static BarGroup* mBarGroupInstance;
18
19	public:
20	static BarGroup* instance()
21	{
22	if (mBarGroupInstance == NULL) {
23	mBarGroupInstance = new BarGroup();
24	}
25	return mBarGroupInstance;
26	}
27	private:
28	*/
29	public:	12	public:
30	explicit BarGroup(BarChartSeries& series, QGraphicsItem *parent = 0);	13	explicit BarGroup(BarChartSeries& series, QGraphicsItem *parent = 0);
31		14
@@ -68,4 +51,4 private:
68		51
69	QTCOMMERCIALCHART_END_NAMESPACE	52	QTCOMMERCIALCHART_END_NAMESPACE
70		53
71	#endif // QBAR~~CHART~~_H	54	#endif // QBARGROUP_H

src/qchartseries.h +1 0

                     SeriesTypeLine = 0,
             //        SeriesTypeArea,
                     SeriesTypeBar,
+                    SeriesTypeStackedBar,
                     SeriesTypePie,
                     SeriesTypeScatter
             //        SeriesTypeSpline

src/src.pro +6 -2

                 pieslice.cpp \
                 qchartview.cpp \
                 qchartseries.cpp \
-                qchartaxis.cpp
+                qchartaxis.cpp \
+                barchart/stackedbarchartseries.cpp \
+                barchart/stackedbargroup.cpp
             PRIVATE_HEADERS += \
                 xylinechart/xylinechartitem_p.h \
                 qchartview.h \
                 qchartaxis.h
-            HEADERS += $$PUBLIC_HEADERS
+            HEADERS += $$PUBLIC_HEADERS \
+                barchart/stackedbarchartseries.h \
+                barchart/stackedbargroup.h
             HEADERS += $$PRIVATE_HEADERS
             INCLUDEPATH += xylinechart \

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