HG_REPOSITORIES/LPP/INSTRUMENTATION/USERS/JEANDET/qtcharts Commit - r1459:e9693669a76b

fix: series visible now affects legend items also

sauimone -

r1459:e9693669a76b

parent child

Context file:

r1459:e9693669a76b

Collapse all files

examples/legend/main.cpp 0 -4

             #include <QApplication>
             #include <QMainWindow>
-            #include <QChartView>
-            #include <QBarSeries>
-            #include <QBarSet>
-            #include <QLegend>
             QTCOMMERCIALCHART_USE_NAMESPACE

examples/legend/mainwidget.h +1 0

             #include <QGraphicsGridLayout>
             #include <QDoubleSpinBox>
             #include <QGroupBox>
+            #include <QBarSeries>
             QTCOMMERCIALCHART_USE_NAMESPACE

src/legend/qlegend.cpp +29 0

                         QPointF point = m_rect.topLeft();
                         m_width = 0;
                         foreach (QGraphicsItem *item, items) {
+                            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_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());
                         }
                         QPointF point = m_rect.topLeft();
                         m_height = 0;
                         foreach (QGraphicsItem *item, items) {
+                            if (item->isVisible()) {
                                 item->setPos(point);
                                 const QRectF& rect = item->boundingRect();
                                 qreal h = rect.height();
                                 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);
                         }
                         m_height = 0;
                         for (int i=0; i<items.count(); i++) {
                             QGraphicsItem *item = items.at(i);
+                            if (item->isVisible()) {
                                 const QRectF& rect = item->boundingRect();
                                 qreal w = rect.width();
                                 qreal h = rect.height();
                                     }
                                 }
                             }
+                        }
                         m_markers->setPos(m_rect.topLeft());
                         m_width = m_minWidth;
                         m_height = 0;
                         for (int i=0; i<items.count(); i++) {
                             QGraphicsItem *item = items.at(i);
+                            if (item->isVisible()) {
                                 const QRectF& rect = item->boundingRect();
                                 qreal w = rect.width();
                                 qreal h = rect.height();
                                     }
                                 }
                             }
+                        }
                         m_markers->setPos(m_rect.topLeft());
                         m_width = m_minWidth;
                         qreal maxWidth = 0;
                         for (int i=0; i<items.count(); i++) {
                             QGraphicsItem *item = items.at(i);
+                            if (item->isVisible()) {
                                 const QRectF& rect = item->boundingRect();
                                 qreal w = rect.width();
                                 qreal h = rect.height();
                                     }
                                 }
                             }
+                        }
                         m_width += maxWidth;
                         m_markers->setPos(m_rect.topLeft());
                         m_height = m_minHeight;
                         qreal maxWidth = 0;
                         for (int i=0; i<items.count(); i++) {
                             QGraphicsItem *item = items.at(i);
+                            if (item->isVisible()) {
                                 const QRectF& rect = item->boundingRect();
                                 qreal w = rect.width();
                                 qreal h = rect.height();
                                     }
                                 }
                             }
+                        }
                         m_width += maxWidth;
                         m_markers->setPos(m_rect.topLeft());
                         m_height = m_minHeight;
                 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()));
                 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"

src/legend/qlegend_p.h +1 0

                 void handleSeriesRemoved(QAbstractSeries *series);
                 void handleSeriesUpdated(QAbstractSeries *series);
                 void handleUpdatePieSeries(); //TODO remove this function
+                void handleSeriesVisibleChanged();
             private:
                 QLegend *q_ptr;

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