HG_REPOSITORIES/LPP/INSTRUMENTATION/USERS/JEANDET/qtcharts Commit - r1463:e1e0c05a814c

barsetCount -> count in tests and examples too

sauimone -

r1463:e1e0c05a814c

parent child

Context file:

r1463:e1e0c05a814c

Collapse all files

examples/legend/mainwidget.cpp +2 -2

             /****************************************************************************
             **
             ** Copyright (C) 2012 Digia Plc
             ** All rights reserved.
             ** For any questions to Digia, please use contact form at http://qt.digia.com
             **
             ** This file is part of the Qt Commercial Charts Add-on.
             **
             ** $QT_BEGIN_LICENSE$
             ** Licensees holding valid Qt Commercial licenses may use this file in
             ** accordance with the Qt Commercial License Agreement provided with the
             ** Software or, alternatively, in accordance with the terms contained in
             ** a written agreement between you and Digia.
             **
             ** If you have questions regarding the use of this file, please use
             ** contact form at http://qt.digia.com
             ** $QT_END_LICENSE$
             **
             ****************************************************************************/
             #include "mainwidget.h"
             #include <QChart>
             #include <QChartView>
             #include <QPushButton>
             #include <QLabel>
             #include <QDebug>
             #include <QBarSet>
             #include <QBarSeries>
             #include <QLegend>
             #include <QFormLayout>
             QTCOMMERCIALCHART_USE_NAMESPACE
             MainWidget::MainWidget(QWidget *parent) :
                 QWidget(parent)
             {
                 // Create buttons for ui
                 m_buttonLayout = new QGridLayout();
                 QPushButton *detachLegendButton = new QPushButton("detach legend");
                 connect(detachLegendButton, SIGNAL(clicked()), this, SLOT(detachLegend()));
                 m_buttonLayout->addWidget(detachLegendButton, 0, 0);
                 QPushButton *attachLegendButton = new QPushButton("attach legend");
                 connect(attachLegendButton, SIGNAL(clicked()), this, SLOT(attachLegend()));
                 m_buttonLayout->addWidget(attachLegendButton, 1, 0);
                 QPushButton *addSetButton = new QPushButton("add barset");
                 connect(addSetButton, SIGNAL(clicked()), this, SLOT(addBarset()));
                 m_buttonLayout->addWidget(addSetButton, 2, 0);
                 QPushButton *removeBarsetButton = new QPushButton("remove barset");
                 connect(removeBarsetButton, SIGNAL(clicked()), this, SLOT(removeBarset()));
                 m_buttonLayout->addWidget(removeBarsetButton, 3, 0);
                 QPushButton *leftButton = new QPushButton("Align legend left");
                 connect(leftButton, SIGNAL(clicked()), this, SLOT(setLegendLeft()));
                 m_buttonLayout->addWidget(leftButton, 4, 0);
                 QPushButton *rightButton = new QPushButton("Align legend right");
                 connect(rightButton, SIGNAL(clicked()), this, SLOT(setLegendRight()));
                 m_buttonLayout->addWidget(rightButton, 5, 0);
                 QPushButton *topButton = new QPushButton("Align legend top");
                 connect(topButton, SIGNAL(clicked()), this, SLOT(setLegendTop()));
                 m_buttonLayout->addWidget(topButton, 6, 0);
                 QPushButton *bottomButton = new QPushButton("Align legend bottom");
                 connect(bottomButton, SIGNAL(clicked()), this, SLOT(setLegendBottom()));
                 m_buttonLayout->addWidget(bottomButton, 7, 0);
                 m_legendPosX = new QDoubleSpinBox();
                 m_legendPosY = new QDoubleSpinBox();
                 m_legendWidth = new QDoubleSpinBox();
                 m_legendHeight = new QDoubleSpinBox();
                 connect(m_legendPosX, SIGNAL(valueChanged(double)), this, SLOT(updateLegendLayout()));
                 connect(m_legendPosY, SIGNAL(valueChanged(double)), this, SLOT(updateLegendLayout()));
                 connect(m_legendWidth, SIGNAL(valueChanged(double)), this, SLOT(updateLegendLayout()));
                 connect(m_legendHeight, SIGNAL(valueChanged(double)), this, SLOT(updateLegendLayout()));
                 QFormLayout* legendLayout = new QFormLayout();
                 legendLayout->addRow("Horizontal position", m_legendPosX);
                 legendLayout->addRow("Vertical position", m_legendPosY);
                 legendLayout->addRow("Width", m_legendWidth);
                 legendLayout->addRow("Height", m_legendHeight);
                 m_legendSettings = new QGroupBox("Detached legend");
                 m_legendSettings->setLayout(legendLayout);
                 m_buttonLayout->addWidget(m_legendSettings);
                 m_legendSettings->setVisible(false);
                 // Create chart view with the chart
                 m_chart = new QChart();
                 m_chartView = new QChartView(m_chart, this);
                 // Create layout for grid and detached legend
                 m_mainLayout = new QGridLayout();
                 m_mainLayout->addLayout(m_buttonLayout, 0, 0);
                 m_mainLayout->addWidget(m_chartView, 0, 1, 3, 1);
                 setLayout(m_mainLayout);
                 createSeries();
             }
             void MainWidget::createSeries()
             {
                 m_series = new QBarSeries();
                 addBarset();
                 addBarset();
                 addBarset();
                 addBarset();
                 m_chart->addSeries(m_series);
                 m_chart->setTitle("Legend detach example");
             //![1]
                 m_chart->legend()->setVisible(true);
                 m_chart->legend()->setAlignment(Qt::AlignBottom);
             //![1]
                 m_chart->axisY()->setNiceNumbersEnabled(true);
                 m_chartView->setRenderHint(QPainter::Antialiasing);
             }
             void MainWidget::showLegendSpinbox()
             {
                 m_legendSettings->setVisible(true);
                 QRectF chartViewRect = m_chartView->rect();
                 QRectF legendRect = m_chart->legend()->boundingRect();
                 m_legendPosX->setMinimum(0);
                 m_legendPosX->setMaximum(chartViewRect.width());
                 m_legendPosX->setValue(150);
                 m_legendPosY->setMinimum(0);
                 m_legendPosY->setMaximum(chartViewRect.height());
                 m_legendPosY->setValue(150);
                 m_legendWidth->setMinimum(0);
                 m_legendWidth->setMaximum(chartViewRect.width());
                 m_legendWidth->setValue(150);
                 m_legendHeight->setMinimum(0);
                 m_legendHeight->setMaximum(chartViewRect.height());
                 m_legendHeight->setValue(75);
             }
             void MainWidget::hideLegendSpinbox()
             {
                 m_legendSettings->setVisible(false);
             }
             void MainWidget::detachLegend()
             {
             //![2]
                 QLegend *legend = m_chart->legend();
                 legend->detachFromChart();
                 m_chart->legend()->setBackgroundVisible(true);
                 m_chart->legend()->setBrush(QBrush(QColor(128,128,128,128)));
                 m_chart->legend()->setPen(QPen(QColor(192,192,192,192)));
             //![2]
                 showLegendSpinbox();
                 updateLegendLayout();
                 update();
             }
             void MainWidget::attachLegend()
             {
             //![3]
                 QLegend *legend = m_chart->legend();
                 legend->attachToChart();
                 m_chart->legend()->setBackgroundVisible(false);
             //![3]
                 hideLegendSpinbox();
                 update();
             }
             void MainWidget::addBarset()
             {
-                QBarSet *barSet = new QBarSet(QString("set ") + QString::number(m_series->barsetCount()));
+                QBarSet *barSet = new QBarSet(QString("set ") + QString::number(m_series->count()));
-                qreal delta = m_series->barsetCount() * 0.1;
+                qreal delta = m_series->count() * 0.1;
                 *barSet << QPointF(0.0 + delta, 1 + delta) << QPointF(1.0 + delta, 2 + delta) << QPointF(2.0 + delta, 3 + delta) << QPointF(3.0 + delta, 4 + delta);
                 m_series->append(barSet);
             }
             void MainWidget::removeBarset()
             {
                 QList<QBarSet*> sets = m_series->barSets();
                 if (sets.count() > 0) {
                     m_series->remove(sets.at(sets.count()-1));
                 }
             }
             void MainWidget::setLegendLeft()
             {
                 m_chart->legend()->setAlignment(Qt::AlignLeft);
             }
             void MainWidget::setLegendRight()
             {
                 m_chart->legend()->setAlignment(Qt::AlignRight);
             }
             void MainWidget::setLegendTop()
             {
                 m_chart->legend()->setAlignment(Qt::AlignTop);
             }
             void MainWidget::setLegendBottom()
             {
                 m_chart->legend()->setAlignment(Qt::AlignBottom);
             }
             void MainWidget::updateLegendLayout()
             {
             //![4]
                 m_chart->legend()->setGeometry(m_legendPosX->value()
                                                ,m_legendPosY->value()
                                                ,m_legendWidth->value()
                                                ,m_legendHeight->value());
                 m_chart->legend()->update();
             //![4]
             }

