HG_REPOSITORIES/LPP/INSTRUMENTATION/USERS/JEANDET/qtcharts Commit - r416:b3ab09e85735

Merge branch 'master' of https://git.it.local/repos/QtCommercialDevel-13049/charts

Marek Rosa -

r416:b3ab09e85735

parent child

Context file:

r416:b3ab09e85735

Expand all files

example/piechartdrilldown/main.cpp created 644 +113 0

@@ -0,0 +1,113
	1	#include <QtGui/QApplication>
	2	#include <QMainWindow>
	3	#include <qchartglobal.h>
	4	#include <qchartview.h>
	5	#include <qpieseries.h>
	6	#include <qpieslice.h>
	7	#include <QTime>
	8
	9	QTCOMMERCIALCHART_USE_NAMESPACE
	10
	11	class DrilldownSlice : public QPieSlice
	12	{
	13	Q_OBJECT
	14
	15	public:
	16	DrilldownSlice(qreal value, QString prefix, QSeries* drilldownSeries)
	17	:m_drilldownSeries(drilldownSeries),
	18	m_prefix(prefix)
	19	{
	20	setValue(value);
	21	setLabelVisible(true);
	22	updateLabel();
	23	connect(this, SIGNAL(changed()), this, SLOT(updateLabel()));
	24	}
	25
	26	QSeries* drilldownSeries() const { return m_drilldownSeries; }
	27
	28	public Q_SLOTS:
	29	void updateLabel()
	30	{
	31	QString label = m_prefix;
	32	label += " " + QString::number(this->value())+ "e (";
	33	label += QString::number(this->percentage()*100, 'f', 1) + "%)";
	34	setLabel(label);
	35	}
	36
	37	private:
	38	QSeries* m_drilldownSeries;
	39	QString m_prefix;
	40	};
	41
	42	class DrilldownChart : public QChartView
	43	{
	44	Q_OBJECT
	45	public:
	46	explicit DrilldownChart(QWidget *parent = 0):QChartView(parent), m_currentSeries(0) {}
	47
	48	void changeSeries(QSeries* series)
	49	{
	50	if (m_currentSeries)
	51	removeSeries(m_currentSeries);
	52	m_currentSeries = series;
	53	addSeries(series);
	54	setChartTitle(series->title());
	55	}
	56
	57	public Q_SLOTS:
	58	void handleSliceClicked(QPieSlice* slice)
	59	{
	60	DrilldownSlice* drilldownSlice = static_cast<DrilldownSlice*>(slice);
	61	changeSeries(drilldownSlice->drilldownSeries());
	62	}
	63
	64	private:
	65	QSeries* m_currentSeries;
	66	};
	67
	68	int main(int argc, char *argv[])
	69	{
	70	QApplication a(argc, argv);
	71
	72	qsrand(QTime(0,0,0).secsTo(QTime::currentTime()));
	73
	74	QMainWindow window;
	75
	76	DrilldownChart* drilldownChart = new DrilldownChart(&window);
	77	drilldownChart->setRenderHint(QPainter::Antialiasing);
	78	drilldownChart->setChartTheme(QChart::ChartThemeVanilla);
	79
	80	QPieSeries* yearSeries = new QPieSeries(drilldownChart);
	81	yearSeries->setTitle("Sales by year - All");
	82	yearSeries->setHoverHighlighting();
	83
	84	QList<QString> months;
	85	months << "Jan" << "Feb" << "Mar" << "Apr" << "May" << "Jun" << "Jul" << "Aug" << "Sep" << "Oct" << "Nov" << "Dec";
	86	QList<QString> names;
	87	names << "Jane" << "John" << "Axel" << "Mary" << "Samantha" << "Bob";
	88
	89	foreach (QString name, names) {
	90	QPieSeries* series = new QPieSeries(drilldownChart);
	91	series->setTitle("Sales by month - " + name);
	92	series->setHoverHighlighting();
	93
	94	foreach (QString month, months)
	95	*series << new DrilldownSlice(qrand() % 1000, month, yearSeries);
	96
	97	QObject::connect(series, SIGNAL(clicked(QPieSlice)), drilldownChart, SLOT(handleSliceClicked(QPieSlice)));
	98
	99	*yearSeries << new DrilldownSlice(series->total(), name, series);
	100	}
	101
	102	QObject::connect(yearSeries, SIGNAL(clicked(QPieSlice)), drilldownChart, SLOT(handleSliceClicked(QPieSlice)));
	103
	104	drilldownChart->changeSeries(yearSeries);
	105
	106	window.setCentralWidget(drilldownChart);
	107	window.resize(600, 600);
	108	window.show();
	109
	110	return a.exec();
	111	}
	112
	113	#include "main.moc"

