From c544258484ff4fd5d2b88402fbaa5d154b89a3a2 Mon Sep 17 00:00:00 2001 From: Titta Heikkala Date: Tue, 1 Jul 2014 07:10:00 +0300 Subject: Qt Charts project file structure change Charts repository structure is changed to follow the structure of a Qt Add-On module. The task includes following changes: - All macros and definitions named 'commercial' have been renamed. - Compile errors related to QString and qSort usage have been fixed. - Old demos are moved under examples. The QML examples now support only Qt Quick 2.0, the support for Qt Quick 1 is removed. - The QML examples with multiple views are updated so that they are usable also with touch devices. - Unnecessary version checks are removed from examples. - The build stamp has been removed as it was only meant for Charts development purposes and it's no longer needed. Also development build related debug prints are removed as __DATE__ can't be used for all OS thus it doesn't make much sense. - Documentation structure has been updated based on the new module structure. The raw HTML files have been removed. Demos are combined to examples. - Unnecessary .qdocinc files are no longer needed. The content is moved to the corresponding .cpp files. - The Charts widget designer plugin is updated according to the module change. - The test cases updated according to the project structure change. Tests are added also for version 2.0. - cmake modules generation is not needed with Qt 5.4 and Qt Charts so it's disabled. - The new module name and version are updated to the plugin.qmltypes file. Task-number: QTRD-2844, QTRD-3217, QTRD-3218, QTRD-3277, QTRD-3228, QTRD-2526, QTRD-3233, QTRD-3222 Change-Id: Ib7fb26057cde710ffaf6bc780c8bf52a16f45160 Reviewed-by: Miikka Heikkinen --- src/charts/scatterchart/scatterchartitem_p.h | 151 +++++++++++++++++++++++++++ 1 file changed, 151 insertions(+) create mode 100644 src/charts/scatterchart/scatterchartitem_p.h (limited to 'src/charts/scatterchart/scatterchartitem_p.h') diff --git a/src/charts/scatterchart/scatterchartitem_p.h b/src/charts/scatterchart/scatterchartitem_p.h new file mode 100644 index 00000000..3c18546e --- /dev/null +++ b/src/charts/scatterchart/scatterchartitem_p.h @@ -0,0 +1,151 @@ +/**************************************************************************** +** +** Copyright (C) 2014 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 Enterprise Charts Add-on. +** +** $QT_BEGIN_LICENSE$ +** Licensees holding valid Qt Enterprise licenses may use this file in +** accordance with the Qt Enterprise 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 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 SCATTERCHARTITEM_H +#define SCATTERCHARTITEM_H + +#include "qchartglobal.h" +#include "xychart_p.h" +#include +#include + +QT_CHARTS_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 m_markerMap; + + bool m_pointLabelsVisible; + QString m_pointLabelsFormat; + QFont m_pointLabelsFont; + QColor m_pointLabelsColor; +}; + +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) + { + QGraphicsEllipseItem::mousePressEvent(event); + m_parent->markerSelected(this); + } + void hoverEnterEvent(QGraphicsSceneHoverEvent *event) + { + QGraphicsEllipseItem::hoverEnterEvent(event); + m_parent->markerHovered(this, true); + } + void hoverLeaveEvent(QGraphicsSceneHoverEvent *event) + { + QGraphicsEllipseItem::hoverLeaveEvent(event); + m_parent->markerHovered(this, false); + } + +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) + { + QGraphicsRectItem::mousePressEvent(event); + m_parent->markerSelected(this); + } + void hoverEnterEvent(QGraphicsSceneHoverEvent *event) + { + QGraphicsRectItem::hoverEnterEvent(event); + m_parent->markerHovered(this, true); + } + void hoverLeaveEvent(QGraphicsSceneHoverEvent *event) + { + QGraphicsRectItem::hoverLeaveEvent(event); + m_parent->markerHovered(this, false); + } + +private: + ScatterChartItem *m_parent; +}; + +QT_CHARTS_END_NAMESPACE + +#endif // SCATTERPRESENTER_H -- cgit v1.2.3