tests/auto/qbarmodelmapper/tst_qbarmodelmapper.cpp +50 -50

             /****************************************************************************
             **
             ** Copyright (C) 2012 Digia Plc
             ** All rights reserved.
             ** For any questions to Digia, please use contact form at http://qt.digia.com
             **
             ** This file is part of the Qt Commercial Charts Add-on.
             **
             ** $QT_BEGIN_LICENSE$
             ** Licensees holding valid Qt Commercial licenses may use this file in
             ** accordance with the Qt Commercial License Agreement provided with the
             ** Software or, alternatively, in accordance with the terms contained in
             ** a written agreement between you and Digia.
             **
             ** If you have questions regarding the use of this file, please use
             ** contact form at http://qt.digia.com
             ** $QT_END_LICENSE$
             **
             ****************************************************************************/
             #include <QtCore/QString>
             #include <QtTest/QtTest>
             #include <qchart.h>
             #include <qchartview.h>
             #include <qgroupedbarseries.h>
             #include <qbarset.h>
             #include <qvbarmodelmapper.h>
             #include <qhbarmodelmapper.h>
             #include <QStandardItemModel>
             QTCOMMERCIALCHART_USE_NAMESPACE
             class tst_qbarmodelmapper : public QObject
             {
                 Q_OBJECT
                 public:
                 tst_qbarmodelmapper();
                 void createVerticalMapper();
                 void createHorizontalMapper();
                 private Q_SLOTS:
                 void initTestCase();
                 void cleanupTestCase();
                 void init();
                 void cleanup();
                 void verticalMapper_data();
                 void verticalMapper();
                 void verticalMapperCustomMapping_data();
                 void verticalMapperCustomMapping();
                 void horizontalMapper_data();
                 void horizontalMapper();
                 void horizontalMapperCustomMapping_data();
                 void horizontalMapperCustomMapping();
                 void seriesUpdated();
                 void verticalModelInsertRows();
                 void verticalModelRemoveRows();
                 void verticalModelInsertColumns();
                 void verticalModelRemoveColumns();
                 void horizontalModelInsertRows();
                 void horizontalModelRemoveRows();
                 void horizontalModelInsertColumns();
                 void horizontalModelRemoveColumns();
                 void modelUpdateCell();
                 private:
                 QStandardItemModel *m_model;
                 int m_modelRowCount;
                 int m_modelColumnCount;
                 QVBarModelMapper *m_vMapper;
                 QHBarModelMapper *m_hMapper;
                 QGroupedBarSeries *m_series;
                 QChart *m_chart;
             };
             tst_qbarmodelmapper::tst_qbarmodelmapper():
                 m_model(0),
                 m_modelRowCount(10),
                 m_modelColumnCount(8),
                 m_vMapper(0),
                 m_hMapper(0),
                 m_series(0),
                 m_chart(0)
             {
             }
             void tst_qbarmodelmapper::createVerticalMapper()
             {
                 m_vMapper = new QVBarModelMapper;
                 QVERIFY(m_vMapper->model() == 0);
                 m_vMapper->setFirstBarSetColumn(0);
                 m_vMapper->setLastBarSetColumn(4);
                 m_vMapper->setModel(m_model);
                 m_vMapper->setSeries(m_series);
             }
             void tst_qbarmodelmapper::createHorizontalMapper()
             {
                 m_hMapper = new QHBarModelMapper;
                 QVERIFY(m_hMapper->model() == 0);
                 m_hMapper->setFirstBarSetRow(0);
                 m_hMapper->setLastBarSetRow(4);
                 m_hMapper->setModel(m_model);
                 m_hMapper->setSeries(m_series);
             }
             void tst_qbarmodelmapper::init()
             {
                 m_series = new QGroupedBarSeries;
                 m_chart->addSeries(m_series);
                 m_model = new QStandardItemModel(m_modelRowCount, m_modelColumnCount, this);
                 for (int row = 0; row < m_modelRowCount; ++row) {
                     for (int column = 0; column < m_modelColumnCount; column++) {
                         m_model->setData(m_model->index(row, column), row * column);
                     }
                 }
             }
             void tst_qbarmodelmapper::cleanup()
             {
                 m_chart->removeSeries(m_series);
                 delete m_series;
                 m_series = 0;
                 m_model->clear();
                 m_model->deleteLater();
                 m_model = 0;
                 if (m_vMapper) {
                     m_vMapper->deleteLater();
                     m_vMapper = 0;
                 }
                 if (m_hMapper) {
                     m_hMapper->deleteLater();
                     m_hMapper = 0;
                 }
             }
             void tst_qbarmodelmapper::initTestCase()
             {
                 m_chart = new QChart;
                 QChartView *chartView = new QChartView(m_chart);
                 chartView->show();
             }
             void tst_qbarmodelmapper::cleanupTestCase()
             {
             }
             void tst_qbarmodelmapper::verticalMapper_data()
             {
                 QTest::addColumn<int>("firstBarSetColumn");
                 QTest::addColumn<int>("lastBarSetColumn");
                 QTest::addColumn<int>("expectedBarSetCount");
                 QTest::newRow("lastBarSetColumn greater than firstBarSetColumn") << 0 << 1 << 2;
                 QTest::newRow("lastBarSetColumn equal to firstBarSetColumn") << 1 << 1 << 1;
                 QTest::newRow("lastBarSetColumn lesser than firstBarSetColumn") << 1 << 0 << 0;
                 QTest::newRow("invalid firstBarSetColumn and correct lastBarSetColumn") << -3 << 1 << 0;
                 QTest::newRow("firstBarSetColumn beyond the size of model and correct lastBarSetColumn") << m_modelColumnCount << 1 << 0;
                 QTest::newRow("firstBarSetColumn beyond the size of model and invalid lastBarSetColumn") << m_modelColumnCount << -1 << 0;
             }
             void tst_qbarmodelmapper::verticalMapper()
             {
                 QFETCH(int, firstBarSetColumn);
                 QFETCH(int, lastBarSetColumn);
                 QFETCH(int, expectedBarSetCount);
                 m_series = new QGroupedBarSeries;
                 QVBarModelMapper *mapper = new QVBarModelMapper;
                 mapper->setFirstBarSetColumn(firstBarSetColumn);
                 mapper->setLastBarSetColumn(lastBarSetColumn);
                 mapper->setModel(m_model);
                 mapper->setSeries(m_series);
                 m_chart->addSeries(m_series);
-                QCOMPARE(m_series->barsetCount(), expectedBarSetCount);
+                QCOMPARE(m_series->count(), expectedBarSetCount);
                 QCOMPARE(mapper->firstBarSetColumn(), qMax(-1, firstBarSetColumn));
                 QCOMPARE(mapper->lastBarSetColumn(), qMax(-1, lastBarSetColumn));
                 delete mapper;
                 mapper = 0;
             }
             void tst_qbarmodelmapper::verticalMapperCustomMapping_data()
             {
                 QTest::addColumn<int>("first");
                 QTest::addColumn<int>("countLimit");
                 QTest::addColumn<int>("expectedBarSetCount");
                 QTest::addColumn<int>("expectedCount");
                 QTest::newRow("first: 0, unlimited count") << 0 << -1 << 2 << m_modelRowCount;
                 QTest::newRow("first: 3, unlimited count") << 3 << -1 << 2 << m_modelRowCount - 3;
                 QTest::newRow("first: 0, count: 5") << 0 << 5 << 2 << qMin(5, m_modelRowCount);
                 QTest::newRow("first: 3, count: 5") << 3 << 5 << 2 << qMin(5, m_modelRowCount - 3);
                 QTest::newRow("first: +1 greater then the number of rows in the model, unlimited count") << m_modelRowCount + 1 << -1 << 0 << 0;
                 QTest::newRow("first: +1 greater then the number of rows in the model, count: 5") << m_modelRowCount + 1 << 5 << 0 << 0;
                 QTest::newRow("first: 0, count: +3 greater than the number of rows in the model (should limit to the size of model)") << 0 << m_modelRowCount + 3 << 2 << m_modelRowCount;
                 QTest::newRow("first: -3(invalid - should default to 0), unlimited count") << -3 << -1 << 2 << m_modelRowCount;
                 QTest::newRow("first: 0, count: -3 (invalid - shlould default to -1)") << 0 << -3 << 2 << m_modelRowCount;
                 QTest::newRow("first: -3(invalid - should default to 0), count: -3 (invalid - shlould default to -1)") << -3 << -3 << 2 << m_modelRowCount;
             }
             void tst_qbarmodelmapper::verticalMapperCustomMapping()
             {
                 QFETCH(int, first);
                 QFETCH(int, countLimit);
                 QFETCH(int, expectedBarSetCount);
                 QFETCH(int, expectedCount);
                 m_series = new QGroupedBarSeries;
-                QCOMPARE(m_series->barsetCount(), 0);
+                QCOMPARE(m_series->count(), 0);
                 QVBarModelMapper *mapper = new QVBarModelMapper;
                 mapper->setFirstBarSetColumn(0);
                 mapper->setLastBarSetColumn(1);
                 mapper->setModel(m_model);
                 mapper->setSeries(m_series);
                 mapper->setFirst(first);
                 mapper->setCount(countLimit);
                 m_chart->addSeries(m_series);
-                QCOMPARE(m_series->barsetCount(), expectedBarSetCount);
+                QCOMPARE(m_series->count(), expectedBarSetCount);
                 if (expectedBarSetCount > 0)
                     QCOMPARE(m_series->barSets().first()->count(), expectedCount);
                 // change values column mapping to invalid
                 mapper->setFirstBarSetColumn(-1);
                 mapper->setLastBarSetColumn(1);
-                QCOMPARE(m_series->barsetCount(), 0);
+                QCOMPARE(m_series->count(), 0);
                 delete mapper;
                 mapper = 0;
             }
             void tst_qbarmodelmapper::horizontalMapper_data()
             {
                 QTest::addColumn<int>("firstBarSetRow");
                 QTest::addColumn<int>("lastBarSetRow");
                 QTest::addColumn<int>("expectedBarSetCount");
                 QTest::newRow("lastBarSetRow greater than firstBarSetRow") << 0 << 1 << 2;
                 QTest::newRow("lastBarSetRow equal to firstBarSetRow") << 1 << 1 << 1;
                 QTest::newRow("lastBarSetRow lesser than firstBarSetRow") << 1 << 0 << 0;
                 QTest::newRow("invalid firstBarSetRow and correct lastBarSetRow") << -3 << 1 << 0;
                 QTest::newRow("firstBarSetRow beyond the size of model and correct lastBarSetRow") << m_modelRowCount << 1 << 0;
                 QTest::newRow("firstBarSetRow beyond the size of model and invalid lastBarSetRow") << m_modelRowCount << -1 << 0;
             }
             void tst_qbarmodelmapper::horizontalMapper()
             {
                 QFETCH(int, firstBarSetRow);
                 QFETCH(int, lastBarSetRow);
                 QFETCH(int, expectedBarSetCount);
                 m_series = new QGroupedBarSeries;
                 QHBarModelMapper *mapper = new QHBarModelMapper;
                 mapper->setFirstBarSetRow(firstBarSetRow);
                 mapper->setLastBarSetRow(lastBarSetRow);
                 mapper->setModel(m_model);
                 mapper->setSeries(m_series);
                 m_chart->addSeries(m_series);
-                QCOMPARE(m_series->barsetCount(), expectedBarSetCount);
+                QCOMPARE(m_series->count(), expectedBarSetCount);
                 QCOMPARE(mapper->firstBarSetRow(), qMax(-1, firstBarSetRow));
                 QCOMPARE(mapper->lastBarSetRow(), qMax(-1, lastBarSetRow));
                 delete mapper;
                 mapper = 0;
             }
             void tst_qbarmodelmapper::horizontalMapperCustomMapping_data()
             {
                 QTest::addColumn<int>("first");
                 QTest::addColumn<int>("countLimit");
                 QTest::addColumn<int>("expectedBarSetCount");
                 QTest::addColumn<int>("expectedCount");
                 QTest::newRow("first: 0, unlimited count") << 0 << -1 << 2 << m_modelColumnCount;
                 QTest::newRow("first: 3, unlimited count") << 3 << -1 << 2 << m_modelColumnCount - 3;
                 QTest::newRow("first: 0, count: 5") << 0 << 5 << 2 << qMin(5, m_modelColumnCount);
                 QTest::newRow("first: 3, count: 5") << 3 << 5 << 2 << qMin(5, m_modelColumnCount - 3);
                 QTest::newRow("first: +1 greater then the number of rows in the model, unlimited count") << m_modelColumnCount + 1 << -1 << 0 << 0;
                 QTest::newRow("first: +1 greater then the number of rows in the model, count: 5") << m_modelColumnCount + 1 << 5 << 0 << 0;
                 QTest::newRow("first: 0, count: +3 greater than the number of rows in the model (should limit to the size of model)") << 0 << m_modelColumnCount + 3 << 2 << m_modelColumnCount;
                 QTest::newRow("first: -3(invalid - should default to 0), unlimited count") << -3 << -1 << 2 << m_modelColumnCount;
                 QTest::newRow("first: 0, count: -3 (invalid - shlould default to -1)") << 0 << -3 << 2 << m_modelColumnCount;
                 QTest::newRow("first: -3(invalid - should default to 0), count: -3 (invalid - shlould default to -1)") << -3 << -3 << 2 << m_modelColumnCount;
             }
             void tst_qbarmodelmapper::horizontalMapperCustomMapping()
             {
                 QFETCH(int, first);
                 QFETCH(int, countLimit);
                 QFETCH(int, expectedBarSetCount);
                 QFETCH(int, expectedCount);
                 m_series = new QGroupedBarSeries;
-                QCOMPARE(m_series->barsetCount(), 0);
+                QCOMPARE(m_series->count(), 0);
                 QHBarModelMapper *mapper = new QHBarModelMapper;
                 mapper->setFirstBarSetRow(0);
                 mapper->setLastBarSetRow(1);
                 mapper->setModel(m_model);
                 mapper->setSeries(m_series);
                 mapper->setFirst(first);
                 mapper->setCount(countLimit);
                 m_chart->addSeries(m_series);
-                QCOMPARE(m_series->barsetCount(), expectedBarSetCount);
+                QCOMPARE(m_series->count(), expectedBarSetCount);
                 if (expectedBarSetCount > 0)
                     QCOMPARE(m_series->barSets().first()->count(), expectedCount);
                 // change values column mapping to invalid
                 mapper->setFirstBarSetRow(-1);
                 mapper->setLastBarSetRow(1);
-                QCOMPARE(m_series->barsetCount(), 0);
+                QCOMPARE(m_series->count(), 0);
                 delete mapper;
                 mapper = 0;
             }
             void tst_qbarmodelmapper::seriesUpdated()
             {
                 // setup the mapper
                 createVerticalMapper();
                 QCOMPARE(m_series->barSets().first()->count(), m_modelRowCount);
                 QCOMPARE(m_vMapper->count(), -1);
                 m_series->barSets().first()->append(123);
                 QCOMPARE(m_model->rowCount(), m_modelRowCount + 1);
                 QCOMPARE(m_vMapper->count(), -1); // the value should not change as it indicates 'all' items there are in the model
                 m_series->barSets().last()->remove(0, m_modelRowCount);
                 QCOMPARE(m_model->rowCount(), 1);
                 QCOMPARE(m_vMapper->count(), -1); // the value should not change as it indicates 'all' items there are in the model
                 m_series->barSets().first()->replace(0, 444.0);
                 QCOMPARE(m_model->data(m_model->index(0, 0)).toReal(), 444.0);
                 m_series->barSets().first()->setLabel("Hello");
                 QCOMPARE(m_model->headerData(0, Qt::Horizontal).toString(), QString("Hello"));
                 QList<qreal> newValues;
                 newValues << 15 << 27 << 35 << 49;
                 m_series->barSets().first()->append(newValues);
                 QCOMPARE(m_model->rowCount(), 1 + newValues.count());
                 QList<QBarSet* > newBarSets;
                 QBarSet* newBarSet_1 = new QBarSet("New_1");
                 newBarSet_1->append(101);
                 newBarSet_1->append(102);
                 newBarSet_1->append(103);
                 newBarSets.append(newBarSet_1);
                 QBarSet* newBarSet_2 = new QBarSet("New_1");
                 newBarSet_2->append(201);
                 newBarSet_2->append(202);
                 newBarSet_2->append(203);
                 newBarSets.append(newBarSet_2);
                 m_series->append(newBarSets);
                 QCOMPARE(m_model->columnCount(), m_modelColumnCount + newBarSets.count());
             }
             void tst_qbarmodelmapper::verticalModelInsertRows()
             {
                 // setup the mapper
                 createVerticalMapper();
-                QCOMPARE(m_series->barsetCount(), m_vMapper->lastBarSetColumn() - m_vMapper->firstBarSetColumn() + 1);
+                QCOMPARE(m_series->count(), m_vMapper->lastBarSetColumn() - m_vMapper->firstBarSetColumn() + 1);
                 QCOMPARE(m_series->barSets().first()->count(), m_modelRowCount);
                 QVERIFY(m_vMapper->model() != 0);
                 int insertCount = 4;
                 m_model->insertRows(3, insertCount);
-                QCOMPARE(m_series->barsetCount(), m_vMapper->lastBarSetColumn() - m_vMapper->firstBarSetColumn() + 1);
+                QCOMPARE(m_series->count(), m_vMapper->lastBarSetColumn() - m_vMapper->firstBarSetColumn() + 1);
                 QCOMPARE(m_series->barSets().first()->count(), m_modelRowCount + insertCount);
                 int first = 3;
                 m_vMapper->setFirst(3);
-                QCOMPARE(m_series->barsetCount(), m_vMapper->lastBarSetColumn() - m_vMapper->firstBarSetColumn() + 1);
+                QCOMPARE(m_series->count(), m_vMapper->lastBarSetColumn() - m_vMapper->firstBarSetColumn() + 1);
                 QCOMPARE(m_series->barSets().first()->count(), m_modelRowCount + insertCount - first);
                 m_model->insertRows(3, insertCount);
-                QCOMPARE(m_series->barsetCount(), m_vMapper->lastBarSetColumn() - m_vMapper->firstBarSetColumn() + 1);
+                QCOMPARE(m_series->count(), m_vMapper->lastBarSetColumn() - m_vMapper->firstBarSetColumn() + 1);
                 QCOMPARE(m_series->barSets().first()->count(), m_modelRowCount +  2 * insertCount - first);
                 int countLimit = 6;
                 m_vMapper->setCount(countLimit);
-                QCOMPARE(m_series->barsetCount(), m_vMapper->lastBarSetColumn() - m_vMapper->firstBarSetColumn() + 1);
+                QCOMPARE(m_series->count(), m_vMapper->lastBarSetColumn() - m_vMapper->firstBarSetColumn() + 1);
                 QCOMPARE(m_series->barSets().first()->count(), qMin(countLimit, m_modelRowCount + 2 * insertCount - first));
                 m_model->insertRows(3, insertCount);
-                QCOMPARE(m_series->barsetCount(), m_vMapper->lastBarSetColumn() - m_vMapper->firstBarSetColumn() + 1);
+                QCOMPARE(m_series->count(), m_vMapper->lastBarSetColumn() - m_vMapper->firstBarSetColumn() + 1);
                 QCOMPARE(m_series->barSets().first()->count(), qMin(countLimit, m_modelRowCount + 3 * insertCount - first));
                 m_vMapper->setFirst(0);
-                QCOMPARE(m_series->barsetCount(), m_vMapper->lastBarSetColumn() - m_vMapper->firstBarSetColumn() + 1);
+                QCOMPARE(m_series->count(), m_vMapper->lastBarSetColumn() - m_vMapper->firstBarSetColumn() + 1);
                 QCOMPARE(m_series->barSets().first()->count(), qMin(countLimit, m_modelRowCount + 3 * insertCount));
                 m_vMapper->setCount(-1);
-                QCOMPARE(m_series->barsetCount(), m_vMapper->lastBarSetColumn() - m_vMapper->firstBarSetColumn() + 1);
+                QCOMPARE(m_series->count(), m_vMapper->lastBarSetColumn() - m_vMapper->firstBarSetColumn() + 1);
                 QCOMPARE(m_series->barSets().first()->count(), m_modelRowCount + 3 * insertCount);
             }
             void tst_qbarmodelmapper::verticalModelRemoveRows()
             {
                 // setup the mapper
                 createVerticalMapper();
-                QCOMPARE(m_series->barsetCount(), m_vMapper->lastBarSetColumn() - m_vMapper->firstBarSetColumn() + 1);
+                QCOMPARE(m_series->count(), m_vMapper->lastBarSetColumn() - m_vMapper->firstBarSetColumn() + 1);
                 QCOMPARE(m_series->barSets().first()->count(), m_modelRowCount);
                 QVERIFY(m_vMapper->model() != 0);
                 int removeCount = 2;
                 m_model->removeRows(1, removeCount);
-                QCOMPARE(m_series->barsetCount(), m_vMapper->lastBarSetColumn() - m_vMapper->firstBarSetColumn() + 1);
+                QCOMPARE(m_series->count(), m_vMapper->lastBarSetColumn() - m_vMapper->firstBarSetColumn() + 1);
                 QCOMPARE(m_series->barSets().first()->count(), m_modelRowCount - removeCount);
                 int first = 1;
                 m_vMapper->setFirst(first);
-                QCOMPARE(m_series->barsetCount(), m_vMapper->lastBarSetColumn() - m_vMapper->firstBarSetColumn() + 1);
+                QCOMPARE(m_series->count(), m_vMapper->lastBarSetColumn() - m_vMapper->firstBarSetColumn() + 1);
                 QCOMPARE(m_series->barSets().first()->count(), m_modelRowCount - removeCount - first);
                 m_model->removeRows(1, removeCount);
-                QCOMPARE(m_series->barsetCount(), m_vMapper->lastBarSetColumn() - m_vMapper->firstBarSetColumn() + 1);
+                QCOMPARE(m_series->count(), m_vMapper->lastBarSetColumn() - m_vMapper->firstBarSetColumn() + 1);
                 QCOMPARE(m_series->barSets().first()->count(), m_modelRowCount -  2 * removeCount - first);
                 int countLimit = 3;
                 m_vMapper->setCount(countLimit);
-                QCOMPARE(m_series->barsetCount(), m_vMapper->lastBarSetColumn() - m_vMapper->firstBarSetColumn() + 1);
+                QCOMPARE(m_series->count(), m_vMapper->lastBarSetColumn() - m_vMapper->firstBarSetColumn() + 1);
                 QCOMPARE(m_series->barSets().first()->count(), qMin(countLimit, m_modelRowCount -  2 * removeCount - first));
                 m_model->removeRows(1, removeCount);
-                QCOMPARE(m_series->barsetCount(), m_vMapper->lastBarSetColumn() - m_vMapper->firstBarSetColumn() + 1);
+                QCOMPARE(m_series->count(), m_vMapper->lastBarSetColumn() - m_vMapper->firstBarSetColumn() + 1);
                 QCOMPARE(m_series->barSets().first()->count(), qMin(countLimit, m_modelRowCount -  3 * removeCount - first));
                 m_vMapper->setFirst(0);
-                QCOMPARE(m_series->barsetCount(), m_vMapper->lastBarSetColumn() - m_vMapper->firstBarSetColumn() + 1);
+                QCOMPARE(m_series->count(), m_vMapper->lastBarSetColumn() - m_vMapper->firstBarSetColumn() + 1);
                 QCOMPARE(m_series->barSets().first()->count(), qMin(countLimit, m_modelRowCount -  3 * removeCount));
                 m_vMapper->setCount(-1);
-                QCOMPARE(m_series->barsetCount(), m_vMapper->lastBarSetColumn() - m_vMapper->firstBarSetColumn() + 1);
+                QCOMPARE(m_series->count(), m_vMapper->lastBarSetColumn() - m_vMapper->firstBarSetColumn() + 1);
                 QCOMPARE(m_series->barSets().first()->count(), m_modelRowCount -  3 * removeCount);
             }
             void tst_qbarmodelmapper::verticalModelInsertColumns()
             {
                 // setup the mapper
                 createVerticalMapper();
-                QCOMPARE(m_series->barsetCount(), m_vMapper->lastBarSetColumn() - m_vMapper->firstBarSetColumn() + 1);
+                QCOMPARE(m_series->count(), m_vMapper->lastBarSetColumn() - m_vMapper->firstBarSetColumn() + 1);
                 QCOMPARE(m_series->barSets().first()->count(), m_modelRowCount);
                 QVERIFY(m_vMapper->model() != 0);
                 int insertCount = 4;
                 m_model->insertColumns(3, insertCount);
-                QCOMPARE(m_series->barsetCount(), m_vMapper->lastBarSetColumn() - m_vMapper->firstBarSetColumn() + 1);
+                QCOMPARE(m_series->count(), m_vMapper->lastBarSetColumn() - m_vMapper->firstBarSetColumn() + 1);
                 QCOMPARE(m_series->barSets().first()->count(), m_modelRowCount);
             }
             void tst_qbarmodelmapper::verticalModelRemoveColumns()
             {
                 // setup the mapper
                 createVerticalMapper();
-                QCOMPARE(m_series->barsetCount(), qMin(m_model->columnCount(), m_vMapper->lastBarSetColumn() - m_vMapper->firstBarSetColumn() + 1));
+                QCOMPARE(m_series->count(), qMin(m_model->columnCount(), m_vMapper->lastBarSetColumn() - m_vMapper->firstBarSetColumn() + 1));
                 QCOMPARE(m_series->barSets().first()->count(), m_modelRowCount);
                 QVERIFY(m_vMapper->model() != 0);
                 int removeCount = m_modelColumnCount - 2;
                 m_model->removeColumns(0, removeCount);
-                QCOMPARE(m_series->barsetCount(), qMin(m_model->columnCount(), m_vMapper->lastBarSetColumn() - m_vMapper->firstBarSetColumn() + 1));
+                QCOMPARE(m_series->count(), qMin(m_model->columnCount(), m_vMapper->lastBarSetColumn() - m_vMapper->firstBarSetColumn() + 1));
                 QCOMPARE(m_series->barSets().first()->count(), m_modelRowCount);
                 // leave all the columns
                 m_model->removeColumns(0, m_modelColumnCount - removeCount);
-                QCOMPARE(m_series->barsetCount(), 0);
+                QCOMPARE(m_series->count(), 0);
             }
             void tst_qbarmodelmapper::horizontalModelInsertRows()
             {
                 // setup the mapper
                 createHorizontalMapper();
-                QCOMPARE(m_series->barsetCount(), m_hMapper->lastBarSetRow() - m_hMapper->firstBarSetRow() + 1);
+                QCOMPARE(m_series->count(), m_hMapper->lastBarSetRow() - m_hMapper->firstBarSetRow() + 1);
                 QCOMPARE(m_series->barSets().first()->count(), m_modelColumnCount);
                 QVERIFY(m_hMapper->model() != 0);
                 int insertCount = 4;
                 m_model->insertRows(3, insertCount);
-                QCOMPARE(m_series->barsetCount(), m_hMapper->lastBarSetRow() - m_hMapper->firstBarSetRow() + 1);
+                QCOMPARE(m_series->count(), m_hMapper->lastBarSetRow() - m_hMapper->firstBarSetRow() + 1);
                 QCOMPARE(m_series->barSets().first()->count(), m_modelColumnCount);
             }
             void tst_qbarmodelmapper::horizontalModelRemoveRows()
             {
                 // setup the mapper
                 createHorizontalMapper();
-                QCOMPARE(m_series->barsetCount(), qMin(m_model->rowCount(), m_hMapper->lastBarSetRow() - m_hMapper->firstBarSetRow() + 1));
+                QCOMPARE(m_series->count(), qMin(m_model->rowCount(), m_hMapper->lastBarSetRow() - m_hMapper->firstBarSetRow() + 1));
                 QCOMPARE(m_series->barSets().first()->count(), m_modelColumnCount);
                 QVERIFY(m_hMapper->model() != 0);
                 int removeCount = m_modelRowCount - 2;
                 m_model->removeRows(0, removeCount);
-                QCOMPARE(m_series->barsetCount(), qMin(m_model->rowCount(), m_hMapper->lastBarSetRow() - m_hMapper->firstBarSetRow() + 1));
+                QCOMPARE(m_series->count(), qMin(m_model->rowCount(), m_hMapper->lastBarSetRow() - m_hMapper->firstBarSetRow() + 1));
                 QCOMPARE(m_series->barSets().first()->count(), m_modelColumnCount);
                 // leave all the columns
                 m_model->removeRows(0, m_modelRowCount - removeCount);
-                QCOMPARE(m_series->barsetCount(), 0);
+                QCOMPARE(m_series->count(), 0);
             }
             void tst_qbarmodelmapper::horizontalModelInsertColumns()
             {
                 // setup the mapper
                 createHorizontalMapper();
-                QCOMPARE(m_series->barsetCount(), m_hMapper->lastBarSetRow() - m_hMapper->firstBarSetRow() + 1);
+                QCOMPARE(m_series->count(), m_hMapper->lastBarSetRow() - m_hMapper->firstBarSetRow() + 1);
                 QCOMPARE(m_series->barSets().first()->count(), m_modelColumnCount);
                 QVERIFY(m_hMapper->model() != 0);
                 int insertCount = 4;
                 m_model->insertColumns(3, insertCount);
-                QCOMPARE(m_series->barsetCount(), m_hMapper->lastBarSetRow() - m_hMapper->firstBarSetRow() + 1);
+                QCOMPARE(m_series->count(), m_hMapper->lastBarSetRow() - m_hMapper->firstBarSetRow() + 1);
                 QCOMPARE(m_series->barSets().first()->count(), m_modelColumnCount + insertCount);
                 int first = 3;
                 m_hMapper->setFirst(3);
-                QCOMPARE(m_series->barsetCount(), m_hMapper->lastBarSetRow() - m_hMapper->firstBarSetRow() + 1);
+                QCOMPARE(m_series->count(), m_hMapper->lastBarSetRow() - m_hMapper->firstBarSetRow() + 1);
                 QCOMPARE(m_series->barSets().first()->count(), m_modelColumnCount + insertCount - first);
                 m_model->insertColumns(3, insertCount);
-                QCOMPARE(m_series->barsetCount(), m_hMapper->lastBarSetRow() - m_hMapper->firstBarSetRow() + 1);
+                QCOMPARE(m_series->count(), m_hMapper->lastBarSetRow() - m_hMapper->firstBarSetRow() + 1);
                 QCOMPARE(m_series->barSets().first()->count(), m_modelColumnCount +  2 * insertCount - first);
                 int countLimit = 6;
                 m_hMapper->setCount(countLimit);
-                QCOMPARE(m_series->barsetCount(), m_hMapper->lastBarSetRow() - m_hMapper->firstBarSetRow() + 1);
+                QCOMPARE(m_series->count(), m_hMapper->lastBarSetRow() - m_hMapper->firstBarSetRow() + 1);
                 QCOMPARE(m_series->barSets().first()->count(), qMin(countLimit, m_modelColumnCount + 2 * insertCount - first));
                 m_model->insertColumns(3, insertCount);
-                QCOMPARE(m_series->barsetCount(), m_hMapper->lastBarSetRow() - m_hMapper->firstBarSetRow() + 1);
+                QCOMPARE(m_series->count(), m_hMapper->lastBarSetRow() - m_hMapper->firstBarSetRow() + 1);
                 QCOMPARE(m_series->barSets().first()->count(), qMin(countLimit, m_modelColumnCount + 3 * insertCount - first));
                 m_hMapper->setFirst(0);
-                QCOMPARE(m_series->barsetCount(), m_hMapper->lastBarSetRow() - m_hMapper->firstBarSetRow() + 1);
+                QCOMPARE(m_series->count(), m_hMapper->lastBarSetRow() - m_hMapper->firstBarSetRow() + 1);
                 QCOMPARE(m_series->barSets().first()->count(), qMin(countLimit, m_modelColumnCount + 3 * insertCount));
                 m_hMapper->setCount(-1);
-                QCOMPARE(m_series->barsetCount(), m_hMapper->lastBarSetRow() - m_hMapper->firstBarSetRow() + 1);
+                QCOMPARE(m_series->count(), m_hMapper->lastBarSetRow() - m_hMapper->firstBarSetRow() + 1);
                 QCOMPARE(m_series->barSets().first()->count(), m_modelColumnCount + 3 * insertCount);
             }
             void tst_qbarmodelmapper::horizontalModelRemoveColumns()
             {
                 // setup the mapper
                 createHorizontalMapper();
-                QCOMPARE(m_series->barsetCount(), m_hMapper->lastBarSetRow() - m_hMapper->firstBarSetRow() + 1);
+                QCOMPARE(m_series->count(), m_hMapper->lastBarSetRow() - m_hMapper->firstBarSetRow() + 1);
                 QCOMPARE(m_series->barSets().first()->count(), m_modelColumnCount);
                 QVERIFY(m_hMapper->model() != 0);
                 int removeCount = 2;
                 m_model->removeColumns(1, removeCount);
-                QCOMPARE(m_series->barsetCount(), m_hMapper->lastBarSetRow() - m_hMapper->firstBarSetRow() + 1);
+                QCOMPARE(m_series->count(), m_hMapper->lastBarSetRow() - m_hMapper->firstBarSetRow() + 1);
                 QCOMPARE(m_series->barSets().first()->count(), m_modelColumnCount - removeCount);
                 int first = 1;
                 m_hMapper->setFirst(first);
-                QCOMPARE(m_series->barsetCount(), m_hMapper->lastBarSetRow() - m_hMapper->firstBarSetRow() + 1);
+                QCOMPARE(m_series->count(), m_hMapper->lastBarSetRow() - m_hMapper->firstBarSetRow() + 1);
                 QCOMPARE(m_series->barSets().first()->count(), m_modelColumnCount - removeCount - first);
                 m_model->removeColumns(1, removeCount);
-                QCOMPARE(m_series->barsetCount(), m_hMapper->lastBarSetRow() - m_hMapper->firstBarSetRow() + 1);
+                QCOMPARE(m_series->count(), m_hMapper->lastBarSetRow() - m_hMapper->firstBarSetRow() + 1);
                 QCOMPARE(m_series->barSets().first()->count(), m_modelColumnCount -  2 * removeCount - first);
                 int countLimit = 3;
                 m_hMapper->setCount(countLimit);
-                QCOMPARE(m_series->barsetCount(), m_hMapper->lastBarSetRow() - m_hMapper->firstBarSetRow() + 1);
+                QCOMPARE(m_series->count(), m_hMapper->lastBarSetRow() - m_hMapper->firstBarSetRow() + 1);
                 QCOMPARE(m_series->barSets().first()->count(), qMin(countLimit, m_modelColumnCount -  2 * removeCount - first));
                 m_model->removeColumns(1, removeCount);
-                QCOMPARE(m_series->barsetCount(), m_hMapper->lastBarSetRow() - m_hMapper->firstBarSetRow() + 1);
+                QCOMPARE(m_series->count(), m_hMapper->lastBarSetRow() - m_hMapper->firstBarSetRow() + 1);
                 QCOMPARE(m_series->barSets().first()->count(), qMin(countLimit, m_modelColumnCount -  3 * removeCount - first));
                 m_hMapper->setFirst(0);
-                QCOMPARE(m_series->barsetCount(), m_hMapper->lastBarSetRow() - m_hMapper->firstBarSetRow() + 1);
+                QCOMPARE(m_series->count(), m_hMapper->lastBarSetRow() - m_hMapper->firstBarSetRow() + 1);
                 QCOMPARE(m_series->barSets().first()->count(), qMin(countLimit, m_modelColumnCount -  3 * removeCount));
                 m_hMapper->setCount(-1);
-                QCOMPARE(m_series->barsetCount(), m_hMapper->lastBarSetRow() - m_hMapper->firstBarSetRow() + 1);
+                QCOMPARE(m_series->count(), m_hMapper->lastBarSetRow() - m_hMapper->firstBarSetRow() + 1);
                 QCOMPARE(m_series->barSets().first()->count(), m_modelColumnCount -  3 * removeCount);
             }
             void tst_qbarmodelmapper::modelUpdateCell()
             {
                 // setup the mapper
                 createVerticalMapper();
                 QVERIFY(m_model->setData(m_model->index(1, 0), 44));
                 QCOMPARE(m_series->barSets().at(0)->at(1).y(), 44.0);
                 QCOMPARE(m_model->data(m_model->index(1, 0)).toReal(), 44.0);
             }
             QTEST_MAIN(tst_qbarmodelmapper)
             #include "tst_qbarmodelmapper.moc"

