HG_REPOSITORIES/LPP/INSTRUMENTATION/USERS/JEANDET/qtcharts Commit - r792:f33d64d30a1c

legend refactoring.

sauimone -

r792:f33d64d30a1c

parent child

Context file:

r792:f33d64d30a1c

Collapse all files

demos/chartthemes/themewidget.cpp +2 -3

                     for (int i(0); i < m_dataTable.count(); i++) {
                         QLineSeries *series1 = new QLineSeries(chart);
                         QLineSeries *series2 = new QLineSeries(chart);
-                        series1->setName(name + QString::number(nameIndex) + QString(" lo"));
-                        series2->setName(name + QString::number(nameIndex) + QString(" hi"));
-                        nameIndex++;
                         foreach (Data data, m_dataTable[i]) {
                             series1->add(data.first);
                             series2->add(QPointF(data.first.x(), 0.0));
                         }
                         QAreaSeries *area = new QAreaSeries(series1, series2);
+                        area->setName(name + QString::number(nameIndex));
+                        nameIndex++;
                         chart->addSeries(area);
                     }
                 }

src/chartpresenter.cpp 0 -1

             void ChartPresenter::handleGeometryChanged()
             {
-                qDebug() << "legend h:" << m_chart->legend()->size().height();
                 QRectF rect(QPoint(0,0),m_chart->size());
                 rect.adjust(m_padding,
                             m_padding + m_chart->legend()->size().height(),

src/legendmarker.cpp +28 -13

             #include <qpieslice.h>
             #include <qbarset.h>
             #include <qxyseries.h>
+            #include <qareaseries.h>
             #include <QPainter>
             #include <QGraphicsSceneEvent>
             #include <QGraphicsSimpleTextItem>
                 m_series(series),
                 m_barset(0),
                 m_pieslice(0),
-                m_type(LegendMarkerTypeSeries),
                 m_textItem(new QGraphicsSimpleTextItem(this))
             {
                 setAcceptedMouseButtons(Qt::LeftButton|Qt::RightButton);
                 m_series(series),
                 m_barset(barset),
                 m_pieslice(0),
-                m_type(LegendMarkerTypeBarset),
                 m_textItem(new QGraphicsSimpleTextItem(this))
             {
                 setAcceptedMouseButtons(Qt::LeftButton|Qt::RightButton);
                 m_series(series),
                 m_barset(0),
                 m_pieslice(pieslice),
-                m_type(LegendMarkerTypePieslice),
                 m_textItem(new QGraphicsSimpleTextItem(this))
             {
                 setAcceptedMouseButtons(Qt::LeftButton|Qt::RightButton);
             void LegendMarker::mousePressEvent(QGraphicsSceneMouseEvent *event)
             {
-                switch (m_type)
+                switch (m_series->type()) {
+                case QSeries::SeriesTypeLine:
-                case LegendMarkerTypeSeries: {
+                case QSeries::SeriesTypeArea:
+                case QSeries::SeriesTypeScatter:
+                case QSeries::SeriesTypeSpline: {
                     emit clicked(m_series,event->button());
                     break;
                     }
-                case LegendMarkerTypeBarset: {
+                case QSeries::SeriesTypeBar:
+                case QSeries::SeriesTypeStackedBar:
+                case QSeries::SeriesTypePercentBar: {
                     emit clicked(m_barset,event->button());
                     break;
                     }
-                case LegendMarkerTypePieslice: {
+                case QSeries::SeriesTypePie: {
                     emit clicked(m_pieslice,event->button());
                     break;
                     }
             void LegendMarker::changed()
             {
-                switch (m_type)
+                switch (m_series->type()) {
+                case QSeries::SeriesTypeArea: {
-                case LegendMarkerTypeSeries: {
+                    QAreaSeries* s = static_cast<QAreaSeries*> (m_series);
+                    setPen(s->pen());
+                    setBrush(s->brush());
+                    setName(s->name());
+                    break;
+                }
+                case QSeries::SeriesTypeLine:
+                case QSeries::SeriesTypeScatter:
+                case QSeries::SeriesTypeSpline: {
                     QXYSeries* s = static_cast<QXYSeries*> (m_series);
                     setPen(s->pen());
                     setBrush(s->brush());
                     setName(s->name());
                     break;
                     }
-                case LegendMarkerTypeBarset: {
+                case QSeries::SeriesTypeBar:
+                case QSeries::SeriesTypeStackedBar:
+                case QSeries::SeriesTypePercentBar: {
                     setPen(m_barset->pen());
                     setBrush(m_barset->brush());
                     setName(m_barset->name());
                     break;
                     }
-                case LegendMarkerTypePieslice: {
+                case QSeries::SeriesTypePie: {
                     setBrush(m_pieslice->brush());
                     setName(m_pieslice->label());
                     break;
                     }
+                default: {
+                    break;
+                    }
                 }
             }

src/legendmarker_p.h 0 -7

             {
                 Q_OBJECT
-                enum LegendMarkerType {
-                    LegendMarkerTypeSeries,
-                    LegendMarkerTypeBarset,
-                    LegendMarkerTypePieslice
-                };
             public:
                 LegendMarker(QSeries *series, QGraphicsItem *parent = 0);
                 LegendMarker(QSeries *series, QBarSet *barset, QGraphicsItem *parent = 0);
                 QBarSet *m_barset;
                 QPieSlice *m_pieslice;
-                LegendMarkerType m_type;
                 QGraphicsSimpleTextItem *m_textItem;
             };

src/qlegend.cpp +78 -88

@@ -219,8 +219,55 void QLegend::handleSeriesAdded(QSeries series, Domain domain)
219	{	219	{
220	Q_UNUSED(domain)	220	Q_UNUSED(domain)
221		221
222	createMarkers(series);	222	switch (series->type())
223	connectSeries(series);	223	{
		224	case QSeries::SeriesTypeLine: {
		225	QLineSeries lineSeries = static_cast<QLineSeries >(series);
		226	appendMarkers(lineSeries);
		227	break;
		228	}
		229	case QSeries::SeriesTypeArea: {
		230	QAreaSeries areaSeries = static_cast<QAreaSeries >(series);
		231	appendMarkers(areaSeries);
		232	break;
		233	}
		234	case QSeries::SeriesTypeBar: {
		235	QBarSeries barSeries = static_cast<QBarSeries >(series);
		236	appendMarkers(barSeries);
		237	break;
		238	}
		239	case QSeries::SeriesTypeStackedBar: {
		240	QStackedBarSeries stackedBarSeries = static_cast<QStackedBarSeries >(series);
		241	appendMarkers(stackedBarSeries);
		242	break;
		243	}
		244	case QSeries::SeriesTypePercentBar: {
		245	QPercentBarSeries percentBarSeries = static_cast<QPercentBarSeries >(series);
		246	appendMarkers(percentBarSeries);
		247	break;
		248	}
		249	case QSeries::SeriesTypeScatter: {
		250	QScatterSeries scatterSeries = static_cast<QScatterSeries >(series);
		251	appendMarkers(scatterSeries);
		252	break;
		253	}
		254	case QSeries::SeriesTypePie: {
		255	QPieSeries pieSeries = static_cast<QPieSeries >(series);
		256	appendMarkers(pieSeries);
		257	connect(pieSeries,SIGNAL(added(QList<QPieSlice>)),this,SLOT(handleAdded(QList<QPieSlice>)));
		258	break;
		259	}
		260	case QSeries::SeriesTypeSpline: {
		261	QSplineSeries splineSeries = static_cast<QSplineSeries >(series);
		262	appendMarkers(splineSeries);
		263	break;
		264	}
		265	default: {
		266	qWarning()<< "QLegend::handleSeriesAdded" << series->type() << "unknown series type.";
		267	break;
		268	}
		269	}
		270
224	updateLayout();	271	updateLayout();
225	}	272	}
226		273
@@ -229,15 +276,24 void QLegend::handleSeriesAdded(QSeries series, Domain domain)
229	*/	276	*/
230	void QLegend::handleSeriesRemoved(QSeries *series)	277	void QLegend::handleSeriesRemoved(QSeries *series)
231	{	278	{
232	disconnectSeries(series);	279	switch (series->type())
233		280	{
234	if (~~series~~->~~type~~() == QSeries::SeriesTypeArea) {	281	case QSeries::SeriesTypeArea: {
235	// This is special case. Area series has upper and lower series, which each have markers	282	QAreaSeries areaSeries = static_cast<QAreaSeries >(series);
236	QAreaSeries* s = static_cast<QAreaSeries *> (series);	283	deleteMarkers(areaSeries);
237	deleteMarkers(s->upperSeries());	284	break;
238	deleteMarkers(s->lowerSeries());	285	}
239	} else {	286	case QSeries::SeriesTypePie: {
		287	QPieSeries pieSeries = static_cast<QPieSeries >(series);
		288	disconnect(pieSeries, SIGNAL(added(QList<QPieSlice >)), this, SLOT(handleAdded(QList<QPieSlice >)));
		289	deleteMarkers(series);
		290	break;
		291	}
		292	default: {
		293	// All other types
240	deleteMarkers(series);	294	deleteMarkers(series);
		295	break;
		296	}
241	}	297	}
242		298
243	updateLayout();	299	updateLayout();
@@ -313,86 +369,19 void QLegend::scrollButtonClicked(LegendScrollButton *scrollButton)
313	}	369	}
314		370
315	/*!	371	/*!
316	\internal Connects the \a series to legend. Legend listens changes in series, for example pie slices added / removed.	372	\internal Helper function. Appends markers from \a series to legend.
317	Not all series notify about events
318	*/
319	void QLegend::connectSeries(QSeries *series)
320	{
321	// Connect relevant signals from series. Currently only pie series has interesting signals
322	// TODO: bar chart may have
323	if (series->type() == QSeries::SeriesTypePie) {
324	QPieSeries pieSeries = static_cast<QPieSeries >(series);
325	connect(pieSeries,SIGNAL(added(QList<QPieSlice>)),this,SLOT(handleAdded(QList<QPieSlice>)));
326	}
327	}
328
329	/*!
330	\internal Disconnects \a series from legend. No more status updates from series to legend.
331	*/
332	void QLegend::disconnectSeries(QSeries *series)
333	{
334	if (series->type() == QSeries::SeriesTypePie) {
335	QPieSeries pieSeries = static_cast<QPieSeries >(series);
336	disconnect(pieSeries, SIGNAL(added(QList<QPieSlice >)), this, SLOT(handleAdded(QList<QPieSlice >)));
337	}
338	}
339
340	/*!
341	\internal Creates new markers for \a series. Marker contains the colored rectangle and series name.
342	With pie chart, created markers depend on pie slices.
343	With bar chart, created markers depend on bar sets.
344	*/	373	*/
345	void QLegend::~~create~~Markers(QSeries *series)	374	void QLegend::appendMarkers(QAreaSeries* series)
346	{
347	switch (series->type())
348	{	375	{
349	case QSeries::SeriesTypeLine: {	376	LegendMarker* marker = new LegendMarker(series,this);
350	QLineSeries lineSeries = static_cast<QLineSeries >(series);	377	marker->setName(series->name());
351	appendMarkers(lineSeries);	378	marker->setPen(series->pen());
352	break;	379	marker->setBrush(series->brush());
353	}	380	connect(marker, SIGNAL(clicked(QSeries , Qt::MouseButton)), this, SIGNAL(clicked(QSeries , Qt::MouseButton)));
354	case QSeries::SeriesTypeArea: {	381	connect(marker, SIGNAL(destroyed()), this, SLOT(handleMarkerDestroyed()));
355	QAreaSeries areaSeries = static_cast<QAreaSeries >(series);	382	connect(series,SIGNAL(updated()),marker,SLOT(changed()));
356	appendMarkers(areaSeries->upperSeries());	383	m_markers.append(marker);
357	if(areaSeries->lowerSeries())	384	childItems().append(marker);
358	appendMarkers(areaSeries->lowerSeries());
359	break;
360	}
361	case QSeries::SeriesTypeBar: {
362	QBarSeries barSeries = static_cast<QBarSeries >(series);
363	appendMarkers(barSeries);
364	break;
365	}
366	case QSeries::SeriesTypeStackedBar: {
367	QStackedBarSeries stackedBarSeries = static_cast<QStackedBarSeries >(series);
368	appendMarkers(stackedBarSeries);
369	break;
370	}
371	case QSeries::SeriesTypePercentBar: {
372	QPercentBarSeries percentBarSeries = static_cast<QPercentBarSeries >(series);
373	appendMarkers(percentBarSeries);
374	break;
375	}
376	case QSeries::SeriesTypeScatter: {
377	QScatterSeries scatterSeries = static_cast<QScatterSeries >(series);
378	appendMarkers(scatterSeries);
379	break;
380	}
381	case QSeries::SeriesTypePie: {
382	QPieSeries pieSeries = static_cast<QPieSeries >(series);
383	appendMarkers(pieSeries);
384	break;
385	}
386	case QSeries::SeriesTypeSpline: {
387	QSplineSeries splineSeries = static_cast<QSplineSeries >(series);
388	appendMarkers(splineSeries);
389	break;
390	}
391	default: {
392	qWarning()<< "QLegend::createMarkers" << series->type() << "unknown series type.";
393	break;
394	}
395	}
396	}	385	}
397		386
398	/*!	387	/*!
@@ -406,6 +395,7 void QLegend::appendMarkers(QXYSeries* series)
406	marker->setBrush(series->brush());	395	marker->setBrush(series->brush());
407	connect(marker, SIGNAL(clicked(QSeries , Qt::MouseButton)), this, SIGNAL(clicked(QSeries , Qt::MouseButton)));	396	connect(marker, SIGNAL(clicked(QSeries , Qt::MouseButton)), this, SIGNAL(clicked(QSeries , Qt::MouseButton)));
408	connect(marker, SIGNAL(destroyed()), this, SLOT(handleMarkerDestroyed()));	397	connect(marker, SIGNAL(destroyed()), this, SLOT(handleMarkerDestroyed()));
		398	connect(series,SIGNAL(updated()),marker,SLOT(changed()));
409	m_markers.append(marker);	399	m_markers.append(marker);
410	childItems().append(marker);	400	childItems().append(marker);
411	}	401	}

src/qlegend.h +3 -4

             class QBarSet;
             class QBarSeries;
             class QPieSeries;
+            class QAreaSeries;
             class LegendScrollButton;
             class QSeries;
             class QChart;
             private:
                 // PIMPL --->
-                void connectSeries(QSeries *series);
+                void appendMarkers(QAreaSeries *series);
-                void disconnectSeries(QSeries *series);
+                void appendMarkers(QXYSeries *series);
-                void createMarkers(QSeries *series);
-                void appendMarkers(QXYSeries *series);      // All line series are derived from QXYSeries, so this works for now
                 void appendMarkers(QBarSeries *series);
                 void appendMarkers(QPieSeries *series);
                 void deleteMarkers(QSeries *series);

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