HG_REPOSITORIES/LPP/INSTRUMENTATION/USERS/JEANDET/qtcharts Commit - r1112:938a9dbeab71

separated categories from barseries constructor

sauimone -

r1112:938a9dbeab71

parent child

Context file:

r1112:938a9dbeab71

Collapse all files

examples/barchart/main.cpp +2 -1

             //![2]
             //![3]
-                QBarSeries* series = new QBarSeries(categories);
+                QBarSeries* series = new QBarSeries();
+                series->setCategories(categories);
                 series->appendBarSet(set0);
                 series->appendBarSet(set1);
                 series->appendBarSet(set2);

examples/percentbarchart/main.cpp +2 -1

             //![2]
             //![3]
-                QPercentBarSeries* series = new QPercentBarSeries(categories);
+                QPercentBarSeries* series = new QPercentBarSeries();
+                series->setCategories(categories);
                 series->appendBarSet(set0);
                 series->appendBarSet(set1);
                 series->appendBarSet(set2);

examples/stackedbarchart/main.cpp +2 -1

             //![2]
             //![3]
-                QStackedBarSeries* series = new QStackedBarSeries(categories);
+                QStackedBarSeries* series = new QStackedBarSeries();
+                series->setCategories(categories);
                 series->appendBarSet(set0);
                 series->appendBarSet(set1);
                 series->appendBarSet(set2);

examples/stackedbarchartdrilldown/drilldownseries.cpp +2 -1

             QTCOMMERCIALCHART_USE_NAMESPACE
             DrilldownBarSeries::DrilldownBarSeries(QStringList categories, QObject *parent)
-                : QStackedBarSeries(categories, parent)
+                : QStackedBarSeries(parent)
             {
+                setCategories(categories);
             }
             void DrilldownBarSeries::mapDrilldownSeries(QString category, DrilldownBarSeries* drilldownSeries)

qmlplugin/declarativebarseries.cpp +3 -1

                     QChart *chart = qobject_cast<QChart *>(declarativeChart->m_chart);
                     Q_ASSERT(chart);
-                    m_series = new QBarSeries(m_categories);
+            //        m_series = new QBarSeries(m_categories);
+                    m_series = new QBarSeries();
+                    m_series->setCategories(m_categories);
                     // TODO: use data from model
                     QBarSet *set0 = new QBarSet("Bub");

src/barchart/qbarseries.cpp +17 -4

                 Constructs empty QBarSeries. Parameter \a categories defines the categories for chart.
                 QBarSeries is QObject which is a child of a \a parent.
             */
-            QBarSeries::QBarSeries(QBarCategories categories, QObject *parent) :
+            QBarSeries::QBarSeries(/*QBarCategories categories,*/ QObject *parent) :
-                QAbstractSeries(*new QBarSeriesPrivate(categories, this),parent)
+                QAbstractSeries(*new QBarSeriesPrivate(/*categories,*/ this),parent)
             {
             }
                 return QAbstractSeries::SeriesTypeBar;
             }
+            void QBarSeries::setCategories(QBarCategories categories)
+            {
+                Q_D(QBarSeries);
+                d->setCategories(categories);
+                emit d->categoriesUpdated();
+            }
             /*!
                 Adds a set of bars to series. Takes ownership of \a set.
             */
             ///////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////
-            QBarSeriesPrivate::QBarSeriesPrivate(QBarCategories categories, QBarSeries *q) :
+            QBarSeriesPrivate::QBarSeriesPrivate(/*QBarCategories categories,*/ QBarSeries *q) :
                 QAbstractSeriesPrivate(q),
-                m_categories(categories),
+            //    m_categories(categories),
                 m_mapCategories(-1),
                 m_mapBarBottom(-1),
                 m_mapBarTop(-1)
             {
             }
