HG_REPOSITORIES/LPP/INSTRUMENTATION/USERS/JEANDET/qtcharts Commit - r1465:7735835ca38c

Property notifications: axis minmax, bar properties, xyseries p-visibl and count

Tero Ahola -

r1465:7735835ca38c

parent child

Context file:

r1465:7735835ca38c

Collapse all files

plugins/declarative/declarativebarseries.cpp +9 -36

@@ -29,6 +29,15 QTCOMMERCIALCHART_BEGIN_NAMESPACE
29	DeclarativeBarSet::DeclarativeBarSet(QObject *parent) :	29	DeclarativeBarSet::DeclarativeBarSet(QObject *parent) :
30	QBarSet("", parent)	30	QBarSet("", parent)
31	{	31	{
		32	connect(this, SIGNAL(valuesAdded(int,int)), this, SLOT(handleCountChanged(int, int)));
		33	connect(this, SIGNAL(valuesRemoved(int,int)), this, SLOT(handleCountChanged(int, int)));
		34	}
		35
		36	void DeclarativeBarSet::handleCountChanged(int index, int count)
		37	{
		38	Q_UNUSED(index)
		39	Q_UNUSED(count)
		40	emit countChanged(QBarSet::count());
32	}	41	}
33		42
34	QVariantList DeclarativeBarSet::values()	43	QVariantList DeclarativeBarSet::values()
@@ -50,42 +59,6 void DeclarativeBarSet::setValues(QVariantList values)
50	}	59	}
51	}	60	}
52		61
53	QColor DeclarativeBarSet::color()
54	{
55	return brush().color();
56	}
57
58	void DeclarativeBarSet::setColor(QColor color)
59	{
60	QBrush b = brush();
61	b.setColor(color);
62	setBrush(b);
63	}
64
65	QColor DeclarativeBarSet::borderColor()
66	{
67	return pen().color();
68	}
69
70	void DeclarativeBarSet::setBorderColor(QColor color)
71	{
72	QPen p = pen();
73	p.setColor(color);
74	setPen(p);
75	}
76
77	QColor DeclarativeBarSet::labelColor()
78	{
79	return labelBrush().color();
80	}
81
82	void DeclarativeBarSet::setLabelColor(QColor color)
83	{
84	QBrush b = labelBrush();
85	b.setColor(color);
86	setLabelBrush(b);
87	}
88
89	DeclarativeBarSeries::DeclarativeBarSeries(QDeclarativeItem *parent) :	62	DeclarativeBarSeries::DeclarativeBarSeries(QDeclarativeItem *parent) :
90	QBarSeries(parent)	63	QBarSeries(parent)
91	{	64	{

plugins/declarative/declarativebarseries.h +7 -9

             {
                 Q_OBJECT
                 Q_PROPERTY(QVariantList values READ values WRITE setValues)
-                Q_PROPERTY(QColor color READ color WRITE setColor)
+                Q_PROPERTY(int count READ count NOTIFY countChanged)
-                Q_PROPERTY(QColor borderColor READ borderColor WRITE setBorderColor)
-                Q_PROPERTY(QColor labelColor READ labelColor WRITE setLabelColor)
             public:
                 explicit DeclarativeBarSet(QObject *parent = 0);
                 QVariantList values();
                 void setValues(QVariantList values);
-                QColor color();
-                void setColor(QColor color);
-                QColor borderColor();
-                void setBorderColor(QColor color);
-                QColor labelColor();
-                void setLabelColor(QColor color);
             public: // From QBarSet
                 Q_INVOKABLE void append(qreal value) { QBarSet::append(value); }
                 Q_INVOKABLE void append(qreal x, qreal y) { QBarSet::append(QPointF(x, y)); }
+            Q_SIGNALS:
+                void countChanged(int count);
+            private Q_SLOTS:
+                void handleCountChanged(int index, int count);
             };
             class DeclarativeBarSeries : public QBarSeries, public QDeclarativeParserStatus

plugins/declarative/declarativelineseries.cpp +11 -4

             DeclarativeLineSeries::DeclarativeLineSeries(QObject *parent) :
                 QLineSeries(parent)
             {
+                connect(this, SIGNAL(pointAdded(int)), this, SLOT(handleCountChanged(int)));
+                connect(this, SIGNAL(pointRemoved(int)), this, SLOT(handleCountChanged(int)));
             }
             QXYSeries *DeclarativeLineSeries::xySeries()
                 return this;
             }
+            void DeclarativeLineSeries::handleCountChanged(int index)
+            {
+                Q_UNUSED(index)
+                emit countChanged(points().count());
+            }
             QDeclarativeListProperty<QObject> DeclarativeLineSeries::declarativeChildren()
             {
                 return QDeclarativeListProperty<QObject>(this, 0, &appendDeclarativeChildren);
             void DeclarativeLineSeries::appendDeclarativeChildren(QDeclarativeListProperty<QObject> *list, QObject *element)
             {
-                QXYSeries *series = qobject_cast<QXYSeries*>(list->object);
+                Q_UNUSED(list)
-                DeclarativeXyPoint *point = qobject_cast<DeclarativeXyPoint *>(element);
+                Q_UNUSED(element)
-                if (series && point)
+                // Empty implementation, childs are parsed in componentComplete
-                    series->append(*point);
             }
             #include "moc_declarativelineseries.cpp"

plugins/declarative/declarativelineseries.h +5 0

                 Q_OBJECT
                 Q_INTERFACES(QDeclarativeParserStatus)
                 Q_PROPERTY(QColor color READ penColor WRITE setPenColor)
+                Q_PROPERTY(int count READ count NOTIFY countChanged)
                 Q_PROPERTY(QDeclarativeListProperty<QObject> declarativeChildren READ declarativeChildren)
                 Q_CLASSINFO("DefaultProperty", "declarativeChildren")
                 Q_INVOKABLE void clear() { QLineSeries::clear(); }
                 Q_INVOKABLE DeclarativeXyPoint *at(int index) { return DeclarativeXySeries::at(index); }
+            Q_SIGNALS:
+                void countChanged(int count);
             public Q_SLOTS:
                 static void appendDeclarativeChildren(QDeclarativeListProperty<QObject> *list, QObject *element);
+                void handleCountChanged(int index);
             };
             QTCOMMERCIALCHART_END_NAMESPACE

plugins/declarative/declarativescatterseries.cpp +11 -4

             DeclarativeScatterSeries::DeclarativeScatterSeries(QObject *parent) :
                 QScatterSeries(parent)
             {
+                connect(this, SIGNAL(pointAdded(int)), this, SLOT(handleCountChanged(int)));
+                connect(this, SIGNAL(pointRemoved(int)), this, SLOT(handleCountChanged(int)));
             }
             QXYSeries *DeclarativeScatterSeries::xySeries()
                 return this;
             }
