From 415d595f93c92e9daf25d1e758adc19975649093 2012-06-01 09:29:13 From: Marek Rosa Date: 2012-06-01 09:29:13 Subject: [PATCH] Revert barseries thought to be only model related --- diff --git a/src/barchart/qbarseries.cpp b/src/barchart/qbarseries.cpp index e13df78..f2ec941 100644 --- a/src/barchart/qbarseries.cpp +++ b/src/barchart/qbarseries.cpp @@ -231,6 +231,23 @@ QBarSeriesPrivate::QBarSeriesPrivate(QBarSeries *q) : { } +void QBarSeriesPrivate::setCategories(QStringList categories) +{ + m_categories = categories; +} + +void QBarSeriesPrivate::insertCategory(int index, const QString category) +{ + m_categories.insert(index, category); + emit categoriesUpdated(); +} + +void QBarSeriesPrivate::removeCategory(int index) +{ + m_categories.removeAt(index); + emit categoriesUpdated(); +} + int QBarSeriesPrivate::categoryCount() const { if (m_categories.count() > 0) { @@ -473,7 +490,7 @@ bool QBarSeriesPrivate::append(QBarSet *set) if (m_dataset) { m_dataset->updateSeries(q); // this notifies legend } -// emit restructuredBars(); // this notifies barchartitem + emit restructuredBars(); // this notifies barchartitem return true; } @@ -489,7 +506,7 @@ bool QBarSeriesPrivate::remove(QBarSet *set) if (m_dataset) { m_dataset->updateSeries(q); // this notifies legend } -// emit restructuredBars(); // this notifies barchartitem + emit restructuredBars(); // this notifies barchartitem return true; } @@ -514,7 +531,7 @@ bool QBarSeriesPrivate::append(QList sets) if (m_dataset) { m_dataset->updateSeries(q); // this notifies legend } -// emit restructuredBars(); // this notifies barchartitem + emit restructuredBars(); // this notifies barchartitem return true; } @@ -534,7 +551,7 @@ bool QBarSeriesPrivate::remove(QList sets) if (m_dataset) { m_dataset->updateSeries(q); // this notifies legend } -// emit restructuredBars(); // this notifies barchartitem + emit restructuredBars(); // this notifies barchartitem } return setsRemoved; } diff --git a/src/barchart/qbarseries_p.h b/src/barchart/qbarseries_p.h index 1edda81..b21d661 100644 --- a/src/barchart/qbarseries_p.h +++ b/src/barchart/qbarseries_p.h @@ -45,6 +45,9 @@ class QBarSeriesPrivate : public QAbstractSeriesPrivate public: QBarSeriesPrivate(QBarSeries *parent); // TODO: refactor/remove private category stuff + void setCategories(QStringList categories); + void insertCategory(int index, const QString category); + void removeCategory(int index); int categoryCount() const; QStringList categories() const; @@ -76,8 +79,8 @@ public: Q_SIGNALS: void clicked(QBarSet *barset, int index); void updatedBars(); -// void restructuredBars(); -// void categoriesUpdated(); + void restructuredBars(); + void categoriesUpdated(); void labelsVisibleChanged(bool visible); private Q_SLOTS: