diff --git a/src/barchart/barchartitem.cpp b/src/barchart/barchartitem.cpp index 13e85d5..27b51a7 100644 --- a/src/barchart/barchartitem.cpp +++ b/src/barchart/barchartitem.cpp @@ -38,7 +38,6 @@ BarChartItem::BarChartItem(QBarSeries *series, ChartPresenter *presenter) : { setFlag(ItemClipsChildrenToShape); connect(series->d_func(), SIGNAL(updatedBars()), this, SLOT(handleLayoutChanged())); - connect(series->d_func(), SIGNAL(restructuredBars()), this, SLOT(handleModelChanged())); connect(series->d_func(), SIGNAL(labelsVisibleChanged(bool)), this, SLOT(labelsVisibleChanged(bool))); setZValue(ChartPresenter::BarSeriesZValue); dataChanged(); @@ -168,12 +167,6 @@ void BarChartItem::setLayout(const QVector &layout) } //handlers -void BarChartItem::handleModelChanged() -{ -// dataChanged(); - presenter()->resetAllElements(); -} - void BarChartItem::handleDomainChanged(qreal minX, qreal maxX, qreal minY, qreal maxY) { m_domainMinX = minX; diff --git a/src/barchart/barchartitem_p.h b/src/barchart/barchartitem_p.h index 1bfd2a0..3fe469b 100644 --- a/src/barchart/barchartitem_p.h +++ b/src/barchart/barchartitem_p.h @@ -63,7 +63,6 @@ public: QRectF geometry() const { return m_rect;} public Q_SLOTS: - void handleModelChanged(); void handleDomainChanged(qreal minX, qreal maxX, qreal minY, qreal maxY); void handleGeometryChanged(const QRectF &size); void handleLayoutChanged(); diff --git a/src/barchart/qbarseries.cpp b/src/barchart/qbarseries.cpp index f2ec941..e13df78 100644 --- a/src/barchart/qbarseries.cpp +++ b/src/barchart/qbarseries.cpp @@ -231,23 +231,6 @@ 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) { @@ -490,7 +473,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; } @@ -506,7 +489,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; } @@ -531,7 +514,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; } @@ -551,7 +534,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 b21d661..1edda81 100644 --- a/src/barchart/qbarseries_p.h +++ b/src/barchart/qbarseries_p.h @@ -45,9 +45,6 @@ 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; @@ -79,8 +76,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: