HG_REPOSITORIES/LPP/INSTRUMENTATION/USERS/JEANDET/qtcharts Commit - r2353:f0ebc1456fe5

test better layout calcuation

Michal Klocek -

r2353:f0ebc1456fe5

parent child

Context file:

r2353:f0ebc1456fe5

Collapse all files

src/axis/horizontalaxis.cpp +2 -2

             /****************************************************************************
             **
             ** Copyright (C) 2012 Digia Plc
             ** All rights reserved.
             ** For any questions to Digia, please use contact form at http://qt.digia.com
             **
             ** This file is part of the Qt Commercial Charts Add-on.
             **
             ** $QT_BEGIN_LICENSE$
             ** Licensees holding valid Qt Commercial licenses may use this file in
             ** accordance with the Qt Commercial License Agreement provided with the
             ** Software or, alternatively, in accordance with the terms contained in
             ** a written agreement between you and Digia.
             **
             ** If you have questions regarding the use of this file, please use
             ** contact form at http://qt.digia.com
             ** $QT_END_LICENSE$
             **
             ****************************************************************************/
             #include "horizontalaxis_p.h"
             #include "qabstractaxis.h"
             #include <QFontMetrics>
             #include <qmath.h>
             #include <QDebug>
             QTCOMMERCIALCHART_BEGIN_NAMESPACE
             HorizontalAxis::HorizontalAxis(QAbstractAxis *axis, QGraphicsItem* item , bool intervalAxis)
                 : ChartAxis(axis, item, intervalAxis)
             {
             }
             HorizontalAxis::~HorizontalAxis()
             {
             }
             void HorizontalAxis::updateGeometry()
             {
                 const QVector<qreal>& layout = ChartAxis::layout();
                 if (layout.isEmpty())
                     return;
                 QStringList labelList = labels();
                 QList<QGraphicsItem *> lines = lineItems();
                 QList<QGraphicsItem *> labels = labelItems();
                 QList<QGraphicsItem *> shades = shadeItems();
                 QList<QGraphicsItem *> axis = arrowItems();
                 QGraphicsSimpleTextItem* title = titleItem();
                 Q_ASSERT(labels.size() == labelList.size());
                 Q_ASSERT(layout.size() == labelList.size());
                 const QRectF &axisRect = axisGeometry();
                 const QRectF &gridRect = gridGeometry();
                 //arrow
                 QGraphicsLineItem *arrowItem = static_cast<QGraphicsLineItem *>(axis.at(0));
                 if (alignment() == Qt::AlignTop)
                     arrowItem->setLine(gridRect.left(), axisRect.bottom(), gridRect.right(), axisRect.bottom());
                 else if (alignment() == Qt::AlignBottom)
                     arrowItem->setLine(gridRect.left(), axisRect.top(), gridRect.right(), axisRect.top());
                 qreal width = 0;
                 QFontMetrics fn(font());
                 //title
                 if (!titleText().isNull()) {
                     QFontMetrics fn(title->font());
                     int size(0);
                     size = gridRect.width();
                     QString titleText = this->titleText();
                     if (fn.boundingRect(titleText).width() > size) {
                         QString string = titleText + "...";
                         while (fn.boundingRect(string).width() > size && string.length() > 3)
                             string.remove(string.length() - 4, 1);
                         title->setText(string);
                     } else {
                         title->setText(titleText);
                     }
                     QPointF center = gridRect.center() - title->boundingRect().center();
                     if (alignment() == Qt::AlignTop) {
                         title->setPos(center.x(), axisRect.top());
                     } else  if (alignment() == Qt::AlignBottom) {
                         title->setPos(center.x(), axisRect.bottom() - title->boundingRect().height());
                     }
                 }
                 for (int i = 0; i < layout.size(); ++i) {
                     //items
                     QGraphicsLineItem *gridItem = static_cast<QGraphicsLineItem*>(lines.at(i));
                     QGraphicsLineItem *tickItem = static_cast<QGraphicsLineItem*>(axis.at(i + 1));
                     QGraphicsSimpleTextItem *labelItem = static_cast<QGraphicsSimpleTextItem *>(labels.at(i));
                     //grid line
                     gridItem->setLine(layout[i], gridRect.top(), layout[i], gridRect.bottom());
                     //label text wrapping
                     if(intervalAxis()&& i+1!=layout.size()) {
                         //wrapping in case of interval axis
                         const qreal delta = layout[i+1] - layout[i];
                         QString text = labelList.at(i);
                         if (fn.boundingRect(text).width() + 1 > delta )
                         {
                             QString label = text + "...";
                             while (fn.boundingRect(label).width() >= delta && label.length() > 3)
                             label.remove(label.length() - 4, 1);
                             labelItem->setText(label);
                         }
                         else {
                             labelItem->setText(text);
                         }
                     }else{
                         labelItem->setText(labelList.at(i));
                     }
                     //label transformation origin point
                     const QRectF& rect = labelItem->boundingRect();
                     QPointF center = rect.center();
                     labelItem->setTransformOriginPoint(center.x(), center.y());
                     //ticks and label position
                     if (alignment() == Qt::AlignTop) {
                         labelItem->setPos(layout[i] - center.x(), axisRect.bottom() - rect.height() - labelPadding());
                         tickItem->setLine(layout[i], axisRect.bottom(), layout[i], axisRect.bottom() - labelPadding());
                     } else if (alignment() == Qt::AlignBottom) {
                         labelItem->setPos(layout[i] - center.x(), axisRect.top() + labelPadding());
                         tickItem->setLine(layout[i], axisRect.top(), layout[i], axisRect.top() + labelPadding());
                     }
                     //label in beetwen
                     if(intervalAxis()&& i+1!=layout.size()) {
                         const qreal delta = (layout[i+1] - layout[i])/2;
                         labelItem->setPos(layout[i] + delta - center.x(), labelItem->pos().y());
                     }
                     //label overlap detection
                     if(labelItem->pos().x() < width ||
-                        labelItem->pos().x() < axisRect.left() ||
+                        labelItem->pos().x() < axisRect.left()  ||
-                        labelItem->pos().x() + rect.width() - 1 > axisRect.right()) {
+                        labelItem->pos().x() + rect.width() -1 > axisRect.right()){
                         labelItem->setVisible(false);
                     } else {
                         labelItem->setVisible(true);
                         width=rect.width()+labelItem->pos().x();
                     }
                     //shades
                     if ((i + 1) % 2 && i > 1) {
                         QGraphicsRectItem *rectItem = static_cast<QGraphicsRectItem *>(shades.at(i / 2 - 1));
                         rectItem->setRect(layout[i - 1], gridRect.top(), layout[i] - layout[i - 1], gridRect.height());
                     }
                     // check if the grid line and the axis tick should be shown
                     qreal x = gridItem->line().p1().x();
                     if (x < gridRect.left() || x > gridRect.right()) {
                         gridItem->setVisible(false);
                         tickItem->setVisible(false);
                     }else{
                         gridItem->setVisible(true);
                         tickItem->setVisible(true);
                     }
                 }
                 //begin/end grid line in case labels between
                 if (intervalAxis()) {
                     QGraphicsLineItem *gridLine;
                     gridLine = static_cast<QGraphicsLineItem *>(lines.at(layout.size()));
                     gridLine->setLine(gridRect.right(), gridRect.top(), gridRect.right(), gridRect.bottom());
                     gridLine->setVisible(true);
                     gridLine = static_cast<QGraphicsLineItem*>(lines.at(layout.size()+1));
                     gridLine->setLine(gridRect.left(), gridRect.top(), gridRect.left(), gridRect.bottom());
                     gridLine->setVisible(true);
                 }
             }
             QSizeF HorizontalAxis::sizeHint(Qt::SizeHint which, const QSizeF &constraint) const
             {
                 Q_UNUSED(constraint);
                 QFontMetrics fn(titleFont());
                 QSizeF sh(0,0);
                 if (titleText().isNull() || !titleItem()->isVisible())
                     return sh;
                 switch (which) {
                 case Qt::MinimumSize:
                         sh = QSizeF(fn.boundingRect("...").width(), fn.height());
                     break;
                 case Qt::MaximumSize:
                 case Qt::PreferredSize:
                         sh = QSizeF(fn.boundingRect(axis()->titleText()).width(), fn.height());
                     break;
                 default:
                     break;
                 }
                 return sh;
             }
             QTCOMMERCIALCHART_END_NAMESPACE

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

             /****************************************************************************
             **
             ** Copyright (C) 2012 Digia Plc
             ** All rights reserved.
             ** For any questions to Digia, please use contact form at http://qt.digia.com
             **
             ** This file is part of the Qt Commercial Charts Add-on.
             **
             ** $QT_BEGIN_LICENSE$
             ** Licensees holding valid Qt Commercial licenses may use this file in
             ** accordance with the Qt Commercial License Agreement provided with the
             ** Software or, alternatively, in accordance with the terms contained in
             ** a written agreement between you and Digia.
             **
             ** If you have questions regarding the use of this file, please use
             ** contact form at http://qt.digia.com
             ** $QT_END_LICENSE$
             **
             ****************************************************************************/
             #include "chartvalueaxisx_p.h"
             #include "qabstractaxis.h"
             #include "chartpresenter_p.h"
             #include "qvalueaxis.h"
             #include "chartlayout_p.h"
             #include <QGraphicsLayout>
             #include <QFontMetrics>
             #include <qmath.h>
             #include <QDebug>
             QTCOMMERCIALCHART_BEGIN_NAMESPACE
             ChartValueAxisX::ChartValueAxisX(QValueAxis *axis, QGraphicsItem* item )
                 : HorizontalAxis(axis, item),
                   m_axis(axis)
             {
             	QObject::connect(m_axis,SIGNAL(tickCountChanged(int)),this, SLOT(handleTickCountChanged(int)));
                 QObject::connect(m_axis,SIGNAL(labelFormatChanged(QString)),this, SLOT(handleLabelFormatChanged(QString)));
             }
             ChartValueAxisX::~ChartValueAxisX()
             {
             }
             QVector<qreal> ChartValueAxisX::calculateLayout() const
             {
             	int tickCount = m_axis->tickCount();
                 Q_ASSERT(tickCount >= 2);
                 QVector<qreal> points;
                 points.resize(tickCount);
                 const QRectF &gridRect = gridGeometry();
                 const qreal deltaX = gridRect.width() / (tickCount - 1);
                 for (int i = 0; i < tickCount; ++i) {
                     points[i] = i * deltaX + gridRect.left();
                 }
                 return points;
             }
             void ChartValueAxisX::updateGeometry()
             {
                 const QVector<qreal>& layout = ChartAxis::layout();
                 if (layout.isEmpty())
                     return;
                 setLabels(createValueLabels(min(),max(),layout.size(),m_axis->labelFormat()));
                 HorizontalAxis::updateGeometry();
             }
             void ChartValueAxisX::handleTickCountChanged(int tick)
             {
             	Q_UNUSED(tick);
                 QGraphicsLayoutItem::updateGeometry();
                 if(presenter()) presenter()->layout()->invalidate();
             }
             void ChartValueAxisX::handleLabelFormatChanged(const QString &format)
             {
                 Q_UNUSED(format);
                 QGraphicsLayoutItem::updateGeometry();
                 if(presenter()) presenter()->layout()->invalidate();
             }
             QSizeF ChartValueAxisX::sizeHint(Qt::SizeHint which, const QSizeF &constraint) const
             {
                 Q_UNUSED(constraint)
                 QFontMetrics fn(font());
                 QSizeF sh;
                 QSizeF base = HorizontalAxis::sizeHint(which, constraint);
                 QStringList ticksList = createValueLabels(min(),max(),m_axis->tickCount(),m_axis->labelFormat());
                 qreal width = 0;
                 qreal height = 0;
-                int count = 1;
-                if(!ticksList.empty()) {
-                    count = qMax(ticksList.last().count(),ticksList.first().count());
                 switch (which) {
-                case Qt::MinimumSize:{
+                    case Qt::MinimumSize: {
-                    count = qMin(count,5);
+                        if(!ticksList.empty()) {
-                    width = fn.averageCharWidth() * count;
+                            width = qMax(fn.boundingRect(ticksList.last()).width(),fn.boundingRect(ticksList.first()).width());
-                    height = fn.height() + labelPadding();
-                    width = qMax(width,base.width());
+                        height = fn.height() + labelPadding();
-                    height += base.height();
+                        width = qMax(width,base.width());
-                    sh = QSizeF(width,height);
+                        height += base.height();
-                    break;
+                        sh = QSizeF(width,height);
+                        break;
-                case Qt::PreferredSize:{
-                    width=fn.averageCharWidth() * count;
+                    case Qt::PreferredSize: {
-                    height=fn.height()+labelPadding();
+                        if(!ticksList.empty()) {
-                    width=qMax(width,base.width());
+                            foreach(QString label,ticksList) {
-                    height+=base.height();
+                                width+=fn.boundingRect(label).width();
-                    sh = QSizeF(width,height);
-                    break;
+                        height=fn.height()+labelPadding();
-                default:
+                        width=qMax(width,base.width());
+                        height+=base.height();
+                        sh = QSizeF(width,height);
+                        break;
+                    }
+                    default:
                     break;
                 }
                 return sh;
             }
             #include "moc_chartvalueaxisx_p.cpp"
             QTCOMMERCIALCHART_END_NAMESPACE

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