+            void DeclarativeScatterSeries::handleCountChanged(int index)
+            {
+                Q_UNUSED(index)
+                emit countChanged(QScatterSeries::count());
+            }
             QDeclarativeListProperty<QObject> DeclarativeScatterSeries::declarativeChildren()
             {
                 return QDeclarativeListProperty<QObject>(this, 0, &appendDeclarativeChildren);
             void DeclarativeScatterSeries::appendDeclarativeChildren(QDeclarativeListProperty<QObject> *list, QObject *element)
             {
-                QXYSeries *series = qobject_cast<QXYSeries*>(list->object);
+                Q_UNUSED(list)
-                DeclarativeXyPoint *point = qobject_cast<DeclarativeXyPoint *>(element);
+                Q_UNUSED(element)
-                if (series && point)
+                // Empty implementation, childs are parsed in componentComplete
-                    series->append(*point);
             }
             QColor DeclarativeScatterSeries::brushColor()

plugins/declarative/declarativescatterseries.h +5 0

                 Q_INTERFACES(QDeclarativeParserStatus)
                 Q_PROPERTY(QColor color READ brushColor WRITE setBrushColor)
                 Q_PROPERTY(QColor borderColor READ penColor WRITE setPenColor)
+                Q_PROPERTY(int count READ count NOTIFY countChanged)
                 Q_PROPERTY(QDeclarativeListProperty<QObject> declarativeChildren READ declarativeChildren)
                 Q_CLASSINFO("DefaultProperty", "declarativeChildren")
                 Q_INVOKABLE void clear() { QScatterSeries::clear(); }
                 Q_INVOKABLE DeclarativeXyPoint *at(int index) { return DeclarativeXySeries::at(index); }
+            Q_SIGNALS:
+                void countChanged(int count);
             public Q_SLOTS:
                 static void appendDeclarativeChildren(QDeclarativeListProperty<QObject> *list, QObject *element);
+                void handleCountChanged(int index);
             };
             QTCOMMERCIALCHART_END_NAMESPACE

