HG_REPOSITORIES/LPP/INSTRUMENTATION/USERS/JEANDET/qtcharts Commit - r2443:5b27b7b1d72a

Fix vanishing labels for first and last ticks....

Miikka Heikkinen -

r2443:5b27b7b1d72a RC2_1.2.1

parent child

Context file:

r2443:5b27b7b1d72a

Collapse all files

src/axis/barcategoryaxis/chartbarcategoryaxisx.cpp +1 -4

             /****************************************************************************
              **
              ** Copyright (C) 2013 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 "chartbarcategoryaxisx_p.h"
             #include "chartpresenter_p.h"
             #include "qbarcategoryaxis_p.h"
             #include "chartlayout_p.h"
             #include <QFontMetrics>
             #include <QDebug>
             #include <qmath.h>
             QTCOMMERCIALCHART_BEGIN_NAMESPACE
             ChartBarCategoryAxisX::ChartBarCategoryAxisX(QBarCategoryAxis *axis, QGraphicsItem* item)
                 : HorizontalAxis(axis, item, true),
                   m_categoriesAxis(axis)
             {
                 QObject::connect(m_categoriesAxis,SIGNAL(categoriesChanged()),this, SLOT(handleCategoriesChanged()));
                 handleCategoriesChanged();
             }
             ChartBarCategoryAxisX::~ChartBarCategoryAxisX()
             {
             }
             QVector<qreal> ChartBarCategoryAxisX::calculateLayout() const
             {
                 QVector<qreal> points;
                 const QRectF& gridRect = gridGeometry();
                 qreal range = max() - min();
                 const qreal delta = gridRect.width() / range;
                 if (delta < 2)
                     return points;
                 qreal adjustedMin = min() + 0.5;
                 qreal offset = (ceil(adjustedMin) - adjustedMin) * delta;
                 int count = qFloor(range);
                 if (count < 1)
                     return points;
                 points.resize(count + 2);
                 for (int i = 0; i < count + 2; ++i)
                     points[i] = offset + (i * delta) + gridRect.left();
                 return points;
             }
             QStringList ChartBarCategoryAxisX::createCategoryLabels(const QVector<qreal>& layout) const
             {
                 QStringList result ;
                 const QRectF &gridRect = gridGeometry();
                 qreal d = (max() - min()) / gridRect.width();
                 for (int i = 0; i < layout.count() - 1; ++i) {
                     qreal x = qFloor((((layout[i] + layout[i + 1]) / 2 - gridRect.left()) * d + min() + 0.5));
                     if ((x < m_categoriesAxis->categories().count()) && (x >= 0)) {
                         result << m_categoriesAxis->categories().at(x);
                     } else {
                         // No label for x coordinate
                         result << "";
                     }
                 }
                 result << "";
                 return result;
             }
             void ChartBarCategoryAxisX::updateGeometry()
             {
                 const QVector<qreal>& layout = ChartAxis::layout();
                 if (layout.isEmpty())
                     return;
                 setLabels(createCategoryLabels(layout));
                 HorizontalAxis::updateGeometry();
             }
             void ChartBarCategoryAxisX::handleCategoriesChanged()
             {
                 QGraphicsLayoutItem::updateGeometry();
                 if(presenter()) presenter()->layout()->invalidate();
             }
             QSizeF ChartBarCategoryAxisX::sizeHint(Qt::SizeHint which, const QSizeF &constraint) const
             {
                 Q_UNUSED(constraint)
                 QFontMetrics fn(font());
                 QSizeF sh;
                 QSizeF base = HorizontalAxis::sizeHint(which, constraint);
                 QStringList ticksList = m_categoriesAxis->categories();
-                qreal width=0;
+                qreal width = 0; // Width is irrelevant for X axes with interval labels
                 qreal height = 0;
                 switch (which) {
                     case Qt::MinimumSize: {
                         QRectF boundingRect = labelBoundingRect(fn, "...");
-                        width = qMax(boundingRect.width(), base.width());
                         height = boundingRect.height() + labelPadding();
                         height += base.height();
                         sh = QSizeF(width, height);
                         break;
                     }
                     case Qt::PreferredSize:{
                         int labelHeight = 0;
                         foreach (const QString& s, ticksList) {
                             QRect rect = labelBoundingRect(fn, s);
                             labelHeight = qMax(rect.height(), labelHeight);
-                            width += rect.width();
                         }
                         height = labelHeight + labelPadding();
                         height += base.height();
-                        width = qMax(width, base.width());
                         sh = QSizeF(width, height);
                         break;
                     }
                     default:
                       break;
                 }
                 return sh;
             }
             #include "moc_chartbarcategoryaxisx_p.cpp"
             QTCOMMERCIALCHART_END_NAMESPACE

src/axis/barcategoryaxis/chartbarcategoryaxisy.cpp +1 -4

             /****************************************************************************
              **
              ** Copyright (C) 2013 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 "chartbarcategoryaxisy_p.h"
             #include "chartpresenter_p.h"
             #include "qbarcategoryaxis_p.h"
             #include "chartlayout_p.h"
             #include <qmath.h>
             #include <QFontMetrics>
             #include <QDebug>
             QTCOMMERCIALCHART_BEGIN_NAMESPACE
             ChartBarCategoryAxisY::ChartBarCategoryAxisY(QBarCategoryAxis *axis, QGraphicsItem* item)
                 : VerticalAxis(axis, item, true),
                   m_categoriesAxis(axis)
             {
                 QObject::connect( m_categoriesAxis,SIGNAL(categoriesChanged()),this, SLOT(handleCategoriesChanged()));
                 handleCategoriesChanged();
             }
             ChartBarCategoryAxisY::~ChartBarCategoryAxisY()
             {
             }
             QVector<qreal> ChartBarCategoryAxisY::calculateLayout() const
             {
                 QVector<qreal> points;
                 const QRectF& gridRect = gridGeometry();
                 qreal range = max() - min();
                 const qreal delta = gridRect.height() / range;
                 if (delta < 2)
                     return points;
                 qreal adjustedMin = min() + 0.5;
                 qreal offset = (ceil(adjustedMin) - adjustedMin) * delta;
                 int count = qFloor(range);
                 if (count < 1)
                     return points;
                 points.resize(count + 2);
                 for (int i = 0; i < count + 2; ++i)
                     points[i] =  gridRect.bottom() - (i * delta) - offset;
                 return points;
             }
             QStringList ChartBarCategoryAxisY::createCategoryLabels(const QVector<qreal>& layout) const
             {
                 QStringList result;
                 const QRectF &gridRect = gridGeometry();
                 qreal d = (max() - min()) / gridRect.height();
                 for (int i = 0; i < layout.count() - 1; ++i) {
                     qreal x = qFloor(((gridRect.height() - (layout[i + 1] + layout[i]) / 2 + gridRect.top()) * d + min() + 0.5));
                     if ((x < m_categoriesAxis->categories().count()) && (x >= 0)) {
                         result << m_categoriesAxis->categories().at(x);
                     } else {
                         // No label for x coordinate
                         result << "";
                     }
                 }
                 result << "";
                 return result;
             }
             void ChartBarCategoryAxisY::updateGeometry()
             {
                 const QVector<qreal>& layout = ChartAxis::layout();
                 if (layout.isEmpty())
                     return;
                 setLabels(createCategoryLabels(layout));
                 VerticalAxis::updateGeometry();
             }
             void ChartBarCategoryAxisY::handleCategoriesChanged()
             {
                 QGraphicsLayoutItem::updateGeometry();
                 if(presenter()) presenter()->layout()->invalidate();
             }
             QSizeF ChartBarCategoryAxisY::sizeHint(Qt::SizeHint which, const QSizeF &constraint) const
             {
                 Q_UNUSED(constraint)
                 QFontMetrics fn(font());
                 QSizeF sh;
                 QSizeF base = VerticalAxis::sizeHint(which, constraint);
                 QStringList ticksList = m_categoriesAxis->categories();
                 qreal width = 0;
-                qreal height=0;
+                qreal height = 0; // Height is irrelevant for Y axes with interval labels
                 switch (which) {
                     case Qt::MinimumSize: {
                         QRectF boundingRect = labelBoundingRect(fn, "...");
                         width = boundingRect.width() + labelPadding();
                         width += base.width();
                         if (base.width() > 0)
                             width += labelPadding();
-                        height = qMax(boundingRect.height(), base.height());
                         sh = QSizeF(width, height);
                         break;
                     }
                     case Qt::PreferredSize:{
                         int labelWidth = 0;
                         foreach (const QString& s, ticksList) {
                             QRect rect = labelBoundingRect(fn, s);
                             labelWidth = qMax(rect.width(), labelWidth);
-                            height += rect.height();
                         }
                         width = labelWidth + labelPadding() + 1;
                         width += base.width();
                         if (base.width() > 0)
                             width += labelPadding();
-                        height = qMax(height, base.height());
                         sh = QSizeF(width, height);
                         break;
                     }
                     default:
                       break;
                   }
                   return sh;
             }
             #include "moc_chartbarcategoryaxisy_p.cpp"
             QTCOMMERCIALCHART_END_NAMESPACE

src/axis/categoryaxis/chartcategoryaxisx.cpp +1 -4

             /****************************************************************************
             **
             ** Copyright (C) 2013 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 "chartcategoryaxisx_p.h"
             #include "qcategoryaxis.h"
             #include "qabstractaxis.h"
             #include "chartpresenter_p.h"
             #include <QGraphicsLayout>
             #include <QFontMetrics>
             #include <qmath.h>
             QTCOMMERCIALCHART_BEGIN_NAMESPACE
             ChartCategoryAxisX::ChartCategoryAxisX(QCategoryAxis *axis, QGraphicsItem* item)
                 : HorizontalAxis(axis, item, true),
                   m_axis(axis)
             {
             }
             ChartCategoryAxisX::~ChartCategoryAxisX()
             {
             }
             QVector<qreal> ChartCategoryAxisX::calculateLayout() const
             {
                 int tickCount = m_axis->categoriesLabels().count() + 1;
                 QVector<qreal> points;
                 if (tickCount < 2)
                     return points;
                 const QRectF &gridRect = gridGeometry();
                 qreal range  = max() - min();
                 if (range > 0) {
                     points.resize(tickCount);
                     qreal scale = gridRect.width() / range;
                     for (int i = 0; i < tickCount; ++i) {
                         if (i < tickCount - 1) {
                             qreal x = (m_axis->startValue(m_axis->categoriesLabels().at(i)) - min()) * scale + gridRect.left();
                             points[i] = x;
                         } else {
                             qreal x = (m_axis->endValue(m_axis->categoriesLabels().at(i - 1)) - min())  * scale + gridRect.left();
                             points[i] = x;
                         }
                     }
                 }
                 return points;
             }
             void ChartCategoryAxisX::updateGeometry()
             {
                 setLabels(m_axis->categoriesLabels() << "");
                 HorizontalAxis::updateGeometry();
             }
             void ChartCategoryAxisX::handleAxisUpdated()
             {
                 updateGeometry();
             }
             QSizeF ChartCategoryAxisX::sizeHint(Qt::SizeHint which, const QSizeF &constraint) const
             {
                 Q_UNUSED(constraint)
                 QFontMetrics fn(font());
                 QSizeF sh;
                 QSizeF base = HorizontalAxis::sizeHint(which, constraint);
                 QStringList ticksList = m_axis->categoriesLabels();
-                qreal width = 0;
+                qreal width = 0; // Width is irrelevant for X axes with interval labels
                 qreal height = 0;
                 switch (which) {
                 case Qt::MinimumSize: {
                     QRectF boundingRect = labelBoundingRect(fn, "...");
-                    width = qMax(boundingRect.width(), base.width());
                     height = boundingRect.height() + labelPadding();
                     height += base.height();
                     sh = QSizeF(width, height);
                     break;
                 }
                 case Qt::PreferredSize: {
                     int labelHeight = 0;
                     foreach (const QString& s, ticksList) {
                         QRect rect = labelBoundingRect(fn, s);
                         labelHeight = qMax(rect.height(), labelHeight);
-                        width += rect.width();
                     }
                     height = labelHeight + labelPadding();
                     height += base.height();
-                    width = qMax(width, base.width());
                     sh = QSizeF(width, height);
                     break;
                 }
                 default:
                     break;
                 }
                 return sh;
             }
             QTCOMMERCIALCHART_END_NAMESPACE

src/axis/categoryaxis/chartcategoryaxisy.cpp +1 -4

             /****************************************************************************
             **
             ** Copyright (C) 2013 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 "chartcategoryaxisy_p.h"
             #include "qcategoryaxis.h"
             #include "qabstractaxis.h"
             #include "chartpresenter_p.h"
             #include <QGraphicsLayout>
             #include <QFontMetrics>
             #include <qmath.h>
             #include <QDebug>
             QTCOMMERCIALCHART_BEGIN_NAMESPACE
             ChartCategoryAxisY::ChartCategoryAxisY(QCategoryAxis *axis, QGraphicsItem* item)
                 : VerticalAxis(axis, item, true),
                   m_axis(axis)
             {
             }
             ChartCategoryAxisY::~ChartCategoryAxisY()
             {
             }
             QVector<qreal> ChartCategoryAxisY::calculateLayout() const
             {
                 int tickCount = m_axis->categoriesLabels().count() + 1;
                 QVector<qreal> points;
                 if (tickCount < 2)
                     return points;
                 const QRectF &gridRect = gridGeometry();
                 qreal range = max() - min();
                 if (range > 0) {
                     points.resize(tickCount);
                     qreal scale = gridRect.height() / range;
                     for (int i = 0; i < tickCount; ++i) {
                         if (i < tickCount - 1) {
                             qreal y = -(m_axis->startValue(m_axis->categoriesLabels().at(i)) - min()) * scale + gridRect.bottom();
                             points[i] = y;
                         } else {
                             qreal y = -(m_axis->endValue(m_axis->categoriesLabels().at(i - 1)) - min())  * scale + gridRect.bottom();
                             points[i] = y;
                         }
                     }
                 }
                 return points;
             }
             void ChartCategoryAxisY::updateGeometry()
             {
                 setLabels(m_axis->categoriesLabels() << "");
                 VerticalAxis::updateGeometry();
             }
             void ChartCategoryAxisY::handleAxisUpdated()
             {
                 updateGeometry();
             }
             QSizeF ChartCategoryAxisY::sizeHint(Qt::SizeHint which, const QSizeF &constraint) const
             {
                 Q_UNUSED(constraint)
                 QFontMetrics fn(font());
                 QSizeF sh;
                 QSizeF base = VerticalAxis::sizeHint(which, constraint);
                 QStringList ticksList = m_axis->categoriesLabels();
                 qreal width = 0;
-                qreal height = 0;
+                qreal height = 0; // Height is irrelevant for Y axes with interval labels
                 switch (which) {
                 case Qt::MinimumSize: {
                     QRectF boundingRect = labelBoundingRect(fn, "...");
                     width = boundingRect.width() + labelPadding();
                     width += base.width();
-                    height = qMax(boundingRect.height(), base.height());
                     sh = QSizeF(width, height);
                     break;
                 }
                 case Qt::PreferredSize: {
                     int labelWidth = 0;
                     foreach (const QString& s, ticksList) {
                         QRect rect = labelBoundingRect(fn, s);
                         labelWidth = qMax(rect.width(), labelWidth);
-                        height += rect.height();
                     }
                     width = labelWidth + labelPadding() + 1;
                     width += base.width();
-                    height = qMax(height, base.height());
                     sh = QSizeF(width, height);
                     break;
                 }
                 default:
                     break;
                 }
                 return sh;
             }
             QTCOMMERCIALCHART_END_NAMESPACE

src/axis/datetimeaxis/chartdatetimeaxisx.cpp +9 -5

             /****************************************************************************
             **
             ** Copyright (C) 2013 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 "chartdatetimeaxisx_p.h"
             #include "chartpresenter_p.h"
             #include "qdatetimeaxis.h"
             #include "chartlayout_p.h"
             #include <QGraphicsLayout>
             #include <QDateTime>
             #include <QFontMetrics>
             #include <qmath.h>
             QTCOMMERCIALCHART_BEGIN_NAMESPACE
             ChartDateTimeAxisX::ChartDateTimeAxisX(QDateTimeAxis *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(formatChanged(QString)),this, SLOT(handleFormatChanged(QString)));
             }
             ChartDateTimeAxisX::~ChartDateTimeAxisX()
             {
             }
             QVector<qreal> ChartDateTimeAxisX::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) {
                     int x = i * deltaX + gridRect.left();
                     points[i] = x;
                 }
                 return points;
             }
             void ChartDateTimeAxisX::updateGeometry()
             {
                 const QVector<qreal>& layout = ChartAxis::layout();
                 if (layout.isEmpty())
                     return;
                 setLabels(createDateTimeLabels(min(),max(), layout.size(),m_axis->format()));
                 HorizontalAxis::updateGeometry();
             }
             void ChartDateTimeAxisX::handleTickCountChanged(int tick)
             {
                 Q_UNUSED(tick)
                 QGraphicsLayoutItem::updateGeometry();
                 if(presenter()) presenter()->layout()->invalidate();
             }
             void ChartDateTimeAxisX::handleFormatChanged(const QString &format)
             {
                 Q_UNUSED(format);
                 QGraphicsLayoutItem::updateGeometry();
                 if(presenter()) presenter()->layout()->invalidate();
             }
             QSizeF ChartDateTimeAxisX::sizeHint(Qt::SizeHint which, const QSizeF &constraint) const
             {
                 Q_UNUSED(constraint)
                 QFontMetrics fn(font());
                 QSizeF sh;
                 QSizeF base = HorizontalAxis::sizeHint(which, constraint);
                 QStringList ticksList = createDateTimeLabels(min(),max(),m_axis->tickCount(),m_axis->format());
+                // Width of horizontal axis sizeHint indicates the maximum distance labels can extend past
+                // first and last ticks. Base width is irrelevant.
                 qreal width = 0;
                 qreal height = 0;
-                if(ticksList.empty()){
+                if (ticksList.empty())
                     return sh;
                 switch (which) {
                 case Qt::MinimumSize:{
                     QRectF boundingRect = labelBoundingRect(fn, "...");
-                    width = qMax(boundingRect.width(), base.width());
+                    width = boundingRect.width() / 2.0;
                     height = boundingRect.height() + labelPadding();
                     height += base.height();
                     sh = QSizeF(width, height);
                     break;
                 }
                 case Qt::PreferredSize: {
                     int labelHeight = 0;
+                    int firstWidth = -1;
                     foreach (const QString& s, ticksList) {
                         QRect rect = labelBoundingRect(fn, s);
                         labelHeight = qMax(rect.height(), labelHeight);
-                        width += rect.width();
+                        width = rect.width();
+                        if (firstWidth < 0)
+                            firstWidth = width;
                     }
                     height = labelHeight + labelPadding();
                     height += base.height();
-                    width = qMax(width, base.width());
+                    width = qMax(width, qreal(firstWidth)) / 2.0;
                     sh = QSizeF(width, height);
                     break;
                 }
                 default:
                     break;
                 }
                 return sh;
             }
             #include "moc_chartdatetimeaxisx_p.cpp"
             QTCOMMERCIALCHART_END_NAMESPACE

src/axis/datetimeaxis/chartdatetimeaxisy.cpp +9 -6

             /****************************************************************************
             **
             ** Copyright (C) 2013 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 "chartdatetimeaxisy_p.h"
             #include "chartpresenter_p.h"
             #include "qdatetimeaxis.h"
             #include "chartlayout_p.h"
             #include <QGraphicsLayout>
             #include <QFontMetrics>
             #include <QDateTime>
             #include <qmath.h>
             QTCOMMERCIALCHART_BEGIN_NAMESPACE
             ChartDateTimeAxisY::ChartDateTimeAxisY(QDateTimeAxis *axis, QGraphicsItem* item)
                 : VerticalAxis(axis, item),
                   m_axis(axis)
             {
                 QObject::connect(m_axis,SIGNAL(tickCountChanged(int)),this, SLOT(handleTickCountChanged(int)));
                 QObject::connect(m_axis,SIGNAL(formatChanged(QString)),this, SLOT(handleFormatChanged(QString)));
             }
             ChartDateTimeAxisY::~ChartDateTimeAxisY()
             {
             }
             QVector<qreal> ChartDateTimeAxisY::calculateLayout() const
             {
                 int tickCount = m_axis->tickCount();
                 Q_ASSERT(tickCount >= 2);
                 QVector<qreal> points;
                 points.resize(tickCount);
                 const QRectF &gridRect = gridGeometry();
                 const qreal deltaY = gridRect.height() / (tickCount - 1);
                 for (int i = 0; i < tickCount; ++i) {
                     int y = i * -deltaY + gridRect.bottom();
                     points[i] = y;
                 }
                 return points;
             }
             void ChartDateTimeAxisY::updateGeometry()
             {
                 const QVector<qreal> &layout = ChartAxis::layout();
                 if (layout.isEmpty())
                     return;
                 setLabels(createDateTimeLabels(min(),max(), layout.size(),m_axis->format()));
                 VerticalAxis::updateGeometry();
             }
             void ChartDateTimeAxisY::handleTickCountChanged(int tick)
             {
                 Q_UNUSED(tick)
                 QGraphicsLayoutItem::updateGeometry();
                 if(presenter()) presenter()->layout()->invalidate();
             }
             void ChartDateTimeAxisY::handleFormatChanged(const QString &format)
             {
                 Q_UNUSED(format);
                 QGraphicsLayoutItem::updateGeometry();
                 if(presenter()) presenter()->layout()->invalidate();
             }
             QSizeF ChartDateTimeAxisY::sizeHint(Qt::SizeHint which, const QSizeF &constraint) const
             {
                 Q_UNUSED(constraint)
                 QFontMetrics fn(font());
                 QSizeF sh;
                 QSizeF base = VerticalAxis::sizeHint(which, constraint);
                 QStringList ticksList = createDateTimeLabels(min(),max(),m_axis->tickCount(),m_axis->format());
                 qreal width = 0;
+                // Height of vertical axis sizeHint indicates the maximum distance labels can extend past
+                // first and last ticks. Base height is irrelevant.
                 qreal height = 0;
+                if (ticksList.empty())
-                if(ticksList.empty()){
                     return sh;
                 switch (which) {
                     case Qt::MinimumSize: {
                         QRectF boundingRect = labelBoundingRect(fn, "...");
                         width = boundingRect.width() + labelPadding();
                         width += base.width();
-                        height = qMax(boundingRect.height(), base.height());
+                        height = boundingRect.height() / 2.0;
                         sh = QSizeF(width, height);
                         break;
                     }
                     case Qt::PreferredSize: {
                         int labelWidth = 0;
+                        int firstHeight = -1;
                         foreach (const QString& s, ticksList) {
                             QRect rect = labelBoundingRect(fn, s);
                             labelWidth = qMax(rect.width(), labelWidth);
-                            height += rect.height();
+                            height = rect.height();
+                            if (firstHeight < 0)
+                                firstHeight = height;
                         }
                         width = labelWidth + labelPadding() + 2; //two pixels of tolerance
                         width += base.width();
-                        height = qMax(height, base.height());
+                        height = qMax(height, qreal(firstHeight)) / 2.0;
                         sh = QSizeF(width, height);
                         break;
                     }
                     default:
                     break;
                 }
                 return sh;
             }
             #include "moc_chartdatetimeaxisy_p.cpp"
             QTCOMMERCIALCHART_END_NAMESPACE

src/axis/logvalueaxis/chartlogvalueaxisx.cpp +8 -4

             /****************************************************************************
             **
             ** Copyright (C) 2013 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 "chartlogvalueaxisx_p.h"
             #include "chartpresenter_p.h"
             #include "qlogvalueaxis.h"
             #include "chartlayout_p.h"
             #include <QGraphicsLayout>
             #include <QFontMetrics>
             #include <qmath.h>
             #include <QDebug>
             QTCOMMERCIALCHART_BEGIN_NAMESPACE
             ChartLogValueAxisX::ChartLogValueAxisX(QLogValueAxis *axis, QGraphicsItem* item)
                 : HorizontalAxis(axis, item),
                   m_axis(axis)
             {
                 QObject::connect(m_axis,SIGNAL(baseChanged(qreal)),this, SLOT(handleBaseChanged(qreal)));
                 QObject::connect(m_axis,SIGNAL(labelFormatChanged(QString)),this, SLOT(handleLabelFormatChanged(QString)));
             }
             ChartLogValueAxisX::~ChartLogValueAxisX()
             {
             }
             QVector<qreal> ChartLogValueAxisX::calculateLayout() const
             {
                 QVector<qreal> points;
                 qreal logMax = log10(m_axis->max()) / log10(m_axis->base());
                 qreal logMin = log10(m_axis->min()) / log10(m_axis->base());
                 qreal leftEdge = logMin < logMax ? logMin : logMax;
                 qreal ceilEdge = ceil(leftEdge);
                 int tickCount = qAbs(ceil(logMax) - ceil(logMin));
                 points.resize(tickCount);
                 const QRectF &gridRect = gridGeometry();
                 const qreal deltaX = gridRect.width() / qAbs(logMax - logMin);
                 for (int i = 0; i < tickCount; ++i)
                     points[i] = (ceilEdge + i) * deltaX - leftEdge * deltaX + gridRect.left();
                 return points;
             }
             void ChartLogValueAxisX::updateGeometry()
             {
                 const QVector<qreal>& layout = ChartAxis::layout();
                 if (layout.isEmpty())
                     return;
                 setLabels(createLogValueLabels(m_axis->min(), m_axis->max(), m_axis->base(), layout.size(), m_axis->labelFormat()));
                 HorizontalAxis::updateGeometry();
             }
             void ChartLogValueAxisX::handleBaseChanged(qreal base)
             {
                 Q_UNUSED(base);
                 QGraphicsLayoutItem::updateGeometry();
                 if(presenter()) presenter()->layout()->invalidate();
             }
             void ChartLogValueAxisX::handleLabelFormatChanged(const QString &format)
             {
                 Q_UNUSED(format);
                 QGraphicsLayoutItem::updateGeometry();
                 if(presenter()) presenter()->layout()->invalidate();
             }
             QSizeF ChartLogValueAxisX::sizeHint(Qt::SizeHint which, const QSizeF &constraint) const
             {
                 Q_UNUSED(constraint)
                 QFontMetrics fn(font());
                 QSizeF sh;
                 QSizeF base = HorizontalAxis::sizeHint(which, constraint);
                 QStringList ticksList;
                 qreal logMax = log10(m_axis->max()) / log10(m_axis->base());
                 qreal logMin = log10(m_axis->min()) / log10(m_axis->base());
                 int tickCount = qAbs(ceil(logMax) - ceil(logMin));
                 if (m_axis->max() > m_axis->min() && tickCount > 1)
                     ticksList = createLogValueLabels(m_axis->min(), m_axis->max(), m_axis->base(), tickCount, m_axis->labelFormat());
                 else
                     ticksList.append(QString(" "));
+                // Width of horizontal axis sizeHint indicates the maximum distance labels can extend past
+                // first and last ticks. Base width is irrelevant.
                 qreal width = 0;
                 qreal height = 0;
                 switch (which) {
                 case Qt::MinimumSize:{
                     QRectF boundingRect = labelBoundingRect(fn, "...");
-                    width = qMax(boundingRect.width(), base.width());
+                    width = boundingRect.width() / 2.0;
                     height = boundingRect.height() + labelPadding();
                     height += base.height();
                     sh = QSizeF(width, height);
                     break;
                 }
                 case Qt::PreferredSize: {
                     int labelHeight = 0;
+                    int firstWidth = -1;
                     foreach (const QString& s, ticksList) {
                         QRect rect = labelBoundingRect(fn, s);
                         labelHeight = qMax(rect.height(), labelHeight);
-                        width += rect.width();
+                        width = rect.width();
+                        if (firstWidth < 0)
+                            firstWidth = width;
                     }
                     height = labelHeight + labelPadding();
                     height += base.height();
-                    width = qMax(width, base.width());
+                    width = qMax(width, qreal(firstWidth)) / 2.0;
                     sh = QSizeF(width, height);
                     break;
                 }
                 default:
                     break;
                 }
                 return sh;
             }
             #include "moc_chartlogvalueaxisx_p.cpp"
             QTCOMMERCIALCHART_END_NAMESPACE

src/axis/logvalueaxis/chartlogvalueaxisy.cpp +8 -3

             /****************************************************************************
             **
             ** Copyright (C) 2013 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 "chartlogvalueaxisy_p.h"
             #include "chartpresenter_p.h"
             #include "qlogvalueaxis.h"
             #include "chartlayout_p.h"
             #include <QGraphicsLayout>
             #include <QFontMetrics>
             #include <qmath.h>
             #include <QDebug>
             QTCOMMERCIALCHART_BEGIN_NAMESPACE
             ChartLogValueAxisY::ChartLogValueAxisY(QLogValueAxis *axis, QGraphicsItem* item)
                 : VerticalAxis(axis, item),
                   m_axis(axis)
             {
                 QObject::connect(m_axis, SIGNAL(baseChanged(qreal)),this, SLOT(handleBaseChanged(qreal)));
                 QObject::connect(m_axis,SIGNAL(labelFormatChanged(QString)),this, SLOT(handleLabelFormatChanged(QString)));
             }
             ChartLogValueAxisY::~ChartLogValueAxisY()
             {
             }
             QVector<qreal> ChartLogValueAxisY::calculateLayout() const
             {
                 QVector<qreal> points;
                 qreal logMax = log10(m_axis->max()) / log10(m_axis->base());
                 qreal logMin = log10(m_axis->min()) / log10(m_axis->base());
                 qreal leftEdge = logMin < logMax ? logMin : logMax;
                 qreal ceilEdge = ceil(leftEdge);
                 int tickCount = qAbs(ceil(logMax) - ceil(logMin));
                 points.resize(tickCount);
                 const QRectF &gridRect = gridGeometry();
                 const qreal deltaY = gridRect.height() / qAbs(logMax - logMin);
                 for (int i = 0; i < tickCount; ++i)
                     points[i] = (ceilEdge + i) * -deltaY - leftEdge * -deltaY + gridRect.bottom();
                 return points;
             }
             void ChartLogValueAxisY::updateGeometry()
             {
                 const QVector<qreal> &layout = ChartAxis::layout();
                 if (layout.isEmpty())
                     return;
                 setLabels(createLogValueLabels(m_axis->min(), m_axis->max(), m_axis->base(), layout.size(), m_axis->labelFormat()));
                 VerticalAxis::updateGeometry();
             }
             void ChartLogValueAxisY::handleBaseChanged(qreal base)
             {
                 Q_UNUSED(base);
                 QGraphicsLayoutItem::updateGeometry();
                 if(presenter()) presenter()->layout()->invalidate();
             }
             void ChartLogValueAxisY::handleLabelFormatChanged(const QString &format)
             {
                 Q_UNUSED(format);
                 QGraphicsLayoutItem::updateGeometry();
                 if(presenter()) presenter()->layout()->invalidate();
             }
             QSizeF ChartLogValueAxisY::sizeHint(Qt::SizeHint which, const QSizeF &constraint) const
             {
                 Q_UNUSED(constraint)
                 QFontMetrics fn(font());
                 QSizeF sh;
                 QSizeF base = VerticalAxis::sizeHint(which, constraint);
                 QStringList ticksList;
                 qreal logMax = log10(m_axis->max()) / log10(m_axis->base());
                 qreal logMin = log10(m_axis->min()) / log10(m_axis->base());
                 int tickCount = qAbs(ceil(logMax) - ceil(logMin));
                 if (m_axis->max() > m_axis->min() && tickCount > 1)
                     ticksList = createLogValueLabels(m_axis->min(), m_axis->max(), m_axis->base(), tickCount, m_axis->labelFormat());
                 else
                     ticksList.append(QString(" "));
                 qreal width = 0;
+                // Height of vertical axis sizeHint indicates the maximum distance labels can extend past
+                // first and last ticks. Base height is irrelevant.
                 qreal height = 0;
                 switch (which) {
                 case Qt::MinimumSize: {
                     QRectF boundingRect = labelBoundingRect(fn, "...");
                     width = boundingRect.width() + labelPadding();
                     width += base.width();
-                    height = qMax(boundingRect.height(), base.height());
+                    height = boundingRect.height() / 2.0;
                     sh = QSizeF(width, height);
                     break;
                 }
                 case Qt::PreferredSize: {
                     int labelWidth = 0;
+                    int firstHeight = -1;
                     foreach (const QString& s, ticksList) {
                         QRect rect = labelBoundingRect(fn, s);
                         labelWidth = qMax(rect.width(), labelWidth);
-                        height += rect.height();
+                        height = rect.height();
+                        if (firstHeight < 0)
+                            firstHeight = height;
                     }
                     width = labelWidth + labelPadding() + 2; //two pixels of tolerance
                     width += base.width();
-                    height = qMax(height, base.height());
+                    height = qMax(height, qreal(firstHeight)) / 2.0;
                     sh = QSizeF(width, height);
                     break;
                 }
                 default:
                     break;
                 }
                 return sh;
             }
             #include "moc_chartlogvalueaxisy_p.cpp"
             QTCOMMERCIALCHART_END_NAMESPACE

src/axis/valueaxis/chartvalueaxisx.cpp +8 -4

             /****************************************************************************
             **
             ** Copyright (C) 2013 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());
+                // Width of horizontal axis sizeHint indicates the maximum distance labels can extend past
+                // first and last ticks. Base width is irrelevant.
                 qreal width = 0;
                 qreal height = 0;
                 switch (which) {
                     case Qt::MinimumSize: {
                         QRectF boundingRect = labelBoundingRect(fn, "...");
-                        width = qMax(boundingRect.width(), base.width());
+                        width = boundingRect.width() / 2.0;
                         height = boundingRect.height() + labelPadding();
                         height += base.height();
                         sh = QSizeF(width, height);
                         break;
                     }
                     case Qt::PreferredSize: {
                         int labelHeight = 0;
+                        int firstWidth = -1;
                         foreach (const QString& s, ticksList) {
                             QRect rect = labelBoundingRect(fn, s);
                             labelHeight = qMax(rect.height(), labelHeight);
-                            width += rect.width();
+                            width = rect.width();
+                            if (firstWidth < 0)
+                                firstWidth = width;
                         }
                         height = labelHeight + labelPadding();
                         height += base.height();
-                        width = qMax(width, base.width());
+                        width = qMax(width, qreal(firstWidth)) / 2.0;
                         sh = QSizeF(width, height);
                         break;
                     }
                     default:
                         break;
                 }
                 return sh;
             }
             #include "moc_chartvalueaxisx_p.cpp"
             QTCOMMERCIALCHART_END_NAMESPACE

src/axis/valueaxis/chartvalueaxisy.cpp +8 -3

             /****************************************************************************
             **
             ** Copyright (C) 2013 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 "chartvalueaxisy_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
             ChartValueAxisY::ChartValueAxisY(QValueAxis *axis, QGraphicsItem* item)
                 : VerticalAxis(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)));
             }
             ChartValueAxisY::~ChartValueAxisY()
             {
             }
             QVector<qreal> ChartValueAxisY::calculateLayout() const
             {
             	int tickCount = m_axis->tickCount();
                 Q_ASSERT(tickCount >= 2);
                 QVector<qreal> points;
                 points.resize(tickCount);
                 const QRectF &gridRect = gridGeometry();
                 const qreal deltaY = gridRect.height() / (tickCount - 1);
                 for (int i = 0; i < tickCount; ++i) {
                     points[i] = i * -deltaY + gridRect.bottom();
                 }
                 return points;
             }
             void ChartValueAxisY::updateGeometry()
             {
                 const QVector<qreal> &layout = ChartAxis::layout();
                 if (layout.isEmpty())
                     return;
                 setLabels(createValueLabels(min(),max(),layout.size(),m_axis->labelFormat()));
                 VerticalAxis::updateGeometry();
             }
             void ChartValueAxisY::handleTickCountChanged(int tick)
             {
             	Q_UNUSED(tick);
                 QGraphicsLayoutItem::updateGeometry();
             	if(presenter()) presenter()->layout()->invalidate();
             }
             void ChartValueAxisY::handleLabelFormatChanged(const QString &format)
             {
                 Q_UNUSED(format);
                 QGraphicsLayoutItem::updateGeometry();
                 if(presenter()) presenter()->layout()->invalidate();
             }
             QSizeF ChartValueAxisY::sizeHint(Qt::SizeHint which, const QSizeF &constraint) const
             {
                 Q_UNUSED(constraint)
                 QFontMetrics fn(font());
                 QSizeF sh;
                 QSizeF base = VerticalAxis::sizeHint(which, constraint);
                 QStringList ticksList = createValueLabels(min(),max(),m_axis->tickCount(),m_axis->labelFormat());
                 qreal width = 0;
+                // Height of vertical axis sizeHint indicates the maximum distance labels can extend past
+                // first and last ticks. Base height is irrelevant.
                 qreal height = 0;
                 switch (which) {
                 case Qt::MinimumSize: {
                     QRectF boundingRect = labelBoundingRect(fn, "...");
                     width = boundingRect.width() + labelPadding();
                     width += base.width();
-                    height = qMax(boundingRect.height(), base.height());
+                    height = boundingRect.height() / 2.0;
                     sh = QSizeF(width, height);
                     break;
                 }
                 case Qt::PreferredSize: {
                     int labelWidth = 0;
+                    int firstHeight = -1;
                     foreach (const QString& s, ticksList) {
                         QRect rect = labelBoundingRect(fn, s);
                         labelWidth = qMax(rect.width(), labelWidth);
-                        height += rect.height();
+                        height = rect.height();
+                        if (firstHeight < 0)
+                            firstHeight = height;
                     }
                     width = labelWidth + labelPadding() + 2; //two pixels of tolerance
                     width += base.width();
-                    height = qMax(height, base.height());
+                    height = qMax(height, qreal(firstHeight)) / 2.0;
                     sh = QSizeF(width, height);
                     break;
                 }
                 default:
                     break;
                 }
                 return sh;
             }
             #include "moc_chartvalueaxisy_p.cpp"
             QTCOMMERCIALCHART_END_NAMESPACE

src/axis/verticalaxis.cpp +2 -2

             /****************************************************************************
             **
             ** Copyright (C) 2013 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 "verticalaxis_p.h"
             #include "qabstractaxis.h"
             #include <QFontMetrics>
             #include <QDebug>
             QTCOMMERCIALCHART_BEGIN_NAMESPACE
             VerticalAxis::VerticalAxis(QAbstractAxis *axis, QGraphicsItem* item, bool intervalAxis)
                 : ChartAxis(axis, item, intervalAxis)
             {
             }
             VerticalAxis::~VerticalAxis()
             {
             }
             void VerticalAxis::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();
                 qreal height = axisRect.bottom();
                 //arrow
                 QGraphicsLineItem *arrowItem = static_cast<QGraphicsLineItem*>(axis.at(0));
                 //arrow position
                 if (alignment()==Qt::AlignLeft)
                     arrowItem->setLine( axisRect.right() , gridRect.top(), axisRect.right(), gridRect.bottom());
                 else if(alignment()==Qt::AlignRight)
                     arrowItem->setLine( axisRect.left() , gridRect.top(), axisRect.left(), gridRect.bottom());
                 QFontMetrics fn(font());
                 //title
                 int titlePad = 0;
                 QRectF titleBoundingRect;
                 if (!titleText().isEmpty() && titleItem()->isVisible()) {
                     QFontMetrics fn(title->font());
                     int size(0);
                     size = gridRect.height();
                     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);
                     }
                     titlePad = titlePadding();
                     titleBoundingRect = title->boundingRect();
                     QPointF center = gridRect.center() - titleBoundingRect.center();
                     if (alignment() == Qt::AlignLeft) {
                         title->setPos(axisRect.left() - titleBoundingRect.width() / 2 + titleBoundingRect.height() / 2 + titlePad, center.y());
                     }
                     else if (alignment() == Qt::AlignRight) {
                         title->setPos(axisRect.right() - titleBoundingRect.width() / 2 - titleBoundingRect.height() / 2 - titlePad, center.y());
                     }
                     title->setTransformOriginPoint(titleBoundingRect.center());
                     title->setRotation(270);
                 }
                 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(gridRect.left() , layout[i], gridRect.right(), layout[i]);
                     //label text wrapping
                     QString text = labelList.at(i);
                     QRectF boundingRect = labelBoundingRect(fn, text);
                     qreal size = axisRect.right() - axisRect.left() - labelPadding() - titleBoundingRect.height() - (titlePad * 2);
                     if (boundingRect.width() > size) {
                         QString label = text + "...";
                         while (boundingRect.width() > size && label.length() > 3) {
                             label.remove(label.length() - 4, 1);
                             boundingRect = labelBoundingRect(fn, label);
                         }
                         labelItem->setText(label);
                     } else {
                         labelItem->setText(text);
                     }
                     //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();
                     //ticks and label position
                     if (alignment() == Qt::AlignLeft) {
                         labelItem->setPos(axisRect.right() - rect.width() + (widthDiff / 2) - labelPadding(), layout[i] - center.y());
                         tickItem->setLine(axisRect.right() - labelPadding(), layout[i], axisRect.right(), layout[i]);
                     } else if (alignment() == Qt::AlignRight) {
                         labelItem->setPos(axisRect.left() + labelPadding() - (widthDiff / 2), layout[i] - center.y());
                         tickItem->setLine(axisRect.left(), layout[i], axisRect.left() + labelPadding(), layout[i]);
                     }
                     //label in beetwen
                     if(intervalAxis()&& i+1!=layout.size()) {
                         const qreal delta = (layout[i+1] - layout[i])/2;
                         labelItem->setPos(labelItem->pos().x() , layout[i] + delta - center.y());
                     }
                     //label overlap detection
                     if(labelItem->pos().y() + boundingRect.height() > height ||
-                        labelItem->pos().y() + boundingRect.height()/2 > gridRect.bottom() ||
+                        labelItem->pos().y() + boundingRect.height()/2 > axisRect.bottom() ||
-                        labelItem->pos().y() + boundingRect.height()/2 < gridRect.top()) {
+                        labelItem->pos().y() + boundingRect.height()/2 < axisRect.top()) {
                         labelItem->setVisible(false);
                     }
                     else {
                         labelItem->setVisible(true);
                         height=labelItem->pos().y();
                     }
                     //shades
                     if ((i + 1) % 2 && i > 1) {
                         QGraphicsRectItem *rectItem = static_cast<QGraphicsRectItem *>(shades.at(i / 2 - 1));
                         rectItem->setRect(gridRect.left(), layout[i], gridRect.width(), layout[i - 1] - layout[i]);
                     }
                     // check if the grid line and the axis tick should be shown
                     qreal y = gridItem->line().p1().y();
                     if ((y < gridRect.top() || y > gridRect.bottom()))
                     {
                         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.left(), gridRect.top(), gridRect.right(), gridRect.top());
                     gridLine->setVisible(true);
                     gridLine = static_cast<QGraphicsLineItem*>(lines.at(layout.size()+1));
                     gridLine->setLine(gridRect.left(), gridRect.bottom(), gridRect.right(), gridRect.bottom());
                     gridLine->setVisible(true);
                 }
             }
             QSizeF VerticalAxis::sizeHint(Qt::SizeHint which, const QSizeF &constraint) const
             {
                 Q_UNUSED(constraint);
                 QFontMetrics fn(titleFont());
                 QSizeF sh(0,0);
                 if (titleText().isEmpty() || !titleItem()->isVisible())
                     return sh;
                 switch (which) {
                 case Qt::MinimumSize:
                         sh = QSizeF(fn.height() + (titlePadding() * 2), fn.boundingRect("...").width());
                     break;
                 case Qt::MaximumSize:
                 case Qt::PreferredSize:
                         sh = QSizeF(fn.height() + (titlePadding() * 2), fn.boundingRect(axis()->titleText()).width());
                     break;
                 default:
                     break;
                 }
                 return sh;
             }
             QTCOMMERCIALCHART_END_NAMESPACE

src/chartlayout.cpp +11 -1

             /****************************************************************************
             **
             ** Copyright (C) 2013 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 "chartlayout_p.h"
             #include "chartpresenter_p.h"
             #include "qlegend_p.h"
             #include "chartaxis_p.h"
             #include "charttitle_p.h"
             #include "chartbackground_p.h"
             #include <QDebug>
             QTCOMMERCIALCHART_BEGIN_NAMESPACE
             static const qreal maxAxisPortion = 0.4;
             ChartLayout::ChartLayout(ChartPresenter *presenter)
                 : m_presenter(presenter),
                   m_margins(20, 20, 20, 20),
                   m_minChartRect(0, 0, 200, 200)
             {
             }
             ChartLayout::~ChartLayout()
             {
             }
             void ChartLayout::setGeometry(const QRectF &rect)
             {
                 if (!rect.isValid())
                     return;
                 QList<ChartAxis *> axes = m_presenter->axisItems();
                 ChartTitle *title = m_presenter->titleElement();
                 QLegend *legend = m_presenter->legend();
                 ChartBackground *background = m_presenter->backgroundElement();
                 QRectF contentGeometry = calculateBackgroundGeometry(rect, background);
                 contentGeometry = calculateContentGeometry(contentGeometry);
                 if (title && title->isVisible())
                     contentGeometry = calculateTitleGeometry(contentGeometry, title);
                 if (legend->isAttachedToChart() && legend->isVisible())
                     contentGeometry = calculateLegendGeometry(contentGeometry, legend);
                 contentGeometry = calculateAxisGeometry(contentGeometry, axes);
                 m_presenter->setGeometry(contentGeometry);
                 QGraphicsLayout::setGeometry(rect);
             }
             QRectF ChartLayout::calculateContentGeometry(const QRectF &geometry) const
             {
                 return geometry.adjusted(m_margins.left(), m_margins.top(), -m_margins.right(), -m_margins.bottom());
             }
             QRectF ChartLayout::calculateContentMinimum(const QRectF &minimum) const
             {
                 return  minimum.adjusted(0, 0, m_margins.left() + m_margins.right(), m_margins.top() + m_margins.bottom());
             }
             QRectF ChartLayout::calculateBackgroundGeometry(const QRectF &geometry, ChartBackground *background) const
             {
                 qreal left, top, right, bottom;
                 getContentsMargins(&left, &top, &right, &bottom);
                 QRectF backgroundGeometry = geometry.adjusted(left, top, -right, -bottom);
                 if (background)
                     background->setRect(backgroundGeometry);
                 return backgroundGeometry;
             }
             QRectF ChartLayout::calculateBackgroundMinimum(const QRectF &minimum) const
             {
                 qreal left, top, right, bottom;
                 getContentsMargins(&left, &top, &right, &bottom);
                 return minimum.adjusted(0, 0, left + right, top + bottom);
             }
             QRectF ChartLayout::calculateAxisGeometry(const QRectF &geometry, const QList<ChartAxis *>& axes) const
             {
                 QSizeF left(0,0);
                 QSizeF minLeft(0,0);
                 QSizeF right(0,0);
                 QSizeF minRight(0,0);
                 QSizeF bottom(0,0);
                 QSizeF minBottom(0,0);
                 QSizeF top(0,0);
                 QSizeF minTop(0,0);
+                QSizeF labelExtents(0,0);
                 int leftCount = 0;
                 int rightCount = 0;
                 int topCount = 0;
                 int bottomCount = 0;
                 foreach (ChartAxis *axis , axes) {
                     if (!axis->isVisible())
                         continue;
                     QSizeF size = axis->effectiveSizeHint(Qt::PreferredSize);
                     //this is used to get single thick font size
                     QSizeF minSize = axis->effectiveSizeHint(Qt::MinimumSize);
                     switch (axis->alignment()) {
                     case Qt::AlignLeft:
                        left.setWidth(left.width()+size.width());
                        left.setHeight(qMax(left.height(),size.height()));
                        minLeft.setWidth(minLeft.width()+minSize.width());
                        minLeft.setHeight(qMax(minLeft.height(),minSize.height()));
+                       labelExtents.setHeight(qMax(size.height(), labelExtents.height()));
                        leftCount++;
                        break;
                     case Qt::AlignRight:
                         right.setWidth(right.width()+size.width());
                         right.setHeight(qMax(right.height(),size.height()));
                         minRight.setWidth(minRight.width()+minSize.width());
                         minRight.setHeight(qMax(minRight.height(),minSize.height()));
+                        labelExtents.setHeight(qMax(size.height(), labelExtents.height()));
                         rightCount++;
                         break;
                     case Qt::AlignTop:
                         top.setWidth(qMax(top.width(),size.width()));
                         top.setHeight(top.height()+size.height());
                         minTop.setWidth(qMax(minTop.width(),minSize.width()));
                         minTop.setHeight(minTop.height()+minSize.height());
+                        labelExtents.setWidth(qMax(size.width(), labelExtents.width()));
                         topCount++;
                         break;
                     case Qt::AlignBottom:
                         bottom.setWidth(qMax(bottom.width(), size.width()));
                         bottom.setHeight(bottom.height() + size.height());
                         minBottom.setWidth(qMax(minBottom.width(),minSize.width()));
                         minBottom.setHeight(minBottom.height() + minSize.height());
+                        labelExtents.setWidth(qMax(size.width(), labelExtents.width()));
                         bottomCount++;
                         break;
                     default:
                         qWarning()<<"Axis is without alignment !";
                         break;
                     }
                 }
                 int totalVerticalAxes = leftCount + rightCount;
                 qreal leftSqueezeRatio = 1.0;
                 qreal rightSqueezeRatio = 1.0;
                 qreal vratio = 0;
                 if (totalVerticalAxes > 0)
                     vratio = (maxAxisPortion * geometry.width()) / totalVerticalAxes;
                 if (leftCount > 0) {
                     int maxWidth = vratio * leftCount;
                     if (left.width() > maxWidth) {
                         leftSqueezeRatio = maxWidth / left.width();
                         left.setWidth(maxWidth);
                     }
                 }
                 if (rightCount > 0) {
                     int maxWidth = vratio * rightCount;
                     if (right.width() > maxWidth) {
                         rightSqueezeRatio = maxWidth / right.width();
                         right.setWidth(maxWidth);
                     }
                 }
                 int totalHorizontalAxes = topCount + bottomCount;
                 qreal topSqueezeRatio = 1.0;
                 qreal bottomSqueezeRatio = 1.0;
                 qreal hratio = 0;
                 if (totalHorizontalAxes > 0)
                     hratio = (maxAxisPortion * geometry.height()) / totalHorizontalAxes;
                 if (topCount > 0) {
                     int maxHeight = hratio * topCount;
                     if (top.height() > maxHeight) {
                         topSqueezeRatio = maxHeight / top.height();
                         top.setHeight(maxHeight);
                     }
                 }
                 if (bottomCount > 0) {
                     int maxHeight = hratio * bottomCount;
                     if (bottom.height() > maxHeight) {
                         bottomSqueezeRatio = maxHeight / bottom.height();
                         bottom.setHeight(maxHeight);
                     }
                 }
                 qreal minHeight = qMax(minLeft.height(),minRight.height()) + 1;
                 qreal minWidth = qMax(minTop.width(),minBottom.width()) + 1;
+                // Ensure that there is enough space for first and last tick labels.
+                left.setWidth(qMax(labelExtents.width(), left.width()));
+                right.setWidth(qMax(labelExtents.width(), right.width()));
+                top.setHeight(qMax(labelExtents.height(), top.height()));
+                bottom.setHeight(qMax(labelExtents.height(), bottom.height()));
                 QRectF chartRect = geometry.adjusted(qMax(left.width(),minWidth/2), qMax(top.height(), minHeight/2),-qMax(right.width(),minWidth/2),-qMax(bottom.height(),minHeight/2));
                 qreal leftOffset = 0;
                 qreal rightOffset = 0;
                 qreal topOffset = 0;
                 qreal bottomOffset = 0;
                 foreach(ChartElement *axisElement , axes) {
                     ChartAxis* axis = qobject_cast<ChartAxis*>(axisElement);
                     if (!axis->isVisible())
                         continue;
                     QSizeF size = axis->effectiveSizeHint(Qt::PreferredSize);
                     switch(axis->alignment()){
                     case Qt::AlignLeft:{
                         qreal width = size.width();
                         if (leftSqueezeRatio < 1.0)
                             width *= leftSqueezeRatio;
                         leftOffset+=width;
                         axis->setGeometry(QRect(chartRect.left()-leftOffset, geometry.top(),width, geometry.bottom()),chartRect);
                         break;
                     }
                     case Qt::AlignRight:{
                         qreal width = size.width();
                         if (rightSqueezeRatio < 1.0)
                             width *= rightSqueezeRatio;
                         axis->setGeometry(QRect(chartRect.right()+rightOffset,geometry.top(),width,geometry.bottom()),chartRect);
                         rightOffset+=width;
                         break;
                     }
                     case Qt::AlignTop: {
                         qreal height = size.height();
                         if (topSqueezeRatio < 1.0)
                             height *= topSqueezeRatio;
                         axis->setGeometry(QRect(geometry.left(), chartRect.top() - topOffset - height, geometry.width(), height), chartRect);
                         topOffset += height;
                         break;
                     }
                     case Qt::AlignBottom:
                         qreal height = size.height();
                         if (bottomSqueezeRatio < 1.0)
                             height *= bottomSqueezeRatio;
                         axis->setGeometry(QRect(geometry.left(), chartRect.bottom() + bottomOffset, geometry.width(), height), chartRect);
                         bottomOffset += height;
                         break;
                     }
                 }
                 return chartRect;
             }
             QRectF ChartLayout::calculateAxisMinimum(const QRectF &minimum, const QList<ChartAxis *>& axes) const
             {
                 QSizeF left;
                 QSizeF right;
                 QSizeF bottom;
                 QSizeF top;
                 foreach (ChartAxis *axis, axes) {
                     QSizeF size = axis->effectiveSizeHint(Qt::MinimumSize);
                     if (!axis->isVisible())
                         continue;
                     switch (axis->alignment()) {
                     case Qt::AlignLeft:
                         left.setWidth(left.width() + size.width());
                         left.setHeight(qMax(left.height() * 2, size.height()));
                         break;
                     case Qt::AlignRight:
                         right.setWidth(right.width() + size.width());
                         right.setHeight(qMax(right.height() * 2, size.height()));
                         break;
                     case Qt::AlignTop:
                         top.setWidth(qMax(top.width(), size.width()));
                         top.setHeight(top.height() + size.height());
                         break;
                     case Qt::AlignBottom:
                         bottom.setWidth(qMax(bottom.width(), size.width()));
                         bottom.setHeight(bottom.height() + size.height());
                         break;
                     }
                 }
                 return minimum.adjusted(0, 0, left.width() + right.width() + qMax(top.width(), bottom.width()), top.height() + bottom.height() + qMax(left.height(), right.height()));
             }
             QRectF ChartLayout::calculateLegendGeometry(const QRectF &geometry, QLegend *legend) const
             {
                 QSizeF size = legend->effectiveSizeHint(Qt::PreferredSize, QSizeF(-1, -1));
                 QRectF legendRect;
                 QRectF result;
                 switch (legend->alignment()) {
                 case Qt::AlignTop: {
                     legendRect = QRectF(geometry.topLeft(), QSizeF(geometry.width(), size.height()));
                     result = geometry.adjusted(0, legendRect.height(), 0, 0);
                     break;
                 }
                 case Qt::AlignBottom: {
                     legendRect = QRectF(QPointF(geometry.left(), geometry.bottom() - size.height()), QSizeF(geometry.width(), size.height()));
                     result = geometry.adjusted(0, 0, 0, -legendRect.height());
                     break;
                 }
                 case Qt::AlignLeft: {
                     qreal width = qMin(size.width(), geometry.width() * maxAxisPortion);
                     legendRect = QRectF(geometry.topLeft(), QSizeF(width, geometry.height()));
                     result = geometry.adjusted(width, 0, 0, 0);
                     break;
                 }
                 case Qt::AlignRight: {
                     qreal width = qMin(size.width(), geometry.width() * maxAxisPortion);
                     legendRect = QRectF(QPointF(geometry.right() - width, geometry.top()), QSizeF(width, geometry.height()));
                     result = geometry.adjusted(0, 0, -width, 0);
                     break;
                 }
                 default: {
                     legendRect = QRectF(0, 0, 0, 0);
                     result = geometry;
                     break;
                 }
                 }
                 legend->setGeometry(legendRect);
                 return result;
             }
             QRectF ChartLayout::calculateLegendMinimum(const QRectF &geometry, QLegend *legend) const
             {
                 QSizeF minSize = legend->effectiveSizeHint(Qt::MinimumSize, QSizeF(-1, -1));
                 return geometry.adjusted(0, 0, minSize.width(), minSize.height());
             }
             QRectF ChartLayout::calculateTitleGeometry(const QRectF &geometry, ChartTitle *title) const
             {
                 title->setGeometry(geometry);
                 QPointF center = geometry.center() - title->boundingRect().center();
                 title->setPos(center.x(),title->pos().y());
                 return geometry.adjusted(0,title->boundingRect().height()+1,0,0);
             }
             QRectF ChartLayout::calculateTitleMinimum(const QRectF &minimum, ChartTitle *title) const
             {
                 QSizeF min = title->sizeHint(Qt::MinimumSize);
                 return  minimum.adjusted(0, 0, min.width(), min.height());
             }
             QSizeF ChartLayout::sizeHint(Qt::SizeHint which, const QSizeF &constraint) const
             {
                 Q_UNUSED(constraint);
                 if (which == Qt::MinimumSize) {
                     QList<ChartAxis *> axes = m_presenter->axisItems();
                     ChartTitle *title = m_presenter->titleElement();
                     QLegend *legend = m_presenter->legend();
                     QRectF minimumRect(0, 0, 0, 0);
                     minimumRect = calculateBackgroundMinimum(minimumRect);
                     minimumRect = calculateContentMinimum(minimumRect);
                     minimumRect = calculateTitleMinimum(minimumRect, title);
                     minimumRect = calculateLegendMinimum(minimumRect, legend);
                     minimumRect = calculateAxisMinimum(minimumRect, axes);
                     return  minimumRect.united(m_minChartRect).size().toSize();
                 }
                 return QSize(-1, -1);
             }
             void ChartLayout::setMargins(const QMargins &margins)
             {
                 if (m_margins != margins) {
                     m_margins = margins;
                     updateGeometry();
                 }
             }
             QMargins ChartLayout::margins() const
             {
                 return m_margins;
             }
             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