From e9693669a76b2ee8dce57f7a42be53b188717439 2012-06-14 10:02:49
From: sauimone <samu.uimonen@digia.com>
Date: 2012-06-14 10:02:49
Subject: [PATCH] fix: series visible now affects legend items also

---

diff --git a/examples/legend/main.cpp b/examples/legend/main.cpp
index c9e057d..d7cefa3 100644
--- a/examples/legend/main.cpp
+++ b/examples/legend/main.cpp
@@ -22,10 +22,6 @@
 
 #include <QApplication>
 #include <QMainWindow>
-#include <QChartView>
-#include <QBarSeries>
-#include <QBarSet>
-#include <QLegend>
 
 QTCOMMERCIALCHART_USE_NAMESPACE
 
diff --git a/examples/legend/mainwidget.h b/examples/legend/mainwidget.h
index 43cf415..fa77344 100644
--- a/examples/legend/mainwidget.h
+++ b/examples/legend/mainwidget.h
@@ -30,6 +30,7 @@
 #include <QGraphicsGridLayout>
 #include <QDoubleSpinBox>
 #include <QGroupBox>
+#include <QBarSeries>
 
 QTCOMMERCIALCHART_USE_NAMESPACE
 
diff --git a/src/legend/qlegend.cpp b/src/legend/qlegend.cpp
index 324e813..2dbe87d 100644
--- a/src/legend/qlegend.cpp
+++ b/src/legend/qlegend.cpp
@@ -459,13 +459,15 @@ void QLegendPrivate::updateLayout()
             QPointF point = m_rect.topLeft();
             m_width = 0;
             foreach (QGraphicsItem *item, items) {
-                item->setPos(point.x(),m_rect.height()/2 -item->boundingRect().height()/2);
-                const QRectF& rect = item->boundingRect();
-                qreal w = rect.width();
-                m_minWidth=qMax(m_minWidth,w);
-                m_minHeight=qMax(m_minHeight,rect.height());
-                m_width+=w;
-                point.setX(point.x() + w);
+                if (item->isVisible()) {
+                    item->setPos(point.x(),m_rect.height()/2 -item->boundingRect().height()/2);
+                    const QRectF& rect = item->boundingRect();
+                    qreal w = rect.width();
+                    m_minWidth=qMax(m_minWidth,w);
+                    m_minHeight=qMax(m_minHeight,rect.height());
+                    m_width+=w;
+                    point.setX(point.x() + w);
+                }
             }
             if(m_width<m_rect.width()) {
                 m_markers->setPos(m_rect.width()/2-m_width/2,m_rect.top());
@@ -481,13 +483,15 @@ void QLegendPrivate::updateLayout()
             QPointF point = m_rect.topLeft();
             m_height = 0;
             foreach (QGraphicsItem *item, items) {
-                item->setPos(point);
-                const QRectF& rect = item->boundingRect();
-                qreal h = rect.height();
-                m_minWidth=qMax(m_minWidth,rect.width());
-                m_minHeight=qMax(m_minHeight,h);
-                m_height+=h;
-                point.setY(point.y() + h);
+                if (item->isVisible()) {
+                    item->setPos(point);
+                    const QRectF& rect = item->boundingRect();
+                    qreal h = rect.height();
+                    m_minWidth=qMax(m_minWidth,rect.width());
+                    m_minHeight=qMax(m_minHeight,h);
+                    m_height+=h;
+                    point.setY(point.y() + h);
+                }
             }
             if(m_height<m_rect.height()) {
                 m_markers->setPos(m_rect.left(),m_rect.height()/2-m_height/2);
@@ -530,20 +534,22 @@ void QLegendPrivate::updateDetachedLayout()
             m_height = 0;
             for (int i=0; i<items.count(); i++) {
                 QGraphicsItem *item = items.at(i);
-                const QRectF& rect = item->boundingRect();
-                qreal w = rect.width();
-                qreal h = rect.height();
-                m_minWidth = qMax(m_minWidth,w);
-                m_minHeight = qMax(m_minHeight,rect.height());
-                m_height = qMax(m_height,h);
-                item->setPos(point.x(),point.y());
-                point.setX(point.x() + w);
-                if (point.x() + w > m_rect.topLeft().x() + m_rect.width()) {
-                    // Next item would go off rect.
-                    point.setX(m_rect.topLeft().x());
-                    point.setY(point.y() + h);
-                    if (i+1 < items.count()) {
-                        m_height += h;
+                if (item->isVisible()) {
+                    const QRectF& rect = item->boundingRect();
+                    qreal w = rect.width();
+                    qreal h = rect.height();
+                    m_minWidth = qMax(m_minWidth,w);
+                    m_minHeight = qMax(m_minHeight,rect.height());
+                    m_height = qMax(m_height,h);
+                    item->setPos(point.x(),point.y());
+                    point.setX(point.x() + w);
+                    if (point.x() + w > m_rect.topLeft().x() + m_rect.width()) {
+                        // Next item would go off rect.
+                        point.setX(m_rect.topLeft().x());
+                        point.setY(point.y() + h);
+                        if (i+1 < items.count()) {
+                            m_height += h;
+                        }
                     }
                 }
             }
@@ -562,20 +568,22 @@ void QLegendPrivate::updateDetachedLayout()
             m_height = 0;
             for (int i=0; i<items.count(); i++) {
                 QGraphicsItem *item = items.at(i);
-                const QRectF& rect = item->boundingRect();
-                qreal w = rect.width();
-                qreal h = rect.height();
-                m_minWidth = qMax(m_minWidth,w);
-                m_minHeight = qMax(m_minHeight,rect.height());
-                m_height = qMax(m_height,h);
-                item->setPos(point.x(),point.y() - h);
-                point.setX(point.x() + w);
-                if (point.x() + w > m_rect.bottomLeft().x() + m_rect.width()) {
-                    // Next item would go off rect.
-                    point.setX(m_rect.bottomLeft().x());
-                    point.setY(point.y() - h);
-                    if (i+1 < items.count()) {
-                        m_height += h;
+                if (item->isVisible()) {
+                    const QRectF& rect = item->boundingRect();
+                    qreal w = rect.width();
+                    qreal h = rect.height();
+                    m_minWidth = qMax(m_minWidth,w);
+                    m_minHeight = qMax(m_minHeight,rect.height());
+                    m_height = qMax(m_height,h);
+                    item->setPos(point.x(),point.y() - h);
+                    point.setX(point.x() + w);
+                    if (point.x() + w > m_rect.bottomLeft().x() + m_rect.width()) {
+                        // Next item would go off rect.
+                        point.setX(m_rect.bottomLeft().x());
+                        point.setY(point.y() - h);
+                        if (i+1 < items.count()) {
+                            m_height += h;
+                        }
                     }
                 }
             }
@@ -595,21 +603,23 @@ void QLegendPrivate::updateDetachedLayout()
             qreal maxWidth = 0;
             for (int i=0; i<items.count(); i++) {
                 QGraphicsItem *item = items.at(i);
-                const QRectF& rect = item->boundingRect();
-                qreal w = rect.width();
-                qreal h = rect.height();
-                m_minWidth = qMax(m_minWidth,rect.width());
-                m_minHeight = qMax(m_minHeight,h);
-                maxWidth = qMax(maxWidth,w);
-                item->setPos(point.x(),point.y());
-                point.setY(point.y() + h);
-                if (point.y() + h > m_rect.topLeft().y() + m_rect.height()) {
-                    // Next item would go off rect.
-                    point.setX(point.x() + maxWidth);
-                    point.setY(m_rect.topLeft().y());
-                    if (i+1 < items.count()) {
-                        m_width += maxWidth;
-                        maxWidth = 0;
+                if (item->isVisible()) {
+                    const QRectF& rect = item->boundingRect();
+                    qreal w = rect.width();
+                    qreal h = rect.height();
+                    m_minWidth = qMax(m_minWidth,rect.width());
+                    m_minHeight = qMax(m_minHeight,h);
+                    maxWidth = qMax(maxWidth,w);
+                    item->setPos(point.x(),point.y());
+                    point.setY(point.y() + h);
+                    if (point.y() + h > m_rect.topLeft().y() + m_rect.height()) {
+                        // Next item would go off rect.
+                        point.setX(point.x() + maxWidth);
+                        point.setY(m_rect.topLeft().y());
+                        if (i+1 < items.count()) {
+                            m_width += maxWidth;
+                            maxWidth = 0;
+                        }
                     }
                 }
             }
@@ -630,21 +640,23 @@ void QLegendPrivate::updateDetachedLayout()
             qreal maxWidth = 0;
             for (int i=0; i<items.count(); i++) {
                 QGraphicsItem *item = items.at(i);
-                const QRectF& rect = item->boundingRect();
-                qreal w = rect.width();
-                qreal h = rect.height();
-                m_minWidth = qMax(m_minWidth,rect.width());
-                m_minHeight = qMax(m_minHeight,h);
-                maxWidth = qMax(maxWidth,w);
-                item->setPos(point.x() - w,point.y());
-                point.setY(point.y() + h);
-                if (point.y() + h > m_rect.topLeft().y() + m_rect.height()) {
-                    // Next item would go off rect.
-                    point.setX(point.x() - maxWidth);
-                    point.setY(m_rect.topLeft().y());
-                    if (i+1 < items.count()) {
-                        m_width += maxWidth;
-                        maxWidth = 0;
+                if (item->isVisible()) {
+                    const QRectF& rect = item->boundingRect();
+                    qreal w = rect.width();
+                    qreal h = rect.height();
+                    m_minWidth = qMax(m_minWidth,rect.width());
+                    m_minHeight = qMax(m_minHeight,h);
+                    maxWidth = qMax(maxWidth,w);
+                    item->setPos(point.x() - w,point.y());
+                    point.setY(point.y() + h);
+                    if (point.y() + h > m_rect.topLeft().y() + m_rect.height()) {
+                        // Next item would go off rect.
+                        point.setX(point.x() - maxWidth);
+                        point.setY(m_rect.topLeft().y());
+                        if (i+1 < items.count()) {
+                            m_width += maxWidth;
+                            maxWidth = 0;
+                        }
                     }
                 }
             }
@@ -682,6 +694,8 @@ void QLegendPrivate::handleSeriesAdded(QAbstractSeries *series, Domain *domain)
     foreach(LegendMarker* marker, markers)
         m_markers->addToGroup(marker);
 
+    QObject::connect(series, SIGNAL(visibleChanged()), this, SLOT(handleSeriesVisibleChanged()));
+
     if(series->type() == QAbstractSeries::SeriesTypePie) {
         QPieSeries *pieSeries = static_cast<QPieSeries *>(series);
         QObject::connect(pieSeries, SIGNAL(added(QList<QPieSlice*>)), this, SLOT(handleUpdatePieSeries()));
@@ -730,6 +744,21 @@ void QLegendPrivate::handleUpdatePieSeries()
     handleSeriesAdded(series, 0);
 }
 
+void QLegendPrivate::handleSeriesVisibleChanged()
+{
+    QAbstractSeries* series = qobject_cast<QAbstractSeries *> (sender());
+    QList<QGraphicsItem *> items = m_markers->childItems();
+
+    foreach (QGraphicsItem *markers, items) {
+        LegendMarker *marker = static_cast<LegendMarker*>(markers);
+        if (marker->series() == series) {
+            marker->setVisible(!marker->isVisible());
+        }
+    }
+
+    updateLayout();
+}
+
 
 #include "moc_qlegend.cpp"
 #include "moc_qlegend_p.cpp"
diff --git a/src/legend/qlegend_p.h b/src/legend/qlegend_p.h
index 00b654a..da2eafd 100644
--- a/src/legend/qlegend_p.h
+++ b/src/legend/qlegend_p.h
@@ -57,6 +57,7 @@ public Q_SLOTS:
     void handleSeriesRemoved(QAbstractSeries *series);
     void handleSeriesUpdated(QAbstractSeries *series);
     void handleUpdatePieSeries(); //TODO remove this function
+    void handleSeriesVisibleChanged();
 
 private:
     QLegend *q_ptr;