Some todo:s in barseries done. Updated temperaturerecords example to use stacked bar series

6 files changed, 8 insertions, 54 deletions

diff --git a/src/barchart/abstractbarchartitem.cpp b/src/barchart/abstractbarchartitem.cpp
index 1e22d267..01a5d592 100644
--- a/src/barchart/abstractbarchartitem.cpp
+++ b/src/barchart/abstractbarchartitem.cpp
@@ -160,7 +160,6 @@ void AbstractBarChartItem::handleDataStructureChanged()
         }
     }
 
-    // TODO: Is this the right place to call it?
     presenter()->chartTheme()->decorate(m_series, presenter()->dataSet()->seriesIndex(m_series));
     handleLayoutChanged();
 }
diff --git a/src/barchart/horizontal/bar/horizontalbarchartitem.cpp b/src/barchart/horizontal/bar/horizontalbarchartitem.cpp
index 68650a45..ec8cf06e 100644
--- a/src/barchart/horizontal/bar/horizontalbarchartitem.cpp
+++ b/src/barchart/horizontal/bar/horizontalbarchartitem.cpp
@@ -49,11 +49,7 @@ QVector<QRectF> HorizontalBarChartItem::calculateLayout()
     qreal barHeight;
 
  // On horizontal chart barWidth of the barseries means height of the rect.
-    if (m_series->d_func()->m_overlap) {
-        barHeight = scaleY * m_series->d_func()->barWidth();
-    } else {
-        barHeight = (scaleY / setCount) * m_series->d_func()->barWidth();
-    }
+    barHeight = (scaleY / setCount) * m_series->d_func()->barWidth();
 
     int itemIndex(0);
     for (int category = 0; category < categoryCount; category++) {
@@ -62,12 +58,8 @@ QVector<QRectF> HorizontalBarChartItem::calculateLayout()
             QBarSetPrivate* barSet = m_series->d_func()->barsetAt(set)->d_ptr.data();
 
             qreal yPos = m_rect.bottom() + (m_domainMinY - barSet->pos(category)) * scaleY;
-            if (m_series->d_func()->m_overlap) {
-                yPos += barHeight/2;
-            } else {
-                yPos += setCount*barHeight/2;
-                yPos -= set*barHeight;
-            }
+            yPos += setCount*barHeight/2;
+            yPos -= set*barHeight;
 
             qreal barWidth = barSet->value(category) * scaleX;
             Bar* bar = m_bars.at(itemIndex);
diff --git a/src/barchart/qabstractbarseries.cpp b/src/barchart/qabstractbarseries.cpp
index befc0344..0edf2a27 100644
--- a/src/barchart/qabstractbarseries.cpp
+++ b/src/barchart/qabstractbarseries.cpp
@@ -376,28 +376,13 @@ bool QAbstractBarSeries::isLabelsVisible() const
     return d->m_labelsVisible;
 }
 
-/*!
-    Sets the overlap drawing mode for bars. If \a overlap is true, then the bars
-    are drawn at same position inside group. Can be used for example to draw negative bars
-    at same position on axis than positive bars. By default overlap is false and bars are drawn
-    next to each other. Note that this setting doesn't affect stacked and percent bar series.
-*/
-void QAbstractBarSeries::setOverlap(bool overlap)
-{
-    Q_D(QAbstractBarSeries);
-    d->setOverlap(overlap);
-}
-
-
-
 ///////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////
 
 QAbstractBarSeriesPrivate::QAbstractBarSeriesPrivate(QAbstractBarSeries *q) :
     QAbstractSeriesPrivate(q),
     m_barWidth(0.5),  // Default value is 50% of category width
     m_labelsVisible(false),
-    m_visible(true),
-    m_overlap(false)
+    m_visible(true)
 {
 }
 
@@ -445,14 +430,6 @@ void QAbstractBarSeriesPrivate::setLabelsVisible(bool visible)
     emit labelsVisibleChanged(visible);
 }
 
-void QAbstractBarSeriesPrivate::setOverlap(bool overlap)
-{
-    if (m_overlap != overlap) {
-        m_overlap = overlap;
-        emit updatedBars();
-    }
-}
-
 qreal QAbstractBarSeriesPrivate::min()
 {
     if (m_barSets.count() <= 0) {
diff --git a/src/barchart/qabstractbarseries.h b/src/barchart/qabstractbarseries.h
index c3a788a1..10e7025e 100644
--- a/src/barchart/qabstractbarseries.h
+++ b/src/barchart/qabstractbarseries.h
@@ -55,8 +55,6 @@ public:
     void setLabelsVisible(bool visible = true);
     bool isLabelsVisible() const;
 
-    void setOverlap(bool overlap = true);
-
 protected:
     explicit QAbstractBarSeries(QAbstractBarSeriesPrivate &d,QObject *parent = 0);
 
diff --git a/src/barchart/qabstractbarseries_p.h b/src/barchart/qabstractbarseries_p.h
index 63c09837..a31d779b 100644
--- a/src/barchart/qabstractbarseries_p.h
+++ b/src/barchart/qabstractbarseries_p.h
@@ -52,7 +52,6 @@ public:
 
     void setVisible(bool visible);
     void setLabelsVisible(bool visible);
-    void setOverlap(bool overlap);
 
     void scaleDomain(Domain& domain);
     ChartElement* createGraphics(ChartPresenter* presenter);
@@ -96,7 +95,6 @@ protected:
     qreal m_barWidth;
     bool m_labelsVisible;
     bool m_visible;
-    bool m_overlap;
 
 private:
     Q_DECLARE_PUBLIC(QAbstractBarSeries)
diff --git a/src/barchart/vertical/bar/barchartitem.cpp b/src/barchart/vertical/bar/barchartitem.cpp
index 0839b71f..453d0764 100644
--- a/src/barchart/vertical/bar/barchartitem.cpp
+++ b/src/barchart/vertical/bar/barchartitem.cpp
@@ -50,11 +50,7 @@ QVector<QRectF> BarChartItem::calculateLayout()
     qreal scaleX = (width / rangeX);
     qreal barWidth;
 
-    if (m_series->d_func()->m_overlap) {
-        barWidth = scaleX * m_series->d_func()->barWidth();
-    } else {
-        barWidth = (scaleX / setCount) * m_series->d_func()->barWidth();
-    }
+    barWidth = (scaleX / setCount) * m_series->d_func()->barWidth();
 
     int itemIndex(0);
     for (int category = 0; category < categoryCount; category++) {
@@ -62,15 +58,9 @@ QVector<QRectF> BarChartItem::calculateLayout()
         for (int set = 0; set < setCount; set++) {
             QBarSetPrivate* barSet = m_series->d_func()->barsetAt(set)->d_ptr.data();
 
-            qreal xPos;
-
-            if (m_series->d_func()->m_overlap) {
-                xPos = (barSet->pos(category) - m_domainMinX) * scaleX + m_rect.left() - barWidth/2;
-            } else {
-                xPos = (barSet->pos(category) - m_domainMinX) * scaleX + m_rect.left();
-                xPos -= setCount*barWidth/2;
-                xPos += set*barWidth;
-            }
+            qreal xPos = (barSet->pos(category) - m_domainMinX) * scaleX + m_rect.left();
+            xPos -= setCount*barWidth/2;
+            xPos += set*barWidth;
 
             qreal barHeight = barSet->value(category) * scaleY;
             Bar* bar = m_bars.at(itemIndex);