HG_REPOSITORIES/LPP/INSTRUMENTATION/USERS/JEANDET/qtcharts Commit - r2335:d5e9c7529cd7

Fixes even more missing layout update calls

Michal Klocek -

r2335:d5e9c7529cd7

parent child

Context file:

r2335:d5e9c7529cd7

Collapse all files

src/axis/barcategoryaxis/chartbarcategoryaxisx.cpp +1 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 "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 offset =-min()-0.5;
                 offset = int(offset * delta)%int(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 height=0;
                   switch (which) {
                     case Qt::MinimumSize:
                         width = fn.boundingRect("...").width();
                         height = fn.height()+labelPadding();
                         width=qMax(width,base.width());
                         height += base.height();
                         sh = QSizeF(width,height);
                         break;
                     case Qt::PreferredSize:{
                         for (int i = 0; i < ticksList.size(); ++i)
                         {
                             QRectF rect = fn.boundingRect(ticksList.at(i));
                             width += rect.width();
                         }
                         height = fn.height()+labelPadding();
                         width = qMax(width,base.width());
                         height += base.height();
                         sh = QSizeF(width,height);
                         break;
                     }
                     default:
                       break;
                   }
                   return sh;
             }
             #include "moc_chartbarcategoryaxisx_p.cpp"
             QTCOMMERCIALCHART_END_NAMESPACE

src/axis/datetimeaxis/chartdatetimeaxisx.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 "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());
                 qreal width = 0;
                 qreal height = 0;
                 if(ticksList.empty()){
                     return sh;
                 }
                 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_chartdatetimeaxisx_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