HG_REPOSITORIES/LPP/INSTRUMENTATION/USERS/JEANDET/qtcharts Commit - r2333:158c8aa5716a

Fixes missing layout updated on ticks,base and format calls

Michal Klocek -

r2333:158c8aa5716a

parent child

Context file:

r2333:158c8aa5716a

Collapse all files

src/axis/logvalueaxis/chartlogvalueaxisx.cpp +3 0

             /****************************************************************************
             **
             ** 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 "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(qRound(logMax - logMin));
                 tickCount++;
                 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(qRound(logMax - logMin));
                 tickCount++;
                 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;
                 qreal height = 0;
                 switch (which) {
                 case Qt::MinimumSize:{
                     int count = qMax(ticksList.last().count(),ticksList.first().count());
                     width = fn.averageCharWidth() * count;
                     height = fn.height() + labelPadding();
                     width = qMax(width,base.width());
                     height += base.height();
                     sh = QSizeF(width,height);
                     break;
                 }
                 case Qt::PreferredSize: {
                     int count = qMax(ticksList.last().count(),ticksList.first().count());
                     width=fn.averageCharWidth() * count;
                     height=fn.height()+labelPadding();
                     width=qMax(width,base.width());
                     height+=base.height();
                     sh = QSizeF(width,height);
                     break;
                 }
                 default:
                     break;
                 }
                 return sh;
             }
             #include "moc_chartlogvalueaxisx_p.cpp"
             QTCOMMERCIALCHART_END_NAMESPACE

src/axis/logvalueaxis/chartlogvalueaxisy.cpp +2 0

             /****************************************************************************
             **
             ** 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 "chartlogvalueaxisy_p.h"
             #include "chartpresenter_p.h"
             #include "qlogvalueaxis.h"
             #include "chartlayout_p.h"
             #include <QGraphicsLayout>
             #include <QFontMetrics>
             #include <qmath.h>
             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(qRound(logMax - logMin));
                 tickCount++;
                 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(qRound(logMax - logMin));
                 tickCount++;
                 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;
                 qreal height = 0;
                 switch (which) {
                 case Qt::MinimumSize: {
                     width = fn.boundingRect("...").width() + labelPadding();
                     width += base.width();
                     height = fn.height();
                     height = qMax(height,base.height());
                     sh = QSizeF(width,height);
                     break;
                 }
                 case Qt::PreferredSize: {
                     int count = qMax(ticksList.first().count() , ticksList.last().count());
                     width = count*fn.averageCharWidth() + labelPadding() + 2; //two pixels of tolerance
                     width += base.width();
                     height = fn.height() * ticksList.count();
                     height = qMax(height,base.height());
                     sh = QSizeF(width,height);
                     break;
                 }
                 default:
                     break;
                 }
                 return sh;
             }
             #include "moc_chartlogvalueaxisy_p.cpp"
             QTCOMMERCIALCHART_END_NAMESPACE

src/axis/logvalueaxis/qlogvalueaxis.cpp +1 -1

             /****************************************************************************
             **
             ** 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 "qlogvalueaxis.h"
             #include "qlogvalueaxis_p.h"
             #include "chartlogvalueaxisx_p.h"
             #include "chartlogvalueaxisy_p.h"
             #include "abstractdomain_p.h"
             #include <float.h>
             #include <cmath>
             QTCOMMERCIALCHART_BEGIN_NAMESPACE
             /*!
                 \class QLogValueAxis
                 \brief The QLogValueAxis class is used for manipulating chart's axis.
                 \mainclass
             */
             /*!
                 \qmlclass DateTimeAxis QLogValueAxis
                 \brief The DateTimeAxis element is used for manipulating chart's axes
                 \inherits AbstractAxis
             */
             /*!
               \property QLogValueAxis::min
               Defines the minimum value on the axis.
               When setting this property the max is adjusted if necessary, to ensure that the range remains valid.
             */
             /*!
               \qmlproperty real ValuesAxis::min
               Defines the minimum value on the axis.
               When setting this property the max is adjusted if necessary, to ensure that the range remains valid.
             */
             /*!
               \property QLogValueAxis::max
               Defines the maximum value on the axis.
               When setting this property the min is adjusted if necessary, to ensure that the range remains valid.
             */
             /*!
               \qmlproperty real ValuesAxis::max
               Defines the maximum value on the axis.
               When setting this property the min is adjusted if necessary, to ensure that the range remains valid.
             */
             /*!
               \fn void QLogValueAxis::minChanged(qreal min)
               Axis emits signal when \a min of axis has changed.
             */
             /*!
               \qmlsignal ValuesAxis::onMinChanged(qreal min)
               Axis emits signal when \a min of axis has changed.
             */
             /*!
               \fn void QLogValueAxis::maxChanged(qreal max)
               Axis emits signal when \a max of axis has changed.
             */
             /*!
               \qmlsignal ValuesAxis::onMaxChanged(qreal max)
               Axis emits signal when \a max of axis has changed.
             */
             /*!
               \fn void QLogValueAxis::rangeChanged(qreal min, qreal max)
               Axis emits signal when \a min or \a max of axis has changed.
             */
             /*!
                 Constructs an axis object which is a child of \a parent.
             */
             QLogValueAxis::QLogValueAxis(QObject *parent) :
                 QAbstractAxis(*new QLogValueAxisPrivate(this), parent)
             {
             }
             /*!
                 \internal
             */
             QLogValueAxis::QLogValueAxis(QLogValueAxisPrivate &d, QObject *parent) : QAbstractAxis(d, parent)
             {
             }
             /*!
                 Destroys the object
             */
             QLogValueAxis::~QLogValueAxis()
             {
                 Q_D(QLogValueAxis);
                 if (d->m_chart)
                     d->m_chart->removeAxis(this);
             }
             void QLogValueAxis::setMin(qreal min)
             {
                 Q_D(QLogValueAxis);
                 setRange(min, qMax(d->m_max, min));
             }
             qreal QLogValueAxis::min() const
             {
                 Q_D(const QLogValueAxis);
                 return d->m_min;
             }
             void QLogValueAxis::setMax(qreal max)
             {
                 Q_D(QLogValueAxis);
                 setRange(qMin(d->m_min, max), max);
             }
             qreal QLogValueAxis::max() const
             {
                 Q_D(const QLogValueAxis);
                 return d->m_max;
             }
             /*!
               Sets range from \a min to \a max on the axis.
               If min is greater than max then this function returns without making any changes.
             */
             void QLogValueAxis::setRange(qreal min, qreal max)
             {
                 Q_D(QLogValueAxis);
                 bool changed = false;
                 if (min > max)
                     return;
                 if (min > 0) {
                     if (!qFuzzyCompare(d->m_min, min)) {
                         d->m_min = min;
                         changed = true;
                         emit minChanged(min);
                     }
                     if (!qFuzzyCompare(d->m_max, max)) {
                         d->m_max = max;
                         changed = true;
                         emit maxChanged(max);
                     }
                     if (changed) {
                         emit rangeChanged(min, max);
                         emit d->rangeChanged(min,max);
                     }
                 }
             }
             void QLogValueAxis::setLabelFormat(const QString &format)
             {
                 Q_D(QLogValueAxis);
                 d->m_format = format;
                 emit labelFormatChanged(format);
             }
             QString QLogValueAxis::labelFormat() const
             {
                 Q_D(const QLogValueAxis);
                 return d->m_format;
             }
             void QLogValueAxis::setBase(qreal base)
             {
                 // check if base is correct
                 if (qFuzzyCompare(base, 1))
                     return;
                 if (base > 0) {
                     Q_D(QLogValueAxis);
                     d->m_base = base;
                     emit baseChanged(base);
                 }
             }
             qreal QLogValueAxis::base() const
             {
                 Q_D(const QLogValueAxis);
                 return d->m_base;
             }
             /*!
               Returns the type of the axis
             */
             QAbstractAxis::AxisType QLogValueAxis::type() const
             {
                 return AxisTypeLogValue;
             }
             /////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////
             QLogValueAxisPrivate::QLogValueAxisPrivate(QLogValueAxis *q)
                 : QAbstractAxisPrivate(q),
                   m_min(1),
                   m_max(1),
                   m_base(10),
                   m_format(QString::null)
             {
             }
             QLogValueAxisPrivate::~QLogValueAxisPrivate()
             {
             }
             void QLogValueAxisPrivate::setMin(const QVariant &min)
             {
                 Q_Q(QLogValueAxis);
                 bool ok;
                 qreal value = min.toReal(&ok);
                 if (ok)
                     q->setMin(value);
             }
             void QLogValueAxisPrivate::setMax(const QVariant &max)
             {
                 Q_Q(QLogValueAxis);
                 bool ok;
                 qreal value = max.toReal(&ok);
                 if (ok)
                     q->setMax(value);
             }
             void QLogValueAxisPrivate::setRange(const QVariant &min, const QVariant &max)
             {
                 Q_Q(QLogValueAxis);
                 bool ok1;
                 bool ok2;
                 qreal value1 = min.toReal(&ok1);
                 qreal value2 = max.toReal(&ok2);
                 if (ok1 && ok2)
                     q->setRange(value1, value2);
             }
             void QLogValueAxisPrivate::setRange(qreal min, qreal max)
             {
                 Q_Q(QLogValueAxis);
                 bool changed = false;
                 if (min > max)
                     return;
                 if (min > 0) {
                     if (!qFuzzyCompare(m_min, min)) {
                         m_min = min;
                         changed = true;
                         emit q->minChanged(min);
                     }
                     if (!qFuzzyCompare(m_max, max)) {
                         m_max = max;
                         changed = true;
                         emit q->maxChanged(max);
                     }
                     if (changed) {
-                        emit q->rangeChanged(min, max);
                         emit rangeChanged(min,max);
+                        emit q->rangeChanged(min, max);
                     }
                 }
             }
             void QLogValueAxisPrivate::initializeGraphics(QGraphicsItem* parent)
             {
                 Q_Q(QLogValueAxis);
                 ChartAxis* axis(0);
                 if (orientation() == Qt::Vertical)
                     axis = new ChartLogValueAxisY(q,parent);
                 if (orientation() == Qt::Horizontal)
                     axis = new ChartLogValueAxisX(q,parent);
                 m_item.reset(axis);
                 QAbstractAxisPrivate::initializeGraphics(parent);
             }
             void QLogValueAxisPrivate::initializeDomain(AbstractDomain *domain)
             {
                 if (orientation() == Qt::Vertical) {
                     if(!qFuzzyCompare(m_max, m_min)) {
                         domain->setRangeY(m_min, m_max);
                     }
                     else if ( domain->minY() > 0) {
                         setRange(domain->minY(), domain->maxY());
                     } else {
                         domain->setRangeY(m_min, domain->maxY());
                     }
                 }
                 if (orientation() == Qt::Horizontal) {
                     if(!qFuzzyCompare(m_max, m_min)) {
                         domain->setRangeX(m_min, m_max);
                     }
                     else if (domain->minX() > 0){
                         setRange(domain->minX(), domain->maxX());
                     } else {
                         domain->setRangeX(m_min, domain->maxX());
                     }
                 }
             }
             #include "moc_qlogvalueaxis.cpp"
             #include "moc_qlogvalueaxis_p.cpp"
             QTCOMMERCIALCHART_END_NAMESPACE

