HG_REPOSITORIES/LPP/INSTRUMENTATION/USERS/JEANDET/qtcharts Commit - r2540:18da5db7d538

Fix multiline axis titles truncation...

Miikka Heikkinen -

r2540:18da5db7d538

parent child

Context file:

r2540:18da5db7d538

Collapse all files

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
-                int labelPadding() const { return 5; }
+                inline qreal labelPadding() const { return qreal(5.0); }
-                int titlePadding() const { return 3; }
+                inline qreal titlePadding() const { return qreal(3.0); }
                 void setLabels(const QStringList &labels) { m_labelsList = labels; }
                 QStringList labels() const { return m_labelsList; }

src/axis/horizontalaxis.cpp +32 -15

                 qreal width = 0;
                 //title
-                int titlePad = 0;
                 QRectF titleBoundingRect;
                 QString titleText = axis()->titleText();
+                qreal availableSpace = axisRect.height() - labelPadding();
                 if (!titleText.isEmpty() && titleItem()->isVisible()) {
-                    title->setHtml(ChartPresenter::truncatedText(axis()->titleFont(), titleText, qreal(0.0), gridRect.width(), Qt::Horizontal, QRectF()));
+                    availableSpace -= titlePadding() * 2.0;
+                    qreal minimumLabelHeight = ChartPresenter::textBoundingRect(axis()->labelsFont(), "...").height();
+                    QString truncatedTitle = ChartPresenter::truncatedText(axis()->titleFont(), titleText, qreal(0.0),
+                                                                           gridRect.width(), Qt::Horizontal, titleBoundingRect);
+                    qreal titleSpace = availableSpace - minimumLabelHeight;
+                    if (titleSpace < titleBoundingRect.height()) {
+                        // Need to also truncate title vertically (multiline title)
+                        bool skip = false;
+                        if (truncatedTitle.endsWith("...")) {
+                            if (truncatedTitle.size() == 3)
+                                skip = true; // Already truncated to minimum
+                            else
+                                truncatedTitle.chop(3);
+                        }
+                        if (!skip)
+                            truncatedTitle = ChartPresenter::truncatedText(axis()->titleFont(), truncatedTitle, qreal(0.0),
+                                                                           titleSpace, Qt::Vertical, titleBoundingRect);
+                    }
+                    title->setHtml(truncatedTitle);
-                    titlePad = titlePadding();
                     titleBoundingRect = title->boundingRect();
                     QPointF center = gridRect.center() - titleBoundingRect.center();
-                    if (axis()->alignment() == Qt::AlignTop) {
+                    if (axis()->alignment() == Qt::AlignTop)
-                        title->setPos(center.x(), axisRect.top() + titlePad);
+                        title->setPos(center.x(), axisRect.top() + titlePadding());
-                    } else  if (axis()->alignment() == Qt::AlignBottom) {
+                    else  if (axis()->alignment() == Qt::AlignBottom)
-                        title->setPos(center.x(), axisRect.bottom() - titleBoundingRect.height() - titlePad);
+                        title->setPos(center.x(), axisRect.bottom() - titleBoundingRect.height() - titlePadding());
+                    availableSpace -= titleBoundingRect.height();
                 }
                 for (int i = 0; i < layout.size(); ++i) {
                     //label text wrapping
                     QString text = labelList.at(i);
                     QRectF boundingRect;
-                    qreal size = axisRect.bottom() - axisRect.top() - labelPadding() - titleBoundingRect.height() - (titlePad * 2);
                     labelItem->setHtml(ChartPresenter::truncatedText(axis()->labelsFont(), text, axis()->labelsAngle(),
-                                                                     size, Qt::Vertical, boundingRect));
+                                                                     availableSpace, Qt::Vertical, boundingRect));
                     //label transformation origin point
                     const QRectF& rect = labelItem->boundingRect();
                     QPointF center = rect.center();
                     labelItem->setTransformOriginPoint(center.x(), center.y());
