HG_REPOSITORIES/LPP/INSTRUMENTATION/USERS/JEANDET/qtcharts Commit - r956:e1337e5f8780

Adds trivial legend handling for slices when removed or added

Michal Klocek -

r956:e1337e5f8780

parent child

Context file:

r956:e1337e5f8780

Collapse all files

src/legendmarker.cpp 0 -1

             {
                 QObject::connect(this, SIGNAL(selected()),pieslice, SIGNAL(selected()));
                 QObject::connect(pieslice, SIGNAL(changed()), this, SLOT(updated()));
-                QObject::connect(pieslice, SIGNAL(destroyed()), this, SLOT(deleteLater())); //TODO:checkthis
                 updated();
             }

src/qchart.cpp 0 -3

                 d_ptr->m_presenter = new ChartPresenter(this,d_ptr->m_dataset);
                 d_ptr->createConnections();
                 d_ptr->m_legend = new LegendScroller(this);
-              //  d_ptr->m_legend->setVisible(false);
                 d_ptr->m_presenter->setTheme(QChart::ChartThemeLight, false);
-                //TODO:fix me setMinimumSize(d_ptr->m_padding.left() * 3, d_ptr->m_padding.top() * 3);
             }
             /*!

src/qlegend.cpp +30 -7

                 setZValue(ChartPresenter::LegendZValue);
                 setFlags(QGraphicsItem::ItemClipsChildrenToShape);
                 setEnabled(false); // By default legend is disabled
+                setVisible(false);
                 QObject::connect(chart->d_ptr->m_dataset,SIGNAL(seriesAdded(QSeries*,Domain*)),d_ptr.data(),SLOT(handleSeriesAdded(QSeries*,Domain*)));
                 QObject::connect(chart->d_ptr->m_dataset,SIGNAL(seriesRemoved(QSeries*)),d_ptr.data(),SLOT(handleSeriesRemoved(QSeries*)));
             }
                 foreach(LegendMarker* marker , markers)
                     m_markers->addToGroup(marker);
+                if(series->type()==QSeries::SeriesTypePie)
+                {
+                    QPieSeries *pieSeries = static_cast<QPieSeries *>(series);
+                    QObject::connect(pieSeries,SIGNAL(added(QList<QPieSlice*>)),this,SLOT(handleUpdateSeries()));
+                    QObject::connect(pieSeries,SIGNAL(removed(QList<QPieSlice*>)),this,SLOT(handleUpdateSeries()));
+                }
                 updateLayout();
             }
                 QList<QGraphicsItem *> items = m_markers->childItems();
-                 foreach (QGraphicsItem *markers, items) {
+                foreach (QGraphicsItem *markers, items) {
-                     LegendMarker *marker = static_cast<LegendMarker*>(markers);
+                    LegendMarker *marker = static_cast<LegendMarker*>(markers);
-                     if (marker->series() == series) {
+                    if (marker->series() == series) {
-                         delete marker;
+                        delete marker;
+                    }
+                }
+                if(series->type()==QSeries::SeriesTypePie)
+                {
+                    QPieSeries *pieSeries = static_cast<QPieSeries *>(series);
+                    QObject::disconnect(pieSeries,SIGNAL(added(QList<QPieSlice*>)),this,SLOT(handleUpdateSeries()));
+                    QObject::disconnect(pieSeries,SIGNAL(removed(QList<QPieSlice*>)),this,SLOT(handleUpdateSeries()));
+                }
                 updateLayout();
             }
+            void QLegendPrivate::handleUpdateSeries()
+            {
+                //TODO: reimplement to be optimal
+                QSeries* series = qobject_cast<QSeries *> (sender());
+                Q_ASSERT(series);
+                handleSeriesRemoved(series);
+                handleSeriesAdded(series,0);
+            }
             #include "moc_qlegend.cpp"
             #include "moc_qlegend_p.cpp"

src/qlegend_p.h +1 0

             public Q_SLOTS:
                 void handleSeriesAdded(QSeries *series, Domain *domain);
                 void handleSeriesRemoved(QSeries *series);
+                void handleUpdateSeries(); //TODO remove this function
             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