HG_REPOSITORIES/LPP/INSTRUMENTATION/USERS/JEANDET/qtcharts Commit - r1184:3138389fa706

Fixes to barseries and pieseries model support. Started adding barseries model tests

Marek Rosa -

r1184:3138389fa706

parent child

Context file:

r1184:3138389fa706

Collapse all files

src/barchart/qbarmodelmapper.cpp +1 0

                 m_mapBarBottom = -1;
                 m_mapBarTop = -1;
                 m_mapCategories = -1;
+                emit updated();
             }
             #include "moc_qbarmodelmapper.cpp"

src/barchart/qbarseries.cpp +22 -6

                 if (mapper) {
                     d->m_mapper = mapper;
                     // connect the signal from the mapper
-                    connect(d->m_mapper, SIGNAL(updated()), d, SLOT(initializePieFromModel()));
+                    connect(d->m_mapper, SIGNAL(updated()), d, SLOT(initializeDataFromModel()));
                     if (d->m_model)
                         d->initializeDataFromModel();
             void QBarSeriesPrivate::modelUpdated(QModelIndex topLeft, QModelIndex bottomRight)
             {
+                if (m_model == 0 || m_mapper == 0)
+                    return;
                 for (int row = topLeft.row(); row <= bottomRight.row(); row++) {
                     for (int column = topLeft.column(); column <= bottomRight.column(); column++) {
                         if (m_mapper->orientation() == Qt::Vertical)
             {
                 Q_Q(QBarSeries);
-                if (m_model == 0 || m_mapper == 0)
-                    return;
                 // create the initial bars
                 m_categories.clear();
                 m_barSets.clear();
+                if (m_model == 0 || m_mapper == 0)
+                    return;
+                // check if mappings are set
+                if (m_mapper->mapBarBottom() == -1 || m_mapper->mapBarTop() == -1 || m_mapper->mapCategories() == -1)
+                    return;
                 //    emit restructuredBars();
                 if (m_mapper->orientation() == Qt::Vertical) {
+                    if (m_mapCategories >= m_model->columnCount())
+                        return;
                     int rowCount = 0;
                     if(m_mapper->count() == -1)
                         rowCount = m_model->rowCount() - m_mapper->first();
                         m_categories << m_model->data(m_model->index(k, m_mapper->mapCategories()), Qt::DisplayRole).toString();
                     }
-                    for (int i = m_mapper->mapBarBottom(); i <= m_mapper->mapBarTop(); i++) {
+                    int lastAvailableBarSet = qMin(m_model->columnCount() - 1, m_mapper->mapBarTop());
+                    for (int i = m_mapper->mapBarBottom(); i <= lastAvailableBarSet; i++) {
+            //        for (int i = m_mapper->mapBarBottom(); i <= m_mapper->mapBarTop(); i++) {
                         QBarSet* barSet = new QBarSet(m_model->headerData(i, Qt::Horizontal, Qt::DisplayRole).toString());
                         for(int m = m_mapper->first(); m < m_mapper->first() + rowCount; m++)
                             *barSet << m_model->data(m_model->index(m, i), Qt::DisplayRole).toDouble();
                         q->appendBarSet(barSet);
                     }
                 } else {
+                    if (m_mapCategories >= m_model->rowCount())
+                        return;
                     int columnCount = 0;
                     if(m_mapper->count() == -1)
                         columnCount = m_model->columnCount() - m_mapper->first();
                         m_categories << m_model->data(m_model->index(m_mapper->mapCategories(), k), Qt::DisplayRole).toString();
                     }
-                    for (int i = m_mapper->mapBarBottom(); i <= m_mapper->mapBarTop(); i++) {
+                    int lastAvailableBarSet = qMin(m_model->rowCount() - 1, m_mapper->mapBarTop());
+                    for (int i = m_mapper->mapBarBottom(); i <= lastAvailableBarSet; i++) {
+            //        for (int i = m_mapper->mapBarBottom(); i <= m_mapper->mapBarTop(); i++) {
                         QBarSet* barSet = new QBarSet(m_model->headerData(i, Qt::Vertical, Qt::DisplayRole).toString());
                         for(int m = m_mapper->first(); m < m_mapper->first() + columnCount; m++)
                             *barSet << m_model->data(m_model->index(i, m), Qt::DisplayRole).toDouble();

src/piechart/qpieseries.cpp +3 -3

             {
                 Q_Q(QPieSeries);
-                if (m_model == 0 || m_mapper == 0)
-                    return;
                 // clear current content
                 q->clear();
+                if (m_model == 0 || m_mapper == 0)
+                    return;
                 // check if mappings are set
                 if (m_mapper->mapValues() == -1 || m_mapper->mapLabels() == -1)
                     return;

test/auto/qgroupedbarseries/tst_qgroupedbarseries.cpp +56 0

@@ -23,6 +23,8
23	#include <qbarset.h>	23	#include <qbarset.h>
24	#include <qchartview.h>	24	#include <qchartview.h>
25	#include <qchart.h>	25	#include <qchart.h>
		26	#include <QBarModelMapper>
		27	#include <QStandardItemModel>
26		28
27	QTCOMMERCIALCHART_USE_NAMESPACE	29	QTCOMMERCIALCHART_USE_NAMESPACE
28		30
@@ -47,6 +49,7 private slots:
47	void mouseclicked();	49	void mouseclicked();
48	void mousehovered_data();	50	void mousehovered_data();
49	void mousehovered();	51	void mousehovered();
		52	void model();
50		53
51	private:	54	private:
52	QGroupedBarSeries* m_barseries;	55	QGroupedBarSeries* m_barseries;
@@ -335,6 +338,59 void tst_QGroupedBarSeries::mousehovered()
335	QVERIFY(seriesSpyArg.at(1).toBool() == false);	338	QVERIFY(seriesSpyArg.at(1).toBool() == false);
336	}	339	}
337		340
		341	void tst_QGroupedBarSeries::model()
		342	{
		343	QGroupedBarSeries *series = new QGroupedBarSeries;
		344	QChart *chart = new QChart;
		345	chart->addSeries(series);
		346	QChartView *chartView = new QChartView(chart);
		347	chartView->show();
		348
		349	int rowCount = 12;
		350	int columnCount = 5;
		351	QStandardItemModel *stdModel = new QStandardItemModel(rowCount, columnCount);
		352	series->setModel(stdModel);
		353	QVERIFY2((series->model()) == stdModel, "Model should be stdModel");
		354
		355
		356	for (int row = 0; row < rowCount; ++row) {
		357	for (int column = 0; column < columnCount; column++) {
		358	QStandardItem item = new QStandardItem(row column);
		359	stdModel->setItem(row, column, item);
		360	}
		361	}
		362
		363	// data has been added to the model, but mapper is not set the number of slices should still be 0
		364	QVERIFY2(series->barsetCount() == 0, "Mapper has not been set, so the number of slices should be 0");
		365
		366	// set the mapper
		367	QBarModelMapper *mapper = new QBarModelMapper;
		368	mapper->setMapCategories(0);
		369	mapper->setMapBarBottom(1);
		370	mapper->setMapBarTop(3);
		371	series->setModelMapper(mapper); // this should cause the Pie to get initialized from the model, since there is now both the model and the mapper defined
		372	QCOMPARE(series->barsetCount(), 3);
		373
		374	// set the mappings to be outside of the model
		375	mapper->setMapBarBottom(6);
		376	mapper->setMapBarTop(7);
		377	QCOMPARE(series->barsetCount(), 0); // Mappings are invalid, so the number of slices should be 0
		378
		379	// set back to correct ones
		380	mapper->setMapBarBottom(1);
		381	mapper->setMapBarTop(3);
		382	QCOMPARE(series->barsetCount(), 3);
		383
		384	// reset the mappings
		385	mapper->reset();
		386	QCOMPARE(series->barsetCount(), 0); // Mappings have been reset and are invalid, so the number of slices should be 0
		387
		388	// unset the model and the mapper
		389	series->setModel(0);
		390	series->setModelMapper(0);
		391	QVERIFY(series->model() == 0); // Model should be unset
		392	QVERIFY(series->modelMapper() == 0); // Model mapper should be unset
		393	}
338		394
339	/*	395	/*
340	bool setModel(QAbstractItemModel *model);	396	bool setModel(QAbstractItemModel *model);

test/auto/qpieseries/tst_qpieseries.cpp +2 -2

             {
                 int rowCount = 12;
                 int columnCount = 7;
-                QStandardItemModel *stdModel = new QStandardItemModel(0, 3);
+                QStandardItemModel *stdModel = new QStandardItemModel(rowCount, columnCount);
                 for (int row = 0; row < rowCount; ++row) {
-                    for (int column = 0; column < 2; column++) {
+                    for (int column = 0; column < columnCount; column++) {
                         QStandardItem *item = new QStandardItem(row * column);
                         stdModel->setItem(row, column, item);
                     }

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