example/piechartdrilldown/piechartdrilldown.pro created 644 +9 0

@@ -0,0 +1,9
	1	!include( ../example.pri ) {
	2	error( "Couldn't find the example.pri file!" )
	3	}
	4	TARGET = piechartdrilldown
	5	SOURCES += main.cpp
	6	HEADERS +=
	7
	8
	9	MOC_DIR = $$PWD/moc

src/barchart/barcategory.cpp created 644 +17 0

@@ -0,0 +1,17
	1	#include "barcategory_p.h"
	2
	3	QTCOMMERCIALCHART_BEGIN_NAMESPACE
	4	BarCategory::BarCategory(QString name, QObject *parent) :
	5	QObject(parent)
	6	,mName(name)
	7	{
	8	}
	9
	10	void BarCategory::barRightClickEvent()
	11	{
	12	// TODO:
	13	emit rightClicked(mName);
	14	}
	15
	16	#include "moc_barcategory_p.cpp"
	17	QTCOMMERCIALCHART_END_NAMESPACE

src/barchart/barcategory_p.h created 644 +26 0

@@ -0,0 +1,26
	1	#ifndef BARCATEGORY_P_H
	2	#define BARCATEGORY_P_H
	3
	4	#include <QObject>
	5	#include <qchartglobal.h>
	6
	7	QTCOMMERCIALCHART_BEGIN_NAMESPACE
	8	// Event handler for bar category
	9	class BarCategory : public QObject
	10	{
	11	Q_OBJECT
	12	public:
	13	explicit BarCategory(QString name, QObject *parent = 0);
	14
	15	signals:
	16	void rightClicked(QString name); // "We want something to happen that involves this category"
	17
	18	public slots:
	19	void barRightClickEvent();
	20
	21	private:
	22	QString mName;
	23	};
	24
	25	QTCOMMERCIALCHART_END_NAMESPACE
	26	#endif // BARCATEGORY_P_H

example/example.pro +1 0

                        percentbarchart \
                        scatter \
                        piechart \
+                       piechartdrilldown \
                        dynamiclinechart \
                        axischart \
                        multichart \

src/barchart/bar.cpp +7 -3

             Bar::Bar(QGraphicsItem *parent)
                 : QGraphicsObject(parent)
             {
-                setAcceptedMouseButtons(Qt::LeftButton);
+                setAcceptedMouseButtons(Qt::LeftButton|Qt::RightButton);
                 setAcceptHoverEvents(true);
             }
                 return r;
             }
-            void Bar::mousePressEvent(QGraphicsSceneMouseEvent* /*event*/)
+            void Bar::mousePressEvent(QGraphicsSceneMouseEvent* event)
             {
-                emit clicked();
+                if (event->button() == Qt::LeftButton) {
+                    emit clicked();
+                } else if (event->button() == Qt::RightButton) {
+                    emit rightClicked();
+                }
             }
             void Bar::hoverEnterEvent(QGraphicsSceneHoverEvent* event)

src/barchart/bar_p.h +1 -1

             Q_SIGNALS:
                 void clicked();
+                void rightClicked();
                 void hoverEntered(QPoint pos);
                 void hoverLeaved();
                 qreal mWidth;
                 qreal mXpos;
                 qreal mYpos;
-                QColor mColor;
                 QBrush mBrush;
                 QPen mPen;

