HG_REPOSITORIES/LPP/INSTRUMENTATION/USERS/JEANDET/qtcharts Commit - r1594:7a5481b8168a

GroupedBarSeries to BarSeries

sauimone -

r1594:7a5481b8168a

parent child

Context file:

r1594:7a5481b8168a

Expand all files

examples/barmodelmapper/tablewidget.cpp +2 -2

             #include <QChartView>
             #include <QLineSeries>
             #include <QVXYModelMapper>
-            #include <QGroupedBarSeries>
+            #include <QBarSeries>
             #include <QBarSet>
             #include <QVBarModelMapper>
             #include <QHeaderView>
                 // series 1
                 //! [4]
-                QGroupedBarSeries *series = new QGroupedBarSeries;
+                QBarSeries *series = new QBarSeries;
                 int first = 3;
                 int count = 5;

examples/groupedbarchart/main.cpp +3 -3

             #include <QApplication>
             #include <QMainWindow>
             #include <QChartView>
-            #include <QGroupedBarSeries>
+            #include <QBarSeries>
             #include <QBarSet>
             #include <QLegend>
             #include <QCategoriesAxis>
             //![1]
             //![2]
-                QGroupedBarSeries* series = new QGroupedBarSeries();
+                QBarSeries* series = new QBarSeries();
                 series->append(set0);
                 series->append(set1);
                 series->append(set2);
             //![3]
                 QChart* chart = new QChart();
                 chart->addSeries(series);
-                chart->setTitle("Simple grouped barchart example");
+                chart->setTitle("Simple barchart example");
                 chart->createDefaultAxes();
             //![3]

examples/legend/mainwidget.cpp +2 -2

             #include <QLabel>
             #include <QDebug>
             #include <QBarSet>
-            #include <QGroupedBarSeries>
+            #include <QBarSeries>
             #include <QLegend>
             #include <QFormLayout>
             void MainWidget::createSeries()
             {
-                m_series = new QGroupedBarSeries();
+                m_series = new QBarSeries();
                 addBarset();
                 addBarset();
                 addBarset();

examples/legend/mainwidget.h +2 -2

             #include <QGraphicsGridLayout>
             #include <QDoubleSpinBox>
             #include <QGroupBox>
-            #include <QGroupedBarSeries>
+            #include <QBarSeries>
             QTCOMMERCIALCHART_USE_NAMESPACE
             private:
                 QChart *m_chart;
-                QGroupedBarSeries *m_series;
+                QBarSeries *m_series;
                 QChartView *m_chartView;
                 QGridLayout *m_mainLayout;

plugins/declarative/declarativebarseries.cpp +13 -13

                 return 0;
             }
-            DeclarativeGroupedBarSeries::DeclarativeGroupedBarSeries(QDeclarativeItem *parent) :
+            DeclarativeBarSeries::DeclarativeBarSeries(QDeclarativeItem *parent) :
-                QGroupedBarSeries(parent)
+                QBarSeries(parent)
             {
             }
-            void DeclarativeGroupedBarSeries::classBegin()
+            void DeclarativeBarSeries::classBegin()
             {
             }