tests/auto/qbarseries/tst_qbarseries.cpp +22 -22

             /****************************************************************************
             **
             ** Copyright (C) 2012 Digia Plc
             ** All rights reserved.
             ** For any questions to Digia, please use contact form at http://qt.digia.com
             **
             ** This file is part of the Qt Commercial Charts Add-on.
             **
             ** $QT_BEGIN_LICENSE$
             ** Licensees holding valid Qt Commercial licenses may use this file in
             ** accordance with the Qt Commercial License Agreement provided with the
             ** Software or, alternatively, in accordance with the terms contained in
             ** a written agreement between you and Digia.
             **
             ** If you have questions regarding the use of this file, please use
             ** contact form at http://qt.digia.com
             ** $QT_END_LICENSE$
             **
             ****************************************************************************/
             #include <QtTest/QtTest>
             #include <qbarseries.h>
             #include <qbarset.h>
             #include <qchartview.h>
             #include <qchart.h>
             QTCOMMERCIALCHART_USE_NAMESPACE
             Q_DECLARE_METATYPE(QBarSet*)
             class tst_QBarSeries : public QObject
             {
                 Q_OBJECT
             public slots:
                 void initTestCase();
                 void cleanupTestCase();
                 void init();
                 void cleanup();
             private slots:
                 void qbarseries_data();
                 void qbarseries();
                 void type_data();
                 void type();
                 void append_data();
                 void append();
                 void remove_data();
                 void remove();
                 void appendList_data();
                 void appendList();
-                void barsetCount_data();
+                void count_data();
-                void barsetCount();
+                void count();
                 void barSets_data();
                 void barSets();
                 void setLabelsVisible_data();
                 void setLabelsVisible();
                 void mouseclicked_data();
                 void mouseclicked();
                 void mousehovered_data();
                 void mousehovered();
                 void clearWithAnimations();
             private:
                 QBarSeries* m_barseries;
                 QBarSeries* m_barseries_with_sets;
                 QList<QBarSet*> m_testSets;
             };
             void tst_QBarSeries::initTestCase()
             {
                 qRegisterMetaType<QBarSet*>("QBarSet*");
             }
             void tst_QBarSeries::cleanupTestCase()
             {
             }
             void tst_QBarSeries::init()
             {
                 m_barseries = new QBarSeries();
                 m_barseries_with_sets = new QBarSeries();
                 for (int i=0; i<5; i++) {
                     m_testSets.append(new QBarSet("testset"));
                     m_barseries_with_sets->append(m_testSets.at(i));
                 }
             }
             void tst_QBarSeries::cleanup()
             {
                 foreach(QBarSet* s, m_testSets) {
                     m_barseries_with_sets->remove(s);
                     delete s;
                 }
                 m_testSets.clear();
                 delete m_barseries;
                 m_barseries = 0;
                 delete m_barseries_with_sets;
                 m_barseries_with_sets = 0;
             }
             void tst_QBarSeries::qbarseries_data()
             {
             }
             void tst_QBarSeries::qbarseries()
             {
                 QBarSeries *barseries = new QBarSeries();
                 QVERIFY(barseries != 0);
             }
             void tst_QBarSeries::type_data()
             {
             }
             void tst_QBarSeries::type()
             {
                 QVERIFY(m_barseries->type() == QAbstractSeries::SeriesTypeBar);
             }
             void tst_QBarSeries::append_data()
             {
             }
             void tst_QBarSeries::append()
             {
-                QVERIFY(m_barseries->barsetCount() == 0);
+                QVERIFY(m_barseries->count() == 0);
                 bool ret = false;
                 // Try adding barset
                 QBarSet *barset = new QBarSet("testset");
                 ret = m_barseries->append(barset);
                 QVERIFY(ret == true);
-                QVERIFY(m_barseries->barsetCount() == 1);
+                QVERIFY(m_barseries->count() == 1);
                 // Try adding another set
                 QBarSet *barset2 = new QBarSet("testset2");
                 ret = m_barseries->append(barset2);
                 QVERIFY(ret == true);
-                QVERIFY(m_barseries->barsetCount() == 2);
+                QVERIFY(m_barseries->count() == 2);
                 // Try adding same set again
                 ret = m_barseries->append(barset2);
                 QVERIFY(ret == false);
-                QVERIFY(m_barseries->barsetCount() == 2);
+                QVERIFY(m_barseries->count() == 2);
                 // Try adding null set
                 ret = m_barseries->append(0);
                 QVERIFY(ret == false);
-                QVERIFY(m_barseries->barsetCount() == 2);
+                QVERIFY(m_barseries->count() == 2);
             }
             void tst_QBarSeries::remove_data()
             {
             }
             void tst_QBarSeries::remove()
             {
                 int count = m_testSets.count();
-                QVERIFY(m_barseries_with_sets->barsetCount() == count);
+                QVERIFY(m_barseries_with_sets->count() == count);
                 // Try to remove null pointer (should not remove, should not crash)
                 bool ret = false;
                 ret = m_barseries_with_sets->remove(0);
                 QVERIFY(ret == false);
-                QVERIFY(m_barseries_with_sets->barsetCount() == count);
+                QVERIFY(m_barseries_with_sets->count() == count);
                 // Try to remove invalid pointer (should not remove, should not crash)
                 ret = m_barseries_with_sets->remove((QBarSet*) (m_testSets.at(0) + 1) );
                 QVERIFY(ret == false);
-                QVERIFY(m_barseries_with_sets->barsetCount() == count);
+                QVERIFY(m_barseries_with_sets->count() == count);
                 // remove some sets
                 ret = m_barseries_with_sets->remove(m_testSets.at(2));
                 QVERIFY(ret == true);
                 ret = m_barseries_with_sets->remove(m_testSets.at(3));
                 QVERIFY(ret == true);
                 ret = m_barseries_with_sets->remove(m_testSets.at(4));
                 QVERIFY(ret == true);
-                QVERIFY(m_barseries_with_sets->barsetCount() == 2);
+                QVERIFY(m_barseries_with_sets->count() == 2);
                 QList<QBarSet*> verifysets = m_barseries_with_sets->barSets();
                 QVERIFY(verifysets.at(0) == m_testSets.at(0));
                 QVERIFY(verifysets.at(1) == m_testSets.at(1));
                 // Try removing all sets again (should be ok, even if some sets have already been removed)
                 ret = false;
                 for (int i=0; i<count; i++) {
                     ret |= m_barseries_with_sets->remove(m_testSets.at(i));
                 }
                 QVERIFY(ret == true);
-                QVERIFY(m_barseries_with_sets->barsetCount() == 0);
+                QVERIFY(m_barseries_with_sets->count() == 0);
             }
             void tst_QBarSeries::appendList_data()
             {
             }
             void tst_QBarSeries::appendList()
             {
                 int count = 5;
-                QVERIFY(m_barseries->barsetCount() == 0);
+                QVERIFY(m_barseries->count() == 0);
                 QList<QBarSet*> sets;
                 for (int i=0; i<count; i++) {
                     sets.append(new QBarSet("testset"));
                 }
                 // Append new sets (should succeed, count should match the count of sets)
                 bool ret = false;
                 ret = m_barseries->append(sets);
                 QVERIFY(ret == true);
-                QVERIFY(m_barseries->barsetCount() == count);
+                QVERIFY(m_barseries->count() == count);
                 // Append same sets again (should fail, count should remain same)
                 ret = m_barseries->append(sets);
                 QVERIFY(ret == false);
-                QVERIFY(m_barseries->barsetCount() == count);
+                QVERIFY(m_barseries->count() == count);
                 // Try append empty list (should succeed, but count should remain same)
                 QList<QBarSet*> invalidList;
                 ret = m_barseries->append(invalidList);
                 QVERIFY(ret == true);
-                QVERIFY(m_barseries->barsetCount() == count);
+                QVERIFY(m_barseries->count() == count);
                 // Try append list with one new and one existing set (should fail, count remains same)
                 invalidList.append(new QBarSet("ok set"));
                 invalidList.append(sets.at(0));
                 ret = m_barseries->append(invalidList);
                 QVERIFY(ret == false);
-                QVERIFY(m_barseries->barsetCount() == count);
+                QVERIFY(m_barseries->count() == count);
                 // Try append list with null pointers (should fail, count remains same)
                 QList<QBarSet*> invalidList2;
                 invalidList2.append(0);
                 invalidList2.append(0);
                 invalidList2.append(0);
                 ret = m_barseries->append(invalidList2);
                 QVERIFY(ret == false);
-                QVERIFY(m_barseries->barsetCount() == count);
+                QVERIFY(m_barseries->count() == count);
             }