src/barchart/barchart.pri +4 -3

                 $$PWD/qstackedbarseries.cpp \
                 $$PWD/separator.cpp \
                 $$PWD/stackedbarpresenter.cpp \
-                $$PWD/barvalue.cpp
+                $$PWD/barvalue.cpp \
+                $$PWD/barcategory.cpp
             PRIVATE_HEADERS += \
                 $$PWD/bar_p.h \
                 $$PWD/percentbarpresenter_p.h \
                 $$PWD/separator_p.h \
                 $$PWD/stackedbarpresenter_p.h \
-                $$PWD/barvalue_p.h
+                $$PWD/barvalue_p.h \
+                $$PWD/barcategory_p.h
             PUBLIC_HEADERS += \
                 $$PWD/qbarseries.h \
                 $$PWD/qbarset.h \
                 $$PWD/qpercentbarseries.h \
                 $$PWD/qstackedbarseries.h

src/barchart/barchartmodel.cpp +11 -1

             #include <QVector>
             #include <QDebug>
             #include "barchartmodel_p.h"
+            #include "barcategory_p.h"
             #include "qbarset.h"
             QTCOMMERCIALCHART_BEGIN_NAMESPACE
                 QObject(parent)
                 ,mCategory(categories)
             {
+                for (int i=0; i<mCategory.count(); i++) {
+                    BarCategory* cat = new BarCategory(mCategory.at(i), this);
+                    mCategoryObjects.append(cat);
+                }
             }
             QStringList BarChartModel::category()
                 return max;
             }
-            QString BarChartModel::label(int category)
+            QString BarChartModel::categoryName(int category)
             {
                 return mCategory.at(category);
             }
+            BarCategory* BarChartModel::categoryObject(int category)
+            {
+                return mCategoryObjects.at(category);
+            }
             #include "moc_barchartmodel_p.cpp"
             QTCOMMERCIALCHART_END_NAMESPACE

src/barchart/barchartmodel_p.h +4 -1

             // TODO: Implement as QAbstractItemModel?
             class QBarSet;
