Added HTML support for various text items

- HTML tags can now be used in chart titles, legends, and labels
- '\n' does no longer cause line break in multi-line text items.
  HTML tag <br/> can be used for line break now.
- Setting pen for axis titles and labels is deprecated
- When setting brush for titles and labels, only the color is relevant
- Logic for identifying label format specifiers was improved,
  so adding additional information to labels via label format string
  is now more viable.

Task-number: QTRD-1912
Change-Id: I8fa56df56fd656e2a3e427eff4abf3481435eec7
Reviewed-by: Mika Salmela <mika.salmela@digia.com>

1 files changed, 2 insertions, 6 deletions

diff --git a/src/axis/chartaxiselement_p.h b/src/axis/chartaxiselement_p.h
index 83e3e4ed..46dac330 100644
--- a/src/axis/chartaxiselement_p.h
+++ b/src/axis/chartaxiselement_p.h
@@ -70,10 +70,6 @@ public:
     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
@@ -102,7 +98,7 @@ protected:
     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(); }
@@ -144,7 +140,7 @@ private:
     QScopedPointer<QGraphicsItemGroup> m_arrow;
     QScopedPointer<QGraphicsItemGroup> m_shades;
     QScopedPointer<QGraphicsItemGroup> m_labels;
-    QScopedPointer<QGraphicsSimpleTextItem> m_title;
+    QScopedPointer<QGraphicsTextItem> m_title;
     bool m_intervalAxis;
 };