HG_REPOSITORIES/LPP/INSTRUMENTATION/USERS/JEANDET/qtcharts Commit - r2539:74f3dbde7a75

Added HTML support for various text items...

Miikka Heikkinen -

r2539:74f3dbde7a75

parent child

Context file:

r2539:74f3dbde7a75

Expand all files

src/axis/barcategoryaxis/chartbarcategoryaxisx.cpp +2 -2

                 switch (which) {
                     case Qt::MinimumSize: {
-                        QRectF boundingRect = textBoundingRect(axis()->labelsFont(), "...", axis()->labelsAngle());
+                        QRectF boundingRect = ChartPresenter::textBoundingRect(axis()->labelsFont(), "...", axis()->labelsAngle());
                         height = boundingRect.height() + labelPadding() + base.height() + 1.0;
                         sh = QSizeF(width, height);
                         break;
                     case Qt::PreferredSize:{
                         qreal labelHeight = 0.0;
                         foreach (const QString& s, ticksList) {
-                            QRectF rect = textBoundingRect(axis()->labelsFont(), s, axis()->labelsAngle());
+                            QRectF rect = ChartPresenter::textBoundingRect(axis()->labelsFont(), s, axis()->labelsAngle());
                             labelHeight = qMax(rect.height(), labelHeight);
                         }
                         height = labelHeight + labelPadding() + base.height() + 1.0;

src/axis/barcategoryaxis/chartbarcategoryaxisy.cpp +2 -2

                 switch (which) {
                     case Qt::MinimumSize: {
-                        QRectF boundingRect = textBoundingRect(axis()->labelsFont(), "...", axis()->labelsAngle());
+                        QRectF boundingRect = ChartPresenter::textBoundingRect(axis()->labelsFont(), "...", axis()->labelsAngle());
                         width = boundingRect.width() + labelPadding() + base.width() + 1.0;
                         if (base.width() > 0.0)
                             width += labelPadding();
                     case Qt::PreferredSize:{
                         qreal labelWidth = 0.0;
                         foreach (const QString& s, ticksList) {
-                            QRectF rect = textBoundingRect(axis()->labelsFont(), s, axis()->labelsAngle());
+                            QRectF rect = ChartPresenter::textBoundingRect(axis()->labelsFont(), s, axis()->labelsAngle());
                             labelWidth = qMax(rect.width(), labelWidth);
                         }
                         width = labelWidth + labelPadding() + base.width() + 1.0;

src/axis/cartesianchartaxis.cpp +5 -7

                 for (int i = 0; i < count; ++i) {
                     QGraphicsLineItem *arrow = new QGraphicsLineItem(this);
                     QGraphicsLineItem *grid = new QGraphicsLineItem(this);
-                    QGraphicsSimpleTextItem *label = new QGraphicsSimpleTextItem(this);
+                    QGraphicsTextItem *label = new QGraphicsTextItem(this);
-                    QGraphicsSimpleTextItem *title = titleItem();
+                    QGraphicsTextItem *title = titleItem();
                     arrow->setPen(axis()->linePen());
                     grid->setPen(axis()->gridLinePen());
                     label->setFont(axis()->labelsFont());
-                    label->setPen(axis()->labelsPen());
+                    label->setDefaultTextColor(axis()->labelsBrush().color());
-                    label->setBrush(axis()->labelsBrush());
                     label->setRotation(axis()->labelsAngle());
                     title->setFont(axis()->titleFont());
-                    title->setPen(axis()->titlePen());
+                    title->setDefaultTextColor(axis()->titleBrush().color());
-                    title->setBrush(axis()->titleBrush());
+                    title->setHtml(axis()->titleText());
-                    title->setText(axis()->titleText());
                     arrowGroup()->addToGroup(arrow);
                     gridGroup()->addToGroup(grid);
                     labelGroup()->addToGroup(label);

src/axis/categoryaxis/chartcategoryaxisx.cpp +2 -2

                 switch (which) {
                 case Qt::MinimumSize: {
-                    QRectF boundingRect = textBoundingRect(axis()->labelsFont(), "...", axis()->labelsAngle());
+                    QRectF boundingRect = ChartPresenter::textBoundingRect(axis()->labelsFont(), "...", axis()->labelsAngle());
                     height = boundingRect.height() + labelPadding() + base.height() + 1.0;
                     sh = QSizeF(width, height);
                     break;
                 case Qt::PreferredSize: {
                     qreal labelHeight = 0.0;
                     foreach (const QString& s, ticksList) {
-                        QRectF rect = textBoundingRect(axis()->labelsFont(), s, axis()->labelsAngle());
+                        QRectF rect = ChartPresenter::textBoundingRect(axis()->labelsFont(), s, axis()->labelsAngle());
                         labelHeight = qMax(rect.height(), labelHeight);
                     }
                     height = labelHeight + labelPadding() + base.height() + 1.0;

src/axis/categoryaxis/chartcategoryaxisy.cpp +2 -2

                 switch (which) {
                 case Qt::MinimumSize: {
-                    QRectF boundingRect = textBoundingRect(axis()->labelsFont(), "...", axis()->labelsAngle());
+                    QRectF boundingRect = ChartPresenter::textBoundingRect(axis()->labelsFont(), "...", axis()->labelsAngle());
                     width = boundingRect.width() + labelPadding() + base.width() + 1.0;
                     sh = QSizeF(width, height);
                     break;
                 case Qt::PreferredSize: {
                     qreal labelWidth = 0.0;
                     foreach (const QString& s, ticksList) {
-                        QRectF rect = textBoundingRect(axis()->labelsFont(), s, axis()->labelsAngle());
+                        QRectF rect = ChartPresenter::textBoundingRect(axis()->labelsFont(), s, axis()->labelsAngle());
                         labelWidth = qMax(rect.width(), labelWidth);
                     }
                     width = labelWidth + labelPadding() + base.width() + 1.0;

src/axis/chartaxiselement.cpp +51 -83

@@ -27,14 +27,15
27		27
28	QTCOMMERCIALCHART_BEGIN_NAMESPACE	28	QTCOMMERCIALCHART_BEGIN_NAMESPACE
29		29
30	QGraphicsSimpleTextItem *dummyTextItem = 0;	30	static const char labelFormatMatchString = "%[\\-\\+#\\s\\d\\.lhjztL]([dicuoxfegXFEG])";
31	class StaticDeleter	31	static QRegExp *labelFormatMatcher = 0;
		32	class StaticLabelFormatMatcherDeleter
32	{	33	{
33	public:	34	public:
34	StaticDeleter() {}	35	StaticLabelFormatMatcherDeleter() {}
35	~StaticDeleter() { delete ~~dummyTextItem~~; }	36	~StaticLabelFormatMatcherDeleter() { delete labelFormatMatcher; }
36	};	37	};
37	StaticDeleter staticDeleter;	38	StaticLabelFormatMatcherDeleter staticLabelFormatMatcherDeleter;
38		39
39	ChartAxisElement::ChartAxisElement(QAbstractAxis axis, QGraphicsItem item, bool intervalAxis)	40	ChartAxisElement::ChartAxisElement(QAbstractAxis axis, QGraphicsItem item, bool intervalAxis)
40	: ChartElement(item),	41	: ChartElement(item),
@@ -44,13 +45,11 ChartAxisElement::ChartAxisElement(QAbstractAxis axis, QGraphicsItem item, boo
44	m_arrow(new QGraphicsItemGroup(item)),	45	m_arrow(new QGraphicsItemGroup(item)),
45	m_shades(new QGraphicsItemGroup(item)),	46	m_shades(new QGraphicsItemGroup(item)),
46	m_labels(new QGraphicsItemGroup(item)),	47	m_labels(new QGraphicsItemGroup(item)),
47	m_title(new QGraphics~~Simple~~TextItem(item)),	48	m_title(new QGraphicsTextItem(item)),
48	m_intervalAxis(intervalAxis)	49	m_intervalAxis(intervalAxis)
49		50
50	{	51	{
51	//initial initialization	52	//initial initialization
52	if (!dummyTextItem)
53	dummyTextItem = new QGraphicsSimpleTextItem;
54	m_arrow->setHandlesChildEvents(false);	53	m_arrow->setHandlesChildEvents(false);
55	m_arrow->setZValue(ChartPresenter::AxisZValue);	54	m_arrow->setZValue(ChartPresenter::AxisZValue);
56	m_labels->setZValue(ChartPresenter::AxisZValue);	55	m_labels->setZValue(ChartPresenter::AxisZValue);
@@ -130,20 +129,19 void ChartAxisElement::handleLabelsAngleChanged(int angle)
130		129
131	void ChartAxisElement::handleLabelsPenChanged(const QPen &pen)	130	void ChartAxisElement::handleLabelsPenChanged(const QPen &pen)
132	{	131	{
133	foreach (QGraphicsItem *item, m_labels->childItems())	132	Q_UNUSED(pen)
134	static_cast<QGraphicsSimpleTextItem *>(item)->setPen(pen);
135	}	133	}
136		134
137	void ChartAxisElement::handleLabelsBrushChanged(const QBrush &brush)	135	void ChartAxisElement::handleLabelsBrushChanged(const QBrush &brush)
138	{	136	{
139	foreach (QGraphicsItem *item, m_labels->childItems())	137	foreach (QGraphicsItem *item, m_labels->childItems())
140	static_cast<QGraphics~~Simple~~TextItem *>(item)->set~~Brush~~(brush);	138	static_cast<QGraphicsTextItem *>(item)->setDefaultTextColor(brush.color());
141	}	139	}
142		140
143	void ChartAxisElement::handleLabelsFontChanged(const QFont &font)	141	void ChartAxisElement::handleLabelsFontChanged(const QFont &font)
144	{	142	{
145	foreach (QGraphicsItem *item, m_labels->childItems())	143	foreach (QGraphicsItem *item, m_labels->childItems())
146	static_cast<QGraphics~~Simple~~TextItem *>(item)->setFont(font);	144	static_cast<QGraphicsTextItem *>(item)->setFont(font);
147	QGraphicsLayoutItem::updateGeometry();	145	QGraphicsLayoutItem::updateGeometry();
148	presenter()->layout()->invalidate();	146	presenter()->layout()->invalidate();
149	}	147	}
@@ -152,17 +150,17 void ChartAxisElement::handleTitleTextChanged(const QString &title)
152	{	150	{
153	QGraphicsLayoutItem::updateGeometry();	151	QGraphicsLayoutItem::updateGeometry();
154	presenter()->layout()->invalidate();	152	presenter()->layout()->invalidate();
155	m_title->set~~Text~~(title);	153	m_title->setHtml(title);
156	}	154	}
157		155
158	void ChartAxisElement::handleTitlePenChanged(const QPen &pen)	156	void ChartAxisElement::handleTitlePenChanged(const QPen &pen)
159	{	157	{
160	m_title->setPen(pen);	158	Q_UNUSED(pen)
161	}	159	}
162		160
163	void ChartAxisElement::handleTitleBrushChanged(const QBrush &brush)	161	void ChartAxisElement::handleTitleBrushChanged(const QBrush &brush)
164	{	162	{
165	m_title->set~~Brush~~(brush);	163	m_title->setDefaultTextColor(brush.color());
166	}	164	}
167		165
168	void ChartAxisElement::handleTitleFontChanged(const QFont &font)	166	void ChartAxisElement::handleTitleFontChanged(const QFont &font)
@@ -194,44 +192,6 void ChartAxisElement::handleVisibleChanged(bool visible)
194	if (presenter()) presenter()->layout()->invalidate();	192	if (presenter()) presenter()->layout()->invalidate();
195	}	193	}
196		194
197	QRectF ChartAxisElement::textBoundingRect(const QFont &font, const QString &text, qreal angle) const
198	{
199	dummyTextItem->setFont(font);
200	dummyTextItem->setText(text);
201	QRectF boundingRect = dummyTextItem->boundingRect();
202
203	// Take rotation into account
204	if (angle) {
205	QTransform transform;
206	transform.rotate(angle);
207	boundingRect = transform.mapRect(boundingRect);
208	}
209
210	return boundingRect;
211	}
212
213	// boundingRect parameter returns the rotated bounding rect of the text
214	QString ChartAxisElement::truncatedText(const QFont &font, const QString &text, qreal angle,
215	qreal maxSize, Qt::Orientation constraintOrientation,
216	QRectF &boundingRect) const
217	{
218	QString truncatedString(text);
219	boundingRect = textBoundingRect(font, truncatedString, angle);
220	qreal checkDimension = ((constraintOrientation == Qt::Horizontal)
221	? boundingRect.width() : boundingRect.height());
222	if (checkDimension > maxSize) {
223	truncatedString.append("...");
224	while (checkDimension > maxSize && truncatedString.length() > 3) {
225	truncatedString.remove(truncatedString.length() - 4, 1);
226	boundingRect = textBoundingRect(font, truncatedString, angle);
227	checkDimension = ((constraintOrientation == Qt::Horizontal)
228	? boundingRect.width() : boundingRect.height());
229	}
230	}
231
232	return truncatedString;
233	}
234
235	void ChartAxisElement::handleRangeChanged(qreal min, qreal max)	195	void ChartAxisElement::handleRangeChanged(qreal min, qreal max)
236	{	196	{
237	Q_UNUSED(min);	197	Q_UNUSED(min);
@@ -270,6 +230,32 qreal ChartAxisElement::max() const
270	return m_axis->d_ptr->max();	230	return m_axis->d_ptr->max();
271	}	231	}
272		232
		233	static void appendFormattedLabel(const QString &capStr, const QByteArray &array,
		234	QStringList &labels, qreal value)
		235	{
		236	if (capStr.isEmpty()) {
		237	labels << QString();
		238	} else if (capStr.at(0) == QLatin1Char('d')
		239	\|\| capStr.at(0) == QLatin1Char('i')
		240	\|\| capStr.at(0) == QLatin1Char('c')) {
		241	labels << QString().sprintf(array, (qint64)value);
		242	} else if (capStr.at(0) == QLatin1Char('u')
		243	\|\| capStr.at(0) == QLatin1Char('o')
		244	\|\| capStr.at(0) == QLatin1Char('x')
		245	\|\| capStr.at(0) == QLatin1Char('X')) {
		246	labels << QString().sprintf(array, (quint64)value);
		247	} else if (capStr.at(0) == QLatin1Char('f')
		248	\|\| capStr.at(0) == QLatin1Char('F')
		249	\|\| capStr.at(0) == QLatin1Char('e')
		250	\|\| capStr.at(0) == QLatin1Char('E')
		251	\|\| capStr.at(0) == QLatin1Char('g')
		252	\|\| capStr.at(0) == QLatin1Char('G')) {
		253	labels << QString().sprintf(array, value);
		254	} else {
		255	labels << QString();
		256	}
		257	}
		258
273	QStringList ChartAxisElement::createValueLabels(qreal min, qreal max, int ticks, const QString &format)	259	QStringList ChartAxisElement::createValueLabels(qreal min, qreal max, int ticks, const QString &format)
274	{	260	{
275	QStringList labels;	261	QStringList labels;
@@ -287,23 +273,14 QStringList ChartAxisElement::createValueLabels(qreal min, qreal max, int ticks,
287	}	273	}
288	} else {	274	} else {
289	QByteArray array = format.toLatin1();	275	QByteArray array = format.toLatin1();
		276	QString capStr;
		277	if (!labelFormatMatcher)
		278	labelFormatMatcher = new QRegExp(labelFormatMatchString);
		279	if (labelFormatMatcher->indexIn(format, 0) != -1)
		280	capStr = labelFormatMatcher->cap(1);
290	for (int i = 0; i < ticks; i++) {	281	for (int i = 0; i < ticks; i++) {
291	qreal value = min + (i * (max - min) / (ticks - 1));	282	qreal value = min + (i * (max - min) / (ticks - 1));
292	if (format.contains("d")	283	appendFormattedLabel(capStr, array, labels, value);
293	\|\| format.contains("i")
294	\|\| format.contains("c")) {
295	labels << QString().sprintf(array, (qint64)value);
296	} else if (format.contains("u")
297	\|\| format.contains("o")
298	\|\| format.contains("x", Qt::CaseInsensitive)) {
299	labels << QString().sprintf(array, (quint64)value);
300	} else if (format.contains("f", Qt::CaseInsensitive)
301	\|\| format.contains("e", Qt::CaseInsensitive)
302	\|\| format.contains("g", Qt::CaseInsensitive)) {
303	labels << QString().sprintf(array, value);
304	} else {
305	labels << QString();
306	}
307	}	284	}
308	}	285	}
309		286
@@ -335,23 +312,14 QStringList ChartAxisElement::createLogValueLabels(qreal min, qreal max, qreal b
335	}	312	}
336	} else {	313	} else {
337	QByteArray array = format.toLatin1();	314	QByteArray array = format.toLatin1();
		315	QString capStr;
		316	if (!labelFormatMatcher)
		317	labelFormatMatcher = new QRegExp(labelFormatMatchString);
		318	if (labelFormatMatcher->indexIn(format, 0) != -1)
		319	capStr = labelFormatMatcher->cap(1);
338	for (int i = firstTick; i < ticks + firstTick; i++) {	320	for (int i = firstTick; i < ticks + firstTick; i++) {
339	qreal value = qPow(base, i);	321	qreal value = qPow(base, i);
340	if (format.contains("d")	322	appendFormattedLabel(capStr, array, labels, value);
341	\|\| format.contains("i")
342	\|\| format.contains("c")) {
343	labels << QString().sprintf(array, (qint64)value);
344	} else if (format.contains("u")
345	\|\| format.contains("o")
346	\|\| format.contains("x", Qt::CaseInsensitive)) {
347	labels << QString().sprintf(array, (quint64)value);
348	} else if (format.contains("f", Qt::CaseInsensitive)
349	\|\| format.contains("e", Qt::CaseInsensitive)
350	\|\| format.contains("g", Qt::CaseInsensitive)) {
351	labels << QString().sprintf(array, value);
352	} else {
353	labels << QString();
354	}
355	}	323	}
356	}	324	}
357		325

src/axis/chartaxiselement_p.h +2 -6

                 QRectF axisGeometry() const { return m_axisRect; }
                 void setAxisGeometry(const QRectF &axisGeometry) { m_axisRect = axisGeometry; }
-                QRectF textBoundingRect(const QFont &font, const QString &text, qreal angle = 0.0) const;
-                QString truncatedText(const QFont &font, const QString &text, qreal angle, qreal maxSize,
-                                      Qt::Orientation constraintOrientation, QRectF &boundingRect) const;
                 void axisSelected();
                 //this flag indicates that axis is used to show intervals it means labels are in between ticks
                 QList<QGraphicsItem *> labelItems() { return m_labels->childItems(); }
                 QList<QGraphicsItem *> shadeItems() { return m_shades->childItems(); }
                 QList<QGraphicsItem *> arrowItems() { return m_arrow->childItems(); }
-                QGraphicsSimpleTextItem *titleItem() const { return m_title.data(); }
+                QGraphicsTextItem *titleItem() const { return m_title.data(); }
                 QGraphicsItemGroup *gridGroup() { return m_grid.data(); }
                 QGraphicsItemGroup *labelGroup() { return m_labels.data(); }
                 QGraphicsItemGroup *shadeGroup() { return m_shades.data(); }
                 QScopedPointer<QGraphicsItemGroup> m_arrow;
                 QScopedPointer<QGraphicsItemGroup> m_shades;
                 QScopedPointer<QGraphicsItemGroup> m_labels;
-                QScopedPointer<QGraphicsSimpleTextItem> m_title;
+                QScopedPointer<QGraphicsTextItem> m_title;
                 bool m_intervalAxis;
             };

src/axis/datetimeaxis/chartdatetimeaxisx.cpp +2 -2

                 switch (which) {
                 case Qt::MinimumSize: {
-                    QRectF boundingRect = textBoundingRect(axis()->labelsFont(), "...", axis()->labelsAngle());
+                    QRectF boundingRect = ChartPresenter::textBoundingRect(axis()->labelsFont(), "...", axis()->labelsAngle());
                     width = boundingRect.width() / 2.0;
                     height = boundingRect.height() + labelPadding() + base.height() + 1.0;
                     sh = QSizeF(width, height);
                     qreal labelHeight = 0.0;
                     qreal firstWidth = -1.0;
                     foreach (const QString& s, ticksList) {
-                        QRectF rect = textBoundingRect(axis()->labelsFont(), s, axis()->labelsAngle());
+                        QRectF rect = ChartPresenter::textBoundingRect(axis()->labelsFont(), s, axis()->labelsAngle());
                         labelHeight = qMax(rect.height(), labelHeight);
                         width = rect.width();
                         if (firstWidth < 0.0)

src/axis/datetimeaxis/chartdatetimeaxisy.cpp +2 -2

                 switch (which) {
                     case Qt::MinimumSize: {
-                        QRectF boundingRect = textBoundingRect(axis()->labelsFont(), "...", axis()->labelsAngle());
+                        QRectF boundingRect = ChartPresenter::textBoundingRect(axis()->labelsFont(), "...", axis()->labelsAngle());
                         width = boundingRect.width() + labelPadding() + base.width() + 1.0;
                         height = boundingRect.height() / 2.0;
                         sh = QSizeF(width, height);
                         qreal labelWidth = 0.0;
                         qreal firstHeight = -1.0;
                         foreach (const QString& s, ticksList) {
-                            QRectF rect = textBoundingRect(axis()->labelsFont(), s, axis()->labelsAngle());
+                            QRectF rect = ChartPresenter::textBoundingRect(axis()->labelsFont(), s, axis()->labelsAngle());
                             labelWidth = qMax(rect.width(), labelWidth);
                             height = rect.height();
                             if (firstHeight < 0.0)

src/axis/horizontalaxis.cpp +7 -6

             #include "horizontalaxis_p.h"
             #include "qabstractaxis_p.h"
+            #include "chartpresenter_p.h"
             #include <qmath.h>
             #include <QDebug>
                 QList<QGraphicsItem *> labels = labelItems();
                 QList<QGraphicsItem *> shades = shadeItems();
                 QList<QGraphicsItem *> arrow = arrowItems();
-                QGraphicsSimpleTextItem *title = titleItem();
+                QGraphicsTextItem *title = titleItem();
                 Q_ASSERT(labels.size() == labelList.size());
                 Q_ASSERT(layout.size() == labelList.size());
                 QRectF titleBoundingRect;
                 QString titleText = axis()->titleText();
                 if (!titleText.isEmpty() && titleItem()->isVisible()) {
-                    title->setText(truncatedText(axis()->titleFont(), titleText, 0.0, gridRect.width(), Qt::Horizontal, QRectF()));
+                    title->setHtml(ChartPresenter::truncatedText(axis()->titleFont(), titleText, qreal(0.0), gridRect.width(), Qt::Horizontal, QRectF()));
                     titlePad = titlePadding();
                     titleBoundingRect = title->boundingRect();
                     //items
                     QGraphicsLineItem *gridItem = static_cast<QGraphicsLineItem*>(lines.at(i));
                     QGraphicsLineItem *tickItem = static_cast<QGraphicsLineItem*>(arrow.at(i + 1));
-                    QGraphicsSimpleTextItem *labelItem = static_cast<QGraphicsSimpleTextItem *>(labels.at(i));
+                    QGraphicsTextItem *labelItem = static_cast<QGraphicsTextItem *>(labels.at(i));
                     //grid line
                     gridItem->setLine(layout[i], gridRect.top(), layout[i], gridRect.bottom());
                     QString text = labelList.at(i);
                     QRectF boundingRect;
                     qreal size = axisRect.bottom() - axisRect.top() - labelPadding() - titleBoundingRect.height() - (titlePad * 2);
-                    labelItem->setText(truncatedText(axis()->labelsFont(), text, axis()->labelsAngle(),
+                    labelItem->setHtml(ChartPresenter::truncatedText(axis()->labelsFont(), text, axis()->labelsAngle(),
                                                                      size, Qt::Vertical, boundingRect));
                     //label transformation origin point
                 switch (which) {
                 case Qt::MinimumSize: {
-                    QRectF titleRect = textBoundingRect(axis()->titleFont(), "...");
+                    QRectF titleRect = ChartPresenter::textBoundingRect(axis()->titleFont(), "...");
                     sh = QSizeF(titleRect.width(), titleRect.height() + (titlePadding() * 2));
                     break;
                 }
                 case Qt::MaximumSize:
                 case Qt::PreferredSize: {
-                    QRectF titleRect = textBoundingRect(axis()->titleFont(), axis()->titleText());
+                    QRectF titleRect = ChartPresenter::textBoundingRect(axis()->titleFont(), axis()->titleText());
                     sh = QSizeF(titleRect.width(), titleRect.height() + (titlePadding() * 2));
                     break;
                 }

src/axis/logvalueaxis/chartlogvalueaxisx.cpp +2 -2

                 switch (which) {
                 case Qt::MinimumSize:{
-                    QRectF boundingRect = textBoundingRect(axis()->labelsFont(), "...", axis()->labelsAngle());
+                    QRectF boundingRect = ChartPresenter::textBoundingRect(axis()->labelsFont(), "...", axis()->labelsAngle());
                     width = boundingRect.width() / 2.0;
                     height = boundingRect.height() + labelPadding() + base.height() + 1.0;
                     sh = QSizeF(width, height);
                     qreal labelHeight = 0.0;
                     qreal firstWidth = -1.0;
                     foreach (const QString& s, ticksList) {
-                        QRectF rect = textBoundingRect(axis()->labelsFont(), s, axis()->labelsAngle());
+                        QRectF rect = ChartPresenter::textBoundingRect(axis()->labelsFont(), s, axis()->labelsAngle());
                         labelHeight = qMax(rect.height(), labelHeight);
                         width = rect.width();
                         if (firstWidth < 0.0)

src/axis/logvalueaxis/chartlogvalueaxisy.cpp +2 -2

                 switch (which) {
                 case Qt::MinimumSize: {
-                    QRectF boundingRect = textBoundingRect(axis()->labelsFont(), "...", axis()->labelsAngle());
+                    QRectF boundingRect = ChartPresenter::textBoundingRect(axis()->labelsFont(), "...", axis()->labelsAngle());
                     width = boundingRect.width() + labelPadding() + base.width() + 1.0;
                     height = boundingRect.height() / 2.0;
                     sh = QSizeF(width, height);
                     qreal labelWidth = 0.0;
                     qreal firstHeight = -1.0;
                     foreach (const QString& s, ticksList) {
-                        QRectF rect = textBoundingRect(axis()->labelsFont(), s, axis()->labelsAngle());
+                        QRectF rect = ChartPresenter::textBoundingRect(axis()->labelsFont(), s, axis()->labelsAngle());
                         labelWidth = qMax(rect.width(), labelWidth);
                         height = rect.height();
                         if (firstHeight < 0.0)

src/axis/polarchartaxisangular.cpp +12 -14

                 QList<QGraphicsItem *> gridItemList = gridItems();
                 QList<QGraphicsItem *> labelItemList = labelItems();
                 QList<QGraphicsItem *> shadeItemList = shadeItems();
-                QGraphicsSimpleTextItem *title = titleItem();
+                QGraphicsTextItem *title = titleItem();
                 QGraphicsEllipseItem *axisLine = static_cast<QGraphicsEllipseItem *>(arrowItemList.at(0));
                 axisLine->setRect(axisGeometry());
                     QGraphicsLineItem *gridLineItem = static_cast<QGraphicsLineItem *>(gridItemList.at(i));
                     QGraphicsLineItem *tickItem = static_cast<QGraphicsLineItem *>(arrowItemList.at(i + 1));
-                    QGraphicsSimpleTextItem *labelItem = static_cast<QGraphicsSimpleTextItem *>(labelItemList.at(i));
+                    QGraphicsTextItem *labelItem = static_cast<QGraphicsTextItem *>(labelItemList.at(i));
                     QGraphicsPathItem *shadeItem = 0;
                     if (i == 0)
                         shadeItem = static_cast<QGraphicsPathItem *>(shadeItemList.at(0));
                     // Angular axis label
                     if (axis()->labelsVisible() && labelVisible) {
-                        labelItem->setText(labelList.at(i));
+                        labelItem->setHtml(labelList.at(i));
                         const QRectF &rect = labelItem->boundingRect();
                         QPointF labelCenter = rect.center();
                         labelItem->setTransformOriginPoint(labelCenter.x(), labelCenter.y());
-                        QRectF boundingRect = textBoundingRect(axis()->labelsFont(), labelList.at(i), axis()->labelsAngle());
+                        QRectF boundingRect = ChartPresenter::textBoundingRect(axis()->labelsFont(), labelList.at(i), axis()->labelsAngle());
                         boundingRect.moveCenter(labelCenter);
                         QPointF positionDiff(rect.topLeft() - boundingRect.topLeft());
                 // Title, centered above the chart
                 QString titleText = axis()->titleText();
                 if (!titleText.isEmpty() && axis()->isTitleVisible()) {
-                    title->setText(truncatedText(axis()->titleFont(), titleText, 0.0, axisGeometry().width(), Qt::Horizontal, QRectF()));
+                    title->setHtml(ChartPresenter::truncatedText(axis()->titleFont(), titleText, qreal(0.0), axisGeometry().width(), Qt::Horizontal, QRectF()));
                     QRectF titleBoundingRect = title->boundingRect();
                     QPointF titleCenter = center - titleBoundingRect.center();
                 for (int i = 0; i < count; ++i) {
                     QGraphicsLineItem *arrow = new QGraphicsLineItem(presenter()->rootItem());
                     QGraphicsLineItem *grid = new QGraphicsLineItem(presenter()->rootItem());
-                    QGraphicsSimpleTextItem *label = new QGraphicsSimpleTextItem(presenter()->rootItem());
+                    QGraphicsTextItem *label = new QGraphicsTextItem(presenter()->rootItem());
-                    QGraphicsSimpleTextItem *title = titleItem();
+                    QGraphicsTextItem *title = titleItem();
                     arrow->setPen(axis()->linePen());
                     grid->setPen(axis()->gridLinePen());
                     label->setFont(axis()->labelsFont());
-                    label->setPen(axis()->labelsPen());
+                    label->setDefaultTextColor(axis()->labelsBrush().color());
-                    label->setBrush(axis()->labelsBrush());
                     label->setRotation(axis()->labelsAngle());
                     title->setFont(axis()->titleFont());
-                    title->setPen(axis()->titlePen());
+                    title->setDefaultTextColor(axis()->titleBrush().color());
-                    title->setBrush(axis()->titleBrush());
+                    title->setHtml(axis()->titleText());
-                    title->setText(axis()->titleText());
                     arrowGroup()->addToGroup(arrow);
                     gridGroup()->addToGroup(grid);
                     labelGroup()->addToGroup(label);
                             continue;
                         }
-                        QRectF boundingRect = textBoundingRect(axis()->labelsFont(), labelList.at(i), axis()->labelsAngle());
+                        QRectF boundingRect = ChartPresenter::textBoundingRect(axis()->labelsFont(), labelList.at(i), axis()->labelsAngle());
                         QPointF labelPoint = QLineF::fromPolar(radius + tickWidth(), 90.0 - labelCoordinate).p2();
                         boundingRect = moveLabelToPosition(labelCoordinate, labelPoint, boundingRect);
                 }
                 if (!axis()->titleText().isEmpty() && axis()->isTitleVisible()) {
-                    QRectF titleRect = textBoundingRect(axis()->titleFont(), axis()->titleText());
+                    QRectF titleRect = ChartPresenter::textBoundingRect(axis()->titleFont(), axis()->titleText());
                     radius -= titlePadding() + (titleRect.height() / 2.0);
                     if (radius < 1.0) // safeguard

src/axis/polarchartaxisradial.cpp +10 -12

                 QList<QGraphicsItem *> gridItemList = gridItems();
                 QList<QGraphicsItem *> labelItemList = labelItems();
                 QList<QGraphicsItem *> shadeItemList = shadeItems();
-                QGraphicsSimpleTextItem* title = titleItem();
+                QGraphicsTextItem* title = titleItem();
                 qreal radius = axisGeometry().height() / 2.0;
                 QLineF line(center, center + QPointF(0, -radius));
                     QGraphicsEllipseItem *gridItem = static_cast<QGraphicsEllipseItem *>(gridItemList.at(i));
                     QGraphicsLineItem *tickItem = static_cast<QGraphicsLineItem *>(arrowItemList.at(i + 1));
-                    QGraphicsSimpleTextItem *labelItem = static_cast<QGraphicsSimpleTextItem *>(labelItemList.at(i));
+                    QGraphicsTextItem *labelItem = static_cast<QGraphicsTextItem *>(labelItemList.at(i));
                     QGraphicsPathItem *shadeItem = 0;
                     if (i == 0)
                         shadeItem = static_cast<QGraphicsPathItem *>(shadeItemList.at(0));
                     // Radial axis label
                     if (axis()->labelsVisible() && labelVisible) {
-                        labelItem->setText(labelList.at(i));
+                        labelItem->setHtml(labelList.at(i));
                         QRectF labelRect = labelItem->boundingRect();
                         QPointF labelCenter = labelRect.center();
                         labelItem->setTransformOriginPoint(labelCenter.x(), labelCenter.y());
-                        QRectF boundingRect = textBoundingRect(axis()->labelsFont(), labelList.at(i), axis()->labelsAngle());
+                        QRectF boundingRect = ChartPresenter::textBoundingRect(axis()->labelsFont(), labelList.at(i), axis()->labelsAngle());
                         boundingRect.moveCenter(labelCenter);
                         QPointF positionDiff(labelRect.topLeft() - boundingRect.topLeft());
                         QPointF labelPoint = center;
                 // Title, along the 0 axis
                 QString titleText = axis()->titleText();
                 if (!titleText.isEmpty() && axis()->isTitleVisible()) {
-                    title->setText(truncatedText(axis()->titleFont(), titleText, 0.0, radius, Qt::Horizontal, QRectF()));
+                    title->setHtml(ChartPresenter::truncatedText(axis()->titleFont(), titleText, qreal(0.0), radius, Qt::Horizontal, QRectF()));
                     QRectF titleBoundingRect = title->boundingRect();
                     QPointF titleCenter = titleBoundingRect.center();
                 for (int i = 0; i < count; ++i) {
                     QGraphicsLineItem *arrow = new QGraphicsLineItem(presenter()->rootItem());
                     QGraphicsEllipseItem *grid = new QGraphicsEllipseItem(presenter()->rootItem());
-                    QGraphicsSimpleTextItem *label = new QGraphicsSimpleTextItem(presenter()->rootItem());
+                    QGraphicsTextItem *label = new QGraphicsTextItem(presenter()->rootItem());
-                    QGraphicsSimpleTextItem *title = titleItem();
+                    QGraphicsTextItem *title = titleItem();
                     arrow->setPen(axis()->linePen());
                     grid->setPen(axis()->gridLinePen());
                     label->setFont(axis()->labelsFont());
-                    label->setPen(axis()->labelsPen());
+                    label->setDefaultTextColor(axis()->labelsBrush().color());
-                    label->setBrush(axis()->labelsBrush());
                     label->setRotation(axis()->labelsAngle());
                     title->setFont(axis()->titleFont());
-                    title->setPen(axis()->titlePen());
+                    title->setDefaultTextColor(axis()->titleBrush().color());
-                    title->setBrush(axis()->titleBrush());
+                    title->setHtml(axis()->titleText());
-                    title->setText(axis()->titleText());
                     arrowGroup()->addToGroup(arrow);
                     gridGroup()->addToGroup(grid);
                     labelGroup()->addToGroup(label);

src/axis/qabstractaxis.cpp +8 -16

             /*!
               \property QAbstractAxis::labelsPen
+              \deprecated
               The pen of the labels.
             */
             /*!
               \property QAbstractAxis::labelsBrush
-              The brush of the labels.
+              The brush of the labels. Only the color of the brush is relevant.
             */
             /*!
             /*!
               \property QAbstractAxis::titleText
-              The title of the axis. Empty by default.
+              The title of the axis. Empty by default. Axis titles support html formatting.
             */
             /*!
               \qmlproperty String AbstractAxis::titleText
-              The title of the axis. Empty by default.
+              The title of the axis. Empty by default. Axis titles support html formatting.
             */
             /*!
               \property QAbstractAxis::titlePen
+              \deprecated
               The pen of the title text.
             */
             /*!
               \property QAbstractAxis::titleBrush
-              The brush of the title text.
+              The brush of the title text. Only the color of the brush is relevant.
             */
             /*!
             /*!
               \fn void QAbstractAxis::labelsPenChanged(const QPen& pen)
+              \deprecated
               The pen of the axis labels has changed to \a pen.
             */
             /*!
               \fn void QAbstractAxis::titlePenChanged(const QPen& pen)
+              \deprecated
               The pen of the axis shades has changed to \a pen.
             */
                 return d_ptr->m_labelsVisible;
             }
-            /*!
-              Sets \a pen used to draw labels.
-            */
             void QAbstractAxis::setLabelsPen(const QPen &pen)
             {
                 if (d_ptr->m_labelsPen != pen) {
                 }
             }
-            /*!
-              Returns the pen used to labels.
-            */
             QPen QAbstractAxis::labelsPen() const
             {
                 if (d_ptr->m_labelsPen == QChartPrivate::defaultPen())
                 return d_ptr->m_titleVisible;
             }
-            /*!
-              Sets \a pen used to draw title.
-            */
             void QAbstractAxis::setTitlePen(const QPen &pen)
             {
                 if (d_ptr->m_titlePen != pen) {
                 }
             }
-            /*!
-              Returns the pen used to title.
-            */
             QPen QAbstractAxis::titlePen() const
             {
                 if (d_ptr->m_titlePen == QChartPrivate::defaultPen())

src/axis/valueaxis/chartvalueaxisx.cpp +2 -2

                 switch (which) {
                     case Qt::MinimumSize: {
-                        QRectF boundingRect = textBoundingRect(axis()->labelsFont(), "...", axis()->labelsAngle());
+                        QRectF boundingRect = ChartPresenter::textBoundingRect(axis()->labelsFont(), "...", axis()->labelsAngle());
                         width = boundingRect.width() / 2.0;
                         height = boundingRect.height() + labelPadding() + base.height() + 1.0;
                         sh = QSizeF(width, height);
                         qreal labelHeight = 0.0;
                         qreal firstWidth = -1.0;
                         foreach (const QString& s, ticksList) {
-                            QRectF rect = textBoundingRect(axis()->labelsFont(), s, axis()->labelsAngle());
+                            QRectF rect = ChartPresenter::textBoundingRect(axis()->labelsFont(), s, axis()->labelsAngle());
                             labelHeight = qMax(rect.height(), labelHeight);
                             width = rect.width();
                             if (firstWidth < 0.0)

src/axis/valueaxis/chartvalueaxisy.cpp +2 -2

                 switch (which) {
                 case Qt::MinimumSize: {
-                    QRectF boundingRect = textBoundingRect(axis()->labelsFont(), "...", axis()->labelsAngle());
+                    QRectF boundingRect = ChartPresenter::textBoundingRect(axis()->labelsFont(), "...", axis()->labelsAngle());
                     width = boundingRect.width() + labelPadding() + base.width() + 1.0;
                     height = boundingRect.height() / 2.0;
                     sh = QSizeF(width, height);
                     qreal labelWidth = 0.0;
                     qreal firstHeight = -1.0;
                     foreach (const QString& s, ticksList) {
-                        QRectF rect = textBoundingRect(axis()->labelsFont(), s, axis()->labelsAngle());
+                        QRectF rect = ChartPresenter::textBoundingRect(axis()->labelsFont(), s, axis()->labelsAngle());
                         labelWidth = qMax(rect.width(), labelWidth);
                         height = rect.height();
                         if (firstHeight < 0.0)

src/axis/verticalaxis.cpp +7 -6

             #include "verticalaxis_p.h"
             #include "qabstractaxis.h"
+            #include "chartpresenter_p.h"
             #include <QDebug>
             QTCOMMERCIALCHART_BEGIN_NAMESPACE
                 QList<QGraphicsItem *> labels = labelItems();
                 QList<QGraphicsItem *> shades = shadeItems();
                 QList<QGraphicsItem *> arrow = arrowItems();
-                QGraphicsSimpleTextItem *title = titleItem();
+                QGraphicsTextItem *title = titleItem();
                 Q_ASSERT(labels.size() == labelList.size());
                 Q_ASSERT(layout.size() == labelList.size());
                 QRectF titleBoundingRect;
                 QString titleText = axis()->titleText();
                 if (!titleText.isEmpty() && titleItem()->isVisible()) {
-                    title->setText(truncatedText(axis()->titleFont(), titleText, 0.0, gridRect.height(), Qt::Horizontal, QRectF()));
+                    title->setHtml(ChartPresenter::truncatedText(axis()->titleFont(), titleText, qreal(0.0), gridRect.height(), Qt::Horizontal, QRectF()));
                     titlePad = titlePadding();
                     titleBoundingRect = title->boundingRect();
                     //items
                     QGraphicsLineItem *gridItem = static_cast<QGraphicsLineItem *>(lines.at(i));
                     QGraphicsLineItem *tickItem = static_cast<QGraphicsLineItem *>(arrow.at(i + 1));
-                    QGraphicsSimpleTextItem *labelItem = static_cast<QGraphicsSimpleTextItem *>(labels.at(i));
+                    QGraphicsTextItem *labelItem = static_cast<QGraphicsTextItem *>(labels.at(i));
                     //grid line
                     gridItem->setLine(gridRect.left(), layout[i], gridRect.right(), layout[i]);
                     QString text = labelList.at(i);
                     QRectF boundingRect;
                     qreal size = axisRect.right() - axisRect.left() - labelPadding() - titleBoundingRect.height() - (titlePad * 2);
-                    labelItem->setText(truncatedText(axis()->labelsFont(), text, axis()->labelsAngle(),
+                    labelItem->setHtml(ChartPresenter::truncatedText(axis()->labelsFont(), text, axis()->labelsAngle(),
                                                      size, Qt::Horizontal, boundingRect));
                     //label transformation origin point
                 switch (which) {
                 case Qt::MinimumSize: {
-                    QRectF titleRect = textBoundingRect(axis()->titleFont(), "...");
+                    QRectF titleRect = ChartPresenter::textBoundingRect(axis()->titleFont(), "...");
                     sh = QSizeF(titleRect.height() + (titlePadding() * 2), titleRect.width());
                     break;
                 }
                 case Qt::MaximumSize:
                 case Qt::PreferredSize: {
-                    QRectF titleRect = textBoundingRect(axis()->titleFont(), axis()->titleText());
+                    QRectF titleRect = ChartPresenter::textBoundingRect(axis()->titleFont(), axis()->titleText());
                     sh = QSizeF(titleRect.height() + (titlePadding() * 2), titleRect.width());
                     break;
                 }

src/barchart/abstractbarchartitem.cpp +6 -6

                 for (int i = 0; i < m_bars.count(); i++) {
                     m_bars.at(i)->setRect(layout.at(i));
-                    QGraphicsSimpleTextItem *label = m_labels.at(i);
+                    QGraphicsTextItem *label = m_labels.at(i);
                     label->setPos(layout.at(i).center() - label->boundingRect().center());
                 }
             void AbstractBarChartItem::handleLabelsVisibleChanged(bool visible)
             {
-                foreach (QGraphicsSimpleTextItem *label, m_labels)
+                foreach (QGraphicsTextItem *label, m_labels)
                     label->setVisible(visible);
                 update();
             }
                         //            m_layout.append(QRectF(0, 0, 1, 1));
                         // Labels
-                        m_labels.append(new QGraphicsSimpleTextItem(this));
+                        m_labels.append(new QGraphicsTextItem(this));
                     }
                 }
                         bar->setBrush(barSet->m_brush);
                         bar->update();
-                        QGraphicsSimpleTextItem *label = m_labels.at(itemIndex);
+                        QGraphicsTextItem *label = m_labels.at(itemIndex);
-                        label->setText(QString("%1").arg(barSet->value(category)));
+                        label->setHtml(QString("%1").arg(barSet->value(category)));
                         label->setFont(barSet->m_labelFont);
-                        label->setBrush(barSet->m_labelBrush);
+                        label->setDefaultTextColor(barSet->m_labelBrush.color());
                         label->update();
                         itemIndex++;
                     }

src/barchart/abstractbarchartitem_p.h +1 -1

                 QAbstractBarSeries *m_series; // Not owned.
                 QList<Bar *> m_bars;
-                QList<QGraphicsSimpleTextItem *> m_labels;
+                QList<QGraphicsTextItem *> m_labels;
                 QSizeF m_oldSize;
             };

src/barchart/horizontal/percent/horizontalpercentbarchartitem.cpp +3 -3

                         bar->setBrush(barSet->m_brush);
                         bar->update();
-                        QGraphicsSimpleTextItem *label = m_labels.at(itemIndex);
+                        QGraphicsTextItem *label = m_labels.at(itemIndex);
                         int p = m_series->d_func()->percentageAt(set, category) * 100;
                         QString vString(QString::number(p));
                         vString.truncate(3);
                         vString.append("%");
-                        label->setText(vString);
+                        label->setHtml(vString);
                         label->setFont(barSet->m_labelFont);
-                        label->setBrush(barSet->m_labelBrush);
+                        label->setDefaultTextColor(barSet->m_labelBrush.color());
                         label->update();
                         itemIndex++;
                     }

src/barchart/vertical/percent/percentbarchartitem.cpp +3 -3

                         bar->setBrush(barSet->m_brush);
                         bar->update();
-                        QGraphicsSimpleTextItem *label = m_labels.at(itemIndex);
+                        QGraphicsTextItem *label = m_labels.at(itemIndex);
                         int p = m_series->d_func()->percentageAt(set, category) * 100;
                         QString vString(QString::number(p));
                         vString.truncate(3);
                         vString.append("%");
-                        label->setText(vString);
+                        label->setHtml(vString);
                         label->setFont(barSet->m_labelFont);
-                        label->setBrush(barSet->m_labelBrush);
+                        label->setDefaultTextColor(barSet->m_labelBrush.color());
                         label->update();
                         itemIndex++;
                     }

src/chartpresenter.cpp +63 -2

@@ -36,6 +36,15
36		36
37	QTCOMMERCIALCHART_BEGIN_NAMESPACE	37	QTCOMMERCIALCHART_BEGIN_NAMESPACE
38		38
		39	QGraphicsTextItem *dummyTextItem = 0;
		40	class StaticDummyTextDeleter
		41	{
		42	public:
		43	StaticDummyTextDeleter() {}
		44	~StaticDummyTextDeleter() { delete dummyTextItem; }
		45	};
		46	StaticDummyTextDeleter staticDummyTextDeleter;
		47
39	ChartPresenter::ChartPresenter(QChart *chart, QChart::ChartType type)	48	ChartPresenter::ChartPresenter(QChart *chart, QChart::ChartType type)
40	: QObject(chart),	49	: QObject(chart),
41	m_chart(chart),	50	m_chart(chart),
@@ -286,7 +295,7 QFont ChartPresenter::titleFont() const
286	void ChartPresenter::setTitleBrush(const QBrush &brush)	295	void ChartPresenter::setTitleBrush(const QBrush &brush)
287	{	296	{
288	createTitleItem();	297	createTitleItem();
289	m_title->set~~Brush~~(brush);	298	m_title->setDefaultTextColor(brush.color());
290	m_layout->invalidate();	299	m_layout->invalidate();
291	}	300	}
292		301
@@ -294,7 +303,7 QBrush ChartPresenter::titleBrush() const
294	{	303	{
295	if (!m_title)	304	if (!m_title)
296	return QBrush();	305	return QBrush();
297	return m_title->~~brush~~();	306	return QBrush(m_title->defaultTextColor());
298	}	307	}
299		308
300	void ChartPresenter::setBackgroundVisible(bool visible)	309	void ChartPresenter::setBackgroundVisible(bool visible)
@@ -378,6 +387,58 ChartTitle *ChartPresenter::titleElement()
378	return m_title;	387	return m_title;
379	}	388	}
380		389
		390	QRectF ChartPresenter::textBoundingRect(const QFont &font, const QString &text, qreal angle)
		391	{
		392	if (!dummyTextItem)
		393	dummyTextItem = new QGraphicsTextItem;
		394
		395	dummyTextItem->setFont(font);
		396	dummyTextItem->setHtml(text);
		397	QRectF boundingRect = dummyTextItem->boundingRect();
		398
		399	// Take rotation into account
		400	if (angle) {
		401	QTransform transform;
		402	transform.rotate(angle);
		403	boundingRect = transform.mapRect(boundingRect);
		404	}
		405
		406	return boundingRect;
		407	}
		408
		409	// boundingRect parameter returns the rotated bounding rect of the text
		410	QString ChartPresenter::truncatedText(const QFont &font, const QString &text, qreal angle,
		411	qreal maxSize, Qt::Orientation constraintOrientation,
		412	QRectF &boundingRect)
		413	{
		414	QString truncatedString(text);
		415	boundingRect = textBoundingRect(font, truncatedString, angle);
		416	qreal checkDimension = ((constraintOrientation == Qt::Horizontal)
		417	? boundingRect.width() : boundingRect.height());
		418	if (checkDimension > maxSize) {
		419	truncatedString.append("...");
		420	while (checkDimension > maxSize && truncatedString.length() > 3) {
		421	// Crude truncation logic - simply remove any html tag completely
		422	int removeIndex(-1);
		423	int removeCount(1);
		424	if (truncatedString.at(truncatedString.length() - 4) == QLatin1Char('>')) {
		425	removeIndex = truncatedString.lastIndexOf(QLatin1Char('<'));
		426	if (removeIndex != -1)
		427	removeCount = truncatedString.length() - 3 - removeIndex;
		428	}
		429	if (removeIndex == -1)
		430	removeIndex = truncatedString.length() - 4;
		431
		432	truncatedString.remove(removeIndex, removeCount);
		433	boundingRect = textBoundingRect(font, truncatedString, angle);
		434	checkDimension = ((constraintOrientation == Qt::Horizontal)
		435	? boundingRect.width() : boundingRect.height());
		436	}
		437	}
		438
		439	return truncatedString;
		440	}
		441
381	#include "moc_chartpresenter_p.cpp"	442	#include "moc_chartpresenter_p.cpp"
382		443
383	QTCOMMERCIALCHART_END_NAMESPACE	444	QTCOMMERCIALCHART_END_NAMESPACE

src/chartpresenter_p.h +3 0

                 QChart::ChartType chartType() const { return m_chart->chartType(); }
                 QChart *chart() { return m_chart; }
+                static QRectF textBoundingRect(const QFont &font, const QString &text, qreal angle = 0.0);
+                static QString truncatedText(const QFont &font, const QString &text, qreal angle, qreal maxSize,
+                                             Qt::Orientation constraintOrientation, QRectF &boundingRect);
             private:
                 void createBackgroundItem();
                 void createPlotAreaBackgroundItem();

src/charttitle.cpp +14 -22

             ****************************************************************************/
             #include "charttitle_p.h"
+            #include "chartpresenter_p.h"
             #include <QFont>
             #include <QFontMetrics>
             #include <QDebug>
             QTCOMMERCIALCHART_BEGIN_NAMESPACE
             ChartTitle::ChartTitle(QGraphicsItem *parent)
-                : QGraphicsSimpleTextItem(parent)
+                : QGraphicsTextItem(parent)
             {
             }
             void ChartTitle::setGeometry(const QRectF &rect)
             {
-                QFontMetrics fn(font());
+                QGraphicsTextItem::setHtml(ChartPresenter::truncatedText(font(), m_text, qreal(0.0), rect.width(), Qt::Horizontal, QRectF()));
-                int width = rect.width();
-                if (fn.boundingRect(m_text).width() > width) {
-                    QString string = m_text + "...";
-                    while (fn.boundingRect(string).width() > width && string.length() > 3)
-                        string.remove(string.length() - 4, 1);
-                    QGraphicsSimpleTextItem::setText(string);
-                } else {
-                    QGraphicsSimpleTextItem::setText(m_text);
                 setPos(rect.topLeft());
             }
             QSizeF ChartTitle::sizeHint(Qt::SizeHint which, const QSizeF &constraint) const
             {
                 Q_UNUSED(constraint);
-                QFontMetrics fn(font());
                 QSizeF sh;
                 switch (which) {
-                case Qt::MinimumSize:
+                case Qt::MinimumSize: {
-                    sh = QSizeF(fn.boundingRect("...").width(), fn.height());
+                    QRectF titleRect = ChartPresenter::textBoundingRect(font(), "...");
+                    sh = QSizeF(titleRect.width(), titleRect.height());
                     break;
+                }
                 case Qt::PreferredSize:
-                    sh = fn.boundingRect(m_text).size();
+                case Qt::MaximumSize: {
-                    break;
+                    QRectF titleRect = ChartPresenter::textBoundingRect(font(), m_text);
-                case Qt::MaximumSize:
+                    sh = QSizeF(titleRect.width(), titleRect.height());
-                    sh = fn.boundingRect(m_text).size();
                     break;
-                case Qt::MinimumDescent:
+                case Qt::MinimumDescent: {
+                    QFontMetrics fn(font());
                     sh = QSizeF(0, fn.descent());
                     break;
+                }
                 default:
                     break;
                 }

src/charttitle_p.h +2 -2

             #define CHARTTITLE_P_H_
             #include "qchartglobal.h"
-            #include <QGraphicsSimpleTextItem>
+            #include <QGraphicsTextItem>
             QTCOMMERCIALCHART_BEGIN_NAMESPACE
-            class ChartTitle : public QGraphicsSimpleTextItem
+            class ChartTitle : public QGraphicsTextItem
             {
             public:
                 ChartTitle(QGraphicsItem *parent = 0);

src/layout/polarchartlayout.cpp +1 -1

                         && chartAxis->axis()->isTitleVisible()
                         && !chartAxis->axis()->titleText().isEmpty()) {
                         // If axis has angular title, adjust geometry down by the space title takes
-                        QRectF dummyRect = chartAxis->textBoundingRect(chartAxis->axis()->titleFont(), chartAxis->axis()->titleText());
+                        QRectF dummyRect = ChartPresenter::textBoundingRect(chartAxis->axis()->titleFont(), chartAxis->axis()->titleText());
                         titleHeight = (dummyRect.height() / 2.0) + chartAxis->titlePadding();
                     }
                 }

src/legend/legendmarkeritem.cpp +9 -17

             #include <QPainter>
             #include <QGraphicsSceneEvent>
-            #include <QGraphicsSimpleTextItem>
+            #include <QGraphicsTextItem>
             #include "qlegend.h"
             #include "qlegend_p.h"
             #include "qlegendmarker.h"
             #include "qlegendmarker_p.h"
             #include "legendmarkeritem_p.h"
+            #include "chartpresenter_p.h"
             QTCOMMERCIALCHART_BEGIN_NAMESPACE
                 m_marker(marker),
                 m_markerRect(0,0,10.0,10.0),
                 m_boundingRect(0,0,0,0),
-                m_textItem(new QGraphicsSimpleTextItem(this)),
+                m_textItem(new QGraphicsTextItem(this)),
                 m_rectItem(new QGraphicsRectItem(this)),
                 m_margin(4),
                 m_space(4),
             void LegendMarkerItem::setLabelBrush(const QBrush &brush)
             {
-                m_textItem->setBrush(brush);
+                m_textItem->setDefaultTextColor(brush.color());
             }
             QBrush LegendMarkerItem::labelBrush() const
             {
-                return m_textItem->brush();
+                return QBrush(m_textItem->defaultTextColor());
             }
             void LegendMarkerItem::setGeometry(const QRectF &rect)
             {
-                QFontMetrics fn (m_font);
                 int width = rect.width();
                 qreal x = m_margin + m_markerRect.width() + m_space + m_margin;
-                qreal y = qMax(m_markerRect.height()+2*m_margin,fn.height()+2*m_margin);
+                QRectF truncatedRect;
-                if (fn.boundingRect(m_label).width() + x > width)
+                m_textItem->setHtml(ChartPresenter::truncatedText(m_font, m_label, qreal(0.0), width - x, Qt::Horizontal, truncatedRect));
-                    QString string = m_label + "...";
-                    while(fn.boundingRect(string).width() + x > width && string.length() > 3)
-                        string.remove(string.length() - 4, 1);
-                    m_textItem->setText(string);
-                else
-                    m_textItem->setText(m_label);
-                const QRectF &textRect = m_textItem->boundingRect();
+                qreal y = qMax(m_markerRect.height() + 2 * m_margin, truncatedRect.height() + 2 * m_margin);
+                const QRectF &textRect = m_textItem->boundingRect();
                 m_textItem->setPos(x - m_margin, y / 2 - textRect.height() / 2);
                 m_rectItem->setRect(m_markerRect);

src/legend/legendmarkeritem_p.h +2 -2

             #include <QFont>
             #include <QBrush>
             #include <QPen>
-            #include <QGraphicsSimpleTextItem>
+            #include <QGraphicsTextItem>
             #include <QGraphicsLayoutItem>
             QTCOMMERCIALCHART_BEGIN_NAMESPACE
                 QLegendMarkerPrivate *m_marker; // Knows
                 QRectF m_markerRect;
                 QRectF m_boundingRect;
-                QGraphicsSimpleTextItem *m_textItem;
+                QGraphicsTextItem *m_textItem;
                 QGraphicsRectItem *m_rectItem;
                 qreal m_margin;
                 qreal m_space;

src/legend/qlegendmarker_p.h 0 -1

             #include <QGraphicsObject>
             #include <QBrush>
             #include <QPen>
-            #include <QGraphicsSimpleTextItem>
             #include <QGraphicsLayoutItem>
             QTCOMMERCIALCHART_BEGIN_NAMESPACE

src/qabstractseries.cpp +2 -2

             /*!
                 \property QAbstractSeries::name
-                \brief name of the series property. The name is shown in legend for QXYSeries.
+                \brief name of the series property. The name is shown in legend for series and supports html formatting.
             */
             /*!
                 \qmlproperty string AbstractSeries::name
-                Name of the series. The name is shown in legend for QXYSeries.
+                Name of the series. The name is shown in legend for series and supports html formatting.
             */
             /*!

src/qchart.cpp +1 -1

             /*!
              \property QChart::title
-             Title is the name (label) of a chart. It is shown as a headline on top of the chart.
+             Title is the name (label) of a chart. It is shown as a headline on top of the chart. Chart title supports html formatting.
              */
             /*!

tests/auto/qchart/tst_qchart.cpp +1 -1

             {
                 QFETCH(QBrush, titleBrush);
                 m_chart->setTitleBrush(titleBrush);
-                QCOMPARE(m_chart->titleBrush(), titleBrush);
+                QCOMPARE(m_chart->titleBrush().color(), titleBrush.color());
             }
             void tst_QChart::titleFont_data()

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