-                    int heightDiff = rect.height() - boundingRect.height();
+                    qreal heightDiff = rect.height() - boundingRect.height();
                     //ticks and label position
                     if (axis()->alignment() == Qt::AlignTop) {
-                        labelItem->setPos(layout[i] - center.x(), axisRect.bottom() - rect.height() + (heightDiff / 2) - labelPadding());
+                        labelItem->setPos(layout[i] - center.x(), axisRect.bottom() - rect.height() + (heightDiff / 2.0) - labelPadding());
                         tickItem->setLine(layout[i], axisRect.bottom(), layout[i], axisRect.bottom() - labelPadding());
                     } else if (axis()->alignment() == Qt::AlignBottom) {
-                        labelItem->setPos(layout[i] - center.x(), axisRect.top() - (heightDiff / 2) + labelPadding());
+                        labelItem->setPos(layout[i] - center.x(), axisRect.top() - (heightDiff / 2.0) + labelPadding());
                         tickItem->setLine(layout[i], axisRect.top(), layout[i], axisRect.top() + labelPadding());
                     }
                 switch (which) {
                 case Qt::MinimumSize: {
                     QRectF titleRect = ChartPresenter::textBoundingRect(axis()->titleFont(), "...");
-                    sh = QSizeF(titleRect.width(), titleRect.height() + (titlePadding() * 2));
+                    sh = QSizeF(titleRect.width(), titleRect.height() + (titlePadding() * 2.0));
                     break;
                 }
                 case Qt::MaximumSize:
                 case Qt::PreferredSize: {
                     QRectF titleRect = ChartPresenter::textBoundingRect(axis()->titleFont(), axis()->titleText());
-                    sh = QSizeF(titleRect.width(), titleRect.height() + (titlePadding() * 2));
+                    sh = QSizeF(titleRect.width(), titleRect.height() + (titlePadding() * 2.0));
                     break;
                 }
                 default:

src/axis/polarchartaxisangular.cpp +1 -1

                     QRectF titleBoundingRect = title->boundingRect();
                     QPointF titleCenter = center - titleBoundingRect.center();
-                    title->setPos(titleCenter.x(), axisGeometry().top() - qreal(titlePadding()) * 2.0 - titleBoundingRect.height() - labelHeight);
+                    title->setPos(titleCenter.x(), axisGeometry().top() - titlePadding() * 2.0 - titleBoundingRect.height() - labelHeight);
                 }
             }

src/axis/polarchartaxisradial.cpp +1 -1

                     QPointF titleCenter = titleBoundingRect.center();
                     QPointF arrowCenter = axisLine->boundingRect().center();
                     QPointF titleCenterDiff = arrowCenter - titleCenter;
-                    title->setPos(titleCenterDiff.x() - qreal(titlePadding()) - (titleBoundingRect.height() / 2.0), titleCenterDiff.y());
+                    title->setPos(titleCenterDiff.x() - titlePadding() - (titleBoundingRect.height() / 2.0), titleCenterDiff.y());
                     title->setTransformOriginPoint(titleCenter);
                     title->setRotation(270.0);
                 }

src/axis/verticalaxis.cpp +33 -16

                     arrowItem->setLine(axisRect.left(), gridRect.top(), axisRect.left(), gridRect.bottom());
                 //title
-                int titlePad = 0;
                 QRectF titleBoundingRect;
                 QString titleText = axis()->titleText();
+                qreal availableSpace = axisRect.width() - labelPadding();
                 if (!titleText.isEmpty() && titleItem()->isVisible()) {
-                    title->setHtml(ChartPresenter::truncatedText(axis()->titleFont(), titleText, qreal(0.0), gridRect.height(), Qt::Horizontal, QRectF()));
+                    availableSpace -= titlePadding() * 2.0;
+                    qreal minimumLabelWidth = ChartPresenter::textBoundingRect(axis()->labelsFont(), "...").width();
+                    QString truncatedTitle = ChartPresenter::truncatedText(axis()->titleFont(), titleText, qreal(0.0),
+                                                                           gridRect.height(), Qt::Horizontal, titleBoundingRect);
+                    qreal titleSpace = availableSpace - minimumLabelWidth;
+                    if (titleSpace < titleBoundingRect.width()) {
+                        // Need to also truncate title vertically (multiline title)
+                        bool skip = false;
+                        if (truncatedTitle.endsWith("...")) {
+                            if (truncatedTitle.size() == 3)
+                                skip = true; // Already truncated to minimum
+                            else
+                                truncatedTitle.chop(3);
+                        }
+                        if (!skip)
+                            truncatedTitle = ChartPresenter::truncatedText(axis()->titleFont(), truncatedTitle, qreal(0.0),
+                                                                           titleSpace, Qt::Vertical, titleBoundingRect);
+                    }
+                    title->setHtml(truncatedTitle);
-                    titlePad = titlePadding();
                     titleBoundingRect = title->boundingRect();
                     QPointF center = gridRect.center() - titleBoundingRect.center();
-                    if (axis()->alignment() == Qt::AlignLeft) {
+                    if (axis()->alignment() == Qt::AlignLeft)
-                        title->setPos(axisRect.left() - titleBoundingRect.width() / 2 + titleBoundingRect.height() / 2 + titlePad, center.y());
+                        title->setPos(axisRect.left() - titleBoundingRect.width() / 2.0 + titleBoundingRect.height() / 2.0 + titlePadding(), center.y());
+                    else if (axis()->alignment() == Qt::AlignRight)
-                    else if (axis()->alignment() == Qt::AlignRight) {
+                        title->setPos(axisRect.right() - titleBoundingRect.width() / 2.0 - titleBoundingRect.height() / 2.0 - titlePadding(), center.y());
-                        title->setPos(axisRect.right() - titleBoundingRect.width() / 2 - titleBoundingRect.height() / 2 - titlePad, center.y());
                     title->setTransformOriginPoint(titleBoundingRect.center());
                     title->setRotation(270);
+                    availableSpace -= titleBoundingRect.height();
                 }
                 for (int i = 0; i < layout.size(); ++i) {
                     //label text wrapping
                     QString text = labelList.at(i);
                     QRectF boundingRect;
-                    qreal size = axisRect.right() - axisRect.left() - labelPadding() - titleBoundingRect.height() - (titlePad * 2);
                     labelItem->setHtml(ChartPresenter::truncatedText(axis()->labelsFont(), text, axis()->labelsAngle(),
-                                                     size, Qt::Horizontal, boundingRect));
+                                       availableSpace, Qt::Horizontal, boundingRect));
                     //label transformation origin point
                     const QRectF &rect = labelItem->boundingRect();
                     QPointF center = rect.center();
                     labelItem->setTransformOriginPoint(center.x(), center.y());
-                    int widthDiff = rect.width() - boundingRect.width();
+                    qreal widthDiff = rect.width() - boundingRect.width();
                     //ticks and label position
                     if (axis()->alignment() == Qt::AlignLeft) {
-                        labelItem->setPos(axisRect.right() - rect.width() + (widthDiff / 2) - labelPadding(), layout[i] - center.y());
+                        labelItem->setPos(axisRect.right() - rect.width() + (widthDiff / 2.0) - labelPadding(), layout[i] - center.y());
                         tickItem->setLine(axisRect.right() - labelPadding(), layout[i], axisRect.right(), layout[i]);
                     } else if (axis()->alignment() == Qt::AlignRight) {
-                        labelItem->setPos(axisRect.left() + labelPadding() - (widthDiff / 2), layout[i] - center.y());
+                        labelItem->setPos(axisRect.left() + labelPadding() - (widthDiff / 2.0), layout[i] - center.y());
                         tickItem->setLine(axisRect.left(), layout[i], axisRect.left() + labelPadding(), layout[i]);
                     }
                 switch (which) {
                 case Qt::MinimumSize: {
                     QRectF titleRect = ChartPresenter::textBoundingRect(axis()->titleFont(), "...");
-                    sh = QSizeF(titleRect.height() + (titlePadding() * 2), titleRect.width());
+                    sh = QSizeF(titleRect.height() + (titlePadding() * 2.0), titleRect.width());
                     break;
                 }
                 case Qt::MaximumSize:
                 case Qt::PreferredSize: {
                     QRectF titleRect = ChartPresenter::textBoundingRect(axis()->titleFont(), axis()->titleText());
-                    sh = QSizeF(titleRect.height() + (titlePadding() * 2), titleRect.width());
+                    sh = QSizeF(titleRect.height() + (titlePadding() * 2.0), titleRect.width());
                     break;
                 }
                 default:

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