HG_REPOSITORIES/LPP/INSTRUMENTATION/USERS/JEANDET/qtcharts Commit - r2592:621c955c10d2

src/axis/cartesianchartaxis.cpp +2 0

             #include <QValueAxis>
             #include <QLogValueAxis>
             #include <QGraphicsLayout>
+            #include <QTextDocument>
             QTCOMMERCIALCHART_BEGIN_NAMESPACE
                     QGraphicsLineItem *arrow = new QGraphicsLineItem(this);
                     QGraphicsLineItem *grid = new QGraphicsLineItem(this);
                     QGraphicsTextItem *label = new QGraphicsTextItem(this);
+                    label->document()->setDocumentMargin(ChartPresenter::textMargin());
                     QGraphicsTextItem *title = titleItem();
                     arrow->setPen(axis()->linePen());
                     grid->setPen(axis()->gridLinePen());

src/axis/chartaxiselement.cpp +2 0

             #include "abstractchartlayout_p.h"
             #include <qmath.h>
             #include <QDateTime>
+            #include <QTextDocument>
             QTCOMMERCIALCHART_BEGIN_NAMESPACE
                 m_shades->setZValue(ChartPresenter::ShadesZValue);
                 m_grid->setZValue(ChartPresenter::GridZValue);
                 m_title->setZValue(ChartPresenter::GridZValue);
+                m_title->document()->setDocumentMargin(ChartPresenter::textMargin());
                 handleVisibleChanged(axis->isVisible());
                 connectSlots();

src/axis/chartaxiselement_p.h +2 -2

                 QAbstractAxis *axis() const { return m_axis; }
                 void setLayout(QVector<qreal> &layout) { m_layout = layout; }
                 QVector<qreal> &layout() { return m_layout; } // Modifiable reference
-                inline qreal labelPadding() const { return qreal(1.0); }
+                inline qreal labelPadding() const { return qreal(4.0); }
-                inline qreal titlePadding() const { return qreal(1.0); }
+                inline qreal titlePadding() const { return qreal(2.0); }
                 void setLabels(const QStringList &labels) { m_labelsList = labels; }
                 QStringList labels() const { return m_labelsList; }

src/axis/polarchartaxisangular.cpp +2 0

             #include "qabstractaxis_p.h"
             #include <QDebug>
             #include <qmath.h>
+            #include <QTextDocument>
             QTCOMMERCIALCHART_BEGIN_NAMESPACE
                     QGraphicsLineItem *arrow = new QGraphicsLineItem(presenter()->rootItem());
                     QGraphicsLineItem *grid = new QGraphicsLineItem(presenter()->rootItem());
                     QGraphicsTextItem *label = new QGraphicsTextItem(presenter()->rootItem());
+                    label->document()->setDocumentMargin(ChartPresenter::textMargin());
                     QGraphicsTextItem *title = titleItem();
                     arrow->setPen(axis()->linePen());
                     grid->setPen(axis()->gridLinePen());

src/axis/polarchartaxisradial.cpp +2 0

             #include "abstractchartlayout_p.h"
             #include "qabstractaxis_p.h"
             #include "linearrowitem_p.h"
+            #include <QTextDocument>
             QTCOMMERCIALCHART_BEGIN_NAMESPACE
                     QGraphicsLineItem *arrow = new QGraphicsLineItem(presenter()->rootItem());
                     QGraphicsEllipseItem *grid = new QGraphicsEllipseItem(presenter()->rootItem());
                     QGraphicsTextItem *label = new QGraphicsTextItem(presenter()->rootItem());
+                    label->document()->setDocumentMargin(ChartPresenter::textMargin());
                     QGraphicsTextItem *title = titleItem();
                     arrow->setPen(axis()->linePen());
                     grid->setPen(axis()->gridLinePen());

