From 60ca912b003e47371282a6d300a8fb9895c1fee2 2012-07-03 11:55:47 From: sauimone Date: 2012-07-03 11:55:47 Subject: [PATCH] made qabstractbarseries constructor protected. Updated tests --- diff --git a/plugins/declarative/declarativechart.cpp b/plugins/declarative/declarativechart.cpp index bed8044..053ec6c 100644 --- a/plugins/declarative/declarativechart.cpp +++ b/plugins/declarative/declarativechart.cpp @@ -467,9 +467,6 @@ QAbstractSeries *DeclarativeChart::createSeries(DeclarativeChart::SeriesType typ case DeclarativeChart::SeriesTypeArea: series = new DeclarativeAreaSeries(); break; - case DeclarativeChart::SeriesTypeBar: - series = new DeclarativeBarSeries(); - break; case DeclarativeChart::SeriesTypeStackedBar: // TODO break; diff --git a/plugins/declarative/plugin.cpp b/plugins/declarative/plugin.cpp index 4062e71..70757c8 100644 --- a/plugins/declarative/plugin.cpp +++ b/plugins/declarative/plugin.cpp @@ -55,7 +55,6 @@ public: qmlRegisterType(uri, 1, 0, "LineSeries"); qmlRegisterType(uri, 1, 0, "SplineSeries"); qmlRegisterType(uri, 1, 0, "AreaSeries"); - qmlRegisterType(uri, 1, 0, "BarSeries"); qmlRegisterType(uri, 1, 0, "GroupedBarSeries"); qmlRegisterType(uri, 1, 0, "StackedBarSeries"); qmlRegisterType(uri, 1, 0, "PercentBarSeries"); diff --git a/src/barchart/qabstractbarseries.cpp b/src/barchart/qabstractbarseries.cpp index 46e5e69..5d684b2 100644 --- a/src/barchart/qabstractbarseries.cpp +++ b/src/barchart/qabstractbarseries.cpp @@ -217,14 +217,6 @@ QAbstractBarSeries::QAbstractBarSeries(QAbstractBarSeriesPrivate &d, QObject *pa } /*! - Returns the type of series. Derived classes override this. -*/ -QAbstractSeries::SeriesType QAbstractBarSeries::type() const -{ - return QAbstractSeries::SeriesTypeBar; -} - -/*! Sets the width of the bars of the series. The unit of \a width is the unit of x-axis. The minimum width for bars is zero and negative values are treated as zero. Setting the width to zero means that width of the bar on screen is one pixel no matter what the scale of x-axis is. Bars wider than zero are scaled with x-axis. diff --git a/src/barchart/qabstractbarseries.h b/src/barchart/qabstractbarseries.h index 52a3699..a7faea7 100644 --- a/src/barchart/qabstractbarseries.h +++ b/src/barchart/qabstractbarseries.h @@ -37,11 +37,13 @@ class QTCOMMERCIALCHART_EXPORT QAbstractBarSeries : public QAbstractSeries Q_PROPERTY(int count READ count NOTIFY countChanged) Q_PROPERTY(bool labelsVisible READ isLabelsVisible WRITE setLabelsVisible NOTIFY labelsVisibleChanged) -public: +protected: explicit QAbstractBarSeries(QObject *parent = 0); + +public: virtual ~QAbstractBarSeries(); - QAbstractSeries::SeriesType type() const; + virtual QAbstractSeries::SeriesType type() const = 0; void setBarWidth(qreal width); qreal barWidth() const; diff --git a/tests/auto/chartdataset/tst_chartdataset.cpp b/tests/auto/chartdataset/tst_chartdataset.cpp index 6443dae..9b6250e 100644 --- a/tests/auto/chartdataset/tst_chartdataset.cpp +++ b/tests/auto/chartdataset/tst_chartdataset.cpp @@ -27,7 +27,7 @@ #include #include #include -#include +#include #include #include #include @@ -136,7 +136,7 @@ void tst_ChartDataSet::addSeries_data() QAbstractSeries* scatter = new QScatterSeries(this); QAbstractSeries* spline = new QSplineSeries(this); QAbstractSeries* pie = new QPieSeries(this); - QAbstractSeries* bar = new QAbstractBarSeries(this); + QAbstractSeries* bar = new QGroupedBarSeries(this); QAbstractSeries* percent = new QPercentBarSeries(this); QAbstractSeries* stacked = new QStackedBarSeries(this); @@ -185,7 +185,7 @@ void tst_ChartDataSet::setAxisX_data() QAbstractSeries* scatter = new QScatterSeries(this); QAbstractSeries* spline = new QSplineSeries(this); QAbstractSeries* pie = new QPieSeries(this); - QAbstractSeries* bar = new QAbstractBarSeries(this); + QAbstractSeries* bar = new QGroupedBarSeries(this); QAbstractSeries* percent = new QPercentBarSeries(this); QAbstractSeries* stacked = new QStackedBarSeries(this); diff --git a/tests/auto/qbarseries/tst_qbarseries.cpp b/tests/auto/qbarseries/tst_qbarseries.cpp index 5bb1e90..e13c382 100644 --- a/tests/auto/qbarseries/tst_qbarseries.cpp +++ b/tests/auto/qbarseries/tst_qbarseries.cpp @@ -19,7 +19,7 @@ ****************************************************************************/ #include -#include +#include #include #include #include @@ -63,8 +63,8 @@ private slots: void clearWithAnimations(); private: - QAbstractBarSeries* m_barseries; - QAbstractBarSeries* m_barseries_with_sets; + QGroupedBarSeries* m_barseries; + QGroupedBarSeries* m_barseries_with_sets; QList m_testSets; @@ -81,8 +81,8 @@ void tst_QBarSeries::cleanupTestCase() void tst_QBarSeries::init() { - m_barseries = new QAbstractBarSeries(); - m_barseries_with_sets = new QAbstractBarSeries(); + m_barseries = new QGroupedBarSeries(); + m_barseries_with_sets = new QGroupedBarSeries(); for (int i=0; i<5; i++) { m_testSets.append(new QBarSet("testset")); @@ -110,7 +110,7 @@ void tst_QBarSeries::qbarseries_data() void tst_QBarSeries::qbarseries() { - QAbstractBarSeries *barseries = new QAbstractBarSeries(); + QGroupedBarSeries *barseries = new QGroupedBarSeries(); QVERIFY(barseries != 0); } @@ -316,15 +316,13 @@ void tst_QBarSeries::mouseclicked_data() void tst_QBarSeries::mouseclicked() { - QAbstractBarSeries* series = new QAbstractBarSeries(); + QGroupedBarSeries* series = new QGroupedBarSeries(); QBarSet* set1 = new QBarSet(QString("set 1")); -// *set1 << QPointF(0,10) << QPointF(1,10) << QPointF(2,10); *set1 << 10 << 10 << 10; series->append(set1); QBarSet* set2 = new QBarSet(QString("set 2")); -// *set2 << QPointF(0.3,10) << QPointF(1.3,10) << QPointF(2.3,10); *set2 << 10 << 10 << 10; series->append(set2); @@ -454,15 +452,13 @@ void tst_QBarSeries::mousehovered_data() void tst_QBarSeries::mousehovered() { - QAbstractBarSeries* series = new QAbstractBarSeries(); + QGroupedBarSeries* series = new QGroupedBarSeries(); QBarSet* set1 = new QBarSet(QString("set 1")); -// *set1 << QPointF(0,10) << QPointF(1,10) << QPointF(2,10); *set1 << 10 << 10 << 10; series->append(set1); QBarSet* set2 = new QBarSet(QString("set 2")); -// *set2 << QPointF(0.3,10) << QPointF(1.3,10) << QPointF(2.3,10); *set2 << 10 << 10 << 10; series->append(set2); @@ -550,15 +546,13 @@ void tst_QBarSeries::mousehovered() void tst_QBarSeries::clearWithAnimations() { - QAbstractBarSeries* series = new QAbstractBarSeries(); + QGroupedBarSeries* series = new QGroupedBarSeries(); QBarSet* set1 = new QBarSet(QString("set 1")); -// *set1 << QPointF(0,10) << QPointF(1,10) << QPointF(2,10); *set1 << 10 << 10 << 10; series->append(set1); QBarSet* set2 = new QBarSet(QString("set 2")); -// *set2 << QPointF(0.3,10) << QPointF(1.3,10) << QPointF(2.3,10); *set2 << 10 << 10 << 10; series->append(set2); diff --git a/tests/auto/qchart/tst_qchart.cpp b/tests/auto/qchart/tst_qchart.cpp index 14e4f1b..37264c2 100644 --- a/tests/auto/qchart/tst_qchart.cpp +++ b/tests/auto/qchart/tst_qchart.cpp @@ -26,6 +26,7 @@ #include #include #include +#include #include #include #include @@ -177,7 +178,7 @@ void tst_QChart::addSeries_data() QAbstractSeries* series2 = new QScatterSeries(this); QAbstractSeries* series3 = new QSplineSeries(this); QAbstractSeries* series4 = new QPieSeries(this); - QAbstractSeries* series5 = new QAbstractBarSeries(this); + QAbstractSeries* series5 = new QGroupedBarSeries(this); QAbstractSeries* series6 = new QPercentBarSeries(this); QAbstractSeries* series7 = new QStackedBarSeries(this); diff --git a/tests/chartwidgettest/dataseriedialog.cpp b/tests/chartwidgettest/dataseriedialog.cpp index 6892e05..e4c4cc2 100644 --- a/tests/chartwidgettest/dataseriedialog.cpp +++ b/tests/chartwidgettest/dataseriedialog.cpp @@ -65,7 +65,6 @@ QGroupBox *DataSerieDialog::seriesTypeSelector() layout->addWidget(line); layout->addWidget(new QRadioButton("Area")); layout->addWidget(new QRadioButton("Pie")); - layout->addWidget(new QRadioButton("Bar")); layout->addWidget(new QRadioButton("Grouped bar")); layout->addWidget(new QRadioButton("Stacked bar")); layout->addWidget(new QRadioButton("Percent bar")); diff --git a/tests/chartwidgettest/mainwidget.cpp b/tests/chartwidgettest/mainwidget.cpp index 44614e2..c82a0cc 100644 --- a/tests/chartwidgettest/mainwidget.cpp +++ b/tests/chartwidgettest/mainwidget.cpp @@ -27,7 +27,6 @@ #include #include #include -#include #include #include #include @@ -266,8 +265,7 @@ void MainWidget::addSeries(QString seriesName, int columnCount, int rowCount, QS series->append(labels.at(i), column.at(i)); m_chart->addSeries(series); } - } else if (seriesName == "Bar" - || seriesName == "Grouped bar" + } else if (seriesName == "Grouped bar" || seriesName == "Stacked bar" || seriesName == "Percent bar") { QStringList category; @@ -275,12 +273,7 @@ void MainWidget::addSeries(QString seriesName, int columnCount, int rowCount, QS foreach(QString label, labels) category << label; QAbstractBarSeries* series = 0; - if (seriesName == "Bar") { - series = new QAbstractBarSeries(this); - QCategoriesAxis* axis = new QCategoriesAxis(); - axis->append(category); - m_chart->setAxisX(axis,series); - } else if (seriesName == "Grouped bar") { + if (seriesName == "Grouped bar") { series = new QGroupedBarSeries(this); QCategoriesAxis* axis = new QCategoriesAxis(); axis->append(category);