HG_REPOSITORIES/LPP/INSTRUMENTATION/USERS/JEANDET/qtcharts Commit - r2689:db3eff743f50

Added possibility to show series value...

Titta Heikkala -

r2689:db3eff743f50

parent child

Context file:

r2689:db3eff743f50

Expand all files

plugins/quick2/plugins.qmltypes +59 0

@@ -1561,9 +1561,20 Module {
1561	prototype: "QtCommercialChart::QAbstractSeries"	1561	prototype: "QtCommercialChart::QAbstractSeries"
1562	exports: ["QtCommercial.Chart/AbstractBarSeries 1.0"]	1562	exports: ["QtCommercial.Chart/AbstractBarSeries 1.0"]
1563	exportMetaObjectRevisions: [0]	1563	exportMetaObjectRevisions: [0]
		1564	Enum {
		1565	name: "LabelsPosition"
		1566	values: {
		1567	"LabelsCenter": 0,
		1568	"LabelsInsideEnd": 1,
		1569	"LabelsInsideBase": 2,
		1570	"LabelsOutsideEnd": 3
		1571	}
		1572	}
1564	Property { name: "barWidth"; type: "double" }	1573	Property { name: "barWidth"; type: "double" }
1565	Property { name: "count"; type: "int"; isReadonly: true }	1574	Property { name: "count"; type: "int"; isReadonly: true }
1566	Property { name: "labelsVisible"; type: "bool" }	1575	Property { name: "labelsVisible"; type: "bool" }
		1576	Property { name: "labelsFormat"; type: "string" }
		1577	Property { name: "labelsPosition"; type: "LabelsPosition" }
1567	Signal {	1578	Signal {
1568	name: "clicked"	1579	name: "clicked"
1569	Parameter { name: "index"; type: "int" }	1580	Parameter { name: "index"; type: "int" }
@@ -1581,6 +1592,14 Module {
1581	Parameter { name: "barset"; type: "QBarSet"; isPointer: true }	1592	Parameter { name: "barset"; type: "QBarSet"; isPointer: true }
1582	}	1593	}
1583	Signal {	1594	Signal {
		1595	name: "labelsFormatChanged"
		1596	Parameter { name: "format"; type: "string" }
		1597	}
		1598	Signal {
		1599	name: "labelsPositionChanged"
		1600	Parameter { name: "position"; type: "QAbstractBarSeries::LabelsPosition" }
		1601	}
		1602	Signal {
1584	name: "barsetsAdded"	1603	name: "barsetsAdded"
1585	Parameter { name: "sets"; type: "QList<QBarSet*>" }	1604	Parameter { name: "sets"; type: "QList<QBarSet*>" }
1586	}	1605	}
@@ -1623,6 +1642,10 Module {
1623	Property { name: "lowerSeries"; type: "QLineSeries"; isReadonly: true; isPointer: true }	1642	Property { name: "lowerSeries"; type: "QLineSeries"; isReadonly: true; isPointer: true }
1624	Property { name: "color"; type: "QColor" }	1643	Property { name: "color"; type: "QColor" }
1625	Property { name: "borderColor"; type: "QColor" }	1644	Property { name: "borderColor"; type: "QColor" }
		1645	Property { name: "pointLabelsFormat"; type: "string" }
		1646	Property { name: "pointLabelsVisible"; type: "bool" }
		1647	Property { name: "pointLabelsFont"; type: "QFont" }
		1648	Property { name: "pointLabelsColor"; type: "QColor" }
1626	Signal {	1649	Signal {
1627	name: "clicked"	1650	name: "clicked"
1628	Parameter { name: "point"; type: "QPointF" }	1651	Parameter { name: "point"; type: "QPointF" }
@@ -1641,6 +1664,22 Module {
1641	name: "borderColorChanged"	1664	name: "borderColorChanged"
1642	Parameter { name: "color"; type: "QColor" }	1665	Parameter { name: "color"; type: "QColor" }
1643	}	1666	}
		1667	Signal {
		1668	name: "pointLabelsFormatChanged"
		1669	Parameter { name: "format"; type: "string" }
		1670	}
		1671	Signal {
		1672	name: "pointLabelsVisibilityChanged"
		1673	Parameter { name: "visible"; type: "bool" }
		1674	}
		1675	Signal {
		1676	name: "pointLabelsFontChanged"
		1677	Parameter { name: "font"; type: "QFont" }
		1678	}
		1679	Signal {
		1680	name: "pointLabelsColorChanged"
		1681	Parameter { name: "color"; type: "QColor" }
		1682	}
1644	}	1683	}
1645	Component {	1684	Component {
1646	name: "QtCommercialChart::QBarCategoryAxis"	1685	name: "QtCommercialChart::QBarCategoryAxis"
@@ -2140,6 +2179,10 Module {
2140	exportMetaObjectRevisions: [0]	2179	exportMetaObjectRevisions: [0]
2141	Property { name: "pointsVisible"; type: "bool" }	2180	Property { name: "pointsVisible"; type: "bool" }
2142	Property { name: "color"; type: "QColor" }	2181	Property { name: "color"; type: "QColor" }
		2182	Property { name: "pointLabelsFormat"; type: "string" }
		2183	Property { name: "pointLabelsVisible"; type: "bool" }
		2184	Property { name: "pointLabelsFont"; type: "QFont" }
		2185	Property { name: "pointLabelsColor"; type: "QColor" }
2143	Signal {	2186	Signal {
2144	name: "clicked"	2187	name: "clicked"
2145	Parameter { name: "point"; type: "QPointF" }	2188	Parameter { name: "point"; type: "QPointF" }
@@ -2166,5 +2209,21 Module {
2166	Parameter { name: "color"; type: "QColor" }	2209	Parameter { name: "color"; type: "QColor" }
2167	}	2210	}
2168	Signal { name: "pointsReplaced" }	2211	Signal { name: "pointsReplaced" }
		2212	Signal {
		2213	name: "pointLabelsFormatChanged"
		2214	Parameter { name: "format"; type: "string" }
		2215	}
		2216	Signal {
		2217	name: "pointLabelsVisibilityChanged"
		2218	Parameter { name: "visible"; type: "bool" }
		2219	}
		2220	Signal {
		2221	name: "pointLabelsFontChanged"
		2222	Parameter { name: "font"; type: "QFont" }
		2223	}
		2224	Signal {
		2225	name: "pointLabelsColorChanged"
		2226	Parameter { name: "color"; type: "QColor" }
		2227	}
2169	}	2228	}
2170	}	2229	}

src/areachart/areachartitem.cpp +61 -1

@@ -36,7 +36,11 AreaChartItem::AreaChartItem(QAreaSeries areaSeries, QGraphicsItem item)
36	m_series(areaSeries),	36	m_series(areaSeries),
37	m_upper(0),	37	m_upper(0),
38	m_lower(0),	38	m_lower(0),
39	m_pointsVisible(false)	39	m_pointsVisible(false),
		40	m_pointLabelsFormat(areaSeries->pointLabelsFormat()),
		41	m_pointLabelsVisible(false),
		42	m_pointLabelsFont(areaSeries->pointLabelsFont()),
		43	m_pointLabelsColor(areaSeries->pointLabelsColor())
40	{	44	{
41	setAcceptHoverEvents(true);	45	setAcceptHoverEvents(true);
42	setZValue(ChartPresenter::LineChartZValue);	46	setZValue(ChartPresenter::LineChartZValue);
@@ -50,6 +54,14 AreaChartItem::AreaChartItem(QAreaSeries areaSeries, QGraphicsItem item)
50	QObject::connect(m_series, SIGNAL(opacityChanged()), this, SLOT(handleUpdated()));	54	QObject::connect(m_series, SIGNAL(opacityChanged()), this, SLOT(handleUpdated()));
51	QObject::connect(this, SIGNAL(clicked(QPointF)), areaSeries, SIGNAL(clicked(QPointF)));	55	QObject::connect(this, SIGNAL(clicked(QPointF)), areaSeries, SIGNAL(clicked(QPointF)));
52	QObject::connect(this, SIGNAL(hovered(QPointF,bool)), areaSeries, SIGNAL(hovered(QPointF,bool)));	56	QObject::connect(this, SIGNAL(hovered(QPointF,bool)), areaSeries, SIGNAL(hovered(QPointF,bool)));
		57	QObject::connect(areaSeries, SIGNAL(pointLabelsFormatChanged(QString)),
		58	this, SLOT(handleUpdated()));
		59	QObject::connect(areaSeries, SIGNAL(pointLabelsVisibilityChanged(bool)),
		60	this, SLOT(handleUpdated()));
		61	QObject::connect(areaSeries, SIGNAL(pointLabelsFontChanged(QFont)),
		62	this, SLOT(handleUpdated()));
		63	QObject::connect(areaSeries, SIGNAL(pointLabelsColorChanged(QColor)),
		64	this, SLOT(handleUpdated()));
53		65
54	handleUpdated();	66	handleUpdated();
55	}	67	}
@@ -131,6 +143,10 void AreaChartItem::handleUpdated()
131	m_pointPen = m_series->pen();	143	m_pointPen = m_series->pen();
132	m_pointPen.setWidthF(2 * m_pointPen.width());	144	m_pointPen.setWidthF(2 * m_pointPen.width());
133	setOpacity(m_series->opacity());	145	setOpacity(m_series->opacity());
		146	m_pointLabelsFormat = m_series->pointLabelsFormat();
		147	m_pointLabelsVisible = m_series->pointLabelsVisible();
		148	m_pointLabelsFont = m_series->pointLabelsFont();
		149	m_pointLabelsColor = m_series->pointLabelsColor();
134	update();	150	update();
135	}	151	}
136		152
@@ -170,6 +186,50 void AreaChartItem::paint(QPainter painter, const QStyleOptionGraphicsItem opt
170	if (m_lower)	186	if (m_lower)
171	painter->drawPoints(m_lower->geometryPoints());	187	painter->drawPoints(m_lower->geometryPoints());
172	}	188	}
		189
		190	// Draw series point label
		191	if (m_pointLabelsVisible) {
		192	static const QString xPointTag(QLatin1String("@xPoint"));
		193	static const QString yPointTag(QLatin1String("@yPoint"));
		194	const int labelOffset = 2;
		195
		196	painter->setFont(m_pointLabelsFont);
		197	painter->setPen(QPen(m_pointLabelsColor));
		198	QFontMetrics fm(painter->font());
		199
		200	QString pointLabel = m_pointLabelsFormat;
		201
		202	if (m_series->upperSeries()) {
		203	for (int i(0); i < m_series->upperSeries()->count(); i++) {
		204	pointLabel.replace(xPointTag, QString::number(m_series->upperSeries()->at(i).x()));
		205	pointLabel.replace(yPointTag, QString::number(m_series->upperSeries()->at(i).y()));
		206
		207	// Position text in relation to the point
		208	int pointLabelWidth = fm.width(pointLabel);
		209	QPointF position(m_upper->geometryPoints().at(i));
		210	position.setX(position.x() - pointLabelWidth / 2);
		211	position.setY(position.y() - m_series->upperSeries()->pen().width() / 2 - labelOffset);
		212
		213	painter->drawText(position, pointLabel);
		214	}
		215	}
		216
		217	if (m_series->lowerSeries()) {
		218	for (int i(0); i < m_series->lowerSeries()->count(); i++) {
		219	pointLabel.replace(xPointTag, QString::number(m_series->lowerSeries()->at(i).x()));
		220	pointLabel.replace(yPointTag, QString::number(m_series->lowerSeries()->at(i).y()));
		221
		222	// Position text in relation to the point
		223	int pointLabelWidth = fm.width(pointLabel);
		224	QPointF position(m_lower->geometryPoints().at(i));
		225	position.setX(position.x() - pointLabelWidth / 2);
		226	position.setY(position.y() - m_series->lowerSeries()->pen().width() / 2 - labelOffset);
		227
		228	painter->drawText(position, pointLabel);
		229	}
		230	}
		231	}
		232
173	painter->restore();	233	painter->restore();
174	}	234	}
175		235

src/areachart/areachartitem_p.h +5 0

                 QBrush m_brush;
                 bool m_pointsVisible;
+                bool m_pointLabelsVisible;
+                QString m_pointLabelsFormat;
+                QFont m_pointLabelsFont;
+                QColor m_pointLabelsColor;
             };
             class AreaBoundItem : public LineChartItem

src/areachart/qareaseries.cpp +177 -1

