##// END OF EJS Templates
Fixes even more missing layout update calls
Fixes even more missing layout update calls

File last commit:

r2333:158c8aa5716a
r2335:d5e9c7529cd7
Show More
chartvalueaxisy.cpp
130 lines | 3.6 KiB | text/x-c | CppLexer
/ src / axis / valueaxis / chartvalueaxisy.cpp
Marek Rosa
Added Chart classes for value and categories axis
r1555 /****************************************************************************
**
** 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$
**
****************************************************************************/
Marek Rosa
renamed QValueAxis related files
r1805 #include "chartvalueaxisy_p.h"
Marek Rosa
Added Chart classes for value and categories axis
r1555 #include "qabstractaxis.h"
#include "chartpresenter_p.h"
Marek Rosa
renamed QValueAxis related files
r1805 #include "qvalueaxis.h"
Michal Klocek
Resubmit commit 394f63738c11558ae410383fbf2403f57fca4bf8 due to too many merge confilcts
r2106 #include "chartlayout_p.h"
Marek Rosa
Added Chart classes for value and categories axis
r1555 #include <QGraphicsLayout>
#include <QFontMetrics>
Michal Klocek
Refactor animator...
r1735 #include <qmath.h>
Michal Klocek
Updates axis drawing code...
r2133 #include <QDebug>
Marek Rosa
Added Chart classes for value and categories axis
r1555
QTCOMMERCIALCHART_BEGIN_NAMESPACE
Michal Klocek
Refactors internals...
r2273 ChartValueAxisY::ChartValueAxisY(QValueAxis *axis, QGraphicsItem* item)
: VerticalAxis(axis, item),
Jani Honkonen
src folder: another massive victory for coding style police
r2131 m_axis(axis)
Marek Rosa
Added Chart classes for value and categories axis
r1555 {
Michal Klocek
Refactors internals...
r2273 QObject::connect(m_axis,SIGNAL(tickCountChanged(int)),this, SLOT(handleTickCountChanged(int)));
Marek Rosa
Fixed: axis not redrawing when labelFormat changed
r2323 QObject::connect(m_axis,SIGNAL(labelFormatChanged(QString)),this, SLOT(handleLabelFormatChanged(QString)));
Marek Rosa
Added Chart classes for value and categories axis
r1555 }
Marek Rosa
renamed QValueAxis related files
r1805 ChartValueAxisY::~ChartValueAxisY()
Marek Rosa
Added Chart classes for value and categories axis
r1555 {
}
Marek Rosa
renamed QValueAxis related files
r1805 QVector<qreal> ChartValueAxisY::calculateLayout() const
Marek Rosa
Added Chart classes for value and categories axis
r1555 {
Michal Klocek
Refactors internals...
r2273 int tickCount = m_axis->tickCount();
Q_ASSERT(tickCount >= 2);
Marek Rosa
Added Chart classes for value and categories axis
r1555
QVector<qreal> points;
Michal Klocek
Refactors internals...
r2273 points.resize(tickCount);
Marek Rosa
Added Chart classes for value and categories axis
r1555
Jani Honkonen
src folder: another massive victory for coding style police
r2131 const QRectF &gridRect = gridGeometry();
Michal Klocek
Refactors axis updateGeometry handling...
r2111
Michal Klocek
Refactors internals...
r2273 const qreal deltaY = gridRect.height() / (tickCount - 1);
for (int i = 0; i < tickCount; ++i) {
Michal Klocek
Bugfix precision error when calculating layout in valueaxis
r2144 points[i] = i * -deltaY + gridRect.bottom();
Marek Rosa
Added Chart classes for value and categories axis
r1555 }
Marek Rosa
Removed generic chartaxis
r1561
Marek Rosa
Added Chart classes for value and categories axis
r1555 return points;
}
Marek Rosa
renamed QValueAxis related files
r1805 void ChartValueAxisY::updateGeometry()
Marek Rosa
Added Chart classes for value and categories axis
r1555 {
Marek Rosa
Removed generic chartaxis
r1561 const QVector<qreal> &layout = ChartAxis::layout();
Jani Honkonen
src folder: another massive victory for coding style police
r2131 if (layout.isEmpty())
return;
Michal Klocek
Refactors internals...
r2273 setLabels(createValueLabels(min(),max(),layout.size(),m_axis->labelFormat()));
Michal Klocek
Refactors axis updateGeometry handling...
r2111 VerticalAxis::updateGeometry();
Marek Rosa
Added Chart classes for value and categories axis
r1555 }
Michal Klocek
Refactors internals...
r2273 void ChartValueAxisY::handleTickCountChanged(int tick)
Michal Klocek
Refactors Domain and Axis...
r1698 {
Michal Klocek
Refactors internals...
r2273 Q_UNUSED(tick);
Michal Klocek
Fixes missing layout updated on ticks,base and format calls
r2333 QGraphicsLayoutItem::updateGeometry();
Michal Klocek
Refactors internals...
r2273 if(presenter()) presenter()->layout()->invalidate();
Michal Klocek
Refactors Domain and Axis...
r1698 }
Marek Rosa
Fixed: axis not redrawing when labelFormat changed
r2323 void ChartValueAxisY::handleLabelFormatChanged(const QString &format)
{
Q_UNUSED(format);
Michal Klocek
Fixes missing layout updated on ticks,base and format calls
r2333 QGraphicsLayoutItem::updateGeometry();
Marek Rosa
Fixed: axis not redrawing when labelFormat changed
r2323 if(presenter()) presenter()->layout()->invalidate();
}
Jani Honkonen
src folder: another massive victory for coding style police
r2131 QSizeF ChartValueAxisY::sizeHint(Qt::SizeHint which, const QSizeF &constraint) const
Michal Klocek
Refactors layout...
r1965 {
Q_UNUSED(constraint)
Michal Klocek
Refactors axis updateGeometry handling...
r2111 QFontMetrics fn(font());
Michal Klocek
Refactors layout...
r1965 QSizeF sh;
Michal Klocek
Refactors ChartAxis...
r2138 QSizeF base = VerticalAxis::sizeHint(which, constraint);
Michal Klocek
Refactors internals...
r2273 QStringList ticksList = createValueLabels(min(),max(),m_axis->tickCount(),m_axis->labelFormat());
Jani Honkonen
src folder: another massive victory for coding style police
r2131 qreal width = 0;
qreal height = 0;
Michal Klocek
Refactors layout...
r1965
Michal Klocek
Refactors internals...
r2273 int count = 1;
if(!ticksList.empty()){
count = qMax(ticksList.last().count(),ticksList.first().count());
}
Michal Klocek
Refactors layout...
r1965 switch (which) {
Marek Rosa
Multiaxis support...
r2093 case Qt::MinimumSize: {
Michal Klocek
Updates axis drawing code...
r2133 width = fn.boundingRect("...").width() + labelPadding();
Jani Honkonen
src folder: another massive victory for coding style police
r2131 width += base.width();
Michal Klocek
Updates axis drawing code...
r2133 height = fn.height();
height = qMax(height,base.height());
sh = QSizeF(width,height);
Marek Rosa
Multiaxis support...
r2093 break;
Michal Klocek
Refactors layout:...
r2105 }
Michal Klocek
Updates axis drawing code...
r2133 case Qt::PreferredSize:
{
width = count*fn.averageCharWidth() + labelPadding() + 2; //two pixels of tolerance
Jani Honkonen
src folder: another massive victory for coding style police
r2131 width += base.width();
Michal Klocek
Updates axis drawing code...
r2133 height = fn.height() * ticksList.count();
height = qMax(height,base.height());
sh = QSizeF(width,height);
Marek Rosa
Multiaxis support...
r2093 break;
Michal Klocek
Refactors layout:...
r2105 }
Marek Rosa
Multiaxis support...
r2093 default:
Michal Klocek
Refactors layout...
r1965 break;
}
return sh;
}
Michal Klocek
Refactors Domain and Axis...
r1698
Michal Klocek
Refactors internals...
r2273 #include "moc_chartvalueaxisy_p.cpp"
Marek Rosa
Added Chart classes for value and categories axis
r1555 QTCOMMERCIALCHART_END_NAMESPACE