##// END OF EJS Templates
HG_REPOSITORIES » LPP » INSTRUMENTATION » USERS » JEANDET » qtcharts
RSS

Clone from http://code.qt.io/qt/qtcharts.git

Fix crash in axis grid animation when animating axis is removed from chart....
Fix crash in axis grid animation when animating axis is removed from chart. Change-Id: Ibd39910f3463e0ccdb62799dfc533018a932f542 Reviewed-by: Titta Heikkala <titta.heikkala@theqtcompany.com>
Titta Heikkala - - Load All Authors

File last commit:

r2810:2db41b8cb90b
r2835:a483852c5c56
Show More
cartesianchartaxis.cpp
262 lines | 8.7 KiB | text/x-c | CppLexer
/ src / charts / axis / cartesianchartaxis.cpp
History | Source | Raw |Copy content |Copy permalink
Miikka Heikkinen
Add Polar chart support...
 r2483 /****************************************************************************
**
Titta Heikkala
Copyright header changes...
 r2776 ** Copyright (C) 2015 The Qt Company Ltd
Miikka Heikkinen
Add Polar chart support...
 r2483 ** All rights reserved.
Titta Heikkala
Copyright header changes...
 r2776 ** For any questions to The Qt Company, please use contact form at http://qt.io
Miikka Heikkinen
Add Polar chart support...
 r2483 **
Titta Heikkala
Updated license headers...
 r2740 ** This file is part of the Qt Charts module.
Miikka Heikkinen
Add Polar chart support...
 r2483 **
Titta Heikkala
Updated license headers...
 r2740 ** Licensees holding valid commercial license for Qt may use this file in
** accordance with the Qt License Agreement provided with the Software
** or, alternatively, in accordance with the terms contained in a written
Titta Heikkala
Copyright header changes...
 r2776 ** agreement between you and The Qt Company.
Miikka Heikkinen
Add Polar chart support...
 r2483 **
** If you have questions regarding the use of this file, please use
Titta Heikkala
Updated license headers...
 r2740 ** contact form at http://qt.io
Miikka Heikkinen
Add Polar chart support...
 r2483 **
****************************************************************************/
Titta Heikkala
Fix include syntax...
 r2714 #include <private/cartesianchartaxis_p.h>
#include <QtCharts/QAbstractAxis>
#include <private/qabstractaxis_p.h>
#include <private/chartpresenter_p.h>
#include <private/abstractchartlayout_p.h>
#include <private/abstractdomain_p.h>
#include <private/linearrowitem_p.h>
#include <QtCharts/QValueAxis>
#include <QtCharts/QLogValueAxis>
#include <QtWidgets/QGraphicsLayout>
#include <QtGui/QTextDocument>
Miikka Heikkinen
Add Polar chart support...
 r2483
Titta Heikkala
Qt Charts project file structure change...
 r2712 QT_CHARTS_BEGIN_NAMESPACE
Miikka Heikkinen
Add Polar chart support...
 r2483