@@ -182,6 +182,110 QTCOMMERCIALCHART_BEGIN_NAMESPACE
182	*/	182	*/
183		183
184	/*!	184	/*!
		185	\property QAreaSeries::pointLabelsFormat
		186	The \a format used for showing labels with series points.
		187
		188	QAreaSeries supports the following format tags:
		189	\table
		190	\row
		191	\li @xPoint \li The x value of the data point
		192	\row
		193	\li @yPoint \li The y value of the data point
		194	\endtable
		195
		196	For example, the following usage of the format tags would produce labels that have the data
		197	point (x, y) shown inside brackets separated by a comma:
		198	\code
		199	series->setPointLabelsFormat("(@xPoint, @yPoint)");
		200	\endcode
		201
		202	By default, the labels format is set to '@xPoint, @yPoint'. The labels are shown on the plot
		203	area, labels on the edge of the plot area are cut. If the points are close to each other the
		204	labels may overlap.
		205
		206	\sa QAreaSeries::pointLabelsVisible, QAreaSeries::pointLabelsFont, QAreaSeries::pointLabelsColor
		207	*/
		208	/*!
		209	\qmlproperty string AreaSeries::pointLabelsFormat
		210	The \a format used for showing labels with series points.
		211
		212	\sa QAreaSeries::pointLabelsFormat, pointLabelsVisible, pointLabelsFont, pointLabelsColor
		213	*/
		214	/*!
		215	\fn void QAreaSeries::pointLabelsFormatChanged(const QString &format)
		216	Signal is emitted when the \a format of data point labels is changed.
		217	*/
		218	/*!
		219	\qmlsignal AreaSeries::onPointLabelsFormatChanged(string format)
		220	Signal is emitted when the \a format of data point labels is changed.
		221	*/
		222
		223	/*!
		224	\property QAreaSeries::pointLabelsVisible
		225	Defines the visibility for data point labels. False by default.
		226
		227	\sa QAreaSeries::pointLabelsFormat
		228	*/
		229	/*!
		230	\qmlproperty bool AreaSeries::pointLabelsVisible
		231	Defines the visibility for data point labels.
		232
		233	\sa pointLabelsFormat
		234	*/
		235	/*!
		236	\fn void QAreaSeries::pointLabelsVisibilityChanged(bool visible)
		237	The visibility of the data point labels is changed to \a visible.
		238	*/
		239	/*!
		240	\qmlsignal AreaSeries::onPointLabelsVisibilityChanged(bool visible)
		241	The visibility of the data point labels is changed to \a visible.
		242	*/
		243
		244	/*!
		245	\property QAreaSeries::pointLabelsFont
		246	Defines the font used for data point labels.
		247
		248	\sa QAreaSeries::pointLabelsFormat
		249	*/
		250	/*!
		251	\qmlproperty font AreaSeries::pointLabelsFont
		252	Defines the font used for data point labels.
		253
		254	\sa pointLabelsFormat
		255	*/
		256	/*!
		257	\fn void QAreaSeries::pointLabelsFontChanged(const QFont &font);
		258	The font used for data point labels is changed to \a font.
		259	*/
		260	/*!
		261	\qmlsignal AreaSeries::onPointLabelsFontChanged(Font font)
		262	The font used for data point labels is changed to \a font.
		263	*/
		264
		265	/*!
		266	\property QAreaSeries::pointLabelsColor
		267	Defines the color used for data point labels. By default, the color is the color of the brush
		268	defined in theme for labels.
		269
		270	\sa QAreaSeries::pointLabelsFormat
		271	*/
		272	/*!
		273	\qmlproperty font AreaSeries::pointLabelsColor
		274	Defines the color used for data point labels. By default, the color is the color of the brush
		275	defined in theme for labels.
		276
		277	\sa pointLabelsFormat
		278	*/
		279	/*!
		280	\fn void QAreaSeries::pointLabelsColorChanged(const QColor &color);
		281	The color used for data point labels is changed to \a color.
		282	*/
		283	/*!
		284	\qmlsignal AreaSeries::onPointLabelsColorChanged(Color color)
		285	The color used for data point labels is changed to \a color.
		286	*/
		287
		288	/*!
185	Constructs area series object which is a child of \a upperSeries. Area will be spanned between \a	289	Constructs area series object which is a child of \a upperSeries. Area will be spanned between \a
186	upperSeries line and \a lowerSeries line. If no \a lowerSeries is passed to constructor, area is specified by axis x (y=0) instead.	290	upperSeries line and \a lowerSeries line. If no \a lowerSeries is passed to constructor, area is specified by axis x (y=0) instead.
187	When series object is added to QChartView or QChart instance ownerships is transferred.	291	When series object is added to QChartView or QChart instance ownerships is transferred.
@@ -344,6 +448,69 bool QAreaSeries::pointsVisible() const
344	return d->m_pointsVisible;	448	return d->m_pointsVisible;
345	}	449	}
346		450
		451	void QAreaSeries::setPointLabelsFormat(const QString &format)
		452	{
		453	Q_D(QAreaSeries);
		454	if (d->m_pointLabelsFormat != format) {
		455	d->m_pointLabelsFormat = format;
		456	emit pointLabelsFormatChanged(format);
		457	}
		458	}
		459
		460	QString QAreaSeries::pointLabelsFormat() const
		461	{
		462	Q_D(const QAreaSeries);
		463	return d->m_pointLabelsFormat;
		464	}
		465
		466	void QAreaSeries::setPointLabelsVisible(bool visible)
		467	{
		468	Q_D(QAreaSeries);
		469	if (d->m_pointLabelsVisible != visible) {
		470	d->m_pointLabelsVisible = visible;
		471	emit pointLabelsVisibilityChanged(visible);
		472	}
		473	}
		474
		475	bool QAreaSeries::pointLabelsVisible() const
		476	{
		477	Q_D(const QAreaSeries);
		478	return d->m_pointLabelsVisible;
		479	}
		480
		481	void QAreaSeries::setPointLabelsFont(const QFont &font)
		482	{
		483	Q_D(QAreaSeries);
		484	if (d->m_pointLabelsFont != font) {
		485	d->m_pointLabelsFont = font;
		486	emit pointLabelsFontChanged(font);
		487	}
		488	}
		489
		490	QFont QAreaSeries::pointLabelsFont() const
		491	{
		492	Q_D(const QAreaSeries);
		493	return d->m_pointLabelsFont;
		494	}
		495
		496	void QAreaSeries::setPointLabelsColor(const QColor &color)
		497	{
		498	Q_D(QAreaSeries);
		499	if (d->m_pointLabelsColor != color) {
		500	d->m_pointLabelsColor = color;
		501	emit pointLabelsColorChanged(color);
		502	}
		503	}
		504
		505	QColor QAreaSeries::pointLabelsColor() const
		506	{
		507	Q_D(const QAreaSeries);
		508	if (d->m_pointLabelsColor == QChartPrivate::defaultPen().color())
		509	return QPen().color();
		510	else
		511	return d->m_pointLabelsColor;
		512	}
		513
347	////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////	514	////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////
348		515
349	QAreaSeriesPrivate::QAreaSeriesPrivate(QLineSeries upperSeries, QLineSeries lowerSeries, QAreaSeries *q)	516	QAreaSeriesPrivate::QAreaSeriesPrivate(QLineSeries upperSeries, QLineSeries lowerSeries, QAreaSeries *q)
@@ -352,7 +519,11 QAreaSeriesPrivate::QAreaSeriesPrivate(QLineSeries upperSeries, QLineSeries lo
352	m_pen(QChartPrivate::defaultPen()),	519	m_pen(QChartPrivate::defaultPen()),
353	m_upperSeries(upperSeries),	520	m_upperSeries(upperSeries),
354	m_lowerSeries(lowerSeries),	521	m_lowerSeries(lowerSeries),
355	m_pointsVisible(false)	522	m_pointsVisible(false),
		523	m_pointLabelsFormat(QLatin1String("@xPoint, @yPoint")),
		524	m_pointLabelsVisible(false),
		525	m_pointLabelsFont(QChartPrivate::defaultFont()),
		526	m_pointLabelsColor(QChartPrivate::defaultPen().color())
356	{	527	{
357	}	528	}
358		529
@@ -470,6 +641,11 void QAreaSeriesPrivate::initializeTheme(int index, ChartTheme* theme, bool forc
470	QBrush brush(colors.at(index % colors.size()));	641	QBrush brush(colors.at(index % colors.size()));
471	q->setBrush(brush);	642	q->setBrush(brush);
472	}	643	}
		644
		645	if (forced \|\| QChartPrivate::defaultPen().color() == m_pointLabelsColor) {
		646	QColor color = theme->labelBrush().color();
		647	q->setPointLabelsColor(color);
		648	}
473	}	649	}
474		650
475		651

src/areachart/qareaseries.h +24 0

                 Q_PROPERTY(QLineSeries *lowerSeries READ lowerSeries)
                 Q_PROPERTY(QColor color READ color WRITE setColor NOTIFY colorChanged)
                 Q_PROPERTY(QColor borderColor READ borderColor WRITE setBorderColor NOTIFY borderColorChanged)
+                Q_PROPERTY(QString pointLabelsFormat READ pointLabelsFormat WRITE setPointLabelsFormat
+                           NOTIFY pointLabelsFormatChanged)
+                Q_PROPERTY(bool pointLabelsVisible READ pointLabelsVisible WRITE setPointLabelsVisible
+                           NOTIFY pointLabelsVisibilityChanged)
+                Q_PROPERTY(QFont pointLabelsFont READ pointLabelsFont WRITE setPointLabelsFont
+                           NOTIFY pointLabelsFontChanged)
+                Q_PROPERTY(QColor pointLabelsColor READ pointLabelsColor WRITE setPointLabelsColor
+                           NOTIFY pointLabelsColorChanged)
             public:
                 explicit QAreaSeries(QObject *parent = 0);
                 void setPointsVisible(bool visible = true);
                 bool pointsVisible() const;
+                void setPointLabelsFormat(const QString &format);
+                QString pointLabelsFormat() const;
+                void setPointLabelsVisible(bool visible = true);
+                bool pointLabelsVisible() const;
+                void setPointLabelsFont(const QFont &font);
+                QFont pointLabelsFont() const;
+                void setPointLabelsColor(const QColor &color);
+                QColor pointLabelsColor() const;
             Q_SIGNALS:
                 void clicked(const QPointF &point);
                 void hovered(const QPointF &point, bool state);
                 void selected();
                 void colorChanged(QColor color);
                 void borderColorChanged(QColor color);
+                void pointLabelsFormatChanged(const QString &format);
+                void pointLabelsVisibilityChanged(bool visible);
+                void pointLabelsFontChanged(const QFont &font);
+                void pointLabelsColorChanged(const QColor &color);
             private:
                 Q_DECLARE_PRIVATE(QAreaSeries)

src/areachart/qareaseries_p.h +4 0

                 QLineSeries *m_upperSeries;
                 QLineSeries *m_lowerSeries;
                 bool m_pointsVisible;
+                QString m_pointLabelsFormat;
+                bool m_pointLabelsVisible;
+                QFont m_pointLabelsFont;
+                QColor m_pointLabelsColor;
             private:
                 Q_DECLARE_PUBLIC(QAreaSeries);
             };

src/barchart/abstractbarchartitem.cpp +41 -5

                 connect(series->d_func(), SIGNAL(restructuredBars()), this, SLOT(handleDataStructureChanged()));
                 connect(series, SIGNAL(visibleChanged()), this, SLOT(handleVisibleChanged()));
                 connect(series, SIGNAL(opacityChanged()), this, SLOT(handleOpacityChanged()));
+                connect(series, SIGNAL(labelsFormatChanged(QString)), this, SLOT(handleUpdatedBars()));
+                connect(series, SIGNAL(labelsFormatChanged(QString)), this, SLOT(positionLabels()));
+                connect(series, SIGNAL(labelsPositionChanged(QAbstractBarSeries::LabelsPosition)),
+                        this, SLOT(handleLabelsPositionChanged()));
                 setZValue(ChartPresenter::BarSeriesZValue);
                 handleDataStructureChanged();
                 handleVisibleChanged();
                 m_layout = layout;
-                for (int i = 0; i < m_bars.count(); i++) {
+                for (int i = 0; i < m_bars.count(); i++)
                     m_bars.at(i)->setRect(layout.at(i));
-                    QGraphicsTextItem *label = m_labels.at(i);
-                    label->setPos(layout.at(i).center() - label->boundingRect().center());
+                positionLabels();
             }
             //handlers
                     int categoryCount = m_series->d_func()->categoryCount();
                     int setCount = m_series->count();
                     int itemIndex(0);
+                    static const QString valueTag(QLatin1String("@value"));
                     for (int category = 0; category < categoryCount; category++) {
                         for (int set = 0; set < setCount; set++) {
                             bar->update();
                             QGraphicsTextItem *label = m_labels.at(itemIndex);
-                            label->setHtml(QString("%1").arg(barSet->value(category)));
+                            QString valueLabel;
+                            if (m_series->labelsFormat().isEmpty()) {
+                                valueLabel = QString("%1").arg(barSet->value(category));
+                            } else {
+                                valueLabel = m_series->labelsFormat();
+                                valueLabel.replace(valueTag, QString::number(barSet->value(category)));
+                            }
+                            label->setHtml(valueLabel);
                             label->setFont(barSet->m_labelFont);
                             label->setDefaultTextColor(barSet->m_labelBrush.color());
                             label->update();
                 }
             }
+            void AbstractBarChartItem::handleLabelsPositionChanged()
+            {
+                positionLabels();
+            }
+            void AbstractBarChartItem::positionLabels()
+            {
+                for (int i = 0; i < m_layout.count(); i++) {
+                    QGraphicsTextItem *label = m_labels.at(i);
+                    qreal xPos = 0;
+                    qreal yPos = m_layout.at(i).center().y() - label->boundingRect().center().y();
+                    if (m_series->labelsPosition() == QAbstractBarSeries::LabelsCenter)
+                        xPos = m_layout.at(i).center().x() - label->boundingRect().center().x();
+                    else if (m_series->labelsPosition() == QAbstractBarSeries::LabelsInsideEnd)
+                        xPos = m_layout.at(i).right() - label->boundingRect().width();
+                    else if (m_series->labelsPosition() == QAbstractBarSeries::LabelsInsideBase)
+                        xPos = m_layout.at(i).left();
+                    else if (m_series->labelsPosition() == QAbstractBarSeries::LabelsOutsideEnd)
+                        xPos = m_layout.at(i).right();
+                    label->setPos(xPos, yPos);
+                    label->setZValue(zValue() + 1);
+                }
+            }
             #include "moc_abstractbarchartitem_p.cpp"
             QTCOMMERCIALCHART_END_NAMESPACE

src/barchart/abstractbarchartitem_p.h +2 0

                 void handleVisibleChanged();
                 void handleOpacityChanged();
                 virtual void handleUpdatedBars();
+                void handleLabelsPositionChanged();
+                virtual void positionLabels();
             protected:

src/barchart/horizontal/percent/horizontalpercentbarchartitem.cpp +9 -1

                 int categoryCount = m_series->d_func()->categoryCount();
                 int setCount = m_series->count();
                 int itemIndex(0);
+                static const QString valueTag(QLatin1String("@value"));
                 for (int category = 0; category < categoryCount; category++) {
                     for (int set = 0; set < setCount; set++) {
                         QString vString(QString::number(p));
                         vString.truncate(3);
                         vString.append("%");
-                        label->setHtml(vString);
+                        QString valueLabel;
+                        if (m_series->labelsFormat().isEmpty()) {
+                            valueLabel = vString;
+                        } else {
+                            valueLabel = m_series->labelsFormat();
+                            valueLabel.replace(valueTag, QString::number(barSet->value(category)));
+                        }
+                        label->setHtml(valueLabel);
                         label->setFont(barSet->m_labelFont);
                         label->setDefaultTextColor(barSet->m_labelBrush.color());
                         label->update();

src/barchart/qabstractbarseries.cpp +102 -1

@@ -129,6 +129,75 QTCOMMERCIALCHART_BEGIN_NAMESPACE
129	*/	129	*/
130		130
131	/*!	131	/*!
		132	\property QAbstractBarSeries::labelsFormat
		133	The \a format used for showing labels in series.
		134
		135	QAbstractBarSeries supports the following format tag:
		136	\table
		137	\row
		138	\li @value \li The value of the bar
		139	\endtable
		140
		141	For example, the following usage of the format tags would produce labels that show the value
		142	followed by unit ('u'):
		143	\code
		144	series->setLabelsFormat("@value u");
		145	\endcode
		146
		147	By default, the labels shows the value of the bar. For percent bar series '%' is added after
		148	the value. The labels are shown on the plot area, labels on the edge of the plot area are cut.
		149	If the bars are close to each other the labels may overlap.
		150
		151	\sa QAbstractBarSeries::labelsVisible, QAbstractBarSeries::labelsPosition
		152	*/
		153	/*!
		154	\qmlproperty string AbstractBarSeries::labelsFormat
		155	The format used for showing labels in series.
		156
		157	\sa QAbstractBarSeries::labelsFormat, labelsVisible, labelsPosition
		158	*/
		159	/*!
		160	\fn void QAbstractBarSeries::labelsFormatChanged(const QString &format)
		161	Signal is emitted when the \a format of data value labels is changed.
		162	*/
		163	/*!
		164	\qmlsignal XYSeries::onLabelsFormatChanged(string format)
		165	Signal is emitted when the \a format of data value labels is changed.
		166	*/
		167
		168	/*!
		169	\enum QAbstractBarSeries::LabelsPosition
		170
		171	This enum describes the position of the data value labels.
		172
		173	\value LabelsCenter Label is in the center of the bar.
		174	\value LabelsInsideEnd Label is inside the bar at the high end of it.
		175	\value LabelsInsideBase Label is inside the bar at the low end of it.
		176	\value LabelsOutsideEnd Label is outside the bar at the high end of it.
		177	*/
		178
		179	/*!
		180	\property QAbstractBarSeries::labelsPosition
		181	Defines the \a position of value labels.
		182
		183	\sa QAbstractBarSeries::labelsVisible, QAbstractBarSeries::labelsFormat
		184	*/
		185	/*!
		186	\qmlproperty string AbstractBarSeries::labelsPosition
		187	Defines the \a position of value labels.
		188
		189	\sa labelsVisible, labelsFormat
		190	*/
		191	/*!
		192	\fn void QAbstractBarSeries::labelsPositionChanged(QAbstractBarSeries::LabelsPosition position)
		193	Signal is emitted when the \a position of value labels is changed.
		194	*/
		195	/*!
		196	\qmlsignal AbstractBarSeries::onLabelsPositionChanged(LabelsPosition position)
		197	Signal is emitted when the \a position of value labels is changed.
		198	*/
		199
		200	/*!
132	\fn void QAbstractBarSeries::clicked(int index, QBarSet *barset)	201	\fn void QAbstractBarSeries::clicked(int index, QBarSet *barset)
133	The signal is emitted if the user clicks with a mouse on top of QBarSet \a barset.	202	The signal is emitted if the user clicks with a mouse on top of QBarSet \a barset.
134	Clicked bar inside set is indexed by \a index	203	Clicked bar inside set is indexed by \a index
@@ -421,6 +490,36 bool QAbstractBarSeries::isLabelsVisible() const
421	return d->m_labelsVisible;	490	return d->m_labelsVisible;
422	}	491	}
423		492
		493	void QAbstractBarSeries::setLabelsFormat(const QString &format)
		494	{
		495	Q_D(QAbstractBarSeries);
		496	if (d->m_labelsFormat != format) {
		497	d->m_labelsFormat = format;
		498	emit labelsFormatChanged(format);
		499	}
		500	}
		501
		502	QString QAbstractBarSeries::labelsFormat() const
		503	{
		504	Q_D(const QAbstractBarSeries);
		505	return d->m_labelsFormat;
		506	}
		507
		508	void QAbstractBarSeries::setLabelsPosition(QAbstractBarSeries::LabelsPosition position)
		509	{
		510	Q_D(QAbstractBarSeries);
		511	if (d->m_labelsPosition != position) {
		512	d->m_labelsPosition = position;
		513	emit labelsPositionChanged(position);
		514	}
		515	}
		516
		517	QAbstractBarSeries::LabelsPosition QAbstractBarSeries::labelsPosition() const
		518	{
		519	Q_D(const QAbstractBarSeries);
		520	return d->m_labelsPosition;
		521	}
		522
424	///////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////	523	///////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////
425		524
426	QAbstractBarSeriesPrivate::QAbstractBarSeriesPrivate(QAbstractBarSeries *q) :	525	QAbstractBarSeriesPrivate::QAbstractBarSeriesPrivate(QAbstractBarSeries *q) :
@@ -428,7 +527,9 QAbstractBarSeriesPrivate::QAbstractBarSeriesPrivate(QAbstractBarSeries *q) :
428	m_barWidth(0.5), // Default value is 50% of category width	527	m_barWidth(0.5), // Default value is 50% of category width
429	m_labelsVisible(false),	528	m_labelsVisible(false),
430	m_visible(true),	529	m_visible(true),
431	m_blockBarUpdate(false)	530	m_blockBarUpdate(false),
		531	m_labelsFormat(),
		532	m_labelsPosition(QAbstractBarSeries::LabelsCenter)
432	{	533	{
433	}	534	}
434		535

src/barchart/qabstractbarseries.h +21 0

                 Q_PROPERTY(qreal barWidth READ barWidth WRITE setBarWidth)
                 Q_PROPERTY(int count READ count NOTIFY countChanged)
                 Q_PROPERTY(bool labelsVisible READ isLabelsVisible WRITE setLabelsVisible NOTIFY labelsVisibleChanged)
+                Q_PROPERTY(QString labelsFormat READ labelsFormat WRITE setLabelsFormat
+                           NOTIFY labelsFormatChanged)
+                Q_PROPERTY(LabelsPosition labelsPosition READ labelsPosition
+                           WRITE setLabelsPosition NOTIFY labelsPositionChanged)
+                Q_ENUMS(LabelsPosition)
+            public:
+                enum LabelsPosition {
+                    LabelsCenter = 0,
+                    LabelsInsideEnd,
+                    LabelsInsideBase,
+                    LabelsOutsideEnd
+                };
             public:
                 virtual ~QAbstractBarSeries();
                 void setLabelsVisible(bool visible = true);
                 bool isLabelsVisible() const;
+                void setLabelsFormat(const QString &format);
+                QString labelsFormat() const;
+                void setLabelsPosition(QAbstractBarSeries::LabelsPosition position);
+                QAbstractBarSeries::LabelsPosition labelsPosition() const;
             protected:
                 explicit QAbstractBarSeries(QAbstractBarSeriesPrivate &d, QObject *parent = 0);
                 void hovered(bool status, int index, QBarSet *barset);
                 void countChanged();
                 void labelsVisibleChanged();
+                void labelsFormatChanged(const QString &format);
+                void labelsPositionChanged(QAbstractBarSeries::LabelsPosition position);
                 void barsetsAdded(QList<QBarSet *> sets);
                 void barsetsRemoved(QList<QBarSet *> sets);

src/barchart/qabstractbarseries_p.h +2 0

                 bool m_labelsVisible;
                 bool m_visible;
                 bool m_blockBarUpdate;
+                QString m_labelsFormat;
+                QAbstractBarSeries::LabelsPosition m_labelsPosition;
             private:
                 Q_DECLARE_PUBLIC(QAbstractBarSeries)

src/barchart/vertical/bar/barchartitem.cpp +30 0

@@ -29,6 +29,9 QTCOMMERCIALCHART_BEGIN_NAMESPACE
29	BarChartItem::BarChartItem(QAbstractBarSeries series, QGraphicsItem item) :	29	BarChartItem::BarChartItem(QAbstractBarSeries series, QGraphicsItem item) :
30	AbstractBarChartItem(series, item)	30	AbstractBarChartItem(series, item)
31	{	31	{
		32	connect(series, SIGNAL(labelsPositionChanged(QAbstractBarSeries::LabelsPosition)),
		33	this, SLOT(handleLabelsPositionChanged()));
		34	connect(series, SIGNAL(labelsFormatChanged(QString)), this, SLOT(positionLabels()));
32	}	35	}
33		36
34	void BarChartItem::initializeLayout()	37	void BarChartItem::initializeLayout()
@@ -86,9 +89,36 QVector<QRectF> BarChartItem::calculateLayout()
86	layout.append(rect.normalized());	89	layout.append(rect.normalized());
87	}	90	}
88	}	91	}
		92
89	return layout;	93	return layout;
90	}	94	}
91		95
		96	void BarChartItem::handleLabelsPositionChanged()
		97	{
		98	positionLabels();
		99	}
		100
		101	void BarChartItem::positionLabels()
		102	{
		103	for (int i = 0; i < m_layout.count(); i++) {
		104	QGraphicsTextItem *label = m_labels.at(i);
		105	qreal xPos = m_layout.at(i).center().x() - label->boundingRect().center().x();
		106	qreal yPos = 0;
		107
		108	if (m_series->labelsPosition() == QAbstractBarSeries::LabelsCenter)
		109	yPos = m_layout.at(i).center().y() - label->boundingRect().center().y();
		110	else if (m_series->labelsPosition() == QAbstractBarSeries::LabelsInsideEnd)
		111	yPos = m_layout.at(i).top();
		112	else if (m_series->labelsPosition() == QAbstractBarSeries::LabelsInsideBase)
		113	yPos = m_layout.at(i).bottom() - label->boundingRect().height();
		114	else if (m_series->labelsPosition() == QAbstractBarSeries::LabelsOutsideEnd)
		115	yPos = m_layout.at(i).top() - label->boundingRect().height();
		116
		117	label->setPos(xPos, yPos);
		118	label->setZValue(zValue() + 1);
		119	}
		120	}
		121
92	#include "moc_barchartitem_p.cpp"	122	#include "moc_barchartitem_p.cpp"
93		123
94	QTCOMMERCIALCHART_END_NAMESPACE	124	QTCOMMERCIALCHART_END_NAMESPACE

src/barchart/vertical/bar/barchartitem_p.h +4 0

             public:
                 BarChartItem(QAbstractBarSeries *series, QGraphicsItem* item = 0);
+            private slots:
+                void handleLabelsPositionChanged();
+                void positionLabels();
             private:
                 virtual QVector<QRectF> calculateLayout();
                 void initializeLayout();

src/barchart/vertical/percent/percentbarchartitem.cpp +38 -1

@@ -29,6 +29,9 QTCOMMERCIALCHART_BEGIN_NAMESPACE
29	PercentBarChartItem::PercentBarChartItem(QAbstractBarSeries series, QGraphicsItem item) :	29	PercentBarChartItem::PercentBarChartItem(QAbstractBarSeries series, QGraphicsItem item) :
30	AbstractBarChartItem(series, item)	30	AbstractBarChartItem(series, item)
31	{	31	{
		32	connect(series, SIGNAL(labelsPositionChanged(QAbstractBarSeries::LabelsPosition)),
		33	this, SLOT(handleLabelsPositionChanged()));
		34	connect(series, SIGNAL(labelsFormatChanged(QString)), this, SLOT(positionLabels()));
32	}	35	}
33		36
34	void PercentBarChartItem::initializeLayout()	37	void PercentBarChartItem::initializeLayout()
@@ -99,6 +102,7 void PercentBarChartItem::handleUpdatedBars()
99	int categoryCount = m_series->d_func()->categoryCount();	102	int categoryCount = m_series->d_func()->categoryCount();
100	int setCount = m_series->count();	103	int setCount = m_series->count();
101	int itemIndex(0);	104	int itemIndex(0);
		105	static const QString valueTag(QLatin1String("@value"));
102		106
103	for (int category = 0; category < categoryCount; category++) {	107	for (int category = 0; category < categoryCount; category++) {
104	for (int set = 0; set < setCount; set++) {	108	for (int set = 0; set < setCount; set++) {
@@ -113,7 +117,14 void PercentBarChartItem::handleUpdatedBars()
113	QString vString(QString::number(p));	117	QString vString(QString::number(p));
114	vString.truncate(3);	118	vString.truncate(3);
115	vString.append("%");	119	vString.append("%");
116	label->setHtml(vString);	120	QString valueLabel;
		121	if (m_series->labelsFormat().isEmpty()) {
		122	valueLabel = vString;
		123	} else {
		124	valueLabel = m_series->labelsFormat();
		125	valueLabel.replace(valueTag, QString::number(barSet->value(category)));
		126	}
		127	label->setHtml(valueLabel);
117	label->setFont(barSet->m_labelFont);	128	label->setFont(barSet->m_labelFont);
118	label->setDefaultTextColor(barSet->m_labelBrush.color());	129	label->setDefaultTextColor(barSet->m_labelBrush.color());
119	label->update();	130	label->update();
@@ -122,6 +133,32 void PercentBarChartItem::handleUpdatedBars()
122	}	133	}
123	}	134	}
124		135
		136	void PercentBarChartItem::handleLabelsPositionChanged()
		137	{
		138	positionLabels();
		139	}
		140
		141	void PercentBarChartItem::positionLabels()
		142	{
		143	for (int i = 0; i < m_layout.count(); i++) {
		144	QGraphicsTextItem *label = m_labels.at(i);
		145	qreal xPos = m_layout.at(i).center().x() - label->boundingRect().center().x();
		146	qreal yPos = 0;
		147
		148	if (m_series->labelsPosition() == QAbstractBarSeries::LabelsCenter)
		149	yPos = m_layout.at(i).center().y() - label->boundingRect().center().y();
		150	else if (m_series->labelsPosition() == QAbstractBarSeries::LabelsInsideEnd)
		151	yPos = m_layout.at(i).top();
		152	else if (m_series->labelsPosition() == QAbstractBarSeries::LabelsInsideBase)
		153	yPos = m_layout.at(i).bottom() - label->boundingRect().height();
		154	else if (m_series->labelsPosition() == QAbstractBarSeries::LabelsOutsideEnd)
		155	yPos = m_layout.at(i).top() - label->boundingRect().height();
		156
		157	label->setPos(xPos, yPos);
		158	label->setZValue(zValue() + 1);
		159	}
		160	}
		161
125	#include "moc_percentbarchartitem_p.cpp"	162	#include "moc_percentbarchartitem_p.cpp"
126		163
127	QTCOMMERCIALCHART_END_NAMESPACE	164	QTCOMMERCIALCHART_END_NAMESPACE

src/barchart/vertical/percent/percentbarchartitem_p.h +4 0

                 PercentBarChartItem(QAbstractBarSeries *series, QGraphicsItem* item = 0);
                 void handleUpdatedBars();
+            private slots:
+                void handleLabelsPositionChanged();
+                void positionLabels();
             private:
                 virtual QVector<QRectF> calculateLayout();
                 void initializeLayout();

src/barchart/vertical/stacked/stackedbarchartitem.cpp +29 0

@@ -29,6 +29,9 QTCOMMERCIALCHART_BEGIN_NAMESPACE
29	StackedBarChartItem::StackedBarChartItem(QAbstractBarSeries series, QGraphicsItem item) :	29	StackedBarChartItem::StackedBarChartItem(QAbstractBarSeries series, QGraphicsItem item) :
30	AbstractBarChartItem(series, item)	30	AbstractBarChartItem(series, item)
31	{	31	{
		32	connect(series, SIGNAL(labelsPositionChanged(QAbstractBarSeries::LabelsPosition)),
		33	this, SLOT(handleLabelsPositionChanged()));
		34	connect(series, SIGNAL(labelsFormatChanged(QString)), this, SLOT(positionLabels()));
32	}	35	}
33		36
34	void StackedBarChartItem::initializeLayout()	37	void StackedBarChartItem::initializeLayout()
@@ -102,6 +105,32 QVector<QRectF> StackedBarChartItem::calculateLayout()
102	return layout;	105	return layout;
103	}	106	}
104		107
		108	void StackedBarChartItem::handleLabelsPositionChanged()
		109	{
		110	positionLabels();
		111	}
		112
		113	void StackedBarChartItem::positionLabels()
		114	{
		115	for (int i = 0; i < m_layout.count(); i++) {
		116	QGraphicsTextItem *label = m_labels.at(i);
		117	qreal xPos = m_layout.at(i).center().x() - label->boundingRect().center().x();
		118	qreal yPos = 0;
		119
		120	if (m_series->labelsPosition() == QAbstractBarSeries::LabelsCenter)
		121	yPos = m_layout.at(i).center().y() - label->boundingRect().center().y();
		122	else if (m_series->labelsPosition() == QAbstractBarSeries::LabelsInsideEnd)
		123	yPos = m_layout.at(i).top();
		124	else if (m_series->labelsPosition() == QAbstractBarSeries::LabelsInsideBase)
		125	yPos = m_layout.at(i).bottom() - label->boundingRect().height();
		126	else if (m_series->labelsPosition() == QAbstractBarSeries::LabelsOutsideEnd)
		127	yPos = m_layout.at(i).top() - label->boundingRect().height();
		128
		129	label->setPos(xPos, yPos);
		130	label->setZValue(zValue() + 1);
		131	}
		132	}
		133
105	#include "moc_stackedbarchartitem_p.cpp"	134	#include "moc_stackedbarchartitem_p.cpp"
106		135
107	QTCOMMERCIALCHART_END_NAMESPACE	136	QTCOMMERCIALCHART_END_NAMESPACE

src/barchart/vertical/stacked/stackedbarchartitem_p.h +4 0

             public:
                 StackedBarChartItem(QAbstractBarSeries *series, QGraphicsItem* item =0);
+            private slots:
+                void handleLabelsPositionChanged();
+                void positionLabels();
             private:
                 virtual QVector<QRectF> calculateLayout();
                 void initializeLayout();

src/linechart/linechartitem.cpp +22 -2

             #include "qlineseries_p.h"
             #include "chartpresenter_p.h"
             #include "polardomain_p.h"
+            #include "chartthememanager_p.h"
+            #include "charttheme_p.h"
             #include <QPainter>
             #include <QGraphicsSceneMouseEvent>
                 : XYChart(series,item),
                   m_series(series),
                   m_pointsVisible(false),
-                  m_chartType(QChart::ChartTypeUndefined)
+                  m_chartType(QChart::ChartTypeUndefined),
+                  m_pointLabelsFormat(series->pointLabelsFormat()),
+                  m_pointLabelsVisible(false),
+                  m_pointLabelsFont(series->pointLabelsFont()),
+                  m_pointLabelsColor(series->pointLabelsColor())
             {
                 setAcceptHoverEvents(true);
                 setZValue(ChartPresenter::LineChartZValue);
                 QObject::connect(series->d_func(), SIGNAL(updated()), this, SLOT(handleUpdated()));
                 QObject::connect(series, SIGNAL(visibleChanged()), this, SLOT(handleUpdated()));
                 QObject::connect(series, SIGNAL(opacityChanged()), this, SLOT(handleUpdated()));
+                QObject::connect(series, SIGNAL(pointLabelsFormatChanged(QString)),
+                                 this, SLOT(handleUpdated()));
+                QObject::connect(series, SIGNAL(pointLabelsVisibilityChanged(bool)),
+                                 this, SLOT(handleUpdated()));
+                QObject::connect(series, SIGNAL(pointLabelsFontChanged(QFont)), this, SLOT(handleUpdated()));
+                QObject::connect(series, SIGNAL(pointLabelsColorChanged(QColor)), this, SLOT(handleUpdated()));
                 handleUpdated();
             }
             void LineChartItem::handleUpdated()
             {
-                // If points visiblity has changed, a geometry update is needed.
+                // If points visibility has changed, a geometry update is needed.
                 // Also, if pen changes when points are visible, geometry update is needed.
                 bool doGeometryUpdate =
                     (m_pointsVisible != m_series->pointsVisible())
                 setOpacity(m_series->opacity());
                 m_pointsVisible = m_series->pointsVisible();
                 m_linePen = m_series->pen();
+                m_pointLabelsFormat = m_series->pointLabelsFormat();
+                m_pointLabelsVisible = m_series->pointLabelsVisible();
+                m_pointLabelsFont = m_series->pointLabelsFont();
+                m_pointLabelsColor = m_series->pointLabelsColor();
                 if (doGeometryUpdate)
                     updateGeometry();
                 update();
                     }
                 }
+                if (m_pointLabelsVisible)
+                    m_series->d_func()->drawSeriesPointLabels(painter, m_points);
                 painter->restore();
             }
             void LineChartItem::mousePressEvent(QGraphicsSceneMouseEvent *event)

src/linechart/linechartitem_p.h +5 0

                 QPen m_linePen;
                 bool m_pointsVisible;
                 QChart::ChartType m_chartType;
+                bool m_pointLabelsVisible;
+                QString m_pointLabelsFormat;
+                QFont m_pointLabelsFont;
+                QColor m_pointLabelsColor;
             };
             QTCOMMERCIALCHART_END_NAMESPACE

src/linechart/qlineseries.cpp +5 0

                     pen.setWidthF(2);
                     q->setPen(pen);
                 }
+                if (forced || QChartPrivate::defaultPen().color() == m_pointLabelsColor) {
+                    QColor color = theme->labelBrush().color();
+                    q->setPointLabelsColor(color);
+                }
             }
             #include "moc_qlineseries.cpp"

src/scatterchart/qscatterseries.cpp +5 0

                     QBrush brush(colors.at(index % colors.size()));
                     q->setBrush(brush);
                 }
+                if (forced || QChartPrivate::defaultPen().color() == m_pointLabelsColor) {
+                    QColor color = theme->labelBrush().color();
+                    q->setPointLabelsColor(color);
+                }
             }
             void QScatterSeriesPrivate::initializeAnimations(QChart::AnimationOptions options)

src/scatterchart/scatterchartitem.cpp +25 -2

                   m_items(this),
                   m_visible(true),
                   m_shape(QScatterSeries::MarkerShapeRectangle),
-                  m_size(15)
+                  m_size(15),
+                  m_pointLabelsFormat(series->pointLabelsFormat()),
+                  m_pointLabelsVisible(false),
+                  m_pointLabelsFont(series->pointLabelsFont()),
+                  m_pointLabelsColor(series->pointLabelsColor())
             {
                 QObject::connect(m_series->d_func(), SIGNAL(updated()), this, SLOT(handleUpdated()));
                 QObject::connect(m_series, SIGNAL(visibleChanged()), this, SLOT(handleUpdated()));
                 QObject::connect(m_series, SIGNAL(opacityChanged()), this, SLOT(handleUpdated()));
+                QObject::connect(series, SIGNAL(pointLabelsFormatChanged(QString)),
+                                 this, SLOT(handleUpdated()));
+                QObject::connect(series, SIGNAL(pointLabelsVisibilityChanged(bool)),
+                                 this, SLOT(handleUpdated()));
+                QObject::connect(series, SIGNAL(pointLabelsFontChanged(QFont)), this, SLOT(handleUpdated()));
+                QObject::connect(series, SIGNAL(pointLabelsColorChanged(QColor)), this, SLOT(handleUpdated()));
                 setZValue(ChartPresenter::ScatterSeriesZValue);
                 setFlags(QGraphicsItem::ItemClipsChildrenToShape);
             void ScatterChartItem::paint(QPainter *painter, const QStyleOptionGraphicsItem *option, QWidget *widget)
             {
-                Q_UNUSED(painter)
                 Q_UNUSED(option)
                 Q_UNUSED(widget)
+                QRectF clipRect = QRectF(QPointF(0, 0), domain()->size());
+                painter->save();
+                painter->setClipRect(clipRect);
+                if (m_pointLabelsVisible)
+                    m_series->d_func()->drawSeriesPointLabels(painter, m_points);
+                painter->restore();
             }
             void ScatterChartItem::setPen(const QPen &pen)
                 m_size = m_series->markerSize();
                 m_shape = m_series->markerShape();
                 setOpacity(m_series->opacity());
+                m_pointLabelsFormat = m_series->pointLabelsFormat();
+                m_pointLabelsVisible = m_series->pointLabelsVisible();
+                m_pointLabelsFont = m_series->pointLabelsFont();
+                m_pointLabelsColor = m_series->pointLabelsColor();
                 if (recreate) {
                     deletePoints(count);

src/scatterchart/scatterchartitem_p.h +5 0

                 int m_size;
                 QRectF m_rect;
                 QMap<QGraphicsItem *, QPointF> m_markerMap;
+                bool m_pointLabelsVisible;
+                QString m_pointLabelsFormat;
+                QFont m_pointLabelsFont;
+                QColor m_pointLabelsColor;
             };
             class CircleMarker: public QGraphicsEllipseItem

src/splinechart/qsplineseries.cpp +5 0

                     pen.setWidthF(2);
                     q->setPen(pen);
                 }
+                if (forced || QChartPrivate::defaultPen().color() == m_pointLabelsColor) {
+                    QColor color = theme->labelBrush().color();
+                    q->setPointLabelsColor(color);
+                }
             }
             void QSplineSeriesPrivate::initializeAnimations(QtCommercialChart::QChart::AnimationOptions options)

src/splinechart/splinechartitem.cpp +18 -1

                 : XYChart(series,item),
                   m_series(series),
                   m_pointsVisible(false),
-                  m_animation(0)
+                  m_animation(0),
+                  m_pointLabelsFormat(series->pointLabelsFormat()),
+                  m_pointLabelsVisible(false),
+                  m_pointLabelsFont(series->pointLabelsFont()),
+                  m_pointLabelsColor(series->pointLabelsColor())
             {
                 setAcceptHoverEvents(true);
                 setZValue(ChartPresenter::SplineChartZValue);
                 QObject::connect(m_series->d_func(), SIGNAL(updated()), this, SLOT(handleUpdated()));
                 QObject::connect(series, SIGNAL(visibleChanged()), this, SLOT(handleUpdated()));
                 QObject::connect(series, SIGNAL(opacityChanged()), this, SLOT(handleUpdated()));
+                QObject::connect(series, SIGNAL(pointLabelsFormatChanged(QString)),
+                                 this, SLOT(handleUpdated()));
+                QObject::connect(series, SIGNAL(pointLabelsVisibilityChanged(bool)),
+                                 this, SLOT(handleUpdated()));
+                QObject::connect(series, SIGNAL(pointLabelsFontChanged(QFont)), this, SLOT(handleUpdated()));
+                QObject::connect(series, SIGNAL(pointLabelsColorChanged(QColor)), this, SLOT(handleUpdated()));
                 handleUpdated();
             }
                 m_linePen = m_series->pen();
                 m_pointPen = m_series->pen();
                 m_pointPen.setWidthF(2 * m_pointPen.width());
+                m_pointLabelsFormat = m_series->pointLabelsFormat();
+                m_pointLabelsVisible = m_series->pointLabelsVisible();
+                m_pointLabelsFont = m_series->pointLabelsFont();
+                m_pointLabelsColor = m_series->pointLabelsColor();
                 update();
             }
                         painter->drawPoints(geometryPoints());
                 }
+                if (m_pointLabelsVisible)
+                    m_series->d_func()->drawSeriesPointLabels(painter, m_points);
                 painter->restore();
             }

src/splinechart/splinechartitem_p.h +5 0

                 QVector<QPointF> m_visiblePoints;
                 SplineAnimation *m_animation;
+                bool m_pointLabelsVisible;
+                QString m_pointLabelsFormat;
+                QFont m_pointLabelsFont;
+                QColor m_pointLabelsColor;
                 friend class SplineAnimation;
             };

src/xychart/qxyseries.cpp +197 -1

@@ -26,6 +26,7
26	#include "qxylegendmarker.h"	26	#include "qxylegendmarker.h"
27	#include "charthelpers_p.h"	27	#include "charthelpers_p.h"
28	#include "qchart_p.h"	28	#include "qchart_p.h"
		29	#include <QPainter>
29		30
30	QTCOMMERCIALCHART_BEGIN_NAMESPACE	31	QTCOMMERCIALCHART_BEGIN_NAMESPACE
31		32
@@ -124,6 +125,110 QTCOMMERCIALCHART_BEGIN_NAMESPACE
124	*/	125	*/
125		126
126	/*!	127	/*!
		128	\property QXYSeries::pointLabelsFormat
		129	The \a format used for showing labels with series points.
		130
		131	QXYSeries supports the following format tags:
		132	\table
		133	\row
		134	\li @xPoint \li The x value of the data point
		135	\row
		136	\li @yPoint \li The y value of the data point
		137	\endtable
		138
		139	For example, the following usage of the format tags would produce labels that have the data
		140	point (x, y) shown inside brackets separated by a comma:
		141	\code
		142	series->setPointLabelsFormat("(@xPoint, @yPoint)");
		143	\endcode
		144
		145	By default, the labels format is set to '@xPoint, @yPoint'. The labels are shown on the plot
		146	area, labels on the edge of the plot area are cut. If the points are close to each other the
		147	labels may overlap.
		148
		149	\sa QXYSeries::pointLabelsVisible, QXYSeries::pointLabelsFont, QXYSeries::pointLabelsColor
		150	*/
		151	/*!
		152	\qmlproperty string XYSeries::pointLabelsFormat
		153	The \a format used for showing labels with series points.
		154
		155	\sa QXYSeries::pointLabelsFormat, pointLabelsVisible, pointLabelsFont, pointLabelsColor
		156	*/
		157	/*!
		158	\fn void QXYSeries::pointLabelsFormatChanged(const QString &format)
		159	Signal is emitted when the \a format of data point labels is changed.
		160	*/
		161	/*!
		162	\qmlsignal XYSeries::onPointLabelsFormatChanged(string format)
		163	Signal is emitted when the \a format of data point labels is changed.
		164	*/
		165
		166	/*!
		167	\property QXYSeries::pointLabelsVisible
		168	Defines the visibility for data point labels. False by default.
		169
		170	\sa QXYSeries::pointLabelsFormat
		171	*/
		172	/*!
		173	\qmlproperty bool XYSeries::pointLabelsVisible
		174	Defines the visibility for data point labels.
		175
		176	\sa pointLabelsFormat
		177	*/
		178	/*!
		179	\fn void QXYSeries::pointLabelsVisibilityChanged(bool visible)
		180	The visibility of the data point labels is changed to \a visible.
		181	*/
		182	/*!
		183	\qmlsignal XYSeries::onPointLabelsVisibilityChanged(bool visible)
		184	The visibility of the data point labels is changed to \a visible.
		185	*/
		186
		187	/*!
		188	\property QXYSeries::pointLabelsFont
		189	Defines the font used for data point labels.
		190
		191	\sa QXYSeries::pointLabelsFormat
		192	*/
		193	/*!
		194	\qmlproperty font XYSeries::pointLabelsFont
		195	Defines the font used for data point labels.
		196
		197	\sa pointLabelsFormat
		198	*/
		199	/*!
		200	\fn void QXYSeries::pointLabelsFontChanged(const QFont &font);
		201	The font used for data point labels is changed to \a font.
		202	*/
		203	/*!
		204	\qmlsignal XYSeries::onPointLabelsFontChanged(Font font)
		205	The font used for data point labels is changed to \a font.
		206	*/
		207
		208	/*!
		209	\property QXYSeries::pointLabelsColor
		210	Defines the color used for data point labels. By default, the color is the color of the brush
		211	defined in theme for labels.
		212
		213	\sa QXYSeries::pointLabelsFormat
		214	*/
		215	/*!
		216	\qmlproperty font XYSeries::pointLabelsColor
		217	Defines the color used for data point labels. By default, the color is the color of the brush
		218	defined in theme for labels.
		219
		220	\sa pointLabelsFormat
		221	*/
		222	/*!
		223	\fn void QXYSeries::pointLabelsColorChanged(const QColor &color);
		224	The color used for data point labels is changed to \a color.
		225	*/
		226	/*!
		227	\qmlsignal XYSeries::onPointLabelsColorChanged(Color color)
		228	The color used for data point labels is changed to \a color.
		229	*/
		230
		231	/*!
127	\fn void QXYSeries::clicked(const QPointF& point)	232	\fn void QXYSeries::clicked(const QPointF& point)
128	\brief Signal is emitted when user clicks the \a point on chart.	233	\brief Signal is emitted when user clicks the \a point on chart.
129	*/	234	*/
@@ -499,6 +604,68 bool QXYSeries::pointsVisible() const
499	return d->m_pointsVisible;	604	return d->m_pointsVisible;
500	}	605	}
501		606
		607	void QXYSeries::setPointLabelsFormat(const QString &format)
		608	{
		609	Q_D(QXYSeries);
		610	if (d->m_pointLabelsFormat != format) {
		611	d->m_pointLabelsFormat = format;
		612	emit pointLabelsFormatChanged(format);
		613	}
		614	}
		615
		616	QString QXYSeries::pointLabelsFormat() const
		617	{
		618	Q_D(const QXYSeries);
		619	return d->m_pointLabelsFormat;
		620	}
		621
		622	void QXYSeries::setPointLabelsVisible(bool visible)
		623	{
		624	Q_D(QXYSeries);
		625	if (d->m_pointLabelsVisible != visible) {
		626	d->m_pointLabelsVisible = visible;
		627	emit pointLabelsVisibilityChanged(visible);
		628	}
		629	}
		630
		631	bool QXYSeries::pointLabelsVisible() const
		632	{
		633	Q_D(const QXYSeries);
		634	return d->m_pointLabelsVisible;
		635	}
		636
		637	void QXYSeries::setPointLabelsFont(const QFont &font)
		638	{
		639	Q_D(QXYSeries);
		640	if (d->m_pointLabelsFont != font) {
		641	d->m_pointLabelsFont = font;
		642	emit pointLabelsFontChanged(font);
		643	}
		644	}
		645
		646	QFont QXYSeries::pointLabelsFont() const
		647	{
		648	Q_D(const QXYSeries);
		649	return d->m_pointLabelsFont;
		650	}
		651
		652	void QXYSeries::setPointLabelsColor(const QColor &color)
		653	{
		654	Q_D(QXYSeries);
		655	if (d->m_pointLabelsColor != color) {
		656	d->m_pointLabelsColor = color;
		657	emit pointLabelsColorChanged(color);
		658	}
		659	}
		660
		661	QColor QXYSeries::pointLabelsColor() const
		662	{
		663	Q_D(const QXYSeries);
		664	if (d->m_pointLabelsColor == QChartPrivate::defaultPen().color())
		665	return QPen().color();
		666	else
		667	return d->m_pointLabelsColor;
		668	}
502		669
503	/*!	670	/*!
504	Stream operator for adding a data \a point to the series.	671	Stream operator for adding a data \a point to the series.
@@ -529,7 +696,11 QXYSeriesPrivate::QXYSeriesPrivate(QXYSeries *q)
529	: QAbstractSeriesPrivate(q),	696	: QAbstractSeriesPrivate(q),
530	m_pen(QChartPrivate::defaultPen()),	697	m_pen(QChartPrivate::defaultPen()),
531	m_brush(QChartPrivate::defaultBrush()),	698	m_brush(QChartPrivate::defaultBrush()),
532	m_pointsVisible(false)	699	m_pointsVisible(false),
		700	m_pointLabelsFormat(QLatin1String("@xPoint, @yPoint")),
		701	m_pointLabelsVisible(false),
		702	m_pointLabelsFont(QChartPrivate::defaultFont()),
		703	m_pointLabelsColor(QChartPrivate::defaultPen().color())
533	{	704	{
534	}	705	}
535		706
@@ -601,6 +772,31 void QXYSeriesPrivate::initializeAnimations(QtCommercialChart::QChart::Animation
601	QAbstractSeriesPrivate::initializeAnimations(options);	772	QAbstractSeriesPrivate::initializeAnimations(options);
602	}	773	}
603		774
		775	void QXYSeriesPrivate::drawSeriesPointLabels(QPainter *painter, const QVector<QPointF> &points)
		776	{
		777	static const QString xPointTag(QLatin1String("@xPoint"));
		778	static const QString yPointTag(QLatin1String("@yPoint"));
		779	const int labelOffset = 2;
		780
		781	painter->setFont(m_pointLabelsFont);
		782	painter->setPen(QPen(m_pointLabelsColor));
		783	QFontMetrics fm(painter->font());
		784
		785	for (int i(0); i < m_points.size(); i++) {
		786	QString pointLabel = m_pointLabelsFormat;
		787	pointLabel.replace(xPointTag, QString::number(m_points.at(i).x()));
		788	pointLabel.replace(yPointTag, QString::number(m_points.at(i).y()));
		789
		790	// Position text in relation to the point
		791	int pointLabelWidth = fm.width(pointLabel);
		792	QPointF position(points.at(i));
		793	position.setX(position.x() - pointLabelWidth / 2);
		794	position.setY(position.y() - painter->pen().width() / 2 - labelOffset);
		795
		796	painter->drawText(position, pointLabel);
		797	}
		798	}
		799
604	#include "moc_qxyseries.cpp"	800	#include "moc_qxyseries.cpp"
605	#include "moc_qxyseries_p.cpp"	801	#include "moc_qxyseries_p.cpp"
606		802

src/xychart/qxyseries.h +24 0

                 Q_OBJECT
                 Q_PROPERTY(bool pointsVisible READ pointsVisible WRITE setPointsVisible)
                 Q_PROPERTY(QColor color READ color WRITE setColor NOTIFY colorChanged)
+                Q_PROPERTY(QString pointLabelsFormat READ pointLabelsFormat WRITE setPointLabelsFormat
+                           NOTIFY pointLabelsFormatChanged)
+                Q_PROPERTY(bool pointLabelsVisible READ pointLabelsVisible WRITE setPointLabelsVisible
+                           NOTIFY pointLabelsVisibilityChanged)
+                Q_PROPERTY(QFont pointLabelsFont READ pointLabelsFont WRITE setPointLabelsFont
+                           NOTIFY pointLabelsFontChanged)
+                Q_PROPERTY(QColor pointLabelsColor READ pointLabelsColor WRITE setPointLabelsColor
+                           NOTIFY pointLabelsColorChanged)
             protected:
                 explicit QXYSeries(QXYSeriesPrivate &d, QObject *parent = 0);
                 void setPointsVisible(bool visible = true);
                 bool pointsVisible() const;
+                void setPointLabelsFormat(const QString &format);
+                QString pointLabelsFormat() const;
+                void setPointLabelsVisible(bool visible = true);
+                bool pointLabelsVisible() const;
+                void setPointLabelsFont(const QFont &font);
+                QFont pointLabelsFont() const;
+                void setPointLabelsColor(const QColor &color);
+                QColor pointLabelsColor() const;
                 void replace(QList<QPointF> points);
             Q_SIGNALS:
                 void pointAdded(int index);
                 void colorChanged(QColor color);
                 void pointsReplaced();
+                void pointLabelsFormatChanged(const QString &format);
+                void pointLabelsVisibilityChanged(bool visible);
+                void pointLabelsFontChanged(const QFont &font);
+                void pointLabelsColorChanged(const QColor &color);
             private:
                 Q_DECLARE_PRIVATE(QXYSeries)

src/xychart/qxyseries_p.h +6 0

                 QAbstractAxis::AxisType defaultAxisType(Qt::Orientation orientation) const;
                 QAbstractAxis* createDefaultAxis(Qt::Orientation orientation) const;
+                void drawSeriesPointLabels(QPainter *painter, const QVector<QPointF> &points);
             Q_SIGNALS:
                 void updated();
                 QPen m_pen;
                 QBrush m_brush;
                 bool m_pointsVisible;
+                QString m_pointLabelsFormat;
+                bool m_pointLabelsVisible;
+                QFont m_pointLabelsFont;
+                QColor m_pointLabelsColor;
             private:
                 Q_DECLARE_PUBLIC(QXYSeries)

tests/auto/qbarseries/tst_qbarseries.cpp +58 0

@@ -29,6 +29,7 QTCOMMERCIALCHART_USE_NAMESPACE
29		29
30	Q_DECLARE_METATYPE(QBarSet*)	30	Q_DECLARE_METATYPE(QBarSet*)
31	Q_DECLARE_METATYPE(QList<QBarSet*>)	31	Q_DECLARE_METATYPE(QList<QBarSet*>)
		32	Q_DECLARE_METATYPE(QAbstractBarSeries::LabelsPosition)
32		33
33	class tst_QBarSeries : public QObject	34	class tst_QBarSeries : public QObject
34	{	35	{
@@ -59,6 +60,8 private slots:
59	void barSets();	60	void barSets();
60	void setLabelsVisible_data();	61	void setLabelsVisible_data();
61	void setLabelsVisible();	62	void setLabelsVisible();
		63	void setLabelsFormat();
		64	void setLabelsPosition();
62	void opacity();	65	void opacity();
63	void mouseclicked_data();	66	void mouseclicked_data();
64	void mouseclicked();	67	void mouseclicked();
@@ -79,6 +82,7 void tst_QBarSeries::initTestCase()
79	{	82	{
80	qRegisterMetaType<QBarSet>("QBarSet");	83	qRegisterMetaType<QBarSet>("QBarSet");
81	qRegisterMetaType<QList<QBarSet> >("QList<QBarSet>");	84	qRegisterMetaType<QList<QBarSet> >("QList<QBarSet>");
		85	qRegisterMetaType<QAbstractBarSeries::LabelsPosition>("QAbstractBarSeries::LabelsPosition");
82	}	86	}
83		87
84	void tst_QBarSeries::cleanupTestCase()	88	void tst_QBarSeries::cleanupTestCase()
@@ -343,6 +347,60 void tst_QBarSeries::setLabelsVisible()
343	QVERIFY(m_barseries_with_sets->isLabelsVisible() == true);	347	QVERIFY(m_barseries_with_sets->isLabelsVisible() == true);
344	}	348	}
345		349
		350	void tst_QBarSeries::setLabelsFormat()
		351	{
		352	QSignalSpy labelsFormatSpy(m_barseries, SIGNAL(labelsFormatChanged(QString)));
		353	QCOMPARE(m_barseries->labelsFormat(), QString());
		354
		355	QString format("(@value)");
		356	m_barseries->setLabelsFormat(format);
		357	TRY_COMPARE(labelsFormatSpy.count(), 1);
		358	QList<QVariant> arguments = labelsFormatSpy.takeFirst();
		359	QVERIFY(arguments.at(0).toString() == format);
		360	QCOMPARE(m_barseries->labelsFormat(), format);
		361
		362	m_barseries->setLabelsFormat(QString());
		363	TRY_COMPARE(labelsFormatSpy.count(), 1);
		364	arguments = labelsFormatSpy.takeFirst();
		365	QVERIFY(arguments.at(0).toString() == QString());
		366	QCOMPARE(m_barseries->labelsFormat(), QString());
		367	}
		368
		369	void tst_QBarSeries::setLabelsPosition()
		370	{
		371	QSignalSpy labelsPositionSpy(m_barseries,
		372	SIGNAL(labelsPositionChanged(QAbstractBarSeries::LabelsPosition)));
		373	QCOMPARE(m_barseries->labelsPosition(), QBarSeries::LabelsCenter);
		374
		375	m_barseries->setLabelsPosition(QBarSeries::LabelsInsideEnd);
		376	TRY_COMPARE(labelsPositionSpy.count(), 1);
		377	QList<QVariant> arguments = labelsPositionSpy.takeFirst();
		378	QVERIFY(arguments.at(0).value<QAbstractBarSeries::LabelsPosition>()
		379	== QBarSeries::LabelsInsideEnd);
		380	QCOMPARE(m_barseries->labelsPosition(), QBarSeries::LabelsInsideEnd);
		381
		382	m_barseries->setLabelsPosition(QBarSeries::LabelsInsideBase);
		383	TRY_COMPARE(labelsPositionSpy.count(), 1);
		384	arguments = labelsPositionSpy.takeFirst();
		385	QVERIFY(arguments.at(0).value<QAbstractBarSeries::LabelsPosition>()
		386	== QBarSeries::LabelsInsideBase);
		387	QCOMPARE(m_barseries->labelsPosition(), QBarSeries::LabelsInsideBase);
		388
		389	m_barseries->setLabelsPosition(QBarSeries::LabelsOutsideEnd);
		390	TRY_COMPARE(labelsPositionSpy.count(), 1);
		391	arguments = labelsPositionSpy.takeFirst();
		392	QVERIFY(arguments.at(0).value<QAbstractBarSeries::LabelsPosition>()
		393	== QBarSeries::LabelsOutsideEnd);
		394	QCOMPARE(m_barseries->labelsPosition(), QBarSeries::LabelsOutsideEnd);
		395
		396	m_barseries->setLabelsPosition(QBarSeries::LabelsCenter);
		397	TRY_COMPARE(labelsPositionSpy.count(), 1);
		398	arguments = labelsPositionSpy.takeFirst();
		399	QVERIFY(arguments.at(0).value<QAbstractBarSeries::LabelsPosition>()
		400	== QBarSeries::LabelsCenter);
		401	QCOMPARE(m_barseries->labelsPosition(), QBarSeries::LabelsCenter);
		402	}
		403
346	void tst_QBarSeries::opacity()	404	void tst_QBarSeries::opacity()
347	{	405	{
348	QSignalSpy opacitySpy(m_barseries, SIGNAL(opacityChanged()));	406	QSignalSpy opacitySpy(m_barseries, SIGNAL(opacityChanged()));

tests/auto/qhorizontalbarseries/tst_qhorizontalbarseries.cpp +58 0

@@ -28,6 +28,7
28	QTCOMMERCIALCHART_USE_NAMESPACE	28	QTCOMMERCIALCHART_USE_NAMESPACE
29		29
30	Q_DECLARE_METATYPE(QBarSet*)	30	Q_DECLARE_METATYPE(QBarSet*)
		31	Q_DECLARE_METATYPE(QAbstractBarSeries::LabelsPosition)
31		32
32	class tst_QHorizontalBarSeries : public QObject	33	class tst_QHorizontalBarSeries : public QObject
33	{	34	{
@@ -56,6 +57,8 private slots:
56	void barSets();	57	void barSets();
57	void setLabelsVisible_data();	58	void setLabelsVisible_data();
58	void setLabelsVisible();	59	void setLabelsVisible();
		60	void setLabelsFormat();
		61	void setLabelsPosition();
59	void mouseclicked_data();	62	void mouseclicked_data();
60	void mouseclicked();	63	void mouseclicked();
61	void mousehovered_data();	64	void mousehovered_data();
@@ -73,6 +76,7 private:
73	void tst_QHorizontalBarSeries::initTestCase()	76	void tst_QHorizontalBarSeries::initTestCase()
74	{	77	{
75	qRegisterMetaType<QBarSet>("QBarSet");	78	qRegisterMetaType<QBarSet>("QBarSet");
		79	qRegisterMetaType<QAbstractBarSeries::LabelsPosition>("QAbstractBarSeries::LabelsPosition");
76	}	80	}
77		81
78	void tst_QHorizontalBarSeries::cleanupTestCase()	82	void tst_QHorizontalBarSeries::cleanupTestCase()
@@ -308,6 +312,60 void tst_QHorizontalBarSeries::setLabelsVisible()
308	QVERIFY(m_barseries_with_sets->isLabelsVisible() == true);	312	QVERIFY(m_barseries_with_sets->isLabelsVisible() == true);
309	}	313	}
310		314
		315	void tst_QHorizontalBarSeries::setLabelsFormat()
		316	{
		317	QSignalSpy labelsFormatSpy(m_barseries, SIGNAL(labelsFormatChanged(QString)));
		318	QCOMPARE(m_barseries->labelsFormat(), QString());
		319
		320	QString format("(@value)");
		321	m_barseries->setLabelsFormat(format);
		322	TRY_COMPARE(labelsFormatSpy.count(), 1);
		323	QList<QVariant> arguments = labelsFormatSpy.takeFirst();
		324	QVERIFY(arguments.at(0).toString() == format);
		325	QCOMPARE(m_barseries->labelsFormat(), format);
		326
		327	m_barseries->setLabelsFormat(QString());
		328	TRY_COMPARE(labelsFormatSpy.count(), 1);
		329	arguments = labelsFormatSpy.takeFirst();
		330	QVERIFY(arguments.at(0).toString() == QString());
		331	QCOMPARE(m_barseries->labelsFormat(), QString());
		332	}
		333
		334	void tst_QHorizontalBarSeries::setLabelsPosition()
		335	{
		336	QSignalSpy labelsPositionSpy(m_barseries,
		337	SIGNAL(labelsPositionChanged(QAbstractBarSeries::LabelsPosition)));
		338	QCOMPARE(m_barseries->labelsPosition(), QHorizontalBarSeries::LabelsCenter);
		339
		340	m_barseries->setLabelsPosition(QHorizontalBarSeries::LabelsInsideEnd);
		341	TRY_COMPARE(labelsPositionSpy.count(), 1);
		342	QList<QVariant> arguments = labelsPositionSpy.takeFirst();
		343	QVERIFY(arguments.at(0).value<QAbstractBarSeries::LabelsPosition>()
		344	== QHorizontalBarSeries::LabelsInsideEnd);
		345	QCOMPARE(m_barseries->labelsPosition(), QHorizontalBarSeries::LabelsInsideEnd);
		346
		347	m_barseries->setLabelsPosition(QHorizontalBarSeries::LabelsInsideBase);
		348	TRY_COMPARE(labelsPositionSpy.count(), 1);
		349	arguments = labelsPositionSpy.takeFirst();
		350	QVERIFY(arguments.at(0).value<QAbstractBarSeries::LabelsPosition>()
		351	== QHorizontalBarSeries::LabelsInsideBase);
		352	QCOMPARE(m_barseries->labelsPosition(), QHorizontalBarSeries::LabelsInsideBase);
		353
		354	m_barseries->setLabelsPosition(QHorizontalBarSeries::LabelsOutsideEnd);
		355	TRY_COMPARE(labelsPositionSpy.count(), 1);
		356	arguments = labelsPositionSpy.takeFirst();
		357	QVERIFY(arguments.at(0).value<QAbstractBarSeries::LabelsPosition>()
		358	== QHorizontalBarSeries::LabelsOutsideEnd);
		359	QCOMPARE(m_barseries->labelsPosition(), QHorizontalBarSeries::LabelsOutsideEnd);
		360
		361	m_barseries->setLabelsPosition(QHorizontalBarSeries::LabelsCenter);
		362	TRY_COMPARE(labelsPositionSpy.count(), 1);
		363	arguments = labelsPositionSpy.takeFirst();
		364	QVERIFY(arguments.at(0).value<QAbstractBarSeries::LabelsPosition>()
		365	== QHorizontalBarSeries::LabelsCenter);
		366	QCOMPARE(m_barseries->labelsPosition(), QHorizontalBarSeries::LabelsCenter);
		367	}
		368
311	void tst_QHorizontalBarSeries::mouseclicked_data()	369	void tst_QHorizontalBarSeries::mouseclicked_data()
312	{	370	{
313		371

tests/auto/qhorizontalpercentbarseries/tst_qhorizontalpercentbarseries.cpp +58 0

@@ -28,6 +28,7
28	QTCOMMERCIALCHART_USE_NAMESPACE	28	QTCOMMERCIALCHART_USE_NAMESPACE
29		29
30	Q_DECLARE_METATYPE(QBarSet*)	30	Q_DECLARE_METATYPE(QBarSet*)
		31	Q_DECLARE_METATYPE(QAbstractBarSeries::LabelsPosition)
31		32
32	class tst_QHorizontalPercentBarSeries : public QObject	33	class tst_QHorizontalPercentBarSeries : public QObject
33	{	34	{
@@ -44,6 +45,8 private slots:
44	void qhorizontalpercentbarseries();	45	void qhorizontalpercentbarseries();
45	void type_data();	46	void type_data();
46	void type();	47	void type();
		48	void setLabelsFormat();
		49	void setLabelsPosition();
47	void mouseclicked_data();	50	void mouseclicked_data();
48	void mouseclicked();	51	void mouseclicked();
49	void mousehovered_data();	52	void mousehovered_data();
@@ -56,6 +59,7 private:
56	void tst_QHorizontalPercentBarSeries::initTestCase()	59	void tst_QHorizontalPercentBarSeries::initTestCase()
57	{	60	{
58	qRegisterMetaType<QBarSet>("QBarSet");	61	qRegisterMetaType<QBarSet>("QBarSet");
		62	qRegisterMetaType<QAbstractBarSeries::LabelsPosition>("QAbstractBarSeries::LabelsPosition");
59	}	63	}
60		64
61	void tst_QHorizontalPercentBarSeries::cleanupTestCase()	65	void tst_QHorizontalPercentBarSeries::cleanupTestCase()
@@ -93,6 +97,60 void tst_QHorizontalPercentBarSeries::type()
93	QVERIFY(m_barseries->type() == QAbstractSeries::SeriesTypeHorizontalPercentBar);	97	QVERIFY(m_barseries->type() == QAbstractSeries::SeriesTypeHorizontalPercentBar);
94	}	98	}
95		99
		100	void tst_QHorizontalPercentBarSeries::setLabelsFormat()
		101	{
		102	QSignalSpy labelsFormatSpy(m_barseries, SIGNAL(labelsFormatChanged(QString)));
		103	QCOMPARE(m_barseries->labelsFormat(), QString());
		104
		105	QString format("(@value)");
		106	m_barseries->setLabelsFormat(format);
		107	TRY_COMPARE(labelsFormatSpy.count(), 1);
		108	QList<QVariant> arguments = labelsFormatSpy.takeFirst();
		109	QVERIFY(arguments.at(0).toString() == format);
		110	QCOMPARE(m_barseries->labelsFormat(), format);
		111
		112	m_barseries->setLabelsFormat(QString());
		113	TRY_COMPARE(labelsFormatSpy.count(), 1);
		114	arguments = labelsFormatSpy.takeFirst();
		115	QVERIFY(arguments.at(0).toString() == QString());
		116	QCOMPARE(m_barseries->labelsFormat(), QString());
		117	}
		118
		119	void tst_QHorizontalPercentBarSeries::setLabelsPosition()
		120	{
		121	QSignalSpy labelsPositionSpy(m_barseries,
		122	SIGNAL(labelsPositionChanged(QAbstractBarSeries::LabelsPosition)));
		123	QCOMPARE(m_barseries->labelsPosition(), QHorizontalPercentBarSeries::LabelsCenter);
		124
		125	m_barseries->setLabelsPosition(QHorizontalPercentBarSeries::LabelsInsideEnd);
		126	TRY_COMPARE(labelsPositionSpy.count(), 1);
		127	QList<QVariant> arguments = labelsPositionSpy.takeFirst();
		128	QVERIFY(arguments.at(0).value<QAbstractBarSeries::LabelsPosition>()
		129	== QHorizontalPercentBarSeries::LabelsInsideEnd);
		130	QCOMPARE(m_barseries->labelsPosition(), QHorizontalPercentBarSeries::LabelsInsideEnd);
		131
		132	m_barseries->setLabelsPosition(QHorizontalPercentBarSeries::LabelsInsideBase);
		133	TRY_COMPARE(labelsPositionSpy.count(), 1);
		134	arguments = labelsPositionSpy.takeFirst();
		135	QVERIFY(arguments.at(0).value<QAbstractBarSeries::LabelsPosition>()
		136	== QHorizontalPercentBarSeries::LabelsInsideBase);
		137	QCOMPARE(m_barseries->labelsPosition(), QHorizontalPercentBarSeries::LabelsInsideBase);
		138
		139	m_barseries->setLabelsPosition(QHorizontalPercentBarSeries::LabelsOutsideEnd);
		140	TRY_COMPARE(labelsPositionSpy.count(), 1);
		141	arguments = labelsPositionSpy.takeFirst();
		142	QVERIFY(arguments.at(0).value<QAbstractBarSeries::LabelsPosition>()
		143	== QHorizontalPercentBarSeries::LabelsOutsideEnd);
		144	QCOMPARE(m_barseries->labelsPosition(), QHorizontalPercentBarSeries::LabelsOutsideEnd);
		145
		146	m_barseries->setLabelsPosition(QHorizontalPercentBarSeries::LabelsCenter);
		147	TRY_COMPARE(labelsPositionSpy.count(), 1);
		148	arguments = labelsPositionSpy.takeFirst();
		149	QVERIFY(arguments.at(0).value<QAbstractBarSeries::LabelsPosition>()
		150	== QHorizontalPercentBarSeries::LabelsCenter);
		151	QCOMPARE(m_barseries->labelsPosition(), QHorizontalPercentBarSeries::LabelsCenter);
		152	}
		153
96	void tst_QHorizontalPercentBarSeries::mouseclicked_data()	154	void tst_QHorizontalPercentBarSeries::mouseclicked_data()
97	{	155	{
98		156

tests/auto/qhorizontalstackedbarseries/tst_qhorizontalstackedbarseries.cpp +58 0

@@ -28,6 +28,7
28	QTCOMMERCIALCHART_USE_NAMESPACE	28	QTCOMMERCIALCHART_USE_NAMESPACE
29		29
30	Q_DECLARE_METATYPE(QBarSet*)	30	Q_DECLARE_METATYPE(QBarSet*)
		31	Q_DECLARE_METATYPE(QAbstractBarSeries::LabelsPosition)
31		32
32	class tst_QHorizontalStackedBarSeries : public QObject	33	class tst_QHorizontalStackedBarSeries : public QObject
33	{	34	{
@@ -44,6 +45,8 private slots:
44	void qhorizontalstackedbarseries();	45	void qhorizontalstackedbarseries();
45	void type_data();	46	void type_data();
46	void type();	47	void type();
		48	void setLabelsFormat();
		49	void setLabelsPosition();
47	void mouseclicked_data();	50	void mouseclicked_data();
48	void mouseclicked();	51	void mouseclicked();
49	void mousehovered_data();	52	void mousehovered_data();
@@ -56,6 +59,7 private:
56	void tst_QHorizontalStackedBarSeries::initTestCase()	59	void tst_QHorizontalStackedBarSeries::initTestCase()
57	{	60	{
58	qRegisterMetaType<QBarSet>("QBarSet");	61	qRegisterMetaType<QBarSet>("QBarSet");
		62	qRegisterMetaType<QAbstractBarSeries::LabelsPosition>("QAbstractBarSeries::LabelsPosition");
59	}	63	}
60		64
61	void tst_QHorizontalStackedBarSeries::cleanupTestCase()	65	void tst_QHorizontalStackedBarSeries::cleanupTestCase()
@@ -93,6 +97,60 void tst_QHorizontalStackedBarSeries::type()
93	QVERIFY(m_barseries->type() == QAbstractSeries::SeriesTypeHorizontalStackedBar);	97	QVERIFY(m_barseries->type() == QAbstractSeries::SeriesTypeHorizontalStackedBar);
94	}	98	}
95		99
		100	void tst_QHorizontalStackedBarSeries::setLabelsFormat()
		101	{
		102	QSignalSpy labelsFormatSpy(m_barseries, SIGNAL(labelsFormatChanged(QString)));
		103	QCOMPARE(m_barseries->labelsFormat(), QString());
		104
		105	QString format("(@value)");
		106	m_barseries->setLabelsFormat(format);
		107	TRY_COMPARE(labelsFormatSpy.count(), 1);
		108	QList<QVariant> arguments = labelsFormatSpy.takeFirst();
		109	QVERIFY(arguments.at(0).toString() == format);
		110	QCOMPARE(m_barseries->labelsFormat(), format);
		111
		112	m_barseries->setLabelsFormat(QString());
		113	TRY_COMPARE(labelsFormatSpy.count(), 1);
		114	arguments = labelsFormatSpy.takeFirst();
		115	QVERIFY(arguments.at(0).toString() == QString());
		116	QCOMPARE(m_barseries->labelsFormat(), QString());
		117	}
		118
		119	void tst_QHorizontalStackedBarSeries::setLabelsPosition()
		120	{
		121	QSignalSpy labelsPositionSpy(m_barseries,
		122	SIGNAL(labelsPositionChanged(QAbstractBarSeries::LabelsPosition)));
		123	QCOMPARE(m_barseries->labelsPosition(), QHorizontalStackedBarSeries::LabelsCenter);
		124
		125	m_barseries->setLabelsPosition(QHorizontalStackedBarSeries::LabelsInsideEnd);
		126	TRY_COMPARE(labelsPositionSpy.count(), 1);
		127	QList<QVariant> arguments = labelsPositionSpy.takeFirst();
		128	QVERIFY(arguments.at(0).value<QAbstractBarSeries::LabelsPosition>()
		129	== QHorizontalStackedBarSeries::LabelsInsideEnd);
		130	QCOMPARE(m_barseries->labelsPosition(), QHorizontalStackedBarSeries::LabelsInsideEnd);
		131
		132	m_barseries->setLabelsPosition(QHorizontalStackedBarSeries::LabelsInsideBase);
		133	TRY_COMPARE(labelsPositionSpy.count(), 1);
		134	arguments = labelsPositionSpy.takeFirst();
		135	QVERIFY(arguments.at(0).value<QAbstractBarSeries::LabelsPosition>()
		136	== QHorizontalStackedBarSeries::LabelsInsideBase);
		137	QCOMPARE(m_barseries->labelsPosition(), QHorizontalStackedBarSeries::LabelsInsideBase);
		138
		139	m_barseries->setLabelsPosition(QHorizontalStackedBarSeries::LabelsOutsideEnd);
		140	TRY_COMPARE(labelsPositionSpy.count(), 1);
		141	arguments = labelsPositionSpy.takeFirst();
		142	QVERIFY(arguments.at(0).value<QAbstractBarSeries::LabelsPosition>()
		143	== QHorizontalStackedBarSeries::LabelsOutsideEnd);
		144	QCOMPARE(m_barseries->labelsPosition(), QHorizontalStackedBarSeries::LabelsOutsideEnd);
		145
		146	m_barseries->setLabelsPosition(QHorizontalStackedBarSeries::LabelsCenter);
		147	TRY_COMPARE(labelsPositionSpy.count(), 1);
		148	arguments = labelsPositionSpy.takeFirst();
		149	QVERIFY(arguments.at(0).value<QAbstractBarSeries::LabelsPosition>()
		150	== QHorizontalStackedBarSeries::LabelsCenter);
		151	QCOMPARE(m_barseries->labelsPosition(), QHorizontalStackedBarSeries::LabelsCenter);
		152	}
		153
96	void tst_QHorizontalStackedBarSeries::mouseclicked_data()	154	void tst_QHorizontalStackedBarSeries::mouseclicked_data()
97	{	155	{
98		156

tests/auto/qlineseries/tst_qlineseries.cpp +5 0

                 QCOMPARE(series.points(), QList<QPointF>());
                 QCOMPARE(series.pen(), QPen());
                 QCOMPARE(series.pointsVisible(), false);
+                QCOMPARE(series.pointLabelsVisible(), false);
+                QCOMPARE(series.pointLabelsFormat(), QLatin1String("@xPoint, @yPoint"));
                 series.append(QList<QPointF>());
                 series.append(0.0,0.0);
                 series.setPen(QPen());
                 series.setPointsVisible(false);
+                series.setPointLabelsVisible(false);
+                series.setPointLabelsFormat(QString());
                 m_chart->addSeries(&series);
                 m_view->show();
                 QTest::qWaitForWindowShown(m_view);

tests/auto/qml-qtquicktest/tst_barseries.qml +12 0

                     function test_properties() {
                         compare(barSeries.barWidth, 0.5);
                         compare(barSeries.labelsVisible, false);
+                        compare(barSeries.labelsPosition, BarSeries.LabelsCenter);
                     }
                     function test_setproperties() {
                         compare(barSeries.count, 0);
                     }
+                    function test_signals() {
+                        labelsPositionSpy.clear();
+                        barSeries.labelsPosition = BarSeries.LabelsOutsideEnd;
+                        compare(labelsPositionSpy.count, 1, "onLabelsPositionChanged")
+                    }
                     function test_remove() {
                         var setCount = 5;
                         var valueCount = 50;
                             target: barSeries
                             signalName: "barsetsRemoved"
                         }
+                        SignalSpy {
+                            id: labelsPositionSpy
+                            target: barSeries
+                            signalName: "labelsPositionChanged"
+                        }
                     }
                     StackedBarSeries {

tests/auto/qpercentbarseries/tst_qpercentbarseries.cpp +58 0

@@ -28,6 +28,7
28	QTCOMMERCIALCHART_USE_NAMESPACE	28	QTCOMMERCIALCHART_USE_NAMESPACE
29		29
30	Q_DECLARE_METATYPE(QBarSet*)	30	Q_DECLARE_METATYPE(QBarSet*)
		31	Q_DECLARE_METATYPE(QAbstractBarSeries::LabelsPosition)
31		32
32	class tst_QPercentBarSeries : public QObject	33	class tst_QPercentBarSeries : public QObject
33	{	34	{
@@ -44,6 +45,8 private slots:
44	void qpercentbarseries();	45	void qpercentbarseries();
45	void type_data();	46	void type_data();
46	void type();	47	void type();
		48	void setLabelsFormat();
		49	void setLabelsPosition();
47	void mouseclicked_data();	50	void mouseclicked_data();
48	void mouseclicked();	51	void mouseclicked();
49	void mousehovered_data();	52	void mousehovered_data();
@@ -56,6 +59,7 private:
56	void tst_QPercentBarSeries::initTestCase()	59	void tst_QPercentBarSeries::initTestCase()
57	{	60	{
58	qRegisterMetaType<QBarSet>("QBarSet");	61	qRegisterMetaType<QBarSet>("QBarSet");
		62	qRegisterMetaType<QAbstractBarSeries::LabelsPosition>("QAbstractBarSeries::LabelsPosition");
59	}	63	}
60		64
61	void tst_QPercentBarSeries::cleanupTestCase()	65	void tst_QPercentBarSeries::cleanupTestCase()
@@ -98,6 +102,60 void tst_QPercentBarSeries::mouseclicked_data()
98		102
99	}	103	}
100		104
		105	void tst_QPercentBarSeries::setLabelsFormat()
		106	{
		107	QSignalSpy labelsFormatSpy(m_barseries, SIGNAL(labelsFormatChanged(QString)));
		108	QCOMPARE(m_barseries->labelsFormat(), QString());
		109
		110	QString format("(@value)");
		111	m_barseries->setLabelsFormat(format);
		112	TRY_COMPARE(labelsFormatSpy.count(), 1);
		113	QList<QVariant> arguments = labelsFormatSpy.takeFirst();
		114	QVERIFY(arguments.at(0).toString() == format);
		115	QCOMPARE(m_barseries->labelsFormat(), format);
		116
		117	m_barseries->setLabelsFormat(QString());
		118	TRY_COMPARE(labelsFormatSpy.count(), 1);
		119	arguments = labelsFormatSpy.takeFirst();
		120	QVERIFY(arguments.at(0).toString() == QString());
		121	QCOMPARE(m_barseries->labelsFormat(), QString());
		122	}
		123
		124	void tst_QPercentBarSeries::setLabelsPosition()
		125	{
		126	QSignalSpy labelsPositionSpy(m_barseries,
		127	SIGNAL(labelsPositionChanged(QAbstractBarSeries::LabelsPosition)));
		128	QCOMPARE(m_barseries->labelsPosition(), QPercentBarSeries::LabelsCenter);
		129
		130	m_barseries->setLabelsPosition(QPercentBarSeries::LabelsInsideEnd);
		131	TRY_COMPARE(labelsPositionSpy.count(), 1);
		132	QList<QVariant> arguments = labelsPositionSpy.takeFirst();
		133	QVERIFY(arguments.at(0).value<QAbstractBarSeries::LabelsPosition>()
		134	== QPercentBarSeries::LabelsInsideEnd);
		135	QCOMPARE(m_barseries->labelsPosition(), QPercentBarSeries::LabelsInsideEnd);
		136
		137	m_barseries->setLabelsPosition(QPercentBarSeries::LabelsInsideBase);
		138	TRY_COMPARE(labelsPositionSpy.count(), 1);
		139	arguments = labelsPositionSpy.takeFirst();
		140	QVERIFY(arguments.at(0).value<QAbstractBarSeries::LabelsPosition>()
		141	== QPercentBarSeries::LabelsInsideBase);
		142	QCOMPARE(m_barseries->labelsPosition(), QPercentBarSeries::LabelsInsideBase);
		143
		144	m_barseries->setLabelsPosition(QPercentBarSeries::LabelsOutsideEnd);
		145	TRY_COMPARE(labelsPositionSpy.count(), 1);
		146	arguments = labelsPositionSpy.takeFirst();
		147	QVERIFY(arguments.at(0).value<QAbstractBarSeries::LabelsPosition>()
		148	== QPercentBarSeries::LabelsOutsideEnd);
		149	QCOMPARE(m_barseries->labelsPosition(), QPercentBarSeries::LabelsOutsideEnd);
		150
		151	m_barseries->setLabelsPosition(QPercentBarSeries::LabelsCenter);
		152	TRY_COMPARE(labelsPositionSpy.count(), 1);
		153	arguments = labelsPositionSpy.takeFirst();
		154	QVERIFY(arguments.at(0).value<QAbstractBarSeries::LabelsPosition>()
		155	== QPercentBarSeries::LabelsCenter);
		156	QCOMPARE(m_barseries->labelsPosition(), QPercentBarSeries::LabelsCenter);
		157	}
		158
101	void tst_QPercentBarSeries::mouseclicked()	159	void tst_QPercentBarSeries::mouseclicked()
102	{	160	{
103	SKIP_IF_CANNOT_TEST_MOUSE_EVENTS();	161	SKIP_IF_CANNOT_TEST_MOUSE_EVENTS();

tests/auto/qstackedbarseries/tst_qstackedbarseries.cpp +58 0

@@ -28,6 +28,7
28	QTCOMMERCIALCHART_USE_NAMESPACE	28	QTCOMMERCIALCHART_USE_NAMESPACE
29		29
30	Q_DECLARE_METATYPE(QBarSet*)	30	Q_DECLARE_METATYPE(QBarSet*)
		31	Q_DECLARE_METATYPE(QAbstractBarSeries::LabelsPosition)
31		32
32	class tst_QStackedBarSeries : public QObject	33	class tst_QStackedBarSeries : public QObject
33	{	34	{
@@ -44,6 +45,8 private slots:
44	void qstackedbarseries();	45	void qstackedbarseries();
45	void type_data();	46	void type_data();
46	void type();	47	void type();
		48	void setLabelsFormat();
		49	void setLabelsPosition();
47	void mouseclicked_data();	50	void mouseclicked_data();
48	void mouseclicked();	51	void mouseclicked();
49	void mousehovered_data();	52	void mousehovered_data();
@@ -56,6 +59,7 private:
56	void tst_QStackedBarSeries::initTestCase()	59	void tst_QStackedBarSeries::initTestCase()
57	{	60	{
58	qRegisterMetaType<QBarSet>("QBarSet");	61	qRegisterMetaType<QBarSet>("QBarSet");
		62	qRegisterMetaType<QAbstractBarSeries::LabelsPosition>("QAbstractBarSeries::LabelsPosition");
59	}	63	}
60		64
61	void tst_QStackedBarSeries::cleanupTestCase()	65	void tst_QStackedBarSeries::cleanupTestCase()
@@ -93,6 +97,60 void tst_QStackedBarSeries::type()
93	QVERIFY(m_barseries->type() == QAbstractSeries::SeriesTypeStackedBar);	97	QVERIFY(m_barseries->type() == QAbstractSeries::SeriesTypeStackedBar);
94	}	98	}
95		99
		100	void tst_QStackedBarSeries::setLabelsFormat()
		101	{
		102	QSignalSpy labelsFormatSpy(m_barseries, SIGNAL(labelsFormatChanged(QString)));
		103	QCOMPARE(m_barseries->labelsFormat(), QString());
		104
		105	QString format("(@value)");
		106	m_barseries->setLabelsFormat(format);
		107	TRY_COMPARE(labelsFormatSpy.count(), 1);
		108	QList<QVariant> arguments = labelsFormatSpy.takeFirst();
		109	QVERIFY(arguments.at(0).toString() == format);
		110	QCOMPARE(m_barseries->labelsFormat(), format);
		111
		112	m_barseries->setLabelsFormat(QString());
		113	TRY_COMPARE(labelsFormatSpy.count(), 1);
		114	arguments = labelsFormatSpy.takeFirst();
		115	QVERIFY(arguments.at(0).toString() == QString());
		116	QCOMPARE(m_barseries->labelsFormat(), QString());
		117	}
		118
		119	void tst_QStackedBarSeries::setLabelsPosition()
		120	{
		121	QSignalSpy labelsPositionSpy(m_barseries,
		122	SIGNAL(labelsPositionChanged(QAbstractBarSeries::LabelsPosition)));
		123	QCOMPARE(m_barseries->labelsPosition(), QStackedBarSeries::LabelsCenter);
		124
		125	m_barseries->setLabelsPosition(QStackedBarSeries::LabelsInsideEnd);
		126	TRY_COMPARE(labelsPositionSpy.count(), 1);
		127	QList<QVariant> arguments = labelsPositionSpy.takeFirst();
		128	QVERIFY(arguments.at(0).value<QAbstractBarSeries::LabelsPosition>()
		129	== QStackedBarSeries::LabelsInsideEnd);
		130	QCOMPARE(m_barseries->labelsPosition(), QStackedBarSeries::LabelsInsideEnd);
		131
		132	m_barseries->setLabelsPosition(QStackedBarSeries::LabelsInsideBase);
		133	TRY_COMPARE(labelsPositionSpy.count(), 1);
		134	arguments = labelsPositionSpy.takeFirst();
		135	QVERIFY(arguments.at(0).value<QAbstractBarSeries::LabelsPosition>()
		136	== QStackedBarSeries::LabelsInsideBase);
		137	QCOMPARE(m_barseries->labelsPosition(), QStackedBarSeries::LabelsInsideBase);
		138
		139	m_barseries->setLabelsPosition(QStackedBarSeries::LabelsOutsideEnd);
		140	TRY_COMPARE(labelsPositionSpy.count(), 1);
		141	arguments = labelsPositionSpy.takeFirst();
		142	QVERIFY(arguments.at(0).value<QAbstractBarSeries::LabelsPosition>()
		143	== QStackedBarSeries::LabelsOutsideEnd);
		144	QCOMPARE(m_barseries->labelsPosition(), QStackedBarSeries::LabelsOutsideEnd);
		145
		146	m_barseries->setLabelsPosition(QStackedBarSeries::LabelsCenter);
		147	TRY_COMPARE(labelsPositionSpy.count(), 1);
		148	arguments = labelsPositionSpy.takeFirst();
		149	QVERIFY(arguments.at(0).value<QAbstractBarSeries::LabelsPosition>()
		150	== QStackedBarSeries::LabelsCenter);
		151	QCOMPARE(m_barseries->labelsPosition(), QStackedBarSeries::LabelsCenter);
		152	}
		153
96	void tst_QStackedBarSeries::mouseclicked_data()	154	void tst_QStackedBarSeries::mouseclicked_data()
97	{	155	{
98		156

tests/auto/qxyseries/tst_qxyseries.cpp +72 0

@@ -81,6 +81,78 void tst_QXYSeries::seriesOpacity()
81	QCOMPARE(opacitySpy.count(), 3);	81	QCOMPARE(opacitySpy.count(), 3);
82	}	82	}
83		83
		84	void tst_QXYSeries::pointLabelsFormat()
		85	{
		86	QSignalSpy labelsFormatSpy(m_series, SIGNAL(pointLabelsFormatChanged(QString)));
		87	QCOMPARE(m_series->pointLabelsFormat(), QLatin1String("@xPoint, @yPoint"));
		88
		89	QString format("@yPoint");
		90	m_series->setPointLabelsFormat(format);
		91	TRY_COMPARE(labelsFormatSpy.count(), 1);
		92	QList<QVariant> arguments = labelsFormatSpy.takeFirst();
		93	QVERIFY(arguments.at(0).toString() == format);
		94
		95	m_series->setPointLabelsFormat(QString());
		96	TRY_COMPARE(labelsFormatSpy.count(), 1);
		97	arguments = labelsFormatSpy.takeFirst();
		98	QVERIFY(arguments.at(0).toString() == QString());
		99
		100	}
		101
		102	void tst_QXYSeries::pointLabelsVisible()
		103	{
		104	QSignalSpy labelsVisibleSpy(m_series, SIGNAL(pointLabelsVisibilityChanged(bool)));
		105	QCOMPARE(m_series->pointLabelsVisible(), false);
		106
		107	m_series->setPointLabelsVisible();
		108	QCOMPARE(m_series->pointLabelsVisible(), true);
		109	TRY_COMPARE(labelsVisibleSpy.count(), 1);
		110	QList<QVariant> arguments = labelsVisibleSpy.takeFirst();
		111	QVERIFY(arguments.at(0).toBool() == true);
		112
		113	m_series->setPointLabelsVisible(false);
		114	QCOMPARE(m_series->pointLabelsVisible(), false);
		115	TRY_COMPARE(labelsVisibleSpy.count(), 1);
		116	arguments = labelsVisibleSpy.takeFirst();
		117	QVERIFY(arguments.at(0).toBool() == false);
		118	}
		119
		120	void tst_QXYSeries::pointLabelsFont()
		121	{
		122	QFont defaultFont(m_series->pointLabelsFont());
		123	QSignalSpy labelsFontSpy(m_series, SIGNAL(pointLabelsFontChanged(QFont)));
		124
		125	QFont font("Times", 10);
		126	m_series->setPointLabelsFont(font);
		127	TRY_COMPARE(labelsFontSpy.count(), 1);
		128	QList<QVariant> arguments = labelsFontSpy.takeFirst();
		129	QVERIFY(arguments.at(0).value<QFont>() == font);
		130
		131	m_series->setPointLabelsFont(defaultFont);
		132	TRY_COMPARE(labelsFontSpy.count(), 1);
		133	arguments = labelsFontSpy.takeFirst();
		134	QVERIFY(arguments.at(0).value<QFont>() == defaultFont);
		135
		136	}
		137
		138	void tst_QXYSeries::pointLabelsColor()
		139	{
		140	QColor defaultColor(QPen().color());
		141	QSignalSpy labelsColorSpy(m_series, SIGNAL(pointLabelsColorChanged(QColor)));
		142	QCOMPARE(m_series->pointLabelsColor(), defaultColor);
		143
		144	QColor color(Qt::blue);
		145	m_series->setPointLabelsColor(color);
		146	TRY_COMPARE(labelsColorSpy.count(), 1);
		147	QList<QVariant> arguments = labelsColorSpy.takeFirst();
		148	QVERIFY(arguments.at(0).value<QColor>() == color);
		149
		150	m_series->setPointLabelsColor(defaultColor);
		151	TRY_COMPARE(labelsColorSpy.count(), 1);
		152	arguments = labelsColorSpy.takeFirst();
		153	QVERIFY(arguments.at(0).value<QColor>() == defaultColor);
		154	}
		155
84	void tst_QXYSeries::append_data()	156	void tst_QXYSeries::append_data()
85	{	157	{
86	QTest::addColumn< QList<QPointF> >("points");	158	QTest::addColumn< QList<QPointF> >("points");

tests/auto/qxyseries/tst_qxyseries.h +4 0

             private slots:
                 void seriesName();
                 void seriesVisible();
+                void pointLabelsFormat();
+                void pointLabelsVisible();
+                void pointLabelsFont();
+                void pointLabelsColor();
                 void seriesOpacity();
                 void oper_data();
                 void oper();

tests/qmlchartproperties/qml/qmlchartproperties/AreaChart.qml +11 -1

             ****************************************************************************/
             import QtQuick 1.0
-            import QtCommercial.Chart 1.1
+            import QtCommercial.Chart 1.4
             ChartView {
                 title: "area series"
                         XYPoint { x: 11; y: 0 }
                     }
+                    pointLabelsFormat: "@xPoint, @yPoint";
                     onNameChanged:              console.log(name + ".onNameChanged: " + name);
                     onVisibleChanged:           console.log(name + ".onVisibleChanged: " + visible);
                     onOpacityChanged:           console.log(name + ".onOpacityChanged: " + opacity);
                     onBorderWidthChanged:       console.log(name + ".onBorderChanged: " + borderWidth);
             //        onCountChanged:             console.log(name + ".onCountChanged: " + count);
                     onHovered:                  console.log("lineSeries.onHovered:" + point.x + "," + point.y + " " + state);
+                    onPointLabelsVisibilityChanged:  console.log(name + ".onPointLabelsVisibilityChanged: "
+                                                                 + visible);
+                    onPointLabelsFormatChanged:      console.log(name + ".onPointLabelsFormatChanged: "
+                                                                 + format);
+                    onPointLabelsFontChanged:        console.log(name + ".onPointLabelsFontChanged: "
+                                                                 + font.family);
+                    onPointLabelsColorChanged:       console.log(name + ".onPointLabelsColorChanged: "
+                                                                 + color);
                 }
                 AreaSeries {

tests/qmlchartproperties/qml/qmlchartproperties/AreaEditor.qml +26 0

@@ -55,6 +55,32 Flow {
55	onClicked: series.borderWidth -= 0.5;	55	onClicked: series.borderWidth -= 0.5;
56	}	56	}
57	Button {	57	Button {
		58	text: "point labels visible"
		59	onClicked: series.pointLabelsVisible = !series.pointLabelsVisible;
		60	}
		61	Button {
		62	text: "point labels format"
		63	onClicked: {
		64	if (series.pointLabelsFormat === "@xPoint, @yPoint")
		65	series.pointLabelsFormat = "(@xPoint)"
		66	else
		67	series.pointLabelsFormat = "@xPoint, @yPoint"
		68	}
		69	}
		70	Button {
		71	text: "point labels font"
		72	onClicked: {
		73	if (series.pointLabelsFont.family === "Times")
		74	series.pointLabelsFont.family = "Courier";
		75	else
		76	series.pointLabelsFont.family = "Times";
		77	}
		78	}
		79	Button {
		80	text: "point labels color"
		81	onClicked: series.pointLabelsColor = main.nextColor();
		82	}
		83	Button {
58	id: upperButton	84	id: upperButton
59	text: "upper series"	85	text: "upper series"
60	unpressedColor: "#79bd8f"	86	unpressedColor: "#79bd8f"

tests/qmlchartproperties/qml/qmlchartproperties/BarChart.qml +11 -1

             ****************************************************************************/
             import QtQuick 1.0
-            import QtCommercial.Chart 1.1
+            import QtCommercial.Chart 1.4
             ChartView {
                 title: "Bar series"
                 BarSeries {
                     id: mySeries
                     name: "bar"
+                    labelsFormat: "@value";
                     axisX: BarCategoryAxis { categories: ["2007", "2008", "2009", "2010", "2011", "2012" ] }
                     BarSet { label: "Bob"; values: [2, 2, 3, 4, 5, 6]
                         onClicked:                  console.log("barset.onClicked: " + index);
                                                             + " " + index);
                     onLabelsVisibleChanged:     console.log("barSeries.onLabelsVisibleChanged: " + series.labelsVisible);
                     onCountChanged:             console.log("barSeries.onCountChanged: " + count);
+                    onLabelsFormatChanged:      console.log("barSeries.onLabelsFormatChanged: " + format);
+                    onLabelsPositionChanged:    console.log("barSeries.onLabelsPositionChanged: " + series.labelsPosition);
+                    function changeLabelsPosition() {
+                        if (labelsPosition === BarSeries.LabelsCenter)
+                            labelsPosition = BarSeries.LabelsInsideEnd;
+                        else
+                            labelsPosition = BarSeries.LabelsCenter;
+                    }
                 }
             }

tests/qmlchartproperties/qml/qmlchartproperties/BarEditor.qml +13 0

@@ -172,6 +172,19 Row {
172	onClicked: series.labelsVisible = !series.labelsVisible;	172	onClicked: series.labelsVisible = !series.labelsVisible;
173	}	173	}
174	Button {	174	Button {
		175	text: "labels format"
		176	onClicked: {
		177	if (series.labelsFormat === "@value")
		178	series.labelsFormat = "@value%"
		179	else
		180	series.labelsFormat = "@value"
		181	}
		182	}
		183	Button {
		184	text: "labels position"
		185	onClicked: series.changeLabelsPosition();
		186	}
		187	Button {
175	text: "set 1 label color"	188	text: "set 1 label color"
176	onClicked: series.at(0).labelColor = main.nextColor();	189	onClicked: series.at(0).labelColor = main.nextColor();
177	}	190	}

tests/qmlchartproperties/qml/qmlchartproperties/HorizontalBarChart.qml +13 -1

             ****************************************************************************/
             import QtQuick 1.0
-            import QtCommercial.Chart 1.1
+            import QtCommercial.Chart 1.4
             ChartView {
                 title: "Bar series"
                 HorizontalBarSeries {
                     id: mySeries
                     name: "bar"
+                    labelsFormat: "@value";
                     axisY: BarCategoryAxis { categories: ["2007", "2008", "2009", "2010", "2011", "2012" ] }
                     BarSet { label: "Bob"; values: [2, 2, 3, 4, 5, 6]
                         onClicked:                  console.log("barset.onClicked: " + index);
                                                             + status + " " + index);
                     onLabelsVisibleChanged:     console.log("horizontalBarSeries.onLabelsVisibleChanged: " + series.labelsVisible);
                     onCountChanged:             console.log("horizontalBarSeries.onCountChanged: " + count);
+                    onLabelsFormatChanged:      console.log("horizontalBarSeries.onLabelsFormatChanged: "
+                                                            + format);
+                    onLabelsPositionChanged:    console.log("horizontalBarSeries.onLabelsPositionChanged: "
+                                                            + series.labelsPosition);
+                    function changeLabelsPosition() {
+                        if (labelsPosition === BarSeries.LabelsCenter)
+                            labelsPosition = BarSeries.LabelsInsideEnd;
+                        else
+                            labelsPosition = BarSeries.LabelsCenter;
+                    }
                 }
             }

tests/qmlchartproperties/qml/qmlchartproperties/HorizontalPercentBarChart.qml +14 -1

             ****************************************************************************/
             import QtQuick 1.0
-            import QtCommercial.Chart 1.1
+            import QtCommercial.Chart 1.4
             ChartView {
                 title: "Percent bar series"
                                                             + " " + status + " " + index);
                     onLabelsVisibleChanged:     console.log("horizontalPercentBarSeries.onLabelsVisibleChanged: " + series.labelsVisible);
                     onCountChanged:             console.log("horizontalPercentBarSeries.onCountChanged: " + count);
+                    onLabelsFormatChanged:      console.log(
+                                                    "horizontalPercentBarSeries.onLabelsFormatChanged: "
+                                                    + format);
+                    onLabelsPositionChanged:    console.log(
+                                                    "horizontalPercentBarSeries.onLabelsPositionChanged: "
+                                                    + series.labelsPosition);
+                    function changeLabelsPosition() {
+                        if (labelsPosition === BarSeries.LabelsCenter)
+                            labelsPosition = BarSeries.LabelsInsideEnd;
+                        else
+                            labelsPosition = BarSeries.LabelsCenter;
+                    }
                 }
             }

tests/qmlchartproperties/qml/qmlchartproperties/HorizontalStackedBarChart.qml +15 -1

             ****************************************************************************/
             import QtQuick 1.0
-            import QtCommercial.Chart 1.1
+            import QtCommercial.Chart 1.4
             ChartView {
                 title: "Stacked bar series"
                 HorizontalStackedBarSeries {
                     id: mySeries
                     name: "bar"
+                    labelsFormat: "@value";
                     axisY: BarCategoryAxis { categories: ["2007", "2008", "2009", "2010", "2011", "2012" ] }
                     BarSet { label: "Bob"; values: [2, 2, 3, 4, 5, 6]
                         onClicked:                  console.log("barset.onClicked: " + index);
                                                             + " " + status + " " + index);
                     onLabelsVisibleChanged:     console.log("horizontalStackedBarSeries.onLabelsVisibleChanged: " + series.labelsVisible);
                     onCountChanged:             console.log("horizontalStackedBarSeries.onCountChanged: " + count);
+                    onLabelsFormatChanged:      console.log(
+                                                    "horizontalStackedBarSeries.onLabelsFormatChanged: "
+                                                    + format);
+                    onLabelsPositionChanged:    console.log(
+                                                    "horizontalStackedBarSeries.onLabelsPositionChanged: "
+                                                    + series.labelsPosition);
+                    function changeLabelsPosition() {
+                        if (labelsPosition === BarSeries.LabelsCenter)
+                            labelsPosition = BarSeries.LabelsInsideEnd;
+                        else
+                            labelsPosition = BarSeries.LabelsCenter;
+                    }
                 }
             }

tests/qmlchartproperties/qml/qmlchartproperties/LineChart.qml +11 -1

             ****************************************************************************/
             import QtQuick 1.0
-            import QtCommercial.Chart 1.1
+            import QtCommercial.Chart 1.4
             ChartView {
                 property variant series: lineSeries
                     XYPoint { x: 3.4; y: 3.0 }
                     XYPoint { x: 4.1; y: 3.3 }
+                    pointLabelsFormat: "@xPoint, @yPoint";
                     onNameChanged:              console.log("lineSeries.onNameChanged: " + name);
                     onVisibleChanged:           console.log("lineSeries.onVisibleChanged: " + visible);
                     onOpacityChanged:           console.log(name + ".onOpacityChanged: " + opacity);
                     onCapStyleChanged:          console.log("lineSeries.onCapStyleChanged: " + capStyle);
                     onCountChanged:             console.log("lineSeries.onCountChanged: " + count);
                     onHovered:                  console.log("lineSeries.onHovered:" + point.x + "," + point.y + " " + state);
+                    onPointLabelsVisibilityChanged:  console.log("lineSeries.onPointLabelsVisibilityChanged: "
+                                                                 + visible);
+                    onPointLabelsFormatChanged:      console.log("lineSeries.onPointLabelsFormatChanged: "
+                                                                 + format);
+                    onPointLabelsFontChanged:        console.log("lineSeries.onPointLabelsFontChanged: "
+                                                                 + font.family);
+                    onPointLabelsColorChanged:       console.log("lineSeries.onPointLabelsColorChanged: "
+                                                                 + color);
                 }
                 LineSeries {

tests/qmlchartproperties/qml/qmlchartproperties/LineEditor.qml +26 0

@@ -72,6 +72,32 Flow {
72	onClicked: series.pointsVisible = !series.pointsVisible;	72	onClicked: series.pointsVisible = !series.pointsVisible;
73	}	73	}
74	Button {	74	Button {
		75	text: "point labels visible"
		76	onClicked: series.pointLabelsVisible = !series.pointLabelsVisible;
		77	}
		78	Button {
		79	text: "point labels format"
		80	onClicked: {
		81	if (series.pointLabelsFormat === "@xPoint, @yPoint")
		82	series.pointLabelsFormat = "(@xPoint)"
		83	else
		84	series.pointLabelsFormat = "@xPoint, @yPoint"
		85	}
		86	}
		87	Button {
		88	text: "point labels font"
		89	onClicked: {
		90	if (series.pointLabelsFont.family === "Times")
		91	series.pointLabelsFont.family = "Courier";
		92	else
		93	series.pointLabelsFont.family = "Times";
		94	}
		95	}
		96	Button {
		97	text: "point labels color"
		98	onClicked: series.pointLabelsColor = main.nextColor();
		99	}
		100	Button {
75	text: "append point"	101	text: "append point"
76	onClicked: series.append(series.count - 1, series.count - 1);	102	onClicked: series.append(series.count - 1, series.count - 1);
77	}	103	}

tests/qmlchartproperties/qml/qmlchartproperties/PercentBarChart.qml +13 -1

             ****************************************************************************/
             import QtQuick 1.0
-            import QtCommercial.Chart 1.1
+            import QtCommercial.Chart 1.4
             ChartView {
                 title: "Percent bar series"
                 PercentBarSeries {
                     id: mySeries
                     name: "bar"
+                    labelsFormat: "@value";
                     axisX: BarCategoryAxis { categories: ["2007", "2008", "2009", "2010", "2011", "2012" ] }
                     BarSet { label: "Bob"; values: [2, 2, 3, 4, 5, 6]
                                                             + " " + status + " " + index);
                     onLabelsVisibleChanged:     console.log("percentBarSeries.onLabelsVisibleChanged: " + series.labelsVisible);
                     onCountChanged:             console.log("percentBarSeries.onCountChanged: " + count);
+                    onLabelsFormatChanged:      console.log("percentBarSeries.onLabelsFormatChanged: "
+                                                            + format);
+                    onLabelsPositionChanged:    console.log("percentBarSeries.onLabelsPositionChanged: "
+                                                            + series.labelsPosition);
+                    function changeLabelsPosition() {
+                        if (labelsPosition === BarSeries.LabelsCenter)
+                            labelsPosition = BarSeries.LabelsInsideEnd;
+                        else
+                            labelsPosition = BarSeries.LabelsCenter;
+                    }
                 }
             }

tests/qmlchartproperties/qml/qmlchartproperties/ScatterChart.qml +11 -1

             ****************************************************************************/
             import QtQuick 1.0
-            import QtCommercial.Chart 1.1
+            import QtCommercial.Chart 1.4
             ChartView {
                 title: "scatter series"
                     XYPoint { x: 2.1; y: 1.3 }
                     XYPoint { x: 2.5; y: 2.1 }
+                    pointLabelsFormat: "@xPoint, @yPoint";
                     onNameChanged:              console.log("scatterSeries.onNameChanged: " + name);
                     onVisibleChanged:           console.log("scatterSeries.onVisibleChanged: " + visible);
                     onOpacityChanged:           console.log(name + ".onOpacityChanged: " + opacity);
                     onBorderColorChanged:       console.log("scatterSeries.onBorderColorChanged: " + borderColor);
                     onBorderWidthChanged:       console.log("scatterSeries.onBorderChanged: " + borderWidth);
                     onCountChanged:             console.log("scatterSeries.onCountChanged: " + count);
+                    onPointLabelsVisibilityChanged:  console.log("lineSeries.onPointLabelsVisibilityChanged: "
+                                                                 + visible);
+                    onPointLabelsFormatChanged:      console.log("lineSeries.onPointLabelsFormatChanged: "
+                                                                 + format);
+                    onPointLabelsFontChanged:        console.log("lineSeries.onPointLabelsFontChanged: "
+                                                                 + font.family);
+                    onPointLabelsColorChanged:       console.log("lineSeries.onPointLabelsColorChanged: "
+                                                                 + color);
                 }
                 ScatterSeries {

tests/qmlchartproperties/qml/qmlchartproperties/ScatterEditor.qml +26 0

@@ -67,6 +67,32 Flow {
67	onClicked: series.markerShape = ((series.markerShape + 1) % 2);	67	onClicked: series.markerShape = ((series.markerShape + 1) % 2);
68	}	68	}
69	Button {	69	Button {
		70	text: "point labels visible"
		71	onClicked: series.pointLabelsVisible = !series.pointLabelsVisible;
		72	}
		73	Button {
		74	text: "point labels format"
		75	onClicked: {
		76	if (series.pointLabelsFormat === "@xPoint, @yPoint")
		77	series.pointLabelsFormat = "(@xPoint)"
		78	else
		79	series.pointLabelsFormat = "@xPoint, @yPoint"
		80	}
		81	}
		82	Button {
		83	text: "point labels font"
		84	onClicked: {
		85	if (series.pointLabelsFont.family === "Times")
		86	series.pointLabelsFont.family = "Courier";
		87	else
		88	series.pointLabelsFont.family = "Times";
		89	}
		90	}
		91	Button {
		92	text: "point labels color"
		93	onClicked: series.pointLabelsColor = main.nextColor();
		94	}
		95	Button {
70	text: "append point"	96	text: "append point"
71	onClicked: series.append(series.count - 1, series.count - 1);	97	onClicked: series.append(series.count - 1, series.count - 1);
72	}	98	}

tests/qmlchartproperties/qml/qmlchartproperties/SplineChart.qml +11 -1

             ****************************************************************************/
             import QtQuick 1.0
