##// END OF EJS Templates
Fix crash when removing pie series from chart...
Fix crash when removing pie series from chart Connections cleanup in PieChartItem destructor didn't account for the possibility of series already having been destroyed. Changed m_series to QPointer so that it'll notice when series gets destroyed, and also added cleaning of slices to series destructor. Task-number: QTRD-1946 Change-Id: I651347bfcfbe7cd78dd26220a811fea5c8071fce Reviewed-by: Mika Salmela Reviewed-by: Mika Salmela <mika.salmela@digia.com>

File last commit:

r2432:53927f716a3d
r2475:9e35a3a169ed
Show More
scatterchartitem_p.h
146 lines | 3.7 KiB | text/x-c | CLexer
/****************************************************************************
**
** Copyright (C) 2013 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$
**
****************************************************************************/
// W A R N I N G
// -------------
//
// This file is not part of the QtCommercial 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 SCATTERCHARTITEM_H
#define SCATTERCHARTITEM_H
#include "qchartglobal.h"
#include "xychart_p.h"
#include <QGraphicsEllipseItem>
#include <QPen>
QTCOMMERCIALCHART_BEGIN_NAMESPACE
class QScatterSeries;
class ScatterChartItem : public XYChart
{
Q_OBJECT
Q_INTERFACES(QGraphicsItem)
public:
explicit ScatterChartItem(QScatterSeries *series, QGraphicsItem* item = 0);
public:
//from QGraphicsItem
QRectF boundingRect() const;
void paint(QPainter *painter, const QStyleOptionGraphicsItem *option, QWidget *widget);
void setPen(const QPen &pen);
void setBrush(const QBrush &brush);
void markerSelected(QGraphicsItem *item);
void markerHovered(QGraphicsItem *item, bool state);
public Q_SLOTS:
void handleUpdated();
private:
void createPoints(int count);
void deletePoints(int count);
protected:
void updateGeometry();
private:
QScatterSeries *m_series;
QGraphicsItemGroup m_items;
bool m_visible;
int m_shape;
int m_size;
QRectF m_rect;
QMap<QGraphicsItem *, QPointF> m_markerMap;
};
class CircleMarker: public QGraphicsEllipseItem
{
public:
CircleMarker(qreal x, qreal y, qreal w, qreal h, ScatterChartItem *parent)
: QGraphicsEllipseItem(x, y, w, h, parent),
m_parent(parent)
{
setAcceptHoverEvents(true);
}
protected:
void mousePressEvent(QGraphicsSceneMouseEvent *event)
{
m_parent->markerSelected(this);
QGraphicsEllipseItem::mousePressEvent(event);
}
void hoverEnterEvent(QGraphicsSceneHoverEvent *event)
{
m_parent->markerHovered(this, true);
QGraphicsEllipseItem::hoverEnterEvent(event);
}
void hoverLeaveEvent(QGraphicsSceneHoverEvent *event)
{
m_parent->markerHovered(this, false);
QGraphicsEllipseItem::hoverLeaveEvent(event);
}
private:
ScatterChartItem *m_parent;
};
class RectangleMarker: public QGraphicsRectItem
{
public:
RectangleMarker(qreal x, qreal y, qreal w, qreal h, ScatterChartItem *parent)
: QGraphicsRectItem(x, y, w, h, parent),
m_parent(parent)
{
setAcceptHoverEvents(true);
}
protected:
void mousePressEvent(QGraphicsSceneMouseEvent *event)
{
m_parent->markerSelected(this);
QGraphicsRectItem::mousePressEvent(event);
}
void hoverEnterEvent(QGraphicsSceneHoverEvent *event)
{
m_parent->markerHovered(this, true);
QGraphicsRectItem::hoverEnterEvent(event);
}
void hoverLeaveEvent(QGraphicsSceneHoverEvent *event)
{
m_parent->markerHovered(this, false);
QGraphicsRectItem::hoverLeaveEvent(event);
}
private:
ScatterChartItem *m_parent;
};
QTCOMMERCIALCHART_END_NAMESPACE
#endif // SCATTERPRESENTER_H