HG_REPOSITORIES/LPP/INSTRUMENTATION/USERS/JEANDET/qtcharts Commit - r164:8e580b305fe6

integrating bar charts to test app.. crashes for now

sauimone -

r164:8e580b305fe6

parent child

Context file:

r164:8e580b305fe6

Collapse all files

src/barchart/barchartmodel.cpp +10 0

             void BarChartModel::removeData(int id)
             {
+                qDebug() << "BarChartModel::removeData";
                 foreach(DataContainer* c, mDataModel) {
                     if (c->mId == id) {
                         mDataModel.removeOne(c);
             int BarChartModel::countRows()
             {
+                qDebug() << "BarChartModel::countRows";
                 return mDataModel.count();
             }
             int BarChartModel::countColumns()
             {
+                qDebug() << "BarChartModel::countColumns";
                 int count(0);
                 for (int i=0; i<mDataModel.count(); i++){
                     // TODO: can we assume that all series have same number of values? If not. then which values are empty?
             int BarChartModel::countTotalItems()
             {
+                qDebug() << "BarChartModel::countTotalItems";
                 int total = mDataModel.count() * countColumns();
                 qDebug() << "BarChartModel::countTotalItems datamodel count" << mDataModel.count();
                 qDebug() << "BarChartModel::countTotalItems countColumns count" << countColumns();
             int BarChartModel::min()
             {
+                qDebug() << "BarChartModel::min";
                 Q_ASSERT(mDataModel.count() > 0);
                 // 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.
             int BarChartModel::max()
             {
+                qDebug() << "BarChartModel::max";
                 Q_ASSERT(mDataModel.count() > 0);
                 // TODO: make min and max members and update them when data changes.
             qreal BarChartModel::valueAt(int series, int item)
             {
+                qDebug() << "BarChartModel::valueAt" << series << item;
                 if ((series < 0) || (series >= mDataModel.count())) {
                     // No series, no value.
                     return 0;
                     return 0;
                 }
+                qDebug() << "ValueAt" << series << item << "=" << mDataModel.at(series)->valueAt(item);
                 return mDataModel.at(series)->valueAt(item);
             }
             qreal BarChartModel::columnSum(int column)
             {
+                qDebug() << "BarChartModel::columnSum";
                 int sum(0);
                 int count = mDataModel.count(); // Count rows
             qreal BarChartModel::maxColumnSum()
             {
+                qDebug() << "BarChartModel::maxColumnSum";
                 int max = INT_MIN;
                 int count = countColumns();

src/barchart/barchartseriesbase.cpp +1 0

             qreal BarChartSeriesBase::valueAt(int series, int item)
             {
+                qDebug() << "BarChartSeriesBase::valueAt" << series << item;
                 return mModel.valueAt(series,item);
             }

src/barchart/bargroupbase.cpp +8 -4

             {
                 return QRectF(0,0,mWidth,mHeight);
             }
+            /*
             void BarGroupBase::themeChanged(ChartTheme *theme)
             {
-                mTheme = theme;
+                qDebug() << "BarGroupBase::themeChanged"
+            //    mTheme = theme;
             }
+            */
             void BarGroupBase::setBarWidth( int w )
             {
                 mBarDefaultWidth = w;
             int BarGroupBase::addColor( QColor color )
             {
+                qDebug() << "BarGroupBase::addColor";
                 int colorIndex = mColors.count();
                 mColors.append(color);
                 return colorIndex;
             void BarGroupBase::resetColors()
             {
+                qDebug() << "BarGroupBase::resetColors";
                 mColors.clear();
             }
             void BarGroupBase::handleModelChanged(int index)
             {
-                qDebug() << "BarGroupBase::handleModelChanged PUUH" << index;
+                qDebug() << "BarGroupBase::handleModelChanged" << index;
                 dataChanged();
             }
             void BarGroupBase::handleGeometryChanged(const QRectF& rect)
             {
+                qDebug() << "BarGroupBase::handleGeometryChanged";
                 mWidth = rect.width();
                 mHeight = rect.height();
                 layoutChanged();

src/barchart/bargroupbase.h +1 -1

                 QRectF boundingRect() const;
                 // From ChartThemeObserver
-                void themeChanged(ChartTheme *theme);
+            //    void themeChanged(ChartTheme *theme);
                 // TODO: these may change with layout awarness.
                 void setBarWidth( int w );

src/barchart/stackedbargroup.cpp +1 -1

             void StackedBarGroup::layoutChanged()
             {
+                qDebug() << "StackedBarGroup::layoutChanged";
                 // Scale bars to new layout
                 // Layout for bars:
                 if (mModel.countRows() <= 0) {

src/charttheme.cpp +9 -2

             void ChartTheme::decorate(BarGroup* item, BarChartSeries* series,int count)
             {
+                for (int i=0; i< m_seriesColor.count(); i++) {
+                    item->addColor(m_seriesColor.at(i));
+                }
                 item->addColor(QColor(255,0,0,128));
                 item->addColor(QColor(255,255,0,128));
                 item->addColor(QColor(0,255,0,128));
             void ChartTheme::decorate(StackedBarGroup* item, StackedBarChartSeries* series,int count)
             {
-                // Add some fugly colors for 5 fist series...
+                for (int i=0; i< m_seriesColor.count(); i++) {
+                    item->addColor(m_seriesColor.at(i));
+                }
                 item->addColor(QColor(255,0,0,128));
                 item->addColor(QColor(255,255,0,128));
                 item->addColor(QColor(0,255,0,128));
             void ChartTheme::decorate(PercentBarGroup* item, PercentBarChartSeries* series,int count)
             {
-            // Add some fugly colors for 5 fist series...
+                for (int i=0; i< m_seriesColor.count(); i++) {
+                    item->addColor(m_seriesColor.at(i));
+                }
                 item->addColor(QColor(255,0,0,128));
                 item->addColor(QColor(255,255,0,128));
                 item->addColor(QColor(0,255,0,128));

src/qchartseries.h +3 0

                 // Prototype for data model. TODO: remove the other setData methods and use something like this for now?
                 virtual bool setData(QAbstractItemModel* /*model*/) { return false; }
+                // Methods for building a table for bar chart. Call repeatedly to add more than one series
+                virtual int addData(QList<qreal> data) {return -1;}
+                virtual void removeData(int id) {}
             };
             QTCOMMERCIALCHART_END_NAMESPACE

test/chartwidgettest/mainwidget.cpp +21 -23

@@ -4,6 +4,7
4	#include "qpieseries.h"	4	#include "qpieseries.h"
5	#include <qlinechartseries.h>	5	#include <qlinechartseries.h>
6	#include <barchartseries.h>	6	#include <barchartseries.h>
		7	#include <stackedbarchartseries.h>
7	#include <QPushButton>	8	#include <QPushButton>
8	#include <QComboBox>	9	#include <QComboBox>
9	#include <QSpinBox>	10	#include <QSpinBox>
@@ -236,31 +237,28 void MainWidget::addSeries(QString series, QString data)
236	if (series == "Bar") {	237	if (series == "Bar") {
237	// This is the another way of creating series. Should we create test cases for both ways, if we support them?	238	// This is the another way of creating series. Should we create test cases for both ways, if we support them?
238	qDebug() << "Bar chart series";	239	qDebug() << "Bar chart series";
239	~~new~~Series = new BarChartSeries(this);	240	StackedBarChartSeries* series0 = new StackedBarChartSeries(this);
240		241
241	// Create some test data to chart	242	// Create some test data to chart
242	QStandardItemModel dataModel(2,10,this);	243	QList<qreal> data0;
243	QModelIndex index;	244	data0 << 1 << 2 << 3 << 4 << 5 << 6 << 7 << 8 << 9 << 10;
244	index = dataModel.index(0,0);	245	QList<qreal> data1;
245	// Series 1, items 6 to 9 missing.	246	data1 << 5 << 0 << 0 << 4 << 0 << 7 << 8 << 9 << 9 << 0;
246	dataModel.setData(dataModel.index(0,0),1);	247	QList<qreal> data2;
247	dataModel.setData(dataModel.index(0,1),12);	248	data2 << 3 << 5 << 8 << 13 << 8 << 5 << 3 << 2 << 1 << 1;
248	dataModel.setData(dataModel.index(0,2),5);	249	QList<qreal> data3;
249	dataModel.setData(dataModel.index(0,3),8);	250	data3 << 5 << 6 << 7 << 3 << 4 << 5 << 8 << 9 << 10 << 5;
250	dataModel.setData(dataModel.index(0,4),17);	251	QList<qreal> data4;
251	dataModel.setData(dataModel.index(0,5),9);	252	data4 << 9 << 7 << 5 << 3 << 1 << 2 << 4 << 6 << 8 << 10;
252		253
253	// Series 2, some other items missing	254	series0->addData(data0);
254	dataModel.setData(dataModel.index(1,0),5);	255	series0->addData(data1);
255	dataModel.setData(dataModel.index(1,3),4);	256	series0->addData(data2);
256	dataModel.setData(dataModel.index(1,5),7);	257	series0->addData(data3);
257	dataModel.setData(dataModel.index(1,6),8);	258	series0->addData(data4);
258	dataModel.setData(dataModel.index(1,8),9);	259
259	dataModel.setData(dataModel.index(1,9),9);	260	m_chartWidget->addSeries(series0);
260		261	newSeries = series0;
261	newSeries->setData(&dataModel);
262
263	m_chartWidget->addSeries(newSeries);
264	}	262	}
265		263
266	setCurrentSeries(newSeries);	264	setCurrentSeries(newSeries);

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