-            void tst_QBarSeries::barsetCount_data()
+            void tst_QBarSeries::count_data()
             {
             }
-            void tst_QBarSeries::barsetCount()
+            void tst_QBarSeries::count()
             {
-                QVERIFY(m_barseries->barsetCount() == 0);
+                QVERIFY(m_barseries->count() == 0);
-                QVERIFY(m_barseries_with_sets->barsetCount() == m_testSets.count());
+                QVERIFY(m_barseries_with_sets->count() == m_testSets.count());
             }
             void tst_QBarSeries::barSets_data()
             {
             }
             void tst_QBarSeries::barSets()
             {
                 QVERIFY(m_barseries->barSets().count() == 0);
                 QList<QBarSet*> sets = m_barseries_with_sets->barSets();
                 QVERIFY(sets.count() == m_testSets.count());
                 for (int i=0; i<m_testSets.count(); i++) {
                     QVERIFY(sets.at(i) == m_testSets.at(i));
                 }
             }
             void tst_QBarSeries::setLabelsVisible_data()
             {
             }
             void tst_QBarSeries::setLabelsVisible()
             {
                 // labels should be invisible by default
                 QVERIFY(m_barseries->isLabelsVisible() == false);
                 QVERIFY(m_barseries_with_sets->isLabelsVisible() == false);
                 // turn labels to visible
                 m_barseries_with_sets->setLabelsVisible(true);
                 // TODO: test the signal
                 QVERIFY(m_barseries_with_sets->isLabelsVisible() == true);
                 // turn labels to invisible
                 m_barseries_with_sets->setLabelsVisible(false);
                 // TODO: test the signal
                 QVERIFY(m_barseries_with_sets->isLabelsVisible() == false);
                 // without parameter, should turn labels to visible
                 m_barseries_with_sets->setLabelsVisible();
                 // TODO: test the signal
                 QVERIFY(m_barseries_with_sets->isLabelsVisible() == true);
             }
             void tst_QBarSeries::mouseclicked_data()
             {
             }
             void tst_QBarSeries::mouseclicked()
             {
                 QBarSeries* series = new QBarSeries();
                 QBarSet* set1 = new QBarSet(QString("set 1"));
                 *set1 << QPointF(0,10) << QPointF(1,10) << QPointF(2,10);
                 series->append(set1);
                 QBarSet* set2 = new QBarSet(QString("set 2"));
                 *set2 << QPointF(0.3,10) << QPointF(1.3,10) << QPointF(2.3,10);
                 series->append(set2);
                 QSignalSpy seriesSpy(series,SIGNAL(clicked(QBarSet*,int)));
                 QChartView view(new QChart());
                 view.resize(400,300);
                 view.chart()->addSeries(series);
                 view.show();
                 QTest::qWaitForWindowShown(&view);
             //====================================================================================
             // barset 1, bar 0
                 QTest::mouseClick(view.viewport(), Qt::LeftButton, 0, QPoint(102,142));
                 QCoreApplication::processEvents(QEventLoop::AllEvents, 1000);
                 QCOMPARE(seriesSpy.count(), 1);
                 QList<QVariant> seriesSpyArg = seriesSpy.takeFirst();
                 QCOMPARE(qvariant_cast<QBarSet*>(seriesSpyArg.at(0)), set1);
                 QVERIFY(seriesSpyArg.at(1).type() == QVariant::Int);
                 QVERIFY(seriesSpyArg.at(1).toInt() == 0);
             //====================================================================================
             // barset 1, bar 1
                 QTest::mouseClick(view.viewport(), Qt::LeftButton, 0, QPoint(186,142));
                 QCoreApplication::processEvents(QEventLoop::AllEvents, 1000);
                 QCOMPARE(seriesSpy.count(), 1);
                 seriesSpyArg = seriesSpy.takeFirst();
                 QCOMPARE(qvariant_cast<QBarSet*>(seriesSpyArg.at(0)), set1);
                 QVERIFY(seriesSpyArg.at(1).type() == QVariant::Int);
                 QVERIFY(seriesSpyArg.at(1).toInt() == 1);
             //====================================================================================
             // barset 1, bar 2
                 QTest::mouseClick(view.viewport(), Qt::LeftButton, 0, QPoint(271,142));
                 QCoreApplication::processEvents(QEventLoop::AllEvents, 1000);
                 QCOMPARE(seriesSpy.count(), 1);
                 seriesSpyArg = seriesSpy.takeFirst();
                 QCOMPARE(qvariant_cast<QBarSet*>(seriesSpyArg.at(0)), set1);
                 QVERIFY(seriesSpyArg.at(1).type() == QVariant::Int);
                 QVERIFY(seriesSpyArg.at(1).toInt() == 2);
             //====================================================================================
             // barset 2, bar 0
                 QTest::mouseClick(view.viewport(), Qt::LeftButton, 0, QPoint(127,142));
                 QCoreApplication::processEvents(QEventLoop::AllEvents, 1000);
                 QCOMPARE(seriesSpy.count(), 1);
                 seriesSpyArg = seriesSpy.takeFirst();
                 QCOMPARE(qvariant_cast<QBarSet*>(seriesSpyArg.at(0)), set2);
                 QVERIFY(seriesSpyArg.at(1).type() == QVariant::Int);
                 QVERIFY(seriesSpyArg.at(1).toInt() == 0);
             //====================================================================================
             // barset 2, bar 1
                 QTest::mouseClick(view.viewport(), Qt::LeftButton, 0, QPoint(212,142));
                 QCoreApplication::processEvents(QEventLoop::AllEvents, 1000);
                 QCOMPARE(seriesSpy.count(), 1);
                 seriesSpyArg = seriesSpy.takeFirst();
                 QCOMPARE(qvariant_cast<QBarSet*>(seriesSpyArg.at(0)), set2);
                 QVERIFY(seriesSpyArg.at(1).type() == QVariant::Int);
                 QVERIFY(seriesSpyArg.at(1).toInt() == 1);
             //====================================================================================
             // barset 2, bar 2
                 QTest::mouseClick(view.viewport(), Qt::LeftButton, 0, QPoint(296,142));
                 QCoreApplication::processEvents(QEventLoop::AllEvents, 1000);
                 QCOMPARE(seriesSpy.count(), 1);
                 seriesSpyArg = seriesSpy.takeFirst();
                 QCOMPARE(qvariant_cast<QBarSet*>(seriesSpyArg.at(0)), set2);
                 QVERIFY(seriesSpyArg.at(1).type() == QVariant::Int);
                 QVERIFY(seriesSpyArg.at(1).toInt() == 2);
             }
             void tst_QBarSeries::mousehovered_data()
             {
             }
             void tst_QBarSeries::mousehovered()
             {
                 QBarSeries* series = new QBarSeries();
                 QBarSet* set1 = new QBarSet(QString("set 1"));
                 *set1 << QPointF(0,10) << QPointF(1,10) << QPointF(2,10);
                 series->append(set1);
                 QBarSet* set2 = new QBarSet(QString("set 2"));
                 *set2 << QPointF(0.3,10) << QPointF(1.3,10) << QPointF(2.3,10);
                 series->append(set2);
                 QSignalSpy seriesSpy(series,SIGNAL(hovered(QBarSet*,bool)));
                 QChartView view(new QChart());
                 view.resize(400,300);
                 view.chart()->addSeries(series);
                 view.show();
                 QTest::qWaitForWindowShown(&view);
                 //this is hack since view does not get events otherwise
                 view.setMouseTracking(true);
             //=======================================================================
             // move mouse to left border
                 QTest::mouseMove(view.viewport(), QPoint(0, 142));
                 QVERIFY(seriesSpy.count() == 0);
             //=======================================================================
             // move mouse on top of set1
                 QTest::mouseMove(view.viewport(), QPoint(102,142));
                 QVERIFY(seriesSpy.count() == 1);
                 QList<QVariant> seriesSpyArg = seriesSpy.takeFirst();
                 QCOMPARE(qvariant_cast<QBarSet*>(seriesSpyArg.at(0)), set1);
                 QVERIFY(seriesSpyArg.at(1).type() == QVariant::Bool);
                 QVERIFY(seriesSpyArg.at(1).toBool() == true);
             //=======================================================================
             // move mouse from top of set1 to top of set2
                 QTest::mouseMove(view.viewport(), QPoint(127,142));
                 QVERIFY(seriesSpy.count() == 2);
                 // should leave set1
                 seriesSpyArg = seriesSpy.takeFirst();
                 QCOMPARE(qvariant_cast<QBarSet*>(seriesSpyArg.at(0)), set1);
                 QVERIFY(seriesSpyArg.at(1).type() == QVariant::Bool);
                 QVERIFY(seriesSpyArg.at(1).toBool() == false);
                 // should enter set2
                 seriesSpyArg = seriesSpy.takeFirst();
                 QCOMPARE(qvariant_cast<QBarSet*>(seriesSpyArg.at(0)), set2);
                 QVERIFY(seriesSpyArg.at(1).type() == QVariant::Bool);
                 QVERIFY(seriesSpyArg.at(1).toBool() == true);
             //=======================================================================
             // move mouse from top of set2 to background
                 QTest::mouseMove(view.viewport(), QPoint(127,0));
                 QVERIFY(seriesSpy.count() == 1);
                 // should leave set2
                 seriesSpyArg = seriesSpy.takeFirst();
                 QCOMPARE(qvariant_cast<QBarSet*>(seriesSpyArg.at(0)), set2);
                 QVERIFY(seriesSpyArg.at(1).type() == QVariant::Bool);
                 QVERIFY(seriesSpyArg.at(1).toBool() == false);
             }
             void tst_QBarSeries::clearWithAnimations()
             {
                 QBarSeries* series = new QBarSeries();
                 QBarSet* set1 = new QBarSet(QString("set 1"));
                 *set1 << QPointF(0,10) << QPointF(1,10) << QPointF(2,10);
                 series->append(set1);
                 QBarSet* set2 = new QBarSet(QString("set 2"));
                 *set2 << QPointF(0.3,10) << QPointF(1.3,10) << QPointF(2.3,10);
                 series->append(set2);
                 QChartView view(new QChart());
                 view.resize(400,300);
                 view.chart()->setAnimationOptions(QChart::SeriesAnimations);
                 view.chart()->addSeries(series);
                 view.show();
                 series->clear();
             }
             QTEST_MAIN(tst_QBarSeries)
             #include "tst_qbarseries.moc"

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