src/axis/verticalaxis.cpp +1 -1

                     QString truncatedTitle = ChartPresenter::truncatedText(axis()->titleFont(), titleText, qreal(0.0),
                                                                            gridRect.height(), Qt::Horizontal, titleBoundingRect);
                     qreal titleSpace = availableSpace - minimumLabelWidth;
-                    if (titleSpace < titleBoundingRect.width()) {
+                    if (titleSpace < titleBoundingRect.height()) {
                         // Need to also truncate title vertically (multiline title)
                         bool skip = false;
                         if (truncatedTitle.endsWith("...")) {

src/barchart/abstractbarchartitem.cpp +4 -1

             #include "baranimation_p.h"
             #include "chartdataset_p.h"
             #include <QPainter>
+            #include <QTextDocument>
             QTCOMMERCIALCHART_BEGIN_NAMESPACE
                         //            m_layout.append(QRectF(0, 0, 1, 1));
                         // Labels
-                        m_labels.append(new QGraphicsTextItem(this));
+                        QGraphicsTextItem *newLabel = new QGraphicsTextItem(this);
+                        newLabel->document()->setDocumentMargin(ChartPresenter::textMargin());
+                        m_labels.append(newLabel);
                     }
                 }

src/chartpresenter.cpp +6 0

             #include "polarchartlayout_p.h"
             #include "charttitle_p.h"
             #include <QTimer>
+            #include <QTextDocument>
             QTCOMMERCIALCHART_BEGIN_NAMESPACE
             QRectF ChartPresenter::textBoundingRect(const QFont &font, const QString &text, qreal angle)
             {
                 static QGraphicsTextItem dummyTextItem;
+                static bool initMargin = true;
+                if (initMargin) {
+                    dummyTextItem.document()->setDocumentMargin(textMargin());
+                    initMargin = false;
+                }
                 dummyTextItem.setFont(font);
                 dummyTextItem.setHtml(text);

src/chartpresenter_p.h +1 0

                 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);
+                inline static qreal textMargin() { return qreal(0.5); }
             private:
                 void createBackgroundItem();
                 void createPlotAreaBackgroundItem();

src/charttitle.cpp +2 -1

             #include <QFont>
             #include <QFontMetrics>
             #include <QDebug>
+            #include <QTextDocument>
             QTCOMMERCIALCHART_BEGIN_NAMESPACE
             ChartTitle::ChartTitle(QGraphicsItem *parent)
                 : QGraphicsTextItem(parent)
             {
+                document()->setDocumentMargin(ChartPresenter::textMargin());
             }
             ChartTitle::~ChartTitle()

src/legend/legendmarkeritem.cpp +6 -3

             #include <QPainter>
             #include <QGraphicsSceneEvent>
             #include <QGraphicsTextItem>
+            #include <QTextDocument>
             #include "qlegend.h"
             #include "qlegend_p.h"
                 m_boundingRect(0,0,0,0),
                 m_textItem(new QGraphicsTextItem(this)),
                 m_rectItem(new QGraphicsRectItem(this)),
-                m_margin(1),
+                m_margin(3),
-                m_space(2),
+                m_space(4),
                 m_hovering(false),
                 m_pressPos(0, 0)
             {
                 m_rectItem->setRect(m_markerRect);
+                m_textItem->document()->setDocumentMargin(ChartPresenter::textMargin());
                 setAcceptHoverEvents(true);
             }
                 m_textItem->setPos(x - m_margin, y / 2 - textRect.height() / 2);
                 m_rectItem->setRect(m_markerRect);
-                m_rectItem->setPos(m_margin, y / 2  - m_markerRect.height() / 2);
+                // The textMargin adjustments to position are done to make default case rects less blurry with anti-aliasing
+                m_rectItem->setPos(m_margin - ChartPresenter::textMargin(), y / 2.0  - m_markerRect.height() / 2.0 + ChartPresenter::textMargin());
                 prepareGeometryChange();
                 m_boundingRect = QRectF(0, 0, x + textRect.width() + m_margin, y);

	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