+            void QBarSeriesPrivate::setCategories(QBarCategories categories)
+            {
+                m_categories = categories;
+            }
             QBarSet* QBarSeriesPrivate::barsetAt(int index)
             {
                 return m_barSets.at(index);

src/barchart/qbarseries.h +2 -1

             {
                 Q_OBJECT
             public:
-                explicit QBarSeries(QBarCategories categories, QObject *parent = 0);
+                explicit QBarSeries(/*QBarCategories categories,*/ QObject *parent = 0);
                 virtual ~QBarSeries();
                 QAbstractSeries::SeriesType type() const;
+                void setCategories(QBarCategories categories);
                 void appendBarSet(QBarSet *set);            // Takes ownership of set
                 void removeBarSet(QBarSet *set);            // Releases ownership, doesn't delete set

src/barchart/qbarseries_p.h +2 -1

             {
                 Q_OBJECT
             public:
-                QBarSeriesPrivate(QBarCategories categories, QBarSeries *parent);
+                QBarSeriesPrivate(/*QBarCategories categories,*/ QBarSeries *parent);
+                void setCategories(QBarCategories categories);
                 void scaleDomain(Domain& domain);
                 Chart* createGraphics(ChartPresenter* presenter);

src/barchart/qpercentbarseries.cpp +3 -3

                 Constructs empty QPercentBarSeries. Parameter \a categories defines the categories for chart.
                 QPercentBarSeries is QObject which is a child of a \a parent.
             */
-            QPercentBarSeries::QPercentBarSeries(QBarCategories categories, QObject *parent)
+            QPercentBarSeries::QPercentBarSeries(/*QBarCategories categories,*/ QObject *parent)
-                : QBarSeries(*new QPercentBarSeriesPrivate(categories,this), parent)
+                : QBarSeries(*new QPercentBarSeriesPrivate(/*categories,*/this), parent)
             {
             }
             ///////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////
-            QPercentBarSeriesPrivate::QPercentBarSeriesPrivate(QBarCategories categories, QPercentBarSeries *q) : QBarSeriesPrivate(categories,q)
+            QPercentBarSeriesPrivate::QPercentBarSeriesPrivate(/*QBarCategories categories,*/ QPercentBarSeries *q) : QBarSeriesPrivate(/*categories,*/q)
             {
             }

src/barchart/qpercentbarseries.h +2 -1

             {
                 Q_OBJECT
             public:
-                explicit QPercentBarSeries(QBarCategories categories, QObject *parent = 0);
+                explicit QPercentBarSeries(/*QBarCategories categories,*/ QObject *parent = 0);
                 QAbstractSeries::SeriesType type() const;
             private:
                 Q_DECLARE_PRIVATE(QPercentBarSeries)
                 Q_DISABLE_COPY(QPercentBarSeries)

src/barchart/qpercentbarseries_p.h +1 -1

             class QPercentBarSeriesPrivate: public QBarSeriesPrivate
             {
             public:
-                QPercentBarSeriesPrivate(QBarCategories categories,QPercentBarSeries* q);
+                QPercentBarSeriesPrivate(/*QBarCategories categories,*/QPercentBarSeries* q);
                 void scaleDomain(Domain& domain);
                 Chart* createGraphics(ChartPresenter* presenter);

src/barchart/qstackedbarseries.cpp +3 -3

                 Constructs empty QStackedBarSeries. Parameter \a categories defines the categories for chart.
                 QStackedBarSeries is QObject which is a child of a \a parent.
             */
-            QStackedBarSeries::QStackedBarSeries(QBarCategories categories, QObject *parent)
+            QStackedBarSeries::QStackedBarSeries(/*QBarCategories categories,*/ QObject *parent)
-                : QBarSeries(*new QStackedBarSeriesPrivate(categories,this), parent)
+                : QBarSeries(*new QStackedBarSeriesPrivate(/*categories,*/this), parent)
             {
             }
             ///////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////
-            QStackedBarSeriesPrivate::QStackedBarSeriesPrivate(QBarCategories categories, QStackedBarSeries *q) : QBarSeriesPrivate(categories,q)
+            QStackedBarSeriesPrivate::QStackedBarSeriesPrivate(/*QBarCategories categories,*/ QStackedBarSeries *q) : QBarSeriesPrivate(/*categories,*/q)
             {
             }

src/barchart/qstackedbarseries.h +2 -1

             {
                 Q_OBJECT
             public:
-                explicit QStackedBarSeries(QBarCategories categories, QObject *parent = 0);
+                explicit QStackedBarSeries(/*QBarCategories categories,*/ QObject *parent = 0);
                 QAbstractSeries::SeriesType type() const;
             private:
                 Q_DECLARE_PRIVATE(QStackedBarSeries)
                 Q_DISABLE_COPY(QStackedBarSeries)

src/barchart/qstackedbarseries_p.h +1 -1

             class QStackedBarSeriesPrivate: public QBarSeriesPrivate
             {
             public:
-                QStackedBarSeriesPrivate(QBarCategories categories,QStackedBarSeries* q);
+                QStackedBarSeriesPrivate(/*QBarCategories categories,*/QStackedBarSeries* q);
                 Chart* createGraphics(ChartPresenter* presenter);
                 void scaleDomain(Domain& domain);

test/auto/qbarseries/tst_qbarseries.cpp +6 -3

             void tst_QBarSeries::init()
             {
                 m_categories << "category0" << "category1" << "category2";
-                m_barseries = new QBarSeries(m_categories);
+                m_barseries = new QBarSeries();
-                m_barseries_with_sets = new QBarSeries(m_categories);
+                m_barseries->setCategories(m_categories);
+                m_barseries_with_sets = new QBarSeries();
+                m_barseries_with_sets->setCategories(m_categories);
                 for (int i=0; i<5; i++) {
                     m_testSets.append(new QBarSet("testset"));
             void tst_QBarSeries::qbarseries()
             {
                 QFETCH(QBarCategories, categories);
-                QBarSeries *barseries = new QBarSeries(categories);
+                QBarSeries *barseries = new QBarSeries();
                 QVERIFY(barseries != 0);
+                barseries->setCategories(categories);
                 QBarCategories verifyCategories = barseries->categories();
                 QVERIFY(verifyCategories.count() == categories.count());

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