##// END OF EJS Templates
Fix box-and-whiskers animations...
Fix box-and-whiskers animations Change-Id: I406a9b5320caa7c971f692330077ea3b71206655 Reviewed-by: Miikka Heikkinen <miikka.heikkinen@digia.com>

File last commit:

r2539:74f3dbde7a75
r2560:a2f72685ff33
Show More
chartbarcategoryaxisx.cpp
138 lines | 4.2 KiB | text/x-c | CppLexer
/ src / axis / barcategoryaxis / chartbarcategoryaxisx.cpp
Marek Rosa
Added Chart classes for value and categories axis
r1555 /****************************************************************************
Michal Klocek
Adds scroll support for categories axis
r1716 **
Miikka Heikkinen
Fixed the copyright year 2012 -> 2013
r2432 ** Copyright (C) 2013 Digia Plc
Michal Klocek
Adds scroll support for categories axis
r1716 ** 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
Added Chart classes for value and categories axis
r1555
Marek Rosa
renamed QBarCategoryAxis related files
r1810 #include "chartbarcategoryaxisx_p.h"
Marek Rosa
Added Chart classes for value and categories axis
r1555 #include "chartpresenter_p.h"
Marek Rosa
renamed QBarCategoryAxis related files
r1810 #include "qbarcategoryaxis_p.h"
Miikka Heikkinen
Add Polar chart support...
r2483 #include "abstractchartlayout_p.h"
Michal Klocek
Fixes rounding issue with labels numbering
r1720 #include <QDebug>
#include <qmath.h>
Marek Rosa
Added Chart classes for value and categories axis
r1555
QTCOMMERCIALCHART_BEGIN_NAMESPACE
Michal Klocek
Refactors internals...
r2273 ChartBarCategoryAxisX::ChartBarCategoryAxisX(QBarCategoryAxis *axis, QGraphicsItem* item)
: HorizontalAxis(axis, item, true),
Jani Honkonen
src folder: another massive victory for coding style police
r2131 m_categoriesAxis(axis)
Marek Rosa
Added Chart classes for value and categories axis
r1555 {
Michal Klocek
Fixes layout rounding issue
r2306 QObject::connect(m_categoriesAxis,SIGNAL(categoriesChanged()),this, SLOT(handleCategoriesChanged()));
handleCategoriesChanged();
Marek Rosa
Added Chart classes for value and categories axis
r1555 }
Marek Rosa
Renamed barcategory grephics item class which has been previously ommited
r1918 ChartBarCategoryAxisX::~ChartBarCategoryAxisX()
sauimone
categories axis implementation
r1570 {
}
Marek Rosa
Renamed barcategory grephics item class which has been previously ommited
r1918 QVector<qreal> ChartBarCategoryAxisX::calculateLayout() const
Marek Rosa
Added Chart classes for value and categories axis
r1555 {
Michal Klocek
Updates axis drawing code...
r2133 QVector<qreal> points;
const QRectF& gridRect = gridGeometry();
qreal range = max() - min();
Miikka Heikkinen
Fix positioning errors with category ticks...
r2436 const qreal delta = gridRect.width() / range;
Marek Rosa
Added Chart classes for value and categories axis
r1555
Miikka Heikkinen
Fix positioning errors with category ticks...
r2436 if (delta < 2)
return points;
Michal Klocek
Updates axis drawing code...
r2133
Miikka Heikkinen
Fix positioning errors with category ticks...
r2436 qreal adjustedMin = min() + 0.5;
qreal offset = (ceil(adjustedMin) - adjustedMin) * delta;
Michal Klocek
Refactors axis updateGeometry handling...
r2111
Michal Klocek
Updates axis drawing code...
r2133 int count = qFloor(range);
Miikka Heikkinen
Fix positioning errors with category ticks...
r2436 if (count < 1)
return points;
Michal Klocek
Fixes rounding issue with labels numbering
r1720
Miikka Heikkinen
Fix positioning errors with category ticks...
r2436 points.resize(count + 2);
Michal Klocek
Adds scroll support for categories axis
r1716
Miikka Heikkinen
Fix positioning errors with category ticks...
r2436 for (int i = 0; i < count + 2; ++i)
Miikka Heikkinen
Fix int-qreal rounding errors in axislayout calculations...
r2447 points[i] = offset + (qreal(i) * delta) + gridRect.left();
Michal Klocek
Updates axis drawing code...
r2133
Marek Rosa
Added Chart classes for value and categories axis
r1555 return points;
}
Marek Rosa
Renamed barcategory grephics item class which has been previously ommited
r1918 QStringList ChartBarCategoryAxisX::createCategoryLabels(const QVector<qreal>& layout) const
Michal Klocek
Fixes rounding issue with labels numbering
r1720 {
Michal Klocek
Refactors axis updateGeometry handling...
r2111 QStringList result ;
Jani Honkonen
src folder: another massive victory for coding style police
r2131 const QRectF &gridRect = gridGeometry();
qreal d = (max() - min()) / gridRect.width();
Michal Klocek
Reimplement zoom/scroll hanling for barcategoryaxis Y
r2145
Jani Honkonen
src folder: another massive victory for coding style police
r2131 for (int i = 0; i < layout.count() - 1; ++i) {
qreal x = qFloor((((layout[i] + layout[i + 1]) / 2 - gridRect.left()) * d + min() + 0.5));
Michal Klocek
Refactors layout:...
r2105 if ((x < m_categoriesAxis->categories().count()) && (x >= 0)) {
Michal Klocek
Fixes rounding issue with labels numbering
r1720 result << m_categoriesAxis->categories().at(x);
Jani Honkonen
src folder: another massive victory for coding style police
r2131 } else {
Michal Klocek
Refactors layout:...
r2105 // No label for x coordinate
result << "";
}
Michal Klocek
Fixes rounding issue with labels numbering
r1720 }
result << "";
return result;
}
Marek Rosa
Renamed barcategory grephics item class which has been previously ommited
r1918 void ChartBarCategoryAxisX::updateGeometry()
Marek Rosa
Added Chart classes for value and categories axis
r1555 {
Miikka Heikkinen
Add Polar chart support...
r2483 const QVector<qreal>& layout = ChartAxisElement::layout();
Jani Honkonen
src folder: another massive victory for coding style police
r2131 if (layout.isEmpty())
return;
Michal Klocek
Refactors axis updateGeometry handling...
r2111 setLabels(createCategoryLabels(layout));
HorizontalAxis::updateGeometry();
Marek Rosa
Added Chart classes for value and categories axis
r1555 }
Michal Klocek
Fixes layout rounding issue
r2306 void ChartBarCategoryAxisX::handleCategoriesChanged()
Michal Klocek
Fixes missing update barcategory...
r1643 {
Michal Klocek
Fixes even more missing layout update calls
r2335 QGraphicsLayoutItem::updateGeometry();
Michal Klocek
Fixes layout rounding issue
r2306 if(presenter()) presenter()->layout()->invalidate();
Michal Klocek
Fixes missing update barcategory...
r1643 }
Jani Honkonen
src folder: another massive victory for coding style police
r2131 QSizeF ChartBarCategoryAxisX::sizeHint(Qt::SizeHint which, const QSizeF &constraint) const
Michal Klocek
Refactors layout...
r1965 {
Q_UNUSED(constraint)
QSizeF sh;
Michal Klocek
Refactors ChartAxis...
r2138 QSizeF base = HorizontalAxis::sizeHint(which, constraint);
Michal Klocek
Fixes layout rounding issue
r2306 QStringList ticksList = m_categoriesAxis->categories();
Michal Klocek
Refactors layout...
r1965
Miikka Heikkinen
Fix vanishing labels for first and last ticks....
r2443 qreal width = 0; // Width is irrelevant for X axes with interval labels
qreal height = 0;
Michal Klocek
Updates axis drawing code...
r2133
Miikka Heikkinen
Fix axis sizehints when labels are angled...
r2412 switch (which) {
case Qt::MinimumSize: {
Miikka Heikkinen
Added HTML support for various text items...
r2539 QRectF boundingRect = ChartPresenter::textBoundingRect(axis()->labelsFont(), "...", axis()->labelsAngle());
Miikka Heikkinen
Fix multiline axis label positioning....
r2534 height = boundingRect.height() + labelPadding() + base.height() + 1.0;
Miikka Heikkinen
Fix axis sizehints when labels are angled...
r2412 sh = QSizeF(width, height);
Michal Klocek
Updates axis drawing code...
r2133 break;
Miikka Heikkinen
Fix axis sizehints when labels are angled...
r2412 }
Michal Klocek
Updates axis drawing code...
r2133 case Qt::PreferredSize:{
Miikka Heikkinen
Fix multiline axis label positioning....
r2534 qreal labelHeight = 0.0;
Miikka Heikkinen
Fix axis sizehints when labels are angled...
r2412 foreach (const QString& s, ticksList) {
Miikka Heikkinen
Added HTML support for various text items...
r2539 QRectF rect = ChartPresenter::textBoundingRect(axis()->labelsFont(), s, axis()->labelsAngle());
Miikka Heikkinen
Fix axis sizehints when labels are angled...
r2412 labelHeight = qMax(rect.height(), labelHeight);
Michal Klocek
Updates axis drawing code...
r2133 }
Miikka Heikkinen
Fix multiline axis label positioning....
r2534 height = labelHeight + labelPadding() + base.height() + 1.0;
Miikka Heikkinen
Fix axis sizehints when labels are angled...
r2412 sh = QSizeF(width, height);
Michal Klocek
Updates axis drawing code...
r2133 break;
}
default:
break;
Miikka Heikkinen
Fix axis sizehints when labels are angled...
r2412 }
return sh;
Michal Klocek
Refactors layout...
r1965 }
Michal Klocek
Fixes layout rounding issue
r2306 #include "moc_chartbarcategoryaxisx_p.cpp"
Marek Rosa
Added Chart classes for value and categories axis
r1555 QTCOMMERCIALCHART_END_NAMESPACE