HG_REPOSITORIES/LPP/INSTRUMENTATION/USERS/JEANDET/qtcharts Commit - r1587:60ca912b003e

made qabstractbarseries constructor protected. Updated tests

sauimone -

r1587:60ca912b003e

parent child

Context file:

r1587:60ca912b003e

Collapse all files

plugins/declarative/declarativechart.cpp 0 -3

                  case DeclarativeChart::SeriesTypeArea:
                      series = new DeclarativeAreaSeries();
                      break;
-                 case DeclarativeChart::SeriesTypeBar:
-                     series = new DeclarativeBarSeries();
-                     break;
                  case DeclarativeChart::SeriesTypeStackedBar:
                      // TODO
                      break;

plugins/declarative/plugin.cpp 0 -1

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

src/barchart/qabstractbarseries.cpp 0 -8

              }
              /*!
-                 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.

src/barchart/qabstractbarseries.h +4 -2

                  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;

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

              #include <qscatterseries.h>
              #include <qsplineseries.h>
              #include <qpieseries.h>
-             #include <qabstractbarseries.h>
+             #include <qgroupedbarseries.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 QAbstractBarSeries(this);
+                 QAbstractSeries* bar = new QGroupedBarSeries(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 QAbstractBarSeries(this);
+                 QAbstractSeries* bar = new QGroupedBarSeries(this);
                  QAbstractSeries* percent = new QPercentBarSeries(this);
                  QAbstractSeries* stacked = new QStackedBarSeries(this);

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

              ****************************************************************************/
              #include <QtTest/QtTest>
-             #include <qabstractbarseries.h>
+             #include <qgroupedbarseries.h>
              #include <qbarset.h>
              #include <qchartview.h>
              #include <qchart.h>
                  void clearWithAnimations();
              private:
-                 QAbstractBarSeries* m_barseries;
-                 QAbstractBarSeries* m_barseries_with_sets;
+                 QGroupedBarSeries* m_barseries;
+                 QGroupedBarSeries* m_barseries_with_sets;
                  QList<QBarSet*> m_testSets;
              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"));
              void tst_QBarSeries::qbarseries()
              {
-                 QAbstractBarSeries *barseries = new QAbstractBarSeries();
+                 QGroupedBarSeries *barseries = new QGroupedBarSeries();
                  QVERIFY(barseries != 0);
              }
              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);
              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);
              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);

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

              #include <qsplineseries.h>
              #include <qpieseries.h>
              #include <qabstractbarseries.h>
+             #include <qgroupedbarseries.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 QAbstractBarSeries(this);
+                 QAbstractSeries* series5 = new QGroupedBarSeries(this);
                  QAbstractSeries* series6 = new QPercentBarSeries(this);
                  QAbstractSeries* series7 = new QStackedBarSeries(this);

tests/chartwidgettest/dataseriedialog.cpp 0 -1

                  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"));

tests/chartwidgettest/mainwidget.cpp +2 -9

              #include <qareaseries.h>
              #include <qsplineseries.h>
              #include <qbarset.h>
-             #include <qabstractbarseries.h>
              #include <qgroupedbarseries.h>
              #include <qstackedbarseries.h>
              #include <qpercentbarseries.h>
                              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;
                      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);

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