plugins/declarative/declarativesplineseries.cpp +11 -4

             DeclarativeSplineSeries::DeclarativeSplineSeries(QObject *parent) :
                 QSplineSeries(parent)
             {
+                connect(this, SIGNAL(pointAdded(int)), this, SLOT(handleCountChanged(int)));
+                connect(this, SIGNAL(pointRemoved(int)), this, SLOT(handleCountChanged(int)));
             }
             QXYSeries *DeclarativeSplineSeries::xySeries()
                 return this;
             }
+            void DeclarativeSplineSeries::handleCountChanged(int index)
+            {
+                Q_UNUSED(index)
+                emit countChanged(points().count());
+            }
             QDeclarativeListProperty<QObject> DeclarativeSplineSeries::declarativeChildren()
             {
                 return QDeclarativeListProperty<QObject>(this, 0, &appendDeclarativeChildren);
             void DeclarativeSplineSeries::appendDeclarativeChildren(QDeclarativeListProperty<QObject> *list, QObject *element)
             {
-                QXYSeries *series = qobject_cast<QXYSeries*>(list->object);
+                Q_UNUSED(list)
-                DeclarativeXyPoint *point = qobject_cast<DeclarativeXyPoint *>(element);
+                Q_UNUSED(element)
-                if (series && point)
+                // Empty implementation, childs are parsed in componentComplete
-                    series->append(*point);
             }
             #include "moc_declarativesplineseries.cpp"

plugins/declarative/declarativesplineseries.h +4 0

                 Q_INVOKABLE void clear() { QSplineSeries::clear(); }
                 Q_INVOKABLE DeclarativeXyPoint *at(int index) { return DeclarativeXySeries::at(index); }
+            Q_SIGNALS:
+                void countChanged(int count);
             public Q_SLOTS:
                 static void appendDeclarativeChildren(QDeclarativeListProperty<QObject> *list, QObject *element);
+                void handleCountChanged(int index);
             };
             QTCOMMERCIALCHART_END_NAMESPACE