CartesianChartAxis::CartesianChartAxis(QAbstractAxis *axis, QGraphicsItem *item , bool intervalAxis)
: ChartAxisElement(axis, item, intervalAxis)
{
Q_ASSERT(item);
}
CartesianChartAxis::~CartesianChartAxis()
{
}
void CartesianChartAxis::createItems(int count)
{
if (arrowItems().size() == 0) {
QGraphicsLineItem *arrow = new LineArrowItem(this, this);
arrow->setPen(axis()->linePen());
arrowGroup()->addToGroup(arrow);
}
if (intervalAxis() && gridItems().size() == 0) {
for (int i = 0 ; i < 2 ; i ++){
QGraphicsLineItem *item = new QGraphicsLineItem(this);
item->setPen(axis()->gridLinePen());
gridGroup()->addToGroup(item);
Miikka Heikkinen
Fix shades for log and category axes....
 r2721 QGraphicsRectItem *shades = new QGraphicsRectItem(this);
shades->setPen(axis()->shadesPen());
shades->setBrush(axis()->shadesBrush());
shadeGroup()->addToGroup(shades);
Miikka Heikkinen
Add Polar chart support...
 r2483 }
}
Titta Heikkala
Fix setting the axis title...
 r2608 QGraphicsTextItem *title = titleItem();
title->setFont(axis()->titleFont());
title->setDefaultTextColor(axis()->titleBrush().color());
title->setHtml(axis()->titleText());
Miikka Heikkinen
Add Polar chart support...
 r2483 for (int i = 0; i < count; ++i) {
QGraphicsLineItem *arrow = new QGraphicsLineItem(this);
QGraphicsLineItem *grid = new QGraphicsLineItem(this);
Miikka Heikkinen
Added HTML support for various text items...
 r2539 QGraphicsTextItem *label = new QGraphicsTextItem(this);
Miikka Heikkinen
Fix text item margins...
 r2592 label->document()->setDocumentMargin(ChartPresenter::textMargin());
Miikka Heikkinen
Add Polar chart support...
 r2483 arrow->setPen(axis()->linePen());
grid->setPen(axis()->gridLinePen());
label->setFont(axis()->labelsFont());
Miikka Heikkinen
Added HTML support for various text items...
 r2539 label->setDefaultTextColor(axis()->labelsBrush().color());
Miikka Heikkinen
Add Polar chart support...
 r2483 label->setRotation(axis()->labelsAngle());
arrowGroup()->addToGroup(arrow);
gridGroup()->addToGroup(grid);
labelGroup()->addToGroup(label);
Miikka Heikkinen
Fix shades for log and category axes....
 r2721 if (gridItems().size() == 1 || (((gridItems().size() + 1) % 2) && gridItems().size() > 0)) {
QGraphicsRectItem *shades = new QGraphicsRectItem(this);
Miikka Heikkinen
Add Polar chart support...
 r2483 shades->setPen(axis()->shadesPen());
shades->setBrush(axis()->shadesBrush());
shadeGroup()->addToGroup(shades);
}
}
}
Titta Heikkala
Added minor ticks to value axis...
 r2795 void CartesianChartAxis::updateMinorTickItems()
{
QValueAxis *valueAxis = qobject_cast<QValueAxis *>(this->axis());
if (valueAxis) {
int currentCount = minorArrowItems().size();
int expectedCount = valueAxis->minorTickCount() * (valueAxis->tickCount() - 1);
int diff = expectedCount - currentCount;
if (diff > 0) {
for (int i = 0; i < diff; i++) {
QGraphicsLineItem *minorArrow = new QGraphicsLineItem(this);
QGraphicsLineItem *minorGrid = new QGraphicsLineItem(this);
minorArrow->setPen(valueAxis->linePen());
minorGrid->setPen(valueAxis->minorGridLinePen());
minorArrowGroup()->addToGroup(minorArrow);
minorGridGroup()->addToGroup(minorGrid);
}
} else {
QList<QGraphicsItem *> minorGridLines = minorGridItems();
QList<QGraphicsItem *> minorArrows = minorArrowItems();
for (int i = 0; i > diff; i--) {
if (!minorGridLines.isEmpty())
delete(minorGridLines.takeLast());
if (!minorArrows.isEmpty())
delete(minorArrows.takeLast());
}
}
}
}
Miikka Heikkinen
Add Polar chart support...
 r2483 void CartesianChartAxis::deleteItems(int count)
{
QList<QGraphicsItem *> lines = gridItems();
QList<QGraphicsItem *> labels = labelItems();
QList<QGraphicsItem *> shades = shadeItems();
QList<QGraphicsItem *> axis = arrowItems();
for (int i = 0; i < count; ++i) {
Miikka Heikkinen
Fix shades for log and category axes....
 r2721 if (lines.size() == 1 || (((lines.size() + 1) % 2) && lines.size() > 0))
Miikka Heikkinen
Add Polar chart support...
 r2483 delete(shades.takeLast());
delete(lines.takeLast());
delete(labels.takeLast());
delete(axis.takeLast());
}
}
void CartesianChartAxis::updateLayout(QVector<qreal> &layout)
{
int diff = ChartAxisElement::layout().size() - layout.size();
if (diff > 0)
deleteItems(diff);
else if (diff < 0)
createItems(-diff);
Titta Heikkala
Added minor ticks to value axis...
 r2795 updateMinorTickItems();
Miikka Heikkinen
Add Polar chart support...
 r2483 if (animation()) {
switch (presenter()->state()) {
case ChartPresenter::ZoomInState:
animation()->setAnimationType(AxisAnimation::ZoomInAnimation);
animation()->setAnimationPoint(presenter()->statePoint());
break;
case ChartPresenter::ZoomOutState:
animation()->setAnimationType(AxisAnimation::ZoomOutAnimation);
animation()->setAnimationPoint(presenter()->statePoint());
break;
case ChartPresenter::ScrollUpState:
case ChartPresenter::ScrollLeftState:
animation()->setAnimationType(AxisAnimation::MoveBackwordAnimation);
break;
case ChartPresenter::ScrollDownState:
case ChartPresenter::ScrollRightState:
animation()->setAnimationType(AxisAnimation::MoveForwardAnimation);
break;
case ChartPresenter::ShowState:
animation()->setAnimationType(AxisAnimation::DefaultAnimation);
break;
}
animation()->setValues(ChartAxisElement::layout(), layout);
presenter()->startAnimation(animation());
} else {
setLayout(layout);
updateGeometry();
}
}
bool CartesianChartAxis::isEmpty()
{
return axisGeometry().isEmpty()
|| gridGeometry().isEmpty()
|| qFuzzyCompare(min(), max());
}
void CartesianChartAxis::setGeometry(const QRectF &axis, const QRectF &grid)
{
m_gridRect = grid;
setAxisGeometry(axis);
if (isEmpty())
return;
QVector<qreal> layout = calculateLayout();
updateLayout(layout);
}
QSizeF CartesianChartAxis::sizeHint(Qt::SizeHint which, const QSizeF &constraint) const
{
Q_UNUSED(which);
Q_UNUSED(constraint);
return QSizeF();
}
void CartesianChartAxis::handleArrowPenChanged(const QPen &pen)
{
foreach (QGraphicsItem *item, arrowItems())
static_cast<QGraphicsLineItem *>(item)->setPen(pen);
}
void CartesianChartAxis::handleGridPenChanged(const QPen &pen)
{
foreach (QGraphicsItem *item, gridItems())
static_cast<QGraphicsLineItem *>(item)->setPen(pen);
}
Titta Heikkala
Added minor ticks to value axis...
 r2795 void CartesianChartAxis::handleMinorArrowPenChanged(const QPen &pen)
{
foreach (QGraphicsItem *item, minorArrowItems())
static_cast<QGraphicsLineItem *>(item)->setPen(pen);
}
void CartesianChartAxis::handleMinorGridPenChanged(const QPen &pen)
{
foreach (QGraphicsItem *item, minorGridItems())
static_cast<QGraphicsLineItem *>(item)->setPen(pen);
}
Titta Heikkala
Added grid color property for value axis...
 r2810 void CartesianChartAxis::handleGridLineColorChanged(const QColor &color)
{
foreach (QGraphicsItem *item, gridItems()) {
QGraphicsLineItem *lineItem = static_cast<QGraphicsLineItem *>(item);
QPen pen = lineItem->pen();
pen.setColor(color);
lineItem->setPen(pen);
}
}
void CartesianChartAxis::handleMinorGridLineColorChanged(const QColor &color)
{
foreach (QGraphicsItem *item, minorGridItems()) {
QGraphicsLineItem *lineItem = static_cast<QGraphicsLineItem *>(item);
QPen pen = lineItem->pen();
pen.setColor(color);
lineItem->setPen(pen);
}
}
Miikka Heikkinen
Add Polar chart support...
 r2483 void CartesianChartAxis::handleShadesBrushChanged(const QBrush &brush)
{
foreach (QGraphicsItem *item, shadeItems())
static_cast<QGraphicsRectItem *>(item)->setBrush(brush);
}
void CartesianChartAxis::handleShadesPenChanged(const QPen &pen)
{
foreach (QGraphicsItem *item, shadeItems())
static_cast<QGraphicsRectItem *>(item)->setPen(pen);
}
#include "moc_cartesianchartaxis_p.cpp"
Titta Heikkala
Qt Charts project file structure change...
 r2712 QT_CHARTS_END_NAMESPACE