HG_REPOSITORIES/LPP/INSTRUMENTATION/USERS/JEANDET/qtcharts Commit - r2192:805641b9c3d1

cleaning up todos

sauimone -

r2192:805641b9c3d1

parent child

Context file:

r2192:805641b9c3d1

Collapse all files

src/legend/legendmarkeritem.cpp 0 -1

             #include <QPainter>
             #include <QGraphicsSceneEvent>
             #include <QGraphicsSimpleTextItem>
-            #include <QDebug>
             #include "qlegend.h"
             #include "qlegend_p.h"

src/legend/qarealegendmarker.cpp 0 -2

             #include "qarealegendmarker_p.h"
             #include "qareaseries_p.h"
             #include <QAreaSeries>
-            #include <QDebug>
             QTCOMMERCIALCHART_BEGIN_NAMESPACE
             QAreaLegendMarker::~QAreaLegendMarker()
             {
-            //    qDebug() << "deleting Area marker" << this;
             }
             /*!

src/legend/qarealegendmarker.h 0 -1

             class QAreaLegendMarkerPrivate;
-            // TODO: No export? make this private. QLegendMarker should be enough for user of the api (why expose the details?)
             class QTCOMMERCIALCHART_EXPORT QAreaLegendMarker : public QLegendMarker
             {
                 Q_OBJECT

src/legend/qarealegendmarker_p.h 0 -5

             #include "legendmarkeritem_p.h"
             #include <QAreaSeries>
-            #include <QDebug>
             QTCOMMERCIALCHART_BEGIN_NAMESPACE
             class QAreaLegendMarker;
                 explicit QAreaLegendMarkerPrivate(QAreaLegendMarker *q, QAreaSeries *series, QLegend *legend);
                 virtual ~QAreaLegendMarkerPrivate();
-                // internal
                 virtual QAreaSeries* series();
                 virtual QObject* relatedObject();
             private:
                 QAreaLegendMarker *q_ptr;
                 QAreaSeries* m_series;
-                friend class QLegendPrivate; // TODO: Is this needed?
                 Q_DECLARE_PUBLIC(QAreaLegendMarker)
             };

src/legend/qbarlegendmarker.cpp 0 -2

             #include "qbarlegendmarker_p.h"
             #include <QAbstractBarSeries>
             #include <QBarSet>
-            #include <QDebug>
             QTCOMMERCIALCHART_BEGIN_NAMESPACE
             QBarLegendMarker::~QBarLegendMarker()
             {
-            //    qDebug() << "deleting bar marker" << this;
             }
             /*!

src/legend/qbarlegendmarker_p.h 0 -4

             #include <QAbstractBarSeries>
             #include <QBarSet>
-            #include <QDebug>
             QTCOMMERCIALCHART_BEGIN_NAMESPACE
             class QBarLegendMarker;
             private:
                 QBarLegendMarker *q_ptr;
                 QAbstractBarSeries* m_series;
                 QBarSet* m_barset;
-                friend class QLegendPrivate;
                 Q_DECLARE_PUBLIC(QBarLegendMarker)
             };

src/legend/qlegend.cpp +5 -64

@@ -178,7 +178,6 QLegend::QLegend(QChart *chart): QGraphicsWidget(chart),
178	setFlags(QGraphicsItem::ItemClipsChildrenToShape);	178	setFlags(QGraphicsItem::ItemClipsChildrenToShape);
179	QObject::connect(chart->d_ptr->m_dataset, SIGNAL(seriesAdded(QAbstractSeries,Domain)), d_ptr.data(), SLOT(handleSeriesAdded(QAbstractSeries*)));	179	QObject::connect(chart->d_ptr->m_dataset, SIGNAL(seriesAdded(QAbstractSeries,Domain)), d_ptr.data(), SLOT(handleSeriesAdded(QAbstractSeries*)));
180	QObject::connect(chart->d_ptr->m_dataset, SIGNAL(seriesRemoved(QAbstractSeries)), d_ptr.data(), SLOT(handleSeriesRemoved(QAbstractSeries)));	180	QObject::connect(chart->d_ptr->m_dataset, SIGNAL(seriesRemoved(QAbstractSeries)), d_ptr.data(), SLOT(handleSeriesRemoved(QAbstractSeries)));
181	// QObject::connect(chart->d_ptr->m_dataset,SIGNAL(seriesUpdated(QAbstractSeries)),d_ptr.data(),SLOT(handleCountChanged(QAbstractSeries)));
182	setLayout(d_ptr->m_layout);	181	setLayout(d_ptr->m_layout);
183	}	182	}
184		183
@@ -477,7 +476,6 void QLegendPrivate::addSeries(QAbstractSeries* series)
477	{	476	{
478	// Only allow one instance of series	477	// Only allow one instance of series
479	if (m_series.contains(series)) {	478	if (m_series.contains(series)) {
480	qDebug() << "series already added" << series;
481	return;	479	return;
482	}	480	}
483		481
@@ -485,36 +483,7 void QLegendPrivate::addSeries(QAbstractSeries* series)
485	decorateMarkers(newMarkers);	483	decorateMarkers(newMarkers);
486	addMarkers(newMarkers);	484	addMarkers(newMarkers);
487		485
488	// TODO: This is the part I don't like. There should be better solution.	486	QObject::connect(series->d_ptr.data(), SIGNAL(countChanged()), this, SLOT(handleCountChanged()));
489	// On the other hand. It is only one switch case for appending and another for removing series
490	// If countChanged signal were on QAbstractSeries, there would be no need for switch at all.
491	switch (series->type())
492	{
493	case QAbstractSeries::SeriesTypePie: {
494	QPieSeries s = qobject_cast<QPieSeries > (series);
495	QObject::connect(s, SIGNAL(countChanged()), this, SLOT(handleCountChanged()));
496	break;
497	}
498	case QAbstractSeries::SeriesTypeBar:
499	case QAbstractSeries::SeriesTypeStackedBar:
500	case QAbstractSeries::SeriesTypePercentBar:
501	case QAbstractSeries::SeriesTypeHorizontalBar:
502	case QAbstractSeries::SeriesTypeHorizontalStackedBar:
503	case QAbstractSeries::SeriesTypeHorizontalPercentBar: {
504	QAbstractBarSeries s = qobject_cast<QAbstractBarSeries > (series);
505	QObject::connect(s, SIGNAL(countChanged()), this, SLOT(handleCountChanged()));
506	break;
507	}
508	case QAbstractSeries::SeriesTypeLine:
509	case QAbstractSeries::SeriesTypeArea:
510	case QAbstractSeries::SeriesTypeScatter:
511	case QAbstractSeries::SeriesTypeSpline:
512	default: {
513	// No need to connect any series related signals. We have no series level
514	// changes, that would generate or delete markers
515	}
516	}
517
518	QObject::connect(series, SIGNAL(visibleChanged()), this, SLOT(handleSeriesVisibleChanged()));	487	QObject::connect(series, SIGNAL(visibleChanged()), this, SLOT(handleSeriesVisibleChanged()));
519		488
520	m_series.append(series);	489	m_series.append(series);
@@ -537,38 +506,10 void QLegendPrivate::removeSeries(QAbstractSeries* series)
537	}	506	}
538	removeMarkers(removed);	507	removeMarkers(removed);
539		508
540	switch (series->type())	509	QObject::disconnect(series->d_ptr.data(), SIGNAL(countChanged()), this, SLOT(handleCountChanged()));
541	{
542	case QAbstractSeries::SeriesTypePie: {
543	QPieSeries s = qobject_cast<QPieSeries > (series);
544	QObject::disconnect(s, SIGNAL(countChanged()), this, SLOT(handleCountChanged()));
545	break;
546	}
547	case QAbstractSeries::SeriesTypeBar:
548	case QAbstractSeries::SeriesTypeStackedBar:
549	case QAbstractSeries::SeriesTypePercentBar:
550	case QAbstractSeries::SeriesTypeHorizontalBar:
551	case QAbstractSeries::SeriesTypeHorizontalStackedBar:
552	case QAbstractSeries::SeriesTypeHorizontalPercentBar: {
553	QAbstractBarSeries s = qobject_cast<QAbstractBarSeries > (series);
554	QObject::disconnect(s, SIGNAL(countChanged()), this, SLOT(handleCountChanged()));
555	break;
556	}
557	// TODO:
558	case QAbstractSeries::SeriesTypeLine:
559	case QAbstractSeries::SeriesTypeArea:
560	case QAbstractSeries::SeriesTypeScatter:
561	case QAbstractSeries::SeriesTypeSpline:
562	default: {
563	// No need to disconnect any series related signals
564	break;
565	}
566	}
567
568	QObject::disconnect(series, SIGNAL(visibleChanged()), this, SLOT(handleSeriesVisibleChanged()));	510	QObject::disconnect(series, SIGNAL(visibleChanged()), this, SLOT(handleSeriesVisibleChanged()));
569		511
570	m_layout->invalidate();	512	m_layout->invalidate();
571	// q_ptr->layout()->activate();
572	}	513	}
573		514
574	void QLegendPrivate::handleSeriesAdded(QAbstractSeries *series)	515	void QLegendPrivate::handleSeriesAdded(QAbstractSeries *series)
@@ -603,14 +544,14 void QLegendPrivate::handleCountChanged()
603	// Here we handle the changes in marker count.	544	// Here we handle the changes in marker count.
604	// Can happen for example when pieslice(s) have been added to or removed from pieseries.	545	// Can happen for example when pieslice(s) have been added to or removed from pieseries.
605		546
606	QAbstractSeries series = qobject_cast<QAbstractSeries > (sender());	547	QAbstractSeriesPrivate series = qobject_cast<QAbstractSeriesPrivate > (sender());
607	QList<QLegendMarker *> createdMarkers = series->~~d_ptr~~->createLegendMarkers(q_ptr);	548	QList<QLegendMarker *> createdMarkers = series->createLegendMarkers(q_ptr);
608		549
609	// Find out removed markers and created markers	550	// Find out removed markers and created markers
610	QList<QLegendMarker *> removedMarkers;	551	QList<QLegendMarker *> removedMarkers;
611	foreach (QLegendMarker *oldMarker, m_markers) {	552	foreach (QLegendMarker *oldMarker, m_markers) {
612	// we have marker, which is related to sender.	553	// we have marker, which is related to sender.
613	if (oldMarker->series() == series) {	554	if (oldMarker->series() == series->q_ptr) {
614	bool found = false;	555	bool found = false;
615	foreach(QLegendMarker *newMarker, createdMarkers) {	556	foreach(QLegendMarker *newMarker, createdMarkers) {
616	// New marker considered existing if:	557	// New marker considered existing if:

src/legend/qlegendmarker.cpp 0 -1

             #include "qlegendmarker_p.h"
             #include "legendmarkeritem_p.h"
             #include "qlegend.h"
-            #include <QDebug>
             #include <QFontMetrics>
             #include <QGraphicsSceneEvent>
             #include <QAbstractSeries>

src/legend/qlegendmarker_p.h +1 -3

             #include <QPen>
             #include <QGraphicsSimpleTextItem>
             #include <QGraphicsLayoutItem>
-            #include <QDebug>
             QTCOMMERCIALCHART_BEGIN_NAMESPACE
                 explicit QLegendMarkerPrivate(QLegendMarker *q, QLegend *legend);
                 virtual ~QLegendMarkerPrivate();
-                // Helper for now. (or deckare LegendLayout as friend)
+                // Helper for now. (or declare LegendLayout as friend)
                 LegendMarkerItem* item() const { return m_item; }
-                // internal
                 virtual QAbstractSeries* series() = 0;
                 virtual QObject* relatedObject() = 0;

src/legend/qpielegendmarker.cpp 0 -2

             #include "qpielegendmarker_p.h"
             #include <QPieSeries>
             #include <QPieSlice>
-            #include <QDebug>
             QTCOMMERCIALCHART_BEGIN_NAMESPACE
             QPieLegendMarker::~QPieLegendMarker()
             {
-            //    qDebug() << "deleting pie marker" << this;
             }
             /*!

src/legend/qpielegendmarker.h 0 -1

             class QPieLegendMarkerPrivate;
-            // TODO: No export? make this private. QLegendMarker should be enough for user of the api (why expose the details?)
             class QTCOMMERCIALCHART_EXPORT QPieLegendMarker : public QLegendMarker
             {
                 Q_OBJECT

src/legend/qpielegendmarker_p.h 0 -3

             #include <QPieSeries>
             #include <QPieSlice>
-            #include <QDebug>
             QTCOMMERCIALCHART_BEGIN_NAMESPACE
             class QPieLegendMarker;
                 QPieSeries* m_series;
                 QPieSlice* m_slice;
-                friend class QLegendPrivate; // TODO: Is this needed?
                 Q_DECLARE_PUBLIC(QPieLegendMarker)
             };

src/legend/qxylegendmarker.cpp 0 -2

             #include "qxylegendmarker_p.h"
             #include "qxyseries_p.h"
             #include <QXYSeries>
-            #include <QDebug>
             QTCOMMERCIALCHART_BEGIN_NAMESPACE
             QXYLegendMarker::~QXYLegendMarker()
             {
-            //    qDebug() << "deleting xy marker" << this;
             }
             /*!

src/legend/qxylegendmarker_p.h 0 -5

             #include "legendmarkeritem_p.h"
             #include <QXYSeries>
-            #include <QDebug>
             QTCOMMERCIALCHART_BEGIN_NAMESPACE
             class QXYLegendMarker;
                 explicit QXYLegendMarkerPrivate(QXYLegendMarker *q, QXYSeries *series, QLegend *legend);
                 virtual ~QXYLegendMarkerPrivate();
-                // internal
                 virtual QAbstractSeries* series();
                 virtual QObject* relatedObject();
             private:
                 QXYLegendMarker *q_ptr;
                 QXYSeries* m_series;
-                friend class QLegendPrivate; // TODO: Is this needed?
                 Q_DECLARE_PUBLIC(QXYLegendMarker)
             };

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