-            void DeclarativeGroupedBarSeries::componentComplete()
+            void DeclarativeBarSeries::componentComplete()
             {
                 foreach(QObject *child, children()) {
                     if (qobject_cast<DeclarativeBarSet *>(child)) {
                 }
             }
-            void DeclarativeGroupedBarSeries::setAxisX(QAbstractAxis *axis)
+            void DeclarativeBarSeries::setAxisX(QAbstractAxis *axis)
             {
                 chart()->setAxisX(axis, this);
             }
-            QAbstractAxis *DeclarativeGroupedBarSeries::axisX()
+            QAbstractAxis *DeclarativeBarSeries::axisX()
             {
                 return chart()->axisX(this);
             }
-            void DeclarativeGroupedBarSeries::setAxisY(QAbstractAxis *axis)
+            void DeclarativeBarSeries::setAxisY(QAbstractAxis *axis)
             {
                 chart()->setAxisY(axis, this);
             }
-            QAbstractAxis *DeclarativeGroupedBarSeries::axisY()
+            QAbstractAxis *DeclarativeBarSeries::axisY()
             {
                 return chart()->axisY(this);
             }
-            QDeclarativeListProperty<QObject> DeclarativeGroupedBarSeries::seriesChildren()
+            QDeclarativeListProperty<QObject> DeclarativeBarSeries::seriesChildren()
             {
                 return QDeclarativeListProperty<QObject>(this, 0, &DeclarativeAbstractBarSeries::appendSeriesChildren);
             }
-            void DeclarativeGroupedBarSeries::appendSeriesChildren(QDeclarativeListProperty<QObject> * list, QObject *element)
+            void DeclarativeBarSeries::appendSeriesChildren(QDeclarativeListProperty<QObject> * list, QObject *element)
             {
                 // Empty implementation; the children are parsed in componentComplete instead
                 Q_UNUSED(list);
                 Q_UNUSED(element);
             }
-            DeclarativeBarSet *DeclarativeGroupedBarSeries::at(int index)
+            DeclarativeBarSet *DeclarativeBarSeries::at(int index)
             {
                 QList<QBarSet*> setList = barSets();
                 if (index >= 0 && index < setList.count())
                 return 0;
             }
-            DeclarativeBarSet *DeclarativeGroupedBarSeries::insert(int index, QString label, QVariantList values)
+            DeclarativeBarSet *DeclarativeBarSeries::insert(int index, QString label, QVariantList values)
             {
                 DeclarativeBarSet *barset = new DeclarativeBarSet(this);
                 barset->setLabel(label);
                 barset->setValues(values);
-                if (QGroupedBarSeries::insert(index, barset))
+                if (QBarSeries::insert(index, barset))
                     return barset;
                 delete barset;
                 return 0;

plugins/declarative/declarativebarseries.h +6 -5

             #define DECLARATIVEBARSERIES_H
             #include "qchartglobal.h"
-            #include "qgroupedbarseries.h"
+            #include "qabstractbarseries.h"
+            #include "qbarseries.h"
             #include "qstackedbarseries.h"
             #include "qpercentbarseries.h"
             #include "qbarset.h"
                 void handleRemoved(QList<QBarSet* > barsets);
             };
-            class DeclarativeGroupedBarSeries : public QGroupedBarSeries, public QDeclarativeParserStatus
+            class DeclarativeBarSeries : public QBarSeries, public QDeclarativeParserStatus
             {
                 Q_OBJECT
                 Q_INTERFACES(QDeclarativeParserStatus)
                 Q_CLASSINFO("DefaultProperty", "seriesChildren")
             public:
-                explicit DeclarativeGroupedBarSeries(QDeclarativeItem *parent = 0);
+                explicit DeclarativeBarSeries(QDeclarativeItem *parent = 0);
                 void setAxisX(QAbstractAxis *axis);
                 QAbstractAxis *axisX();
                 void setAxisY(QAbstractAxis *axis);
                 Q_INVOKABLE DeclarativeBarSet *at(int index);
                 Q_INVOKABLE DeclarativeBarSet *append(QString label, QVariantList values) { return insert(count(), label, values); }
                 Q_INVOKABLE DeclarativeBarSet *insert(int index, QString label, QVariantList values);
-                Q_INVOKABLE bool remove(QBarSet *barset) { return QGroupedBarSeries::remove(barset); }
+                Q_INVOKABLE bool remove(QBarSet *barset) { return QBarSeries::remove(barset); }
-                Q_INVOKABLE void clear() { return QGroupedBarSeries::clear(); }
+                Q_INVOKABLE void clear() { return QBarSeries::clear(); }
             public: // from QDeclarativeParserStatus
                 void classBegin();

plugins/declarative/declarativechart.cpp +2 -2

                 case DeclarativeChart::SeriesTypePercentBar:
                     // TODO
                     break;
-                case DeclarativeChart::SeriesTypeGroupedBar:
+                case DeclarativeChart::SeriesTypeBar:
-                    series = new DeclarativeGroupedBarSeries();
+                    series = new DeclarativeBarSeries();
                     break;
                 case DeclarativeChart::SeriesTypePie:
                     series = new DeclarativePieSeries();

plugins/declarative/declarativechart.h 0 -1

                     SeriesTypeBar,
                     SeriesTypeStackedBar,
                     SeriesTypePercentBar,
-                    SeriesTypeGroupedBar,
                     SeriesTypePie,
                     SeriesTypeScatter,
                     SeriesTypeSpline

plugins/declarative/plugin.cpp +1 -1

                     qmlRegisterType<DeclarativeLineSeries>(uri, 1, 0, "LineSeries");
                     qmlRegisterType<DeclarativeSplineSeries>(uri, 1, 0, "SplineSeries");
                     qmlRegisterType<DeclarativeAreaSeries>(uri, 1, 0, "AreaSeries");
-                    qmlRegisterType<DeclarativeGroupedBarSeries>(uri, 1, 0, "GroupedBarSeries");
+                    qmlRegisterType<DeclarativeBarSeries>(uri, 1, 0, "BarSeries");
                     qmlRegisterType<DeclarativeStackedBarSeries>(uri, 1, 0, "StackedBarSeries");
                     qmlRegisterType<DeclarativePercentBarSeries>(uri, 1, 0, "PercentBarSeries");
                     qmlRegisterType<DeclarativePieSeries>(uri, 1, 0, "PieSeries");

src/animations/chartanimator_p.h +1 -1

                 virtual ~ChartAnimator();
                 void addAnimation(PieChartItem *item);
-                void addAnimation(BarChartItem *item);          // This can handle also grouped bar chart.
+                void addAnimation(BarChartItem *item);
                 void addAnimation(StackedBarChartItem *item);
                 void addAnimation(PercentBarChartItem *item);
                 void removeAnimation(Chart *item);

src/barchart/barchart.pri +3 -3

                 $$PWD/qbarset.cpp \
                 $$PWD/qpercentbarseries.cpp \
                 $$PWD/qstackedbarseries.cpp \
-                $$PWD/qgroupedbarseries.cpp \
+                $$PWD/qbarseries.cpp \
                 $$PWD/stackedbarchartitem.cpp \
                 $$PWD/qbarmodelmapper.cpp \
                 $$PWD/qvbarmodelmapper.cpp \
                 $$PWD/qabstractbarseries_p.h \
                 $$PWD/qstackedbarseries_p.h\
                 $$PWD/qpercentbarseries_p.h \
-                $$PWD/qgroupedbarseries_p.h \
+                $$PWD/qbarseries_p.h \
                 $$PWD/qbarmodelmapper_p.h
             PUBLIC_HEADERS += \
                 $$PWD/qbarset.h \
                 $$PWD/qpercentbarseries.h \
                 $$PWD/qstackedbarseries.h \
-                $$PWD/qgroupedbarseries.h \
+                $$PWD/qbarseries.h \
                 $$PWD/qbarmodelmapper.h \
                 $$PWD/qvbarmodelmapper.h \
                 $$PWD/qhbarmodelmapper.h

src/barchart/qabstractbarseries.cpp +4 -4

                 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.
-                Note that with QGroupedBarSeries this value means the width of one group of bars instead of just one bar.
+                Note that with QBarSeries this value means the width of one group of bars instead of just one bar.
-                \sa QGroupedBarSeries
+                \sa QBarSeries
             */
             /*!
                 \qmlproperty real AbstractBarSeries::barWidth
                 The width of the bars of the series. The unit of 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.
-                Note that with QGroupedBarSeries this value means the width of one group of bars instead of just one bar.
+                Note that with QBarSeries this value means the width of one group of bars instead of just one bar.
             */
             /*!
                 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.
-                Note that with \link QGroupedBarSeries \endlink this value means the width of one group of bars instead of just one bar.
+                Note that with \link QBarSeries \endlink this value means the width of one group of bars instead of just one bar.
             */
             void QAbstractBarSeries::setBarWidth(qreal width)
             {

src/barchart/qbarseries.cpp ~~src/barchart/qgroupedbarseries.cpp~~ renamed +18 -18

             **
             ****************************************************************************/
-            #include "qgroupedbarseries.h"
+            #include "qbarseries.h"
-            #include "qgroupedbarseries_p.h"
+            #include "qbarseries_p.h"
             #include "groupedbarchartitem_p.h"
             #include "chartdataset_p.h"
             #include "charttheme_p.h"
             QTCOMMERCIALCHART_BEGIN_NAMESPACE
             /*!
-                \class QGroupedBarSeries
+                \class QBarSeries
-                \brief Series for creating grouped bar chart
+                \brief Series for creating bar chart
                 \mainclass
-                QGroupedBarSeries represents a series of data shown as bars. The purpose of this class is to draw bars
+                QBarSeries represents a series of data shown as bars. The purpose of this class is to draw bars
-                as groups, where bars in same category are grouped next to each other. QGroupedBarSeries groups the data
+                as groups, where bars in same category are grouped next to each other. QBarSeries groups the data
                 from sets to categories, which are defined by a QStringList.
                 See the \l {GroupedbarChart Example} {grouped bar chart example} to learn how to create a grouped bar chart.
                 \sa QBarSet, QPercentBarSeries, QAbstractBarSeries, QStackedBarSeries
             */
             /*!
-                \qmlclass GroupedBarSeries QGroupedBarSeries
+                \qmlclass BarSeries QBarSeries
                 \inherits AbstractBarSeries
                 The following QML shows how to create a simple grouped bar chart:
             */
             /*!
-                Constructs empty QGroupedBarSeries.
+                Constructs empty QBarSeries.
-                QGroupedBarSeries is QObject which is a child of a \a parent.
+                QBarSeries is QObject which is a child of a \a parent.
             */
-            QGroupedBarSeries::QGroupedBarSeries(QObject *parent)
+            QBarSeries::QBarSeries(QObject *parent)
-                : QAbstractBarSeries(*new QGroupedBarSeriesPrivate(this), parent)
+                : QAbstractBarSeries(*new QBarSeriesPrivate(this), parent)
             {
             }
             /*!
                 Returns QChartSeries::SeriesTypeGroupedBar.
             */
-            QAbstractSeries::SeriesType QGroupedBarSeries::type() const
+            QAbstractSeries::SeriesType QBarSeries::type() const
             {
-                return QAbstractSeries::SeriesTypeGroupedBar;
+                return QAbstractSeries::SeriesTypeBar;
             }
             ///////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////
-            QGroupedBarSeriesPrivate::QGroupedBarSeriesPrivate(QGroupedBarSeries *q) : QAbstractBarSeriesPrivate(q)
+            QBarSeriesPrivate::QBarSeriesPrivate(QBarSeries *q) : QAbstractBarSeriesPrivate(q)
             {
             }
-            void QGroupedBarSeriesPrivate::scaleDomain(Domain& domain)
+            void QBarSeriesPrivate::scaleDomain(Domain& domain)
             {
                 qreal minX(domain.minX());
                 qreal minY(domain.minY());
             }
-            Chart* QGroupedBarSeriesPrivate::createGraphics(ChartPresenter* presenter)
+            Chart* QBarSeriesPrivate::createGraphics(ChartPresenter* presenter)
             {
-                Q_Q(QGroupedBarSeries);
+                Q_Q(QBarSeries);
                 GroupedBarChartItem* bar = new GroupedBarChartItem(q,presenter);
                 if(presenter->animationOptions().testFlag(QChart::SeriesAnimations)) {
             }
-            #include "moc_qgroupedbarseries.cpp"
+            #include "moc_qbarseries.cpp"
             QTCOMMERCIALCHART_END_NAMESPACE

src/barchart/qbarseries.h ~~src/barchart/qgroupedbarseries.h~~ renamed +8 -8

             **
             ****************************************************************************/
-            #ifndef GROUPEDBARSERIES_H
+            #ifndef QBARSERIES_H
-            #define GROUPEDBARSERIES_H
+            #define QBARSERIES_H
             #include <QStringList>
             #include <qabstractbarseries.h>
             QTCOMMERCIALCHART_BEGIN_NAMESPACE
-            class QGroupedBarSeriesPrivate;
+            class QBarSeriesPrivate;
-            class QTCOMMERCIALCHART_EXPORT QGroupedBarSeries : public QAbstractBarSeries
+            class QTCOMMERCIALCHART_EXPORT QBarSeries : public QAbstractBarSeries
             {
                 Q_OBJECT
             public:
-                explicit QGroupedBarSeries(QObject *parent = 0);
+                explicit QBarSeries(QObject *parent = 0);
                 QAbstractSeries::SeriesType type() const;
             private:
-                Q_DECLARE_PRIVATE(QGroupedBarSeries)
+                Q_DECLARE_PRIVATE(QBarSeries)
-                Q_DISABLE_COPY(QGroupedBarSeries)
+                Q_DISABLE_COPY(QBarSeries)
             };
             QTCOMMERCIALCHART_END_NAMESPACE
-            #endif // GROUPEDBARSERIES_H
+            #endif // QBARSERIES_H

src/barchart/qbarseries_p.h ~~src/barchart/qgroupedbarseries_p.h~~ renamed +6 -6

             //
             // We mean it.
-            #ifndef QGROUPEDBARSERIES_P_H
+            #ifndef QBARSERIES_P_H
-            #define QGROUPEDBARSERIES_P_H
+            #define QBARSERIES_P_H
             #include "qabstractbarseries_p.h"
             #include "domain_p.h"
             QTCOMMERCIALCHART_BEGIN_NAMESPACE
-            class QGroupedBarSeriesPrivate: public QAbstractBarSeriesPrivate
+            class QBarSeriesPrivate: public QAbstractBarSeriesPrivate
             {
             public:
-                QGroupedBarSeriesPrivate(QGroupedBarSeries* q);
+                QBarSeriesPrivate(QBarSeries* q);
                 Chart* createGraphics(ChartPresenter* presenter);
                 void scaleDomain(Domain& domain);
             private:
-                Q_DECLARE_PUBLIC(QGroupedBarSeries)
+                Q_DECLARE_PUBLIC(QBarSeries)
             };
             QTCOMMERCIALCHART_END_NAMESPACE
-            #endif // QGROUPEDBARSERIES_P_H
+            #endif // QBARSERIES_P_H

src/barchart/qbarset.cpp +2 -2

                 \mainclass
-                \sa QAbstractBarSeries, QGroupedBarSeries, QStackedBarSeries, QPercentBarSeries
+                \sa QAbstractBarSeries, QBarSeries, QStackedBarSeries, QPercentBarSeries
             */
             /*!
                 \qmlclass BarSet QBarSet
                 First value of set is assumed to belong to first category, second to second category and so on.
                 If set has fewer values than there are categories, then the missing values are assumed to be
                 at the end of set. For missing values in middle of a set, numerical value of zero is used.
-                \sa AbstractBarSeries, GroupedBarSeries, StackedBarSeries, PercentBarSeries
+                \sa AbstractBarSeries, BarSeries, StackedBarSeries, PercentBarSeries
             */
             /*!

src/barchart/qvbarmodelmapper.cpp +1 -1

                 model has at least four columns). Each bar set would contain data starting from row 1. The name of a set would be
                 defined by the horizontal header (of the column).
                 \code
-                    GroupedBarSeries {
+                    BarSeries {
                         VBarModelMapper {
                             model: myCustomModel // QAbstractItemModel derived implementation
                             firstBarSetColumn: 1

src/qabstractseries.cpp 0 -1

                 \value SeriesTypeBar
                 \value SeriesTypeStackedBar
                 \value SeriesTypePercentBar
-                \value SeriesTypeGroupedBar
                 \value SeriesTypePie
                 \value SeriesTypeScatter
                 \value SeriesTypeSpline

src/qabstractseries.h 0 -1

                     SeriesTypeBar,
                     SeriesTypeStackedBar,
                     SeriesTypePercentBar,
-                    SeriesTypeGroupedBar,
                     SeriesTypePie,
                     SeriesTypeScatter,
                     SeriesTypeSpline

tests/auto/chartdataset/tst_chartdataset.cpp +3 -3

             #include <qscatterseries.h>
             #include <qsplineseries.h>
             #include <qpieseries.h>
-            #include <qgroupedbarseries.h>
+            #include <qbarseries.h>
             #include <qpercentbarseries.h>
             #include <qstackedbarseries.h>
             #include <private/chartdataset_p.h>
                 QAbstractSeries* scatter = new QScatterSeries(this);
                 QAbstractSeries* spline = new QSplineSeries(this);
                 QAbstractSeries* pie = new QPieSeries(this);
-                QAbstractSeries* bar = new QGroupedBarSeries(this);
+                QAbstractSeries* bar = new QBarSeries(this);
                 QAbstractSeries* percent = new QPercentBarSeries(this);
                 QAbstractSeries* stacked = new QStackedBarSeries(this);
                 QAbstractSeries* scatter = new QScatterSeries(this);
                 QAbstractSeries* spline = new QSplineSeries(this);
                 QAbstractSeries* pie = new QPieSeries(this);
-                QAbstractSeries* bar = new QGroupedBarSeries(this);
+                QAbstractSeries* bar = new QBarSeries(this);
                 QAbstractSeries* percent = new QPercentBarSeries(this);
                 QAbstractSeries* stacked = new QStackedBarSeries(this);

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

             #include <qchart.h>
             #include <qchartview.h>
-            #include <qgroupedbarseries.h>
+            #include <qbarseries.h>
             #include <qbarset.h>
             #include <qvbarmodelmapper.h>
             #include <qhbarmodelmapper.h>
                 QVBarModelMapper *m_vMapper;
                 QHBarModelMapper *m_hMapper;
-                QGroupedBarSeries *m_series;
+                QBarSeries *m_series;
                 QChart *m_chart;
             };
             void tst_qbarmodelmapper::init()
             {
-                m_series = new QGroupedBarSeries;
+                m_series = new QBarSeries;
                 m_chart->addSeries(m_series);
                 m_model = new QStandardItemModel(m_modelRowCount, m_modelColumnCount, this);
                 QFETCH(int, lastBarSetColumn);
                 QFETCH(int, expectedBarSetCount);
-                m_series = new QGroupedBarSeries;
+                m_series = new QBarSeries;
                 QVBarModelMapper *mapper = new QVBarModelMapper;
                 mapper->setFirstBarSetColumn(firstBarSetColumn);
                 QFETCH(int, expectedBarSetCount);
                 QFETCH(int, expectedCount);
-                m_series = new QGroupedBarSeries;
+                m_series = new QBarSeries;
                 QCOMPARE(m_series->count(), 0);
                 QFETCH(int, lastBarSetRow);
                 QFETCH(int, expectedBarSetCount);
-                m_series = new QGroupedBarSeries;
+                m_series = new QBarSeries;
                 QHBarModelMapper *mapper = new QHBarModelMapper;
                 mapper->setFirstBarSetRow(firstBarSetRow);
                 QFETCH(int, expectedBarSetCount);
                 QFETCH(int, expectedCount);
-                m_series = new QGroupedBarSeries;
+                m_series = new QBarSeries;
                 QCOMPARE(m_series->count(), 0);

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

             ****************************************************************************/
             #include <QtTest/QtTest>
-            #include <qgroupedbarseries.h>
+            #include <qbarseries.h>
             #include <qbarset.h>
             #include <qchartview.h>
             #include <qchart.h>
                 void clearWithAnimations();
             private:
-                QGroupedBarSeries* m_barseries;
+                QBarSeries* m_barseries;
-                QGroupedBarSeries* m_barseries_with_sets;
+                QBarSeries* m_barseries_with_sets;
                 QList<QBarSet*> m_testSets;
             void tst_QBarSeries::init()
             {
-                m_barseries = new QGroupedBarSeries();
+                m_barseries = new QBarSeries();
-                m_barseries_with_sets = new QGroupedBarSeries();
+                m_barseries_with_sets = new QBarSeries();
                 for (int i=0; i<5; i++) {
                     m_testSets.append(new QBarSet("testset"));
             void tst_QBarSeries::qbarseries()
             {
-                QGroupedBarSeries *barseries = new QGroupedBarSeries();
+                QBarSeries *barseries = new QBarSeries();
                 QVERIFY(barseries != 0);
             }
             void tst_QBarSeries::mouseclicked()
             {
-                QGroupedBarSeries* series = new QGroupedBarSeries();
+                QBarSeries* series = new QBarSeries();
                 QBarSet* set1 = new QBarSet(QString("set 1"));
                 *set1 << 10 << 10 << 10;
             void tst_QBarSeries::mousehovered()
             {
-                QGroupedBarSeries* series = new QGroupedBarSeries();
+                QBarSeries* series = new QBarSeries();
                 QBarSet* set1 = new QBarSet(QString("set 1"));
                 *set1 << 10 << 10 << 10;
             void tst_QBarSeries::clearWithAnimations()
             {
-                QGroupedBarSeries* series = new QGroupedBarSeries();
+                QBarSeries* series = new QBarSeries();
                 QBarSet* set1 = new QBarSet(QString("set 1"));
                 *set1 << 10 << 10 << 10;

tests/auto/qbarset/tst_qbarset.cpp +2 -2

             #include <QtTest/QtTest>
             #include <qbarset.h>
-            #include <qgroupedbarseries.h>
+            #include <qbarseries.h>
             #include <qchartview.h>
             QTCOMMERCIALCHART_USE_NAMESPACE
                 QBarSet *set2 = new QBarSet("set2");
                 // Append set1 to series
-                QGroupedBarSeries *series = new QGroupedBarSeries();
+                QBarSeries *series = new QBarSeries();
                 bool success = series->append(set1);
                 QVERIFY(success);

tests/auto/qchart/tst_qchart.cpp +2 -2

             #include <qsplineseries.h>
             #include <qpieseries.h>
             #include <qabstractbarseries.h>
-            #include <qgroupedbarseries.h>
+            #include <qbarseries.h>
             #include <qpercentbarseries.h>
             #include <qstackedbarseries.h>
             #include <qvaluesaxis.h>
                 QAbstractSeries* series2 = new QScatterSeries(this);
                 QAbstractSeries* series3 = new QSplineSeries(this);
                 QAbstractSeries* series4 = new QPieSeries(this);
-                QAbstractSeries* series5 = new QGroupedBarSeries(this);
+                QAbstractSeries* series5 = new QBarSeries(this);
                 QAbstractSeries* series6 = new QPercentBarSeries(this);
                 QAbstractSeries* series7 = new QStackedBarSeries(this);

tests/auto/qgroupedbarseries/tst_qgroupedbarseries.cpp +6 -6

             ****************************************************************************/
             #include <QtTest/QtTest>
-            #include <qgroupedbarseries.h>
+            #include <qbarseries.h>
             #include <qbarset.h>
             #include <qchartview.h>
             #include <qchart.h>
                 void mousehovered();
             private:
-                QGroupedBarSeries* m_barseries;
+                QBarSeries* m_barseries;
             };
             void tst_QGroupedBarSeries::initTestCase()
             void tst_QGroupedBarSeries::init()
             {
-                m_barseries = new QGroupedBarSeries();
+                m_barseries = new QBarSeries();
             }
             void tst_QGroupedBarSeries::cleanup()
             void tst_QGroupedBarSeries::qgroupedbarseries()
             {
-                QGroupedBarSeries *barseries = new QGroupedBarSeries();
+                QBarSeries *barseries = new QBarSeries();
                 QVERIFY(barseries != 0);
             }
             void tst_QGroupedBarSeries::mouseclicked()
             {
-                QGroupedBarSeries* series = new QGroupedBarSeries();
+                QBarSeries* series = new QBarSeries();
                 QBarSet* set1 = new QBarSet(QString("set 1"));
                 *set1 << 10 << 10 << 10;
             void tst_QGroupedBarSeries::mousehovered()
             {
-                QGroupedBarSeries* series = new QGroupedBarSeries();
+                QBarSeries* series = new QBarSeries();
                 QBarSet* set1 = new QBarSet(QString("set 1"));
                 *set1 << 10 << 10 << 10;

tests/chartwidgettest/dataseriedialog.cpp +1 -1

                 layout->addWidget(line);
                 layout->addWidget(new QRadioButton("Area"));
                 layout->addWidget(new QRadioButton("Pie"));
-                layout->addWidget(new QRadioButton("Grouped bar"));
+                layout->addWidget(new QRadioButton("Bar"));
                 layout->addWidget(new QRadioButton("Stacked bar"));
                 layout->addWidget(new QRadioButton("Percent bar"));
                 layout->addWidget(new QRadioButton("Scatter"));

tests/chartwidgettest/mainwidget.cpp +4 -4

             #include <qareaseries.h>
             #include <qsplineseries.h>
             #include <qbarset.h>
-            #include <qgroupedbarseries.h>
+            #include <qbarseries.h>
             #include <qstackedbarseries.h>
             #include <qpercentbarseries.h>
             #include <QPushButton>
                             series->append(labels.at(i), column.at(i));
                         m_chart->addSeries(series);
                     }
-                } else if (seriesName == "Grouped bar"
+                } else if (seriesName == "Bar"
                            || seriesName == "Stacked bar"
                            || seriesName == "Percent bar") {
                     QStringList category;
                     foreach(QString label, labels)
                         category << label;
                     QAbstractBarSeries* series = 0;
-                    if (seriesName == "Grouped bar") {
+                    if (seriesName == "Bar") {
-                        series = new QGroupedBarSeries(this);
+                        series = new QBarSeries(this);
                         QCategoriesAxis* axis = new QCategoriesAxis();
                         axis->append(category);
                         m_chart->setAxisX(axis,series);

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