+            class BarCategory;
             class BarChartModel : public QObject //, public QAbstractItemModel
             {
                 qreal categorySum(int category);
                 qreal maxCategorySum();     // returns maximum sum of sets in all categories.
-                QString label(int category);
+                QString categoryName(int category);
+                BarCategory* categoryObject(int category);
             signals:
                 void modelUpdated();
                 QList<QBarSet*> mDataModel;
                 QStringList mCategory;
+                QList<BarCategory*> mCategoryObjects;
                 int mCurrentSet;

src/barchart/barpresenterbase.cpp +8 -5

             #include "barvalue_p.h"
             #include "barlabel_p.h"
             #include "separator_p.h"
+            #include "barcategory_p.h"
             #include "qbarset.h"
             #include "qbarseries.h"
             #include <QDebug>
             void BarPresenterBase::dataChanged()
             {
                 // TODO: performance optimizations. Do we really need to delete and create items every time data is changed or can we reuse them?
-                qDebug() << "datachanged";
+            //    qDebug() << "datachanged";
                 // Delete old bars
                 foreach (QGraphicsItem* item, childItems()) {
                     delete item;
                 // Create new graphic items for bars
                 for (int c=0; c<mSeries->categoryCount(); c++) {
+                    BarCategory *category = mSeries->categoryObject(c);
                     for (int s=0; s<mSeries->barsetCount(); s++) {
                         QBarSet *set = mSeries->barsetAt(s);
                         Bar *bar = new Bar(this);
                         childItems().append(bar);
                         mBars.append(bar);
-                        connect(bar,SIGNAL(clicked()),set,SLOT(barClicked()));
+                        connect(bar,SIGNAL(clicked()),set,SLOT(barClickedEvent()));
-                        connect(bar,SIGNAL(hoverEntered(QPoint)),set,SLOT(barHoverEntered(QPoint)));
+                        connect(bar,SIGNAL(rightClicked()),category,SLOT(barRightClickEvent()));
-                        connect(bar,SIGNAL(hoverLeaved()),set,SLOT(barHoverLeaved()));
+                        connect(bar,SIGNAL(hoverEntered(QPoint)),set,SLOT(barHoverEnterEvent(QPoint)));
+                        connect(bar,SIGNAL(hoverLeaved()),set,SLOT(barHoverLeaveEvent()));
                     }
                 }
                 int count = mSeries->categoryCount();
                 for (int i=0; i<count; i++) {
                     BarLabel* label = new BarLabel(this);
-                    label->set(mSeries->label(i));
+                    label->set(mSeries->categoryName(i));
                     childItems().append(label);
                     mLabels.append(label);
                 }

src/barchart/qbarseries.cpp +13 -3

             #include "qbarseries.h"
             #include "qbarset.h"
             #include "barchartmodel_p.h"
+            #include "barcategory_p.h"
             QTCOMMERCIALCHART_BEGIN_NAMESPACE
                 : QSeries(parent)
                 ,mModel(new BarChartModel(categories, this))
             {
+                for (int i=0; i<mModel->categoryCount(); i++) {
+                    BarCategory *categoryObject = mModel->categoryObject(i);
+                    connect(categoryObject, SIGNAL(rightClicked(QString)), this, SIGNAL(categoryRightClicked(QString)));
+                }
             }
             /*!
             /*!
                 \internal \a category
             */
-            QString QBarSeries::label(int category)
+            QString QBarSeries::categoryName(int category)
             {
-                return mModel->label(category);
+                return mModel->categoryName(category);
             }
             /*!
                 return *mModel;
             }
+            BarCategory* QBarSeries::categoryObject(int category)
+            {
+                return mModel->categoryObject(category);
+            }
             #include "moc_qbarseries.cpp"
             QTCOMMERCIALCHART_END_NAMESPACE

src/barchart/qbarseries.h +5 -2

             class QBarSet;
             class BarChartModel;
+            class BarCategory;
             // Container for series
             class QTCOMMERCIALCHART_EXPORT QBarSeries : public QSeries
                 // TODO: Functions below this are not part of api and will be moved
                 // to private implementation, when we start using it
                 // TODO: TO PIMPL --->
-                QBarSet *barsetAt(int index);
+                QBarSet* barsetAt(int index);
-                QString label(int category);
+                QString categoryName(int category);
                 qreal min();
                 qreal max();
                 qreal valueAt(int set, int category);
                 qreal categorySum(int category);
                 qreal maxCategorySum();
                 BarChartModel& model();
+                BarCategory* categoryObject(int category);
                 // <--- TO PIMPL
             signals:
                 void changed(int index);
+                void categoryRightClicked(QString category);
                 // TODO: internal signals, these to private implementation.
                 // TODO: TO PIMPL --->

src/barchart/qbarset.cpp +3 -8

             /*!
                 \internal
             */
-            void QBarSet::barClicked()
+            void QBarSet::barClickedEvent()
             {
-            //    qDebug() << "QBarset::barClicked" << this;
                 // Some bar of this set has been clicked
                 // TODO: What happens then?
                 emit clicked();     // Notify that set has been clicked
             /*!
                 \internal \a pos
             */
-            void QBarSet::barHoverEntered(QPoint pos)
+            void QBarSet::barHoverEnterEvent(QPoint pos)
             {
                 emit showToolTip(pos, mName);
                 emit hoverEnter(pos);
             /*!
                 \internal
             */
-            void QBarSet::barHoverLeaved()
+            void QBarSet::barHoverLeaveEvent()
             {
-            //    qDebug() << "QBarset::barHoverLeaved" << this;
-            //    if (mToolTipEnabled) {
-                    // TODO: do what?
-            //    }
                 // Emit signal to user of charts
                 emit hoverLeave();
             }

src/barchart/qbarset.h +3 -3

             public Q_SLOTS:
                 // These are for internal communication
                 // TODO: TO PIMPL --->
-                void barClicked();
+                void barClickedEvent();
-                void barHoverEntered(QPoint pos);
+                void barHoverEnterEvent(QPoint pos);
-                void barHoverLeaved();
+                void barHoverLeaveEvent();
                 // <--- TO PIMPL
             private:

src/chartdataset.cpp +27 -2

                 m_domainMap.replace(axisY,domain);
                 m_seriesMap.insert(axisY,series);
                 emit seriesAdded(series);
-                setDomain(m_domainIndex);
+                setDomain(m_domainIndex,axisY);
             }
                 emit axisRangeChanged(axisX(),labels);
             }
+            void ChartDataSet::setDomain(int index,QChartAxis* axis)
+            {
+                int i = m_domainMap.count(axis) - index -1;
+                Q_ASSERT(i>=0);
+                Domain domain = m_domainMap.values(axis).at(i);
+                {
+                QStringList labels = createLabels(axis,domain.m_minY,domain.m_maxY);
+                QList<QSeries*> seriesList = m_seriesMap.values(axis);
+                foreach(QSeries* series, seriesList) {
+                    emit seriesDomainChanged(series,domain);
+                }
+                axis->updateRange(domain.m_minY,domain.m_maxY);
+                emit axisRangeChanged(axis,labels);
+                }
+                QStringList labels = createLabels(axisX(),domain.m_minX,domain.m_maxX);
+                axisX()->updateRange(domain.m_minX,domain.m_maxY);
+                emit axisRangeChanged(axisX(),labels);
+            }
             void ChartDataSet::clearDomains(int toIndex)
             {
                 Q_ASSERT(toIndex>=0);
                         m_domainMap.replace(axis,domain);
                     }
+                    setDomain(m_domainIndex);
                 }
                 else {
                     for(int j=domains.size()-1; j>=0;j--)
                     m_domainMap.insert(axis,domains.at(j));
+                    setDomain(m_domainIndex,axis);
                 }
-                setDomain(m_domainIndex);
             }
             void ChartDataSet::handleTickChanged(QChartAxis* axis)

src/chartdataset_p.h +1 0

                 const Domain domain(QChartAxis *axisY) const;
                 int domainIndex() const {return m_domainIndex;}
                 void setDomain(int index);
+                void setDomain(int index,QChartAxis* axis);
                 QChartAxis* axisX() const { return m_axisX;};
                 QChartAxis* axisY(QSeries* series = 0) const;

src/piechart/piepresenter.cpp +12 -2

                 foreach (QPieSlice* s, m_series->m_slices) {
                     // calculate the farthest point in the slice from the pie center
+                    // the arm
                     qreal centerAngle = s->m_startAngle + (s->m_angleSpan / 2);
-                    qreal len = pieRadius + s->labelArmLength() + s->explodeDistance();
+                    qreal len = pieRadius + PIESLICE_LABEL_GAP + s->labelArmLength() + s->explodeDistance();
                     QPointF dp(qSin(centerAngle*(PI/180)) * len, -qCos(centerAngle*(PI/180)) * len);
                     QPointF p = pieRect.center() + dp;
-                    // TODO: consider the label text
+                    // the label text
+                    QFontMetricsF fm(s->labelFont());
+                    QRectF labelRect = fm.boundingRect(s->label());
+                    if (centerAngle < 90 || centerAngle > 270)
+                        p += QPointF(0, -labelRect.height());
+                    if (centerAngle < 180)
+                        p += QPointF(labelRect.width(), 0);
+                    else
+                        p += QPointF(-labelRect.width(), 0);
                     // calculate how much the radius must get smaller to fit that point in the base rectangle
                     qreal dt = m_rect.top() - p.y();

src/piechart/pieslice.cpp +1 -1

                 // update label position
                 qreal radius = rect.height() / 2;
-                QPointF edgeCenter = rect.center() + offset(centerAngle, radius + 5);
+                QPointF edgeCenter = rect.center() + offset(centerAngle, radius + PIESLICE_LABEL_GAP);
                 m_slicelabel->setArmStartPoint(edgeCenter);
                 m_slicelabel->setArmAngle(centerAngle);
                 m_slicelabel->updateGeometry();

src/piechart/pieslice_p.h +2 0

             #include <QColor>
             #include <QPen>
+            #define PIESLICE_LABEL_GAP 5
             QTCOMMERCIALCHART_BEGIN_NAMESPACE
             class PiePresenter;
             class PieSliceLabel;

src/piechart/pieslicelabel.cpp +2 -2

                 QPointF parm2 = parm1;
                 textRect.moveBottomLeft(parm1);
                 if (m_armAngle < 180) { // arm swings the other way on the left side
-                     parm2 += QPointF(m_textRect.width(), 0);
+                     parm2 += QPointF(textRect.width(), 0);
                 } else {
-                     parm2 += QPointF(-m_textRect.width(),0);
+                     parm2 += QPointF(-textRect.width(),0);
                      textRect.moveBottomLeft(parm2);
                 }

src/piechart/qpieseries.cpp +24 -6

                 add(QList<QPieSlice*>() << slice);
             }
+            /*!
+                Adds a single \a slice to the series and returns a reference to the series.
+                Slice ownership is passed to the series.
+            */
+            QPieSeries& QPieSeries::operator << (QPieSlice* slice)
+            {
+                add(slice);
+                return *this;
+            }
             /*!
                 Adds a single slice to the series with give \a value and \a name.
                 Convenience method for highlighting a slice when user hovers over the slice.
                 It changes the slice color to be lighter and shows the label of the slice.
                 Set \a enable to true to highlight a slice when user hovers on top of it.
-                \sa QPieSlice::isExploded(), QPieSlice::setExploded()
             */
             void QPieSeries::setHoverHighlighting(bool enable)
             {
                 if (enable) {
             }
             /*!
+                Returns the sum of all slice values in this series.
+                \sa QPieSlice::value(), QPieSlice::setValue()
+            */
+            qreal QPieSeries::total() const
+            {
+                return m_total;
+            }
+            /*!
                 \fn void QPieSeries::changed(const QPieSeries::ChangeSet& changeSet)
                 This signal emitted when something has changed in the series.
                 Q_ASSERT(slice);
                 QColor c = slice->brush().color().lighter();
                 slice->setBrush(c);
-                slice->setLabelVisible(true);
             }
             void QPieSeries::highlightOff(QPieSlice* slice)
                 Q_ASSERT(slice);
                 QColor c = slice->brush().color().darker(150);
                 slice->setBrush(c);
-                slice->setLabelVisible(false);
             }
             void QPieSeries::updateDerivativeData()
                     m_total += s->value();
                 // we must have some values
-                Q_ASSERT(m_total > 0); // TODO: is this the correct way to handle this?
+                if (m_total == 0) {
+                    qDebug() << "QPieSeries::updateDerivativeData() total == 0";
+                    Q_ASSERT(m_total > 0); // TODO: is this the correct way to handle this?
+                }
                 // update slice attributes
                 qreal sliceAngle = m_pieStartAngle;

src/piechart/qpieseries.h +3 0

                 void add(QList<QPieSlice*> slices);
                 void add(QPieSlice* slice);
                 QPieSlice* add(qreal value, QString name);
+                QPieSeries& operator << (QPieSlice* slice);
                 void remove(QPieSlice* slice);
                 void clear();
                 void setClickExplodes(bool enable = true);
                 void setHoverHighlighting(bool enable = true);
+                qreal total() const;
                 // TODO: find slices?
                 // QList<QPieSlice*> findByValue(qreal value);
                 // ...

src/qseries.cpp +14 0

@@ -52,6 +52,20
52	\brief Returns the legend of the series. If series is empty, empty list is returned.	52	\brief Returns the legend of the series. If series is empty, empty list is returned.
53	*/	53	*/
54		54
		55	/*!
		56	\fn void QSeries::setTitle(QString title)
		57	\brief Sets a \a title for the series.
		58
		59	This is not used directly by the chart itself. It is up to the user to use this as for example
		60	chart title.
		61	\sa QChart::setChartTitle()
		62	*/
		63
		64	/*!
		65	\fn QString QSeries::title()
		66	\brief Returns the title of the series.
		67	*/
		68
55	QTCOMMERCIALCHART_BEGIN_NAMESPACE	69	QTCOMMERCIALCHART_BEGIN_NAMESPACE
56	#include "moc_qseries.cpp"	70	#include "moc_qseries.cpp"
57	QTCOMMERCIALCHART_END_NAMESPACE	71	QTCOMMERCIALCHART_END_NAMESPACE

src/qseries.h +6 0

                 // TODO: should this be internal?
                 virtual QList<QSeries::Legend> legend() { QList<QSeries::Legend> l; return l; }
+                void setTitle(QString title) { m_title = title; }
+                QString title() { return m_title; }
+            private:
+                QString m_title;
             };
             QTCOMMERCIALCHART_END_NAMESPACE

test/auto/chartdataset/tst_chartdataset.cpp +67 -51

@@ -135,69 +135,85 void tst_ChartDataSet::addDomain()
135		135
136	void tst_ChartDataSet::addSeries_data()	136	void tst_ChartDataSet::addSeries_data()
137	{	137	{
138	QTest::addColumn<int>("~~serie~~sCount");	138	QTest::addColumn<int>("defaultAxisCount");
139	QTest::addColumn<int>("~~axisY~~Count");	139	QTest::addColumn<int>("firstAxisCount");
140	QTest::newRow("2 series, default axis") << 2 << 0;	140	QTest::addColumn<int>("secoundAxisCount");
141	QTest::newRow("2 ~~series, 2 new axis~~") << 2 << 2;	141	QTest::newRow("2 ,1 ,0") << 2 << 1 << 0;
142	QTest::newRow("2 series, 1 new axis") << 2 << 2;	142	QTest::newRow("2 series, 2 new axis") << 2 << 0 << 2;
143	QTest::newRow("~~3 series, 3~~ new axis") << 3 << 3;	143	QTest::newRow("2 series, 1 new axis") << 2 << 0 << 2;
144	QTest::newRow("3 series, 2 new axis") << 3 << 2;	144	QTest::newRow("3 series, 3 new axis") << 3 << 0 << 3;
145	QTest::newRow("3 series, 1 new axis") << 3 << 1;	145	QTest::newRow("3 series, 2 new axis") << 3 << 0 << 2;
		146	QTest::newRow("3 series, 1 new axis") << 3 << 0 << 1;
		147	QTest::newRow("3 series, default + 1 new axis") << 3 << 0 << 1;
146	}	148	}
147		149
148	void tst_ChartDataSet::addSeries()	150	void tst_ChartDataSet::addSeries()
149	{	151	{
150	QFETCH(int, ~~serie~~sCount);	152	QFETCH(int, defaultAxisCount);
151	QFETCH(int, ~~axisY~~Count);	153	QFETCH(int, firstAxisCount);
		154	QFETCH(int, secoundAxisCount);
152		155
153	ChartDataSet dataSet;	156	ChartDataSet dataSet;
154		157
155	QSignalSpy spy0(&dataSet, SIGNAL(axisAdded(QChartAxis*)));	158	QSignalSpy spy0(&dataSet, SIGNAL(axisAdded(QChartAxis*)));
156	QSignalSpy spy1(&dataSet,	159	QSignalSpy spy1(&dataSet, SIGNAL(axisRangeChanged(QChartAxis*, QStringList const&)));
157	SIGNAL(axisRangeChanged(QChartAxis*, QStringList const&)));	160	QSignalSpy spy2(&dataSet, SIGNAL(axisRemoved(QChartAxis*)));
158	QSignalSpy spy2(&dataSet, SIGNAL(~~axisRemov~~ed(Q~~ChartAxi~~s*)));	161	QSignalSpy spy3(&dataSet, SIGNAL(seriesAdded(QSeries*)));
159	QSignalSpy spy3(&dataSet, SIGNAL(series~~Add~~ed(QSeries*)));	162	QSignalSpy spy4(&dataSet, SIGNAL(seriesDomainChanged(QSeries*, Domain const&)));
160	QSignalSpy spy4(&dataSet,	163	QSignalSpy spy5(&dataSet, SIGNAL(seriesRemoved(QSeries*)));
161	SIGNAL(seriesDomainChanged(QSeries*, Domain const&)));
162	QSignalSpy spy5(&dataSet, SIGNAL(seriesRemoved(QSeries*)));
163		164
164	QList<QChartAxis*> axisList;	165	for (int i = 0; i < defaultAxisCount; i++) {
		166	QLineSeries* series = new QLineSeries();
		167	dataSet.addSeries(series);
		168	}
165		169
166	for (int i = 0; i < axisYCount; i++) {	170	QChartAxis* firstAxis = new QChartAxis();
167	QChartAxis* axis = new QChartAxis();
168	axisList << axis;
169	}
170		171
171	QList<QChartAxis*>::iterator iterator = axisList.begin();	172	for (int i = 0; i < firstAxisCount; i++) {
		173	QLineSeries* series = new QLineSeries();
		174	dataSet.addSeries(series, firstAxis);
		175	}
172		176
173	for (int i = 0; i < seriesCount; i++) {	177	QChartAxis* secoundAxis = new QChartAxis();
174	QChartAxis* axisY = 0;	178
175	QLineSeries* series = new QLineSeries();	179	for (int i = 0; i < secoundAxisCount; i++) {
176	if (iterator != axisList.end()) {	180	QLineSeries* series = new QLineSeries();
177	axisY = *iterator;	181	dataSet.addSeries(series, secoundAxis);
178	iterator++;	182	}
179	} else if (axisList.count() > 0) {
180	iterator--;
181	axisY = *iterator;
182	iterator++;
183	}
184	dataSet.addSeries(series, axisY);
185	}
186		183
187	//default axis	184	int axisCount = 1;
188	if (axisYCount == 0)
189	axisYCount+=2;
190	else
191	axisYCount++;
192		185
193	QCOMPARE(spy0.count(), axisYCount);	186	if (defaultAxisCount > 0)
194	QCOMPARE(spy1.count(), seriesCount*2);	187	axisCount++;
195	QCOMPARE(spy2.count(), 0);	188	if (firstAxisCount > 0)
196	QCOMPARE(spy3.count(), seriesCount);	189	axisCount++;
197	QCOMPARE(spy4.count(), seriesCount);	190	if (secoundAxisCount > 0)
198	QCOMPARE(spy5.count(), 0);	191	axisCount++;
199		192
200	QCOMPARE(dataSet.domainIndex(), 0);	193	QCOMPARE(spy0.count(), axisCount);
		194	QCOMPARE(spy1.count(), (defaultAxisCount + firstAxisCount + secoundAxisCount)*2);
		195	QCOMPARE(spy2.count(), 0);
		196	QCOMPARE(spy3.count(), defaultAxisCount + firstAxisCount + secoundAxisCount);
		197
		198	int i = 0;
		199	while (defaultAxisCount) {
		200	i+=defaultAxisCount;
		201	defaultAxisCount--;
		202	}
		203	int j = 0;
		204	while (firstAxisCount>0) {
		205	j += firstAxisCount;
		206	firstAxisCount--;
		207	}
		208	int k = 0;
		209	while (secoundAxisCount>0) {
		210	k += secoundAxisCount;
		211	secoundAxisCount--;
		212	}
		213	QCOMPARE(spy4.count(),i + j + k);
		214	QCOMPARE(spy5.count(), 0);
		215
		216	QCOMPARE(dataSet.domainIndex(), 0);
201	}	217	}
202		218
203	void tst_ChartDataSet::axisY_data()	219	void tst_ChartDataSet::axisY_data()
@@ -344,7 +360,7 void tst_ChartDataSet::domain()
344	QCOMPARE(spy1.count(), 6);	360	QCOMPARE(spy1.count(), 6);
345	QCOMPARE(spy2.count(), 0);	361	QCOMPARE(spy2.count(), 0);
346	QCOMPARE(spy3.count(), 3);	362	QCOMPARE(spy3.count(), 3);
347	QCOMPARE(spy4.count(), 3);	363	QCOMPARE(spy4.count(), 6);
348	QCOMPARE(spy5.count(), 0);	364	QCOMPARE(spy5.count(), 0);
349	}	365	}
350		366

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