plugins/declarative/declarativexyseries.cpp +2 -2

                 foreach(QObject *child, series->children()) {
                     if (qobject_cast<DeclarativeXyPoint *>(child)) {
-                        // TODO:
+                        DeclarativeXyPoint *point = qobject_cast<DeclarativeXyPoint *>(child);
-            //            series->append(qobject_cast<DeclarativeXyPoint *>(child));
+                        series->append(point->x(), point->y());
                     } else if(qobject_cast<QVXYModelMapper *>(child)) {
                         QVXYModelMapper *mapper = qobject_cast<QVXYModelMapper *>(child);
                         mapper->setSeries(series);

plugins/declarative/plugin.cpp +2 0

                     qmlRegisterUncreatableType<QLegend>(uri, 1, 0, "Legend",
                                                       QLatin1String("Trying to create uncreatable: Legend."));
+                    qmlRegisterUncreatableType<QXYSeries>(uri, 1, 0, "QXYSeries",
+                                                      QLatin1String("Trying to create uncreatable: QXYSeries."));
                     qmlRegisterUncreatableType<QScatterSeries>(uri, 1, 0, "QScatterSeries",
                                                       QLatin1String("Trying to create uncreatable: QScatterSeries."));
                     qmlRegisterUncreatableType<QPieSeries>(uri, 1, 0, "QPieSeries",

src/axis/qaxis.h +4 -4

                 Q_PROPERTY(bool shadesVisible READ shadesVisible WRITE setShadesVisible NOTIFY shadesVisibleChanged)
                 Q_PROPERTY(QColor shadesColor READ shadesColor WRITE setShadesColor NOTIFY shadesColorChanged)
                 Q_PROPERTY(QColor shadesBorderColor READ shadesBorderColor WRITE setShadesBorderColor NOTIFY shadesBorderColorChanged)
-                Q_PROPERTY(qreal min READ min WRITE setMin)
+                Q_PROPERTY(qreal min READ min WRITE setMin NOTIFY minChanged)
-                Q_PROPERTY(qreal max READ max WRITE setMax)
+                Q_PROPERTY(qreal max READ max WRITE setMax NOTIFY maxChanged)
                 Q_PROPERTY(int ticksCount READ ticksCount WRITE setTicksCount NOTIFY ticksCountChanged)
                 Q_PROPERTY(bool niceNumbersEnabled READ niceNumbersEnabled WRITE setNiceNumbersEnabled NOTIFY niceNumbersEnabledChanged)
                 void visibleChanged(bool visible);
                 void labelsVisibleChanged(bool visible);
                 void gridVisibleChanged(bool visible);
-            	void minChanged(qreal min);
-            	void maxChanged(qreal max);
             	void rangeChanged(qreal min, qreal max);
                 void colorChanged(QColor color);
                 void labelsColorChanged(QColor color);
                 void shadesVisibleChanged(bool visible);
                 void shadesColorChanged(QColor color);
                 void shadesBorderColorChanged(QColor color);
+                void minChanged(qreal min);
+                void maxChanged(qreal max);
                 void ticksCountChanged(int count);
                 void niceNumbersEnabledChanged(bool enabled);

src/barchart/qbarseries.cpp +4 -17

             /*!
                 \property QBarSeries::barWidth
-                \brief Sets the width of the bars of the series. The unit of \a width is the unit of x-axis. The minimum width for bars
+                \brief The width of the bars of the series. The unit of \a width is the unit of x-axis. The minimum width for bars
                 is zero and negative values are treated as zero. Setting the width to zero means that width of the bar on screen
                 is one pixel no matter what the scale of x-axis is. Bars wider than zero are scaled with x-axis.
                 Note that with QGroupedBarSeries this value means the width of one group of bars instead of just one bar. This is
                 Parameter \a status is true, if mouse entered on top of series, false if mouse left from top of series.
             */
             /*!
-                \fn void QBarSeries::barWidthChanged()
+                \fn void QBarSeries::barWidthChanged(qreal)
-                This signal is emitted when bar width has been changed.
+                This signal is emitted when bar width has been changed to \a width.
             */
             /*!
                 return QAbstractSeries::SeriesTypeBar;
             }
-            /*!
-                Sets the width of the bars of the series. The unit of \a width is the unit of x-axis. The minimum width for bars
-                is zero and negative values are treated as zero. Setting the width to zero means that width of the bar on screen
-                is one pixel no matter what the scale of x-axis is. Bars wider than zero are scaled with x-axis.
-                Note that with QGroupedBarSeries this value means the width of one group of bars instead of just one bar. This is
-                because with grouped series it is more logical to set widht of whole group and let the chart calculate correct
-                width for bar.
-                \sa QGroupedBarSeries
-            */
             void QBarSeries::setBarWidth(qreal width)
             {
                 Q_D(QBarSeries);
                 d->setBarWidth(width);
-                emit barWidthChanged();
+                emit barWidthChanged(width);
             }
-            /*!
-                Returns the width of bars.
-            */
             qreal QBarSeries::barWidth() const
             {
                 Q_D(const QBarSeries);
             /*!
                 Adds a set of bars to series. Takes ownership of \a set. If the set is null or is already in series, it won't be appended.
                 Returns true, if appending succeeded.
             */
             bool QBarSeries::append(QBarSet *set)
             {

src/barchart/qbarseries.h +1 -1

             Q_SIGNALS:
                 void clicked(QBarSet *barset, int index);
                 void hovered(QBarSet* barset, bool status);
-                void barWidthChanged();
+                void barWidthChanged(qreal width);
                 void countChanged();
                 void labelsVisibleChanged();

src/barchart/qbarset.cpp +75 0

@@ -63,6 +63,21 QTCOMMERCIALCHART_BEGIN_NAMESPACE
63	*/	63	*/
64		64
65	/*!	65	/*!
		66	\property QBarSet::color
		67	\brief The fill (brush) color of the bar set.
		68	*/
		69
		70	/*!
		71	\property QBarSet::borderColor
		72	\brief The line (pen) color of the bar set.
		73	*/
		74
		75	/*!
		76	\property QBarSet::labelColor
		77	\brief The text (label) color of the bar set.
		78	*/
		79
		80	/*!
66	\fn void QBarSet::labelChanged()	81	\fn void QBarSet::labelChanged()
67		82
68	This signal is emitted when the label of the barSet has changed.	83	This signal is emitted when the label of the barSet has changed.
@@ -103,6 +118,21 QTCOMMERCIALCHART_BEGIN_NAMESPACE
103	*/	118	*/
104		119
105	/*!	120	/*!
		121	\fn void QBarSet::colorChanged(QColor)
		122	This signal is emitted when the fill (brush) color of the set has changed to \a color.
		123	*/
		124
		125	/*!
		126	\fn void QBarSet::borderColorChanged(QColor)
		127	This signal is emitted when the line (pen) color of the set has changed to \a color.
		128	*/
		129
		130	/*!
		131	\fn void QBarSet::labelColorChanged(QColor)
		132	This signal is emitted when the text (label) color of the set has changed to \a color.
		133	*/
		134
		135	/*!
106	\fn void QBarSet::valuesAdded(int index, int count)	136	\fn void QBarSet::valuesAdded(int index, int count)
107		137
108	This signal is emitted when new values have been added to the set.	138	This signal is emitted when new values have been added to the set.
@@ -413,6 +443,51 QFont QBarSet::labelFont() const
413	return d_ptr->m_labelFont;	443	return d_ptr->m_labelFont;
414	}	444	}
415		445
		446	QColor QBarSet::color()
		447	{
		448	return brush().color();
		449	}
		450
		451	void QBarSet::setColor(QColor color)
		452	{
		453	QBrush b = brush();
		454	if (b.color() != color) {
		455	b.setColor(color);
		456	setBrush(b);
		457	emit colorChanged(color);
		458	}
		459	}
		460
		461	QColor QBarSet::borderColor()
		462	{
		463	return pen().color();
		464	}
		465
		466	void QBarSet::setBorderColor(QColor color)
		467	{
		468	QPen p = pen();
		469	if (p.color() != color) {
		470	p.setColor(color);
		471	setPen(p);
		472	emit borderColorChanged(color);
		473	}
		474	}
		475
		476	QColor QBarSet::labelColor()
		477	{
		478	return labelBrush().color();
		479	}
		480
		481	void QBarSet::setLabelColor(QColor color)
		482	{
		483	QBrush b = labelBrush();
		484	if (b.color() != color) {
		485	b.setColor(color);
		486	setLabelBrush(b);
		487	emit labelColorChanged(color);
		488	}
		489	}
		490
416	////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////	491	////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////
417		492
418	QBarSetPrivate::QBarSetPrivate(const QString label, QBarSet *parent) : QObject(parent),	493	QBarSetPrivate::QBarSetPrivate(const QString label, QBarSet *parent) : QObject(parent),

src/barchart/qbarset.h +15 0

                 Q_PROPERTY(QBrush brush READ brush WRITE setBrush NOTIFY brushChanged)
                 Q_PROPERTY(QBrush labelBrush READ labelBrush WRITE setLabelBrush NOTIFY labelBrushChanged)
                 Q_PROPERTY(QFont labelFont READ labelFont WRITE setLabelFont NOTIFY labelFontChanged)
+                Q_PROPERTY(QColor color READ color WRITE setColor NOTIFY colorChanged)
+                Q_PROPERTY(QColor borderColor READ borderColor WRITE setBorderColor NOTIFY borderColorChanged)
+                Q_PROPERTY(QColor labelColor READ labelColor WRITE setLabelColor NOTIFY labelColorChanged)
             public:
                 explicit QBarSet(const QString label, QObject *parent = 0);
                 void setLabelFont(const QFont &font);
                 QFont labelFont() const;
+                QColor color();
+                void setColor(QColor color);
+                QColor borderColor();
+                void setBorderColor(QColor color);
+                QColor labelColor();
+                void setLabelColor(QColor color);
             Q_SIGNALS:
                 void penChanged();
                 void brushChanged();
                 void labelChanged();
                 void labelBrushChanged();
                 void labelFontChanged();
+                void colorChanged(QColor color);
+                void borderColorChanged(QColor color);
+                void labelColorChanged(QColor color);
                 void valuesAdded(int index, int count);
                 void valuesRemoved(int index, int count);

src/xychart/qxyseries.cpp +6 -6

             */
             /*!
-                \property QXYSeries::count
-                Number of points in the series.
-            */
-            /*!
                \fn QPen QXYSeries::pen() const
                \brief  Returns pen used to draw points for series.
                 \sa setPen()
             */
             /*!
+                \fn void QXYSeries::pointsVisibleChanged(bool visible)
+                \brief Signal is emitted when the point visibility has changed to \a visible.
+            */
+            /*!
                 \fn void QXYSeriesPrivate::updated()
                 \brief \internal
             */
                 if (d->m_pointsVisible != visible){
                     d->m_pointsVisible = visible;
                     emit d->updated();
+                    emit pointsVisibleChanged(visible);
                 }
             }

src/xychart/qxyseries.h +3 -2

             class QTCOMMERCIALCHART_EXPORT QXYSeries : public QAbstractSeries
             {
                 Q_OBJECT
-                Q_PROPERTY(bool pointsVisible READ pointsVisible WRITE setPointsVisible)
+                Q_PROPERTY(bool pointsVisible READ pointsVisible WRITE setPointsVisible NOTIFY pointsVisibleChanged)
-                Q_PROPERTY(int count READ count)
             protected:
                 explicit QXYSeries(QXYSeriesPrivate &d,QObject *parent = 0);
                 void pointReplaced(int index);
                 void pointRemoved(int index);
                 void pointAdded(int index);
+                void pointsVisibleChanged(bool visible);
             private:
                 Q_DECLARE_PRIVATE(QXYSeries)

tests/auto/qbarset/tst_qbarset.cpp +12 -5

                 QVERIFY(qFuzzyIsNull(m_barset->sum()));
                 QSignalSpy valueSpy(m_barset, SIGNAL(valuesAdded(int,int)));
+                QSignalSpy countSpy(m_barset, SIGNAL(countChanged(int)));
                 qreal sum(0.0);
                 qreal value(0.0);
                 QCOMPARE(m_barset->count(), count);
                 QVERIFY(qFuzzyCompare(m_barset->sum(), sum));
-                QVERIFY(valueSpy.count() == count);
+                QCOMPARE(valueSpy.count(), count);
+                QCOMPARE(countSpy.count(), count);
             }
             void tst_QBarSet::appendOperator_data()
                 QVERIFY(qFuzzyIsNull(m_barset->sum()));
                 QSignalSpy valueSpy(m_barset,SIGNAL(valuesAdded(int,int)));
+                QSignalSpy countSpy(m_barset, SIGNAL(countChanged(int)));
                 qreal sum(0.0);
                 qreal value(0.0);
                 QCOMPARE(m_barset->count(), count);
                 QVERIFY(qFuzzyCompare(m_barset->sum(), sum));
-                QVERIFY(valueSpy.count() == count);
+                QCOMPARE(valueSpy.count(), count);
+                QCOMPARE(countSpy.count(), count);
             }
             void tst_QBarSet::insert_data()
                 QCOMPARE(m_barset->count(), 0);
                 QVERIFY(qFuzzyIsNull(m_barset->sum()));
                 QSignalSpy valueSpy(m_barset,SIGNAL(valuesAdded(int,int)));
+                QSignalSpy countSpy(m_barset, SIGNAL(countChanged(int)));
                 m_barset->insert(0, 1.0);       // 1.0
                 QCOMPARE(m_barset->at(0).y(), 1.0);
                 QCOMPARE(m_barset->at(2).y(), 1.0);
                 QCOMPARE(m_barset->count(), 3);
                 QVERIFY(qFuzzyCompare(m_barset->sum(), 6.0));
-                QVERIFY(valueSpy.count() == 3);
+                QCOMPARE(valueSpy.count(), 3);
+                QCOMPARE(countSpy.count(), 3);
             }
             void tst_QBarSet::remove_data()
                 QVERIFY(qFuzzyIsNull(m_barset->sum()));
                 QSignalSpy valueSpy(m_barset,SIGNAL(valuesRemoved(int,int)));
+                QSignalSpy countSpy(m_barset, SIGNAL(countChanged(int)));
                 m_barset->append(1.0);
                 m_barset->append(2.0);
                 QCOMPARE(m_barset->count(), 2);
                 QCOMPARE(m_barset->sum(), 6.0);
-                QVERIFY(valueSpy.count() == 2);
+                QCOMPARE(valueSpy.count(), 2);
+                QCOMPARE(countSpy.count(), 6);
             }
             void tst_QBarSet::replace_data()

tests/qmlchartproperties/qml/qmlchartproperties/BarEditor.qml +6 -5

                     ignoreUnknownSignals: true
                     onNameChanged:              console.log("series.onNameChanged: " + series.name);
                     onVisibleChanged:           console.log("series.onVisibleChanged: " + series.visible);
+                    onBarWidthChanged:          console.log("series.onBardWidthChanged: " + width)
                     onLabelsVisibleChanged:     console.log("series.onLabelsVisibleChanged: " + series.labelsVisible);
-                    onCountChanged:             console.log("series.onCountChanged: " + series.count);
+                    onCountChanged:             console.log("series.onCountChanged: " + count);
                 }
                 Connections {
                     id: setConnections
                     ignoreUnknownSignals: true
-                    onColorChanged:             console.log("series.onColorChanged: " + series.color);
+                    onColorChanged:             console.log("series.onColorChanged: " + color);
-                    onBorderColorChanged:       console.log("series.onBorderColorChanged: " + series.borderColor);
+                    onBorderColorChanged:       console.log("series.onBorderColorChanged: " + color);
-                    onLabelColorChanged:        console.log("series.onLabelColorChanged: " + series.labelColor);
+                    onLabelColorChanged:        console.log("series.onLabelColorChanged: " + color);
-                    onCountChanged:             console.log("series.onCountChanged: " + series.count);
+                    onCountChanged:             console.log("series.onCountChanged: " + count);
                 }
                 Button {

tests/qmlchartproperties/qml/qmlchartproperties/ChartEditor.qml +44 -8

                     onShadesVisibleChanged:         console.log("axisX.onShadesVisibleChanged: " + visible);
                     onShadesColorChanged:           console.log("axisX.onShadesColorChanged: " + color);
                     onShadesBorderColorChanged:     console.log("axisX.onShadesBorderColorChanged: " + color);
-                    onNiceNumbersEnabledChanged:    console.log("axisX.onNiceNumbersEnabledChanged: " + enabled);
+                    onMinChanged:                   console.log("axisX.onMinChanged: " + min);
+                    onMaxChanged:                   console.log("axisX.onMaxChanged: " + max);
                     onTicksCountChanged:            console.log("axisX.onTicksCountChanged: " + count);
+                    onNiceNumbersEnabledChanged:    console.log("axisX.onNiceNumbersEnabledChanged: " + enabled);
                 }
                 Connections {
                     onShadesVisibleChanged:         console.log("axisY.onShadesVisibleChanged: " + visible);
                     onShadesColorChanged:           console.log("axisY.onShadesColorChanged: " + color);
                     onShadesBorderColorChanged:     console.log("axisY.onShadesBorderColorChanged: " + color);
-                    onNiceNumbersEnabledChanged:    console.log("axisY.onNiceNumbersEnabledChanged: " + enabled);
+                    onMinChanged:                   console.log("axisY.onMinChanged: " + min);
+                    onMaxChanged:                   console.log("axisY.onMaxChanged: " + max);
                     onTicksCountChanged:            console.log("axisY.onTicksCountChanged: " + count);
+                    onNiceNumbersEnabledChanged:    console.log("axisY.onNiceNumbersEnabledChanged: " + enabled);
                 }
                 Button {
                     onClicked: series.legend.alignment ^= Qt.AlignRight;
                 }
                 Button {
-                    text: "axis X nice nmb"
-                    onClicked: series.axisX.niceNumbersEnabled = !series.axisX.niceNumbersEnabled;
-                Button {
                     text: "axis X visible"
                     onClicked: series.axisX.visible = !series.axisX.visible;
                 }
                     onClicked: series.axisX.shadesBorderColor = main.nextColor();
                 }
                 Button {
+                    text: "axis X max +"
+                    onClicked: series.axisX.max += 0.1;
+                }
+                Button {
+                    text: "axis X max -"
+                    onClicked: series.axisX.max -= 0.1;
+                }
+                Button {
+                    text: "axis X min +"
+                    onClicked: series.axisX.min += 0.1;
+                }
+                Button {
+                    text: "axis X min -"
+                    onClicked: series.axisX.min -= 0.1;
+                }
+                Button {
                     text: "axis X ticks count +"
                     onClicked: series.axisX.ticksCount++;
                 }
                     onClicked: series.axisX.ticksCount--;
                 }
                 Button {
-                    text: "axis Y nice nmb"
+                    text: "axis X nice nmb"
-                    onClicked: series.axisY.niceNumbersEnabled = !series.axisY.niceNumbersEnabled;
+                    onClicked: series.axisX.niceNumbersEnabled = !series.axisX.niceNumbersEnabled;
                 }
                 Button {
                     text: "axis Y visible"
                     onClicked: series.axisY.shadesBorderColor = main.nextColor();
                 }
                 Button {
+                    text: "axis Y max +"
+                    onClicked: series.axisY.max += 0.1;
+                }
+                Button {
+                    text: "axis Y max -"
+                    onClicked: series.axisY.max -= 0.1;
+                }
+                Button {
+                    text: "axis Y min +"
+                    onClicked: series.axisY.min += 0.1;
+                }
+                Button {
+                    text: "axis Y min -"
+                    onClicked: series.axisY.min -= 0.1;
+                }
+                Button {
                     text: "axis Y ticks count +"
                     onClicked: series.axisY.ticksCount++;
                 }
                     text: "axis Y ticks count -"
                     onClicked: series.axisY.ticksCount--;
                 }
+                Button {
+                    text: "axis Y nice nmb"
+                    onClicked: series.axisY.niceNumbersEnabled = !series.axisY.niceNumbersEnabled;
+                }
             }

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