-            import QtCommercial.Chart 1.1
+            import QtCommercial.Chart 1.4
             ChartView {
                 title: "spline series"
                     XYPoint { x: 3.4; y: 3.0 }
                     XYPoint { x: 4.1; y: 3.3 }
+                    pointLabelsFormat: "@xPoint, @yPoint";
                     onNameChanged:              console.log("splineSeries.onNameChanged: " + name);
                     onVisibleChanged:           console.log("splineSeries.onVisibleChanged: " + visible);
                     onOpacityChanged:           console.log(name + ".onOpacityChanged: " + opacity);
                     onStyleChanged:             console.log("splineSeries.onStyleChanged: " + style);
                     onCapStyleChanged:          console.log("splineSeries.onCapStyleChanged: " + capStyle);
                     onCountChanged:             console.log("splineSeries.onCountChanged: " + count);
+                    onPointLabelsVisibilityChanged:  console.log("splineSeries.onPointLabelsVisibilityChanged: "
+                                                                 + visible);
+                    onPointLabelsFormatChanged:      console.log("splineSeries.onPointLabelsFormatChanged: "
+                                                                 + format);
+                    onPointLabelsFontChanged:        console.log("splineSeries.onPointLabelsFontChanged: "
+                                                                 + font.family);
+                    onPointLabelsColorChanged:       console.log("splineSeries.onPointLabelsColorChanged: "
+                                                                 + color);
                 }
                 SplineSeries {

tests/qmlchartproperties/qml/qmlchartproperties/StackedBarChart.qml +13 -1

             ****************************************************************************/
             import QtQuick 1.0
-            import QtCommercial.Chart 1.1
+            import QtCommercial.Chart 1.4
             ChartView {
                 title: "Stacked bar series"
                 StackedBarSeries {
                     id: mySeries
                     name: "bar"
+                    labelsFormat: "@value";
                     axisX: BarCategoryAxis { categories: ["2007", "2008", "2009", "2010", "2011", "2012" ] }
                     BarSet { label: "Bob"; values: [2, 2, 3, 4, 5, 6]
                         onClicked:                  console.log("barset.onClicked: " + index);
                                                             + " " + status + " " + index);
                     onLabelsVisibleChanged:     console.log("stackedBarSeries.onLabelsVisibleChanged: " + series.labelsVisible);
                     onCountChanged:             console.log("stackedBarSeries.onCountChanged: " + count);
+                    onLabelsFormatChanged:      console.log("stackedBarSeries.onLabelsFormatChanged: "
+                                                            + format);
+                    onLabelsPositionChanged:    console.log("stackedBarSeries.onLabelsPositionChanged: "
+                                                            + series.labelsPosition);
+                    function changeLabelsPosition() {
+                        if (labelsPosition === BarSeries.LabelsCenter)
+                            labelsPosition = BarSeries.LabelsInsideEnd;
+                        else
+                            labelsPosition = BarSeries.LabelsCenter;
+                    }
                 }
             }

tests/quick2chartproperties/qml/quick2chartproperties/AreaChart.qml +11 -1

             ****************************************************************************/
             import QtQuick 2.0
-            import QtCommercial.Chart 1.1
+            import QtCommercial.Chart 1.4
             ChartView {
                 title: "area series"
                         XYPoint { x: 11; y: 0 }
                     }
+                    pointLabelsFormat: "@xPoint, @yPoint";
                     onNameChanged:              console.log(name + ".onNameChanged: " + name);
                     onVisibleChanged:           console.log(name + ".onVisibleChanged: " + visible);
                     onOpacityChanged:           console.log(name + ".onOpacityChanged: " + opacity);
                     onBorderWidthChanged:       console.log(name + ".onBorderChanged: " + borderWidth);
             //        onCountChanged:             console.log(name + ".onCountChanged: " + count);
                     onHovered:                  console.log("lineSeries.onHovered:" + point.x + "," + point.y + " " + state);
+                    onPointLabelsVisibilityChanged:  console.log(name + ".onPointLabelsVisibilityChanged: "
+                                                                 + visible);
+                    onPointLabelsFormatChanged:      console.log(name + ".onPointLabelsFormatChanged: "
+                                                                 + format);
+                    onPointLabelsFontChanged:        console.log(name + ".onPointLabelsFontChanged: "
+                                                                 + font.family);
+                    onPointLabelsColorChanged:       console.log(name + ".onPointLabelsColorChanged: "
+                                                                 + color);
                 }
                 AreaSeries {

tests/quick2chartproperties/qml/quick2chartproperties/AreaEditor.qml +26 0

@@ -55,6 +55,32 Flow {
55	onClicked: series.borderWidth -= 0.5;	55	onClicked: series.borderWidth -= 0.5;
56	}	56	}
57	Button {	57	Button {
		58	text: "point labels visible"
		59	onClicked: series.pointLabelsVisible = !series.pointLabelsVisible;
		60	}
		61	Button {
		62	text: "point labels format"
		63	onClicked: {
		64	if (series.pointLabelsFormat === "@xPoint, @yPoint")
		65	series.pointLabelsFormat = "(@xPoint)"
		66	else
		67	series.pointLabelsFormat = "@xPoint, @yPoint"
		68	}
		69	}
		70	Button {
		71	text: "point labels font"
		72	onClicked: {
		73	if (series.pointLabelsFont.family === "Times")
		74	series.pointLabelsFont.family = "Courier";
		75	else
		76	series.pointLabelsFont.family = "Times";
		77	}
		78	}
		79	Button {
		80	text: "point labels color"
		81	onClicked: series.pointLabelsColor = main.nextColor();
		82	}
		83	Button {
58	id: upperButton	84	id: upperButton
59	text: "upper series"	85	text: "upper series"
60	unpressedColor: "#79bd8f"	86	unpressedColor: "#79bd8f"

tests/quick2chartproperties/qml/quick2chartproperties/BarChart.qml +11 -1

             ****************************************************************************/
             import QtQuick 2.0
-            import QtCommercial.Chart 1.1
+            import QtCommercial.Chart 1.4
             ChartView {
                 title: "Bar series"
                 BarSeries {
                     id: mySeries
                     name: "bar"
+                    labelsFormat: "@value";
                     axisX: BarCategoryAxis { categories: ["2007", "2008", "2009", "2010", "2011", "2012" ] }
                     BarSet { label: "Bob"; values: [2, 2, 3, 4, 5, 6]
                         onClicked:                  console.log("barset.onClicked: " + index);
                                                             + " " + index);
                     onLabelsVisibleChanged:     console.log("barSeries.onLabelsVisibleChanged: " + series.labelsVisible);
                     onCountChanged:             console.log("barSeries.onCountChanged: " + count);
+                    onLabelsFormatChanged:      console.log("barSeries.onLabelsFormatChanged: " + format);
+                    onLabelsPositionChanged:    console.log("barSeries.onLabelsPositionChanged: " + series.labelsPosition);
+                    function changeLabelsPosition() {
+                        if (labelsPosition === BarSeries.LabelsCenter)
+                            labelsPosition = BarSeries.LabelsInsideEnd;
+                        else
+                            labelsPosition = BarSeries.LabelsCenter;
+                    }
                 }
             }

tests/quick2chartproperties/qml/quick2chartproperties/BarEditor.qml +13 0

@@ -172,6 +172,19 Row {
172	onClicked: series.labelsVisible = !series.labelsVisible;	172	onClicked: series.labelsVisible = !series.labelsVisible;
173	}	173	}
174	Button {	174	Button {
		175	text: "labels format"
		176	onClicked: {
		177	if (series.labelsFormat === "@value")
		178	series.labelsFormat = "@value%"
		179	else
		180	series.labelsFormat = "@value"
		181	}
		182	}
		183	Button {
		184	text: "labels position"
		185	onClicked: series.changeLabelsPosition();
		186	}
		187	Button {
175	text: "set 1 label color"	188	text: "set 1 label color"
176	onClicked: series.at(0).labelColor = main.nextColor();	189	onClicked: series.at(0).labelColor = main.nextColor();
177	}	190	}

tests/quick2chartproperties/qml/quick2chartproperties/HorizontalBarChart.qml +13 -1

             ****************************************************************************/
             import QtQuick 2.0
-            import QtCommercial.Chart 1.1
+            import QtCommercial.Chart 1.4
             ChartView {
                 title: "Bar series"
                 HorizontalBarSeries {
                     id: mySeries
                     name: "bar"
+                    labelsFormat: "@value";
                     axisY: BarCategoryAxis { categories: ["2007", "2008", "2009", "2010", "2011", "2012" ] }
                     BarSet { label: "Bob"; values: [2, 2, 3, 4, 5, 6]
                         onClicked:                  console.log("barset.onClicked: " + index);
                                                             + status + " " + index);
                     onLabelsVisibleChanged:     console.log("horizontalBarSeries.onLabelsVisibleChanged: " + series.labelsVisible);
                     onCountChanged:             console.log("horizontalBarSeries.onCountChanged: " + count);
+                    onLabelsFormatChanged:      console.log("horizontalBarSeries.onLabelsFormatChanged: "
+                                                            + format);
+                    onLabelsPositionChanged:    console.log("horizontalBarSeries.onLabelsPositionChanged: "
+                                                            + series.labelsPosition);
+                    function changeLabelsPosition() {
+                        if (labelsPosition === BarSeries.LabelsCenter)
+                            labelsPosition = BarSeries.LabelsInsideEnd;
+                        else
+                            labelsPosition = BarSeries.LabelsCenter;
+                    }
                 }
             }

tests/quick2chartproperties/qml/quick2chartproperties/HorizontalPercentBarChart.qml +15 -1

             ****************************************************************************/
             import QtQuick 2.0
-            import QtCommercial.Chart 1.1
+            import QtCommercial.Chart 1.4
             ChartView {
                 title: "Percent bar series"
                 HorizontalPercentBarSeries {
                     id: mySeries
                     name: "bar"
+                    labelsFormat: "@value";
                     axisY: BarCategoryAxis { categories: ["2007", "2008", "2009", "2010", "2011", "2012" ] }
                     BarSet { label: "Bob"; values: [2, 2, 3, 4, 5, 6]
                         onClicked:                  console.log("barset.onClicked: " + index);
                                                             + " " + status + " " + index);
                     onLabelsVisibleChanged:     console.log("horizontalPercentBarSeries.onLabelsVisibleChanged: " + series.labelsVisible);
                     onCountChanged:             console.log("horizontalPercentBarSeries.onCountChanged: " + count);
+                    onLabelsFormatChanged:      console.log(
+                                                    "horizontalPercentBarSeries.onLabelsFormatChanged: "
+                                                    + format);
+                    onLabelsPositionChanged:    console.log(
+                                                    "horizontalPercentBarSeries.onLabelsPositionChanged: "
+                                                    + series.labelsPosition);
+                    function changeLabelsPosition() {
+                        if (labelsPosition === BarSeries.LabelsCenter)
+                            labelsPosition = BarSeries.LabelsInsideEnd;
+                        else
+                            labelsPosition = BarSeries.LabelsCenter;
+                    }
                 }
             }

tests/quick2chartproperties/qml/quick2chartproperties/HorizontalStackedBarChart.qml +15 -1

             ****************************************************************************/
             import QtQuick 2.0
-            import QtCommercial.Chart 1.1
+            import QtCommercial.Chart 1.4
             ChartView {
                 title: "Stacked bar series"
                 HorizontalStackedBarSeries {
                     id: mySeries
                     name: "bar"
+                    labelsFormat: "@value";
                     axisY: BarCategoryAxis { categories: ["2007", "2008", "2009", "2010", "2011", "2012" ] }
                     BarSet { label: "Bob"; values: [2, 2, 3, 4, 5, 6]
                         onClicked:                  console.log("barset.onClicked: " + index);
                                                             + " " + status + " " + index);
                     onLabelsVisibleChanged:     console.log("horizontalStackedBarSeries.onLabelsVisibleChanged: " + series.labelsVisible);
                     onCountChanged:             console.log("horizontalStackedBarSeries.onCountChanged: " + count);
+                    onLabelsFormatChanged:      console.log(
+                                                    "horizontalStackedBarSeries.onLabelsFormatChanged: "
+                                                    + format);
+                    onLabelsPositionChanged:    console.log(
+                                                    "horizontalStackedBarSeries.onLabelsPositionChanged: "
+                                                    + series.labelsPosition);
+                    function changeLabelsPosition() {
+                        if (labelsPosition === BarSeries.LabelsCenter)
+                            labelsPosition = BarSeries.LabelsInsideEnd;
+                        else
+                            labelsPosition = BarSeries.LabelsCenter;
+                    }
                 }
             }

tests/quick2chartproperties/qml/quick2chartproperties/LineChart.qml +11 -1

             ****************************************************************************/
             import QtQuick 2.0
-            import QtCommercial.Chart 1.1
+            import QtCommercial.Chart 1.4
             ChartView {
                 property variant series: lineSeries
                     XYPoint { x: 3.4; y: 3.0 }
                     XYPoint { x: 4.1; y: 3.3 }
+                    pointLabelsFormat: "@xPoint, @yPoint";
                     onNameChanged:              console.log("lineSeries.onNameChanged: " + name);
                     onVisibleChanged:           console.log("lineSeries.onVisibleChanged: " + visible);
                     onOpacityChanged:           console.log(name + ".onOpacityChanged: " + opacity);
                     onCapStyleChanged:          console.log("lineSeries.onCapStyleChanged: " + capStyle);
                     onCountChanged:             console.log("lineSeries.onCountChanged: " + count);
                     onHovered:                  console.log("lineSeries.onHovered:" + point.x + "," + point.y + " " + state);
+                    onPointLabelsVisibilityChanged:  console.log("lineSeries.onPointLabelsVisibilityChanged: "
+                                                                 + visible);
+                    onPointLabelsFormatChanged:      console.log("lineSeries.onPointLabelsFormatChanged: "
+                                                                 + format);
+                    onPointLabelsFontChanged:        console.log("lineSeries.onPointLabelsFontChanged: "
+                                                                 + font.family);
+                    onPointLabelsColorChanged:       console.log("lineSeries.onPointLabelsColorChanged: "
+                                                                 + color);
                 }
                 LineSeries {

tests/quick2chartproperties/qml/quick2chartproperties/LineEditor.qml +26 0

@@ -72,6 +72,32 Flow {
72	onClicked: series.pointsVisible = !series.pointsVisible;	72	onClicked: series.pointsVisible = !series.pointsVisible;
73	}	73	}
74	Button {	74	Button {
		75	text: "point labels visible"
		76	onClicked: series.pointLabelsVisible = !series.pointLabelsVisible;
		77	}
		78	Button {
		79	text: "point labels format"
		80	onClicked: {
		81	if (series.pointLabelsFormat === "@xPoint, @yPoint")
		82	series.pointLabelsFormat = "(@xPoint)"
		83	else
		84	series.pointLabelsFormat = "@xPoint, @yPoint"
		85	}
		86	}
		87	Button {
		88	text: "point labels font"
		89	onClicked: {
		90	if (series.pointLabelsFont.family === "Times")
		91	series.pointLabelsFont.family = "Courier";
		92	else
		93	series.pointLabelsFont.family = "Times";
		94	}
		95	}
		96	Button {
		97	text: "point labels color"
		98	onClicked: series.pointLabelsColor = main.nextColor();
		99	}
		100	Button {
75	text: "append point"	101	text: "append point"
76	onClicked: series.append(series.count - 1, series.count - 1);	102	onClicked: series.append(series.count - 1, series.count - 1);
77	}	103	}

tests/quick2chartproperties/qml/quick2chartproperties/PercentBarChart.qml +13 -1

             ****************************************************************************/
             import QtQuick 2.0
-            import QtCommercial.Chart 1.1
+            import QtCommercial.Chart 1.4
             ChartView {
                 title: "Percent bar series"
                 PercentBarSeries {
                     id: mySeries
                     name: "bar"
+                    labelsFormat: "@value";
                     axisX: BarCategoryAxis { categories: ["2007", "2008", "2009", "2010", "2011", "2012" ] }
                     BarSet { label: "Bob"; values: [2, 2, 3, 4, 5, 6]
                                                             + " " + status + " " + index);
                     onLabelsVisibleChanged:     console.log("percentBarSeries.onLabelsVisibleChanged: " + series.labelsVisible);
                     onCountChanged:             console.log("percentBarSeries.onCountChanged: " + count);
+                    onLabelsFormatChanged:      console.log("percentBarSeries.onLabelsFormatChanged: "
+                                                            + format);
+                    onLabelsPositionChanged:    console.log("percentBarSeries.onLabelsPositionChanged: "
+                                                            + series.labelsPosition);
+                    function changeLabelsPosition() {
+                        if (labelsPosition === BarSeries.LabelsCenter)
+                            labelsPosition = BarSeries.LabelsInsideEnd;
+                        else
+                            labelsPosition = BarSeries.LabelsCenter;
+                    }
                 }
             }

tests/quick2chartproperties/qml/quick2chartproperties/ScatterChart.qml +11 -1

             ****************************************************************************/
             import QtQuick 2.0
-            import QtCommercial.Chart 1.1
+            import QtCommercial.Chart 1.4
             ChartView {
                 title: "scatter series"
                     XYPoint { x: 2.1; y: 1.3 }
                     XYPoint { x: 2.5; y: 2.1 }
+                    pointLabelsFormat: "@xPoint, @yPoint";
                     onNameChanged:              console.log("scatterSeries.onNameChanged: " + name);
                     onVisibleChanged:           console.log("scatterSeries.onVisibleChanged: " + visible);
                     onOpacityChanged:           console.log(name + ".onOpacityChanged: " + opacity);
                     onBorderColorChanged:       console.log("scatterSeries.onBorderColorChanged: " + borderColor);
                     onBorderWidthChanged:       console.log("scatterSeries.onBorderChanged: " + borderWidth);
                     onCountChanged:             console.log("scatterSeries.onCountChanged: " + count);
+                    onPointLabelsVisibilityChanged:  console.log("lineSeries.onPointLabelsVisibilityChanged: "
+                                                                 + visible);
+                    onPointLabelsFormatChanged:      console.log("lineSeries.onPointLabelsFormatChanged: "
+                                                                 + format);
+                    onPointLabelsFontChanged:        console.log("lineSeries.onPointLabelsFontChanged: "
+                                                                 + font.family);
+                    onPointLabelsColorChanged:       console.log("lineSeries.onPointLabelsColorChanged: "
+                                                                 + color);
                 }
                 ScatterSeries {

tests/quick2chartproperties/qml/quick2chartproperties/ScatterEditor.qml +26 0

@@ -67,6 +67,32 Flow {
67	onClicked: series.markerShape = ((series.markerShape + 1) % 2);	67	onClicked: series.markerShape = ((series.markerShape + 1) % 2);
68	}	68	}
69	Button {	69	Button {
		70	text: "point labels visible"
		71	onClicked: series.pointLabelsVisible = !series.pointLabelsVisible;
		72	}
		73	Button {
		74	text: "point labels format"
		75	onClicked: {
		76	if (series.pointLabelsFormat === "@xPoint, @yPoint")
		77	series.pointLabelsFormat = "(@xPoint)"
		78	else
		79	series.pointLabelsFormat = "@xPoint, @yPoint"
		80	}
		81	}
		82	Button {
		83	text: "point labels font"
		84	onClicked: {
		85	if (series.pointLabelsFont.family === "Times")
		86	series.pointLabelsFont.family = "Courier";
		87	else
		88	series.pointLabelsFont.family = "Times";
		89	}
		90	}
		91	Button {
		92	text: "point labels color"
		93	onClicked: series.pointLabelsColor = main.nextColor();
		94	}
		95	Button {
70	text: "append point"	96	text: "append point"
71	onClicked: series.append(series.count - 1, series.count - 1);	97	onClicked: series.append(series.count - 1, series.count - 1);
72	}	98	}

tests/quick2chartproperties/qml/quick2chartproperties/SplineChart.qml +11 -1

             ****************************************************************************/
             import QtQuick 2.0
-            import QtCommercial.Chart 1.1
+            import QtCommercial.Chart 1.4
             ChartView {
                 title: "spline series"
                     XYPoint { x: 3.4; y: 3.0 }
                     XYPoint { x: 4.1; y: 3.3 }
+                    pointLabelsFormat: "@xPoint, @yPoint";
                     onNameChanged:              console.log("splineSeries.onNameChanged: " + name);
                     onVisibleChanged:           console.log("splineSeries.onVisibleChanged: " + visible);
                     onOpacityChanged:           console.log(name + ".onOpacityChanged: " + opacity);
                     onStyleChanged:             console.log("splineSeries.onStyleChanged: " + style);
                     onCapStyleChanged:          console.log("splineSeries.onCapStyleChanged: " + capStyle);
                     onCountChanged:             console.log("splineSeries.onCountChanged: " + count);
+                    onPointLabelsVisibilityChanged:  console.log("splineSeries.onPointLabelsVisibilityChanged: "
+                                                                 + visible);
+                    onPointLabelsFormatChanged:      console.log("splineSeries.onPointLabelsFormatChanged: "
+                                                                 + format);
+                    onPointLabelsFontChanged:        console.log("splineSeries.onPointLabelsFontChanged: "
+                                                                 + font.family);
+                    onPointLabelsColorChanged:       console.log("splineSeries.onPointLabelsColorChanged: "
+                                                                 + color);
                 }
                 SplineSeries {

tests/quick2chartproperties/qml/quick2chartproperties/StackedBarChart.qml +13 -1

             ****************************************************************************/
             import QtQuick 2.0
-            import QtCommercial.Chart 1.1
+            import QtCommercial.Chart 1.4
             ChartView {
                 title: "Stacked bar series"
                 StackedBarSeries {
                     id: mySeries
                     name: "bar"
+                    labelsFormat: "@value";
                     axisX: BarCategoryAxis { categories: ["2007", "2008", "2009", "2010", "2011", "2012" ] }
                     BarSet { label: "Bob"; values: [2, 2, 3, 4, 5, 6]
                         onClicked:                  console.log("barset.onClicked: " + index);
                                                             + " " + status + " " + index);
                     onLabelsVisibleChanged:     console.log("stackedBarSeries.onLabelsVisibleChanged: " + series.labelsVisible);
                     onCountChanged:             console.log("stackedBarSeries.onCountChanged: " + count);
+                    onLabelsFormatChanged:      console.log("stackedBarSeries.onLabelsFormatChanged: "
+                                                            + format);
+                    onLabelsPositionChanged:    console.log("stackedBarSeries.onLabelsPositionChanged: "
+                                                            + series.labelsPosition);
+                    function changeLabelsPosition() {
+                        if (labelsPosition === BarSeries.LabelsCenter)
+                            labelsPosition = BarSeries.LabelsInsideEnd;
+                        else
+                            labelsPosition = BarSeries.LabelsCenter;
+                    }
                 }
             }

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