src/axis/valueaxis/chartvalueaxisx.cpp +2 0

             /****************************************************************************
             **
             ** 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:{
                     count = qMin(count,5);
                     width = fn.averageCharWidth() * count;
                     height = fn.height() + labelPadding();
                     width = qMax(width,base.width());
                     height += base.height();
                     sh = QSizeF(width,height);
                     break;
                 }
                 case Qt::PreferredSize:{
                     width=fn.averageCharWidth() * count;
                     height=fn.height()+labelPadding();
                     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

src/axis/valueaxis/chartvalueaxisy.cpp +2 0

             /****************************************************************************
             **
             ** 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 "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;
                 qreal height = 0;
                 int count = 1;
                 if(!ticksList.empty()){
                     count = qMax(ticksList.last().count(),ticksList.first().count());
                 }
                 switch (which) {
                 case Qt::MinimumSize: {
                     width = fn.boundingRect("...").width() + labelPadding();
                     width += base.width();
                     height = fn.height();
                     height = qMax(height,base.height());
                     sh = QSizeF(width,height);
                     break;
                 }
                 case Qt::PreferredSize:
                 {
                     width = count*fn.averageCharWidth() + labelPadding() + 2; //two pixels of tolerance
                     width += base.width();
                     height = fn.height() * ticksList.count();
                     height = qMax(height,base.height());
                     sh = QSizeF(width,height);
                     break;
                 }
                 default:
                     break;
                 }
                 return sh;
             }
             #include "moc_chartvalueaxisy_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