##// END OF EJS Templates
Check that areaseries is actually in chart before trying to update....
Check that areaseries is actually in chart before trying to update. When a line series is used both as a series on chart and as an area series boundary, but not at the same time, animation can sometimes get confused as to what series to update if the area series is removed from the chart and the line series is added to the chart while a series animation is running. Task-number: QTRD-3445 Change-Id: Ia3d72d3ceba784b6e162b2c9b678acdc3e3ffcac Reviewed-by: Titta Heikkala <titta.heikkala@theqtcompany.com>

File last commit:

r2800:891ed0097501
r2800:891ed0097501
Show More
areachartitem_p.h
132 lines | 3.8 KiB | text/x-c | CLexer
/****************************************************************************
**
** Copyright (C) 2015 The Qt Company Ltd
** All rights reserved.
** For any questions to The Qt Company, please use contact form at http://qt.io
**
** This file is part of the Qt Charts module.
**
** 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
** agreement between you and The Qt Company.
**
** If you have questions regarding the use of this file, please use
** contact form at http://qt.io
**
****************************************************************************/
// W A R N I N G
// -------------
//
// This file is not part of the Qt Enterprise Chart API. It exists purely as an
// implementation detail. This header file may change from version to
// version without notice, or even be removed.
//
// We mean it.
#ifndef AREACHARTITEM_H
#define AREACHARTITEM_H
#include <QtCharts/QChartGlobal>
#include <private/linechartitem_p.h>
#include <QtCharts/QAreaSeries>
#include <QtGui/QPen>
QT_CHARTS_BEGIN_NAMESPACE
class AreaChartItem;
class AreaChartItem : public ChartItem
{
Q_OBJECT
public:
AreaChartItem(QAreaSeries *areaSeries, QGraphicsItem* item = 0);
~AreaChartItem();
//from QGraphicsItem
QRectF boundingRect() const;
void paint(QPainter *painter, const QStyleOptionGraphicsItem *option, QWidget *widget);
QPainterPath shape() const;
LineChartItem *upperLineItem() const { return m_upper; }
LineChartItem *lowerLineItem() const { return m_lower; }
void updatePath();
void setPresenter(ChartPresenter *presenter);
QAreaSeries *series() const { return m_series; }
protected:
void mousePressEvent(QGraphicsSceneMouseEvent *event);
void hoverEnterEvent(QGraphicsSceneHoverEvent *event);
void hoverLeaveEvent(QGraphicsSceneHoverEvent *event);
void mouseReleaseEvent(QGraphicsSceneMouseEvent *event);
void mouseDoubleClickEvent(QGraphicsSceneMouseEvent *event);
Q_SIGNALS:
void clicked(const QPointF &point);
void hovered(const QPointF &point, bool state);
void pressed(const QPointF &point);
void released(const QPointF &point);
void doubleClicked(const QPointF &point);
public Q_SLOTS:
void handleUpdated();
void handleDomainUpdated();
private:
QAreaSeries *m_series;
LineChartItem *m_upper;
LineChartItem *m_lower;
QPainterPath m_path;
QRectF m_rect;
QPen m_linePen;
QPen m_pointPen;
QBrush m_brush;
bool m_pointsVisible;
bool m_pointLabelsVisible;
QString m_pointLabelsFormat;
QFont m_pointLabelsFont;
QColor m_pointLabelsColor;
QPointF m_lastMousePos;
bool m_mousePressed;
};
class AreaBoundItem : public LineChartItem
{
public:
AreaBoundItem(AreaChartItem *area, QLineSeries *lineSeries,QGraphicsItem* item = 0)
: LineChartItem(lineSeries, item), m_item(area)
{
// We do not actually want to draw anything from LineChartItem.
// Drawing is done in AreaChartItem only.
setVisible(false);
}
~AreaBoundItem() {}
void updateGeometry()
{
// Make sure the series is in a chart before trying to update
if (m_item->series()->chart()) {
// Turn off points drawing from component line chart item, as that
// messes up the fill for area series.
suppressPoints();
// Component lineseries are not necessarily themselves on the chart,
// so get the chart type for them from area chart.
forceChartType(m_item->series()->chart()->chartType());
LineChartItem::updateGeometry();
m_item->updatePath();
}
}
private:
AreaChartItem *m_item;
};
QT_CHARTS_END_NAMESPACE
#endif