HG_REPOSITORIES/LPP/INSTRUMENTATION/USERS/JEANDET/qtcharts Commit - r1790:9e99014de1f1

Switched the z-order of axis to be below series...

Tero Ahola -

r1790:9e99014de1f1

parent child

Context file:

r1790:9e99014de1f1

Collapse all files

demos/chartinteractions/chart.cpp created 644 +101 0

@@ -0,0 +1,101
	1	/****************************************************************************
	2	**
	3	** Copyright (C) 2012 Digia Plc
	4	** All rights reserved.
	5	** For any questions to Digia, please use contact form at http://qt.digia.com
	6	**
	7	** This file is part of the Qt Commercial Charts Add-on.
	8	**
	9	** $QT_BEGIN_LICENSE$
	10	** Licensees holding valid Qt Commercial licenses may use this file in
	11	** accordance with the Qt Commercial License Agreement provided with the
	12	** Software or, alternatively, in accordance with the terms contained in
	13	** a written agreement between you and Digia.
	14	**
	15	** If you have questions regarding the use of this file, please use
	16	** contact form at http://qt.digia.com
	17	** $QT_END_LICENSE$
	18	**
	19	****************************************************************************/
	20
	21	#include <QValuesAxis>
	22	#include <QAbstractAxis>
	23	#include <QDebug>
	24
	25	#include "chart.h"
	26
	27	Chart::Chart(QGraphicsItem parent, Qt::WindowFlags wFlags, QLineSeries series)
	28	: QChart(parent, wFlags), m_series(series)
	29	{
	30	m_clicked = false;
	31	}
	32
	33	Chart::~Chart()
	34	{
	35	}
	36
	37	void Chart::clickPoint(const QPointF &point)
	38	{
	39	//Get all points from the series.
	40	QList<QPointF> points = m_series->points();
	41	//Construct a small rectangle around the clicked point
	42	//to identify the real point clicked from the series.
	43	QRectF clickRect(point.x() - 0.5, point.y() - 0.5, 1.0, 1.0);
	44
	45	//Find the clicked point to be moved.
	46	foreach (QPointF p, points) {
	47	if (clickRect.contains(p)) {
	48	m_movingPoint = p;
	49	m_clicked = true;
	50	return;
	51	}
	52	}
	53	}
	54
	55	void Chart::setPointClicked(bool clicked)
	56	{
	57	m_clicked = clicked;
	58	}
	59
	60	void Chart::handlePointMove(const QPoint &point)
	61	{
	62	if (m_clicked) {
	63	//Map the point clicked from the ChartView
	64	//to the area occupied by the chart.
	65	QPoint mappedPoint = point;
	66	mappedPoint.setX(point.x()-this->plotArea().x());
	67	mappedPoint.setY(point.y()-this->plotArea().y());
	68
	69	//Get the x- and y axis to be able to convert the mapped
	70	//coordinate point to the charts scale.
	71	QAbstractAxis * axisx = this->axisX();
	72	QValuesAxis* haxis = 0;
	73	if (axisx->type() == QAbstractAxis::AxisTypeValues)
	74	haxis = qobject_cast<QValuesAxis*>(axisx);
	75
	76	QAbstractAxis * axisy = this->axisY();
	77	QValuesAxis* vaxis = 0;
	78	if (axisy->type() == QAbstractAxis::AxisTypeValues)
	79	vaxis = qobject_cast<QValuesAxis*>(axisy);
	80
	81	if (haxis && vaxis) {
	82	//Calculate the "unit" between points on the x
	83	//y axis.
	84	double xUnit = this->plotArea().width()/haxis->max();
	85	double yUnit = this->plotArea().height()/vaxis->max();
	86
	87	//Convert the mappedPoint to the actual chart scale.
	88	double x = mappedPoint.x()/xUnit;
	89	double y = vaxis->max() - mappedPoint.y()/yUnit;
	90
	91	//Replace the old point with the new one.
	92	m_series->replace(m_movingPoint, QPointF(x, y));
	93
	94	//Update the m_movingPoint so we are able to
	95	//do the replace also during mousemoveEvent.
	96	m_movingPoint.setX(x);
	97	m_movingPoint.setY(y);
	98	}
	99	}
	100	}
	101

demos/chartinteractions/chart.h created 644 +52 0

@@ -0,0 +1,52
	1	/****************************************************************************
	2	**
	3	** Copyright (C) 2012 Digia Plc
	4	** All rights reserved.
	5	** For any questions to Digia, please use contact form at http://qt.digia.com
	6	**
	7	** This file is part of the Qt Commercial Charts Add-on.
	8	**
	9	** $QT_BEGIN_LICENSE$
	10	** Licensees holding valid Qt Commercial licenses may use this file in
	11	** accordance with the Qt Commercial License Agreement provided with the
	12	** Software or, alternatively, in accordance with the terms contained in
	13	** a written agreement between you and Digia.
	14	**
	15	** If you have questions regarding the use of this file, please use
	16	** contact form at http://qt.digia.com
	17	** $QT_END_LICENSE$
	18	**
	19	****************************************************************************/
	20
	21	#ifndef CHART_H
	22	#define CHART_H
	23
	24	#include <QChart>
	25	#include <QLineSeries>
	26
	27	QTCOMMERCIALCHART_USE_NAMESPACE
	28
	29	class Chart : public QChart
	30	{
	31	Q_OBJECT
	32	public:
	33	explicit Chart(QGraphicsItem parent = 0, Qt::WindowFlags wFlags = 0, QLineSeries series = 0);
	34	~Chart();
	35
	36	public slots:
	37	void clickPoint(const QPointF &point);
	38
	39	public:
	40	void handlePointMove(const QPoint &point);
	41	void setPointClicked(bool clicked);
	42
	43	private:
	44	QLineSeries *m_series;
	45	QPointF m_movingPoint;
	46
	47	//Boolean value to determine if an actual point in the
	48	//series is clicked.
	49	bool m_clicked;
	50	};
	51
	52	#endif // CHART_H

demos/chartinteractions/chartinteractions.pro created 644 +9 0

@@ -0,0 +1,9
	1	!include( ../demos.pri ):error( "Couldn't find the demos.pri file!" )
	2
	3	QT += core gui
	4
	5	TARGET = chartinteractions
	6	TEMPLATE = app
	7
	8	HEADERS += chart.h chartview.h
	9	SOURCES += main.cpp chart.cpp chartview.cpp

demos/chartinteractions/chartview.cpp created 644 +50 0

@@ -0,0 +1,50
	1	/****************************************************************************
	2	**
	3	** Copyright (C) 2012 Digia Plc
	4	** All rights reserved.
	5	** For any questions to Digia, please use contact form at http://qt.digia.com
	6	**
	7	** This file is part of the Qt Commercial Charts Add-on.
	8	**
	9	** $QT_BEGIN_LICENSE$
	10	** Licensees holding valid Qt Commercial licenses may use this file in
	11	** accordance with the Qt Commercial License Agreement provided with the
	12	** Software or, alternatively, in accordance with the terms contained in
	13	** a written agreement between you and Digia.
	14	**
	15	** If you have questions regarding the use of this file, please use
	16	** contact form at http://qt.digia.com
	17	** $QT_END_LICENSE$
	18	**
	19	****************************************************************************/
	20
	21	#include <QMouseEvent>
	22	#include "chartview.h"
	23	#include "chart.h"
	24
	25	ChartView::ChartView(Chart chart, QWidget parent) :
	26	QChartView(chart, parent)
	27	{
	28	m_chart = chart;
	29	}
	30
	31	void ChartView::mousePressEvent(QMouseEvent *event)
	32	{
	33	m_mousePos = event->pos();
	34	QChartView::mousePressEvent(event);
	35	}
	36
	37	void ChartView::mouseMoveEvent(QMouseEvent *event)
	38	{
	39	m_chart->handlePointMove(event->pos());
	40	QChartView::mouseMoveEvent(event);
	41	}
	42
	43	void ChartView::mouseReleaseEvent(QMouseEvent *event)
	44	{
	45	if (event->pos() != m_mousePos) {
	46	m_chart->handlePointMove(event->pos());
	47	m_chart->setPointClicked(false);
	48	}
	49	QChartView::mouseReleaseEvent(event);
	50	}

demos/chartinteractions/chartview.h created 644 +45 0

@@ -0,0 +1,45
	1	/****************************************************************************
	2	**
	3	** Copyright (C) 2012 Digia Plc
	4	** All rights reserved.
	5	** For any questions to Digia, please use contact form at http://qt.digia.com
	6	**
	7	** This file is part of the Qt Commercial Charts Add-on.
	8	**
	9	** $QT_BEGIN_LICENSE$
	10	** Licensees holding valid Qt Commercial licenses may use this file in
	11	** accordance with the Qt Commercial License Agreement provided with the
	12	** Software or, alternatively, in accordance with the terms contained in
	13	** a written agreement between you and Digia.
	14	**
	15	** If you have questions regarding the use of this file, please use
	16	** contact form at http://qt.digia.com
	17	** $QT_END_LICENSE$
	18	**
	19	****************************************************************************/
	20
	21	#ifndef CHARTVIEW_H
	22	#define CHARTVIEW_H
	23
	24	#include <QChartView>
	25
	26	class Chart;
	27
	28	QTCOMMERCIALCHART_USE_NAMESPACE
	29
	30	class ChartView : public QChartView
	31	{
	32	public:
	33	ChartView(Chart chart, QWidget parent = 0);
	34
	35	protected:
	36	void mousePressEvent(QMouseEvent *event);
	37	void mouseMoveEvent(QMouseEvent *event);
	38	void mouseReleaseEvent(QMouseEvent *event);
	39
	40	private:
	41	Chart *m_chart;
	42	QPoint m_mousePos;
	43	};
	44
	45	#endif

demos/chartinteractions/main.cpp created 644 +71 0

@@ -0,0 +1,71
	1	/****************************************************************************
	2	**
	3	** Copyright (C) 2012 Digia Plc
	4	** All rights reserved.
	5	** For any questions to Digia, please use contact form at http://qt.digia.com
	6	**
	7	** This file is part of the Qt Commercial Charts Add-on.
	8	**
	9	** $QT_BEGIN_LICENSE$
	10	** Licensees holding valid Qt Commercial licenses may use this file in
	11	** accordance with the Qt Commercial License Agreement provided with the
	12	** Software or, alternatively, in accordance with the terms contained in
	13	** a written agreement between you and Digia.
	14	**
	15	** If you have questions regarding the use of this file, please use
	16	** contact form at http://qt.digia.com
	17	** $QT_END_LICENSE$
	18	**
	19	****************************************************************************/
	20
	21	#include <QApplication>
	22	#include <QMainWindow>
	23	#include <QLineSeries>
	24
	25	#include <QValuesAxis>
	26
	27	#include "chart.h"
	28	#include "chartview.h"
	29
	30	QTCOMMERCIALCHART_USE_NAMESPACE
	31
	32	int main(int argc, char *argv[])
	33	{
	34	QApplication a(argc, argv);
	35
	36	QLineSeries* series = new QLineSeries();
	37
	38	series->append(0, 6);
	39	series->append(1, 3);
	40	series->append(2, 4);
	41	series->append(3, 8);
	42	series->append(7, 13);
	43	series->append(10, 5);
	44	*series << QPointF(11, 1) << QPointF(13, 3) << QPointF(17, 6) << QPointF(18, 3) << QPointF(20, 2);
	45
	46	Chart* chart = new Chart(0, 0, series);
	47	chart->legend()->hide();
	48	chart->addSeries(series);
	49	chart->createDefaultAxes();
	50	chart->setTitle("Drag'n drop to move data points");
	51
	52	QValuesAxis *axisX = new QValuesAxis();
	53	chart->setAxisX(axisX, series);
	54	axisX->setRange(0, 20);
	55
	56	QValuesAxis *axisY = new QValuesAxis();
	57	chart->setAxisY(axisY, series);
	58	axisY->setRange(0, 13);
	59
	60	QObject::connect(series, SIGNAL(clicked(QPointF)), chart, SLOT(clickPoint(QPointF)));
	61
	62	ChartView* chartView = new ChartView(chart);
	63	chartView->setRenderHint(QPainter::Antialiasing);
	64
	65	QMainWindow window;
	66	window.setCentralWidget(chartView);
	67	window.resize(400, 300);
	68	window.show();
	69
	70	return a.exec();
	71	}

demos/demos.pro +2 -1

             CURRENTLY_BUILDING_COMPONENTS = "demos"
             !include( ../config.pri ) {
                 error( "Couldn't find the config.pri file!" )
             }
             TEMPLATE = subdirs
             SUBDIRS += chartthemes \
                        piechartcustomization \
                        dynamicspline \
                        qmlchart \
                        qmlweather \
                        qmlf1legends \
                        qmlcustomizations \
                        qmlcustommodel \
                        qmloscilloscope \
-                       chartviewer
+                       chartviewer \
+                       chartinteractions

src/axis/qabstractaxis.h +1 -1

             /****************************************************************************
             **
             ** Copyright (C) 2012 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$
             **
             ****************************************************************************/
             #ifndef QABSTRACTAXIS_H
             #define QABSTRACTAXIS_H
             #include <qchartglobal.h>
             #include <QPen>
             #include <QFont>
             #include <QVariant>
             QTCOMMERCIALCHART_BEGIN_NAMESPACE
             class QAbstractAxisPrivate;
             class QTCOMMERCIALCHART_EXPORT QAbstractAxis : public QObject
             {
             	Q_OBJECT
             	Q_PROPERTY(bool visible READ isVisible WRITE setVisible NOTIFY visibleChanged)
                 Q_PROPERTY(bool arrowVisible READ isArrowVisible WRITE setArrowVisible NOTIFY arrowVisibleChanged)
                 Q_PROPERTY(QColor color READ axisPenColor WRITE setAxisPenColor NOTIFY colorChanged)
                 Q_PROPERTY(bool labelsVisible READ labelsVisible WRITE setLabelsVisible NOTIFY labelsVisibleChanged)
                 Q_PROPERTY(int labelsAngle READ labelsAngle WRITE setLabelsAngle)
                 Q_PROPERTY(QFont labelsFont READ labelsFont WRITE setLabelsFont)
                 Q_PROPERTY(QColor labelsColor READ labelsColor WRITE setLabelsColor NOTIFY labelsColorChanged)
                 Q_PROPERTY(bool gridVisible READ isGridLineVisible WRITE setGridLineVisible NOTIFY gridVisibleChanged)
                 Q_PROPERTY(bool shadesVisible READ shadesVisible WRITE setShadesVisible NOTIFY shadesVisibleChanged)
                 Q_PROPERTY(QColor shadesColor READ shadesColor WRITE setShadesColor NOTIFY shadesColorChanged)
                 Q_PROPERTY(QColor shadesBorderColor READ shadesBorderColor WRITE setShadesBorderColor NOTIFY shadesBorderColorChanged)
             public:
                 enum AxisType {
                     AxisTypeNoAxis = 0x0,
                     AxisTypeValues = 0x1,
                     AxisTypeCategories = 0x2,
                     AxisTypeIntervals = 0x3,
                     AxisTypeDateTime = 0x4
                 };
                 Q_DECLARE_FLAGS(AxisTypes, AxisType)
             protected:
                 explicit QAbstractAxis(QAbstractAxisPrivate &d,QObject *parent = 0);
             public:
                 ~QAbstractAxis();
                 virtual AxisType type() const = 0;
                 //visibilty hadnling
                 bool isVisible() const;
                 void setVisible(bool visible = true);
                 //axis handling
                 bool isArrowVisible() const;
                 void setArrowVisible(bool visible = true);
                 void setAxisPen(const QPen &pen);
                 QPen axisPen() const;
                 void setAxisPenColor(QColor color);
                 QColor axisPenColor() const;
                 //grid handling
                 bool isGridLineVisible() const;
                 void setGridLineVisible(bool visible = true);
                 void setGridLinePen(const QPen &pen);
                 QPen gridLinePen() const;
                 //labels handling
                 bool labelsVisible() const;
                 void setLabelsVisible(bool visible = true);
                 void setLabelsPen(const QPen &pen);
                 QPen labelsPen() const;
                 void setLabelsBrush(const QBrush &brush);
                 QBrush labelsBrush() const;
                 void setLabelsFont(const QFont &font);
                 QFont labelsFont() const;
                 void setLabelsAngle(int angle);
                 int labelsAngle() const;
                 void setLabelsColor(QColor color);
                 QColor labelsColor() const;
                 //shades handling
                 bool shadesVisible() const;
                 void setShadesVisible(bool visible = true);
                 void setShadesPen(const QPen &pen);
                 QPen shadesPen() const;
                 void setShadesBrush(const QBrush &brush);
                 QBrush shadesBrush() const;
                 void setShadesColor(QColor color);
                 QColor shadesColor() const;
                 void setShadesBorderColor(QColor color);
                 QColor shadesBorderColor() const;
                 Qt::Orientation orientation();
                 //range handling
                 void setMin(const QVariant &min);
                 void setMax(const QVariant &max);
                 void setRange(const QVariant &min, const QVariant &max);
                 void show();
                 void hide();
             Q_SIGNALS:
                 void visibleChanged(bool visible);
                 void arrowVisibleChanged(bool visible);
                 void labelsVisibleChanged(bool visible);
                 void gridVisibleChanged(bool visible);
                 void colorChanged(QColor color);
                 void labelsColorChanged(QColor color);
                 void shadesVisibleChanged(bool visible);
                 void shadesColorChanged(QColor color);
                 void shadesBorderColorChanged(QColor color);
             protected:
             	QScopedPointer<QAbstractAxisPrivate> d_ptr;
-                Q_DISABLE_COPY(QAbstractAxis);
+                Q_DISABLE_COPY(QAbstractAxis)
                 friend class ChartDataSet;
                 friend class ChartAxis;
                 friend class ChartPresenter;
             };
             QTCOMMERCIALCHART_END_NAMESPACE
             #endif

src/chartpresenter_p.h +1 -1

             /****************************************************************************
             **
             ** Copyright (C) 2012 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 CHARTPRESENTER_H
             #define CHARTPRESENTER_H
             #include "qchartglobal.h"
             #include "qchart.h" //becouse of QChart::ChartThemeId //TODO
             #include <QRectF>
             QTCOMMERCIALCHART_BEGIN_NAMESPACE
             class ChartElement;
             class QAbstractSeries;
             class ChartDataSet;
             class Domain;
             class ChartAxis;
             class ChartTheme;
             class ChartAnimator;
             class ChartBackground;
             class ChartAnimation;
             class ChartLayout;
             class ChartPresenter: public QObject
             {
                 Q_OBJECT
             public:
                 enum ZValues {
                     BackgroundZValue = -1,
                     ShadesZValue ,
                     GridZValue,
+                    AxisZValue,
                     SeriesZValue,
                     LineChartZValue = SeriesZValue,
                     SplineChartZValue = SeriesZValue,
                     BarSeriesZValue = SeriesZValue,
                     ScatterSeriesZValue = SeriesZValue,
                     PieSeriesZValue = SeriesZValue,
-                    AxisZValue,
                     LegendZValue,
                     TopMostZValue
                 };
                 enum State {
                     ShowState,
                     ScrollUpState,
                     ScrollDownState,
                     ScrollLeftState,
                     ScrollRightState,
                     ZoomInState,
                     ZoomOutState
                 };
                 ChartPresenter(QChart* chart,ChartDataSet *dataset);
                 virtual ~ChartPresenter();
                 ChartTheme *chartTheme() const { return m_chartTheme; }
                 ChartDataSet *dataSet() const { return m_dataset; }
                 QGraphicsItem* rootItem() const { return m_chart; }
                 QGraphicsRectItem* backgroundItem();
                 QGraphicsItem* titleItem();
                 QList<ChartAxis*> axisItems() const;
                 QLegend* legend();
                 void setBackgroundBrush(const QBrush& brush);
                 QBrush backgroundBrush() const;
                 void setBackgroundPen(const QPen& pen);
                 QPen backgroundPen() const;
                 void setTitle(const QString& title);
                 QString title() const;
                 void setTitleFont(const QFont& font);
                 QFont titleFont() const;
                 void setTitleBrush(const QBrush &brush);
                 QBrush titleBrush() const;
                 void setBackgroundVisible(bool visible);
                 bool isBackgroundVisible() const;
                 void setBackgroundDropShadowEnabled(bool enabled);
                 bool isBackgroundDropShadowEnabled() const;
                 void setVisible(bool visible);
                 void setTheme(QChart::ChartTheme theme,bool force = true);
                 QChart::ChartTheme theme();
                 void setAnimationOptions(QChart::AnimationOptions options);
                 QChart::AnimationOptions animationOptions() const;
                 void zoomIn(qreal factor);
                 void zoomIn(const QRectF& rect);
                 void zoomOut(qreal factor);
                 void scroll(qreal dx,qreal dy);
                 void setGeometry(const QRectF& rect);
                 QRectF geometry() { return m_rect; }
                 void startAnimation(ChartAnimation* animation);
                 State state() const { return m_state; }
                 QPointF statePoint() const { return m_statePoint; }
                 void resetAllElements();
                 void setMarginsMinimum(const QRectF& margins);
                 QRectF margins() const;
                 QGraphicsLayout* layout();
             private:
                 void createBackgroundItem();
                 void createTitleItem();
                 void selectVisibleAxis();
             public Q_SLOTS:
                 void handleSeriesAdded(QAbstractSeries* series,Domain* domain);
                 void handleSeriesRemoved(QAbstractSeries* series);
                 void handleAxisAdded(QAbstractAxis* axis,Domain* domain);
                 void handleAxisRemoved(QAbstractAxis* axis);
                 void handleAxisVisibleChanged(bool visible);
             private Q_SLOTS:
                 void handleAnimationFinished();
             Q_SIGNALS:
                 void geometryChanged(const QRectF& rect);
                 void animationsFinished();
                 void marginsChanged(QRectF margins);
             private:
                 QChart* m_chart;
                 ChartDataSet* m_dataset;
                 ChartTheme *m_chartTheme;
                 QMap<QAbstractSeries*, ChartElement*> m_chartItems;
                 QMap<QAbstractAxis*, ChartAxis*> m_axisItems;
                 QRectF m_rect;
                 QChart::AnimationOptions m_options;
                 State m_state;
                 QPointF m_statePoint;
                 QList<ChartAnimation*> m_animations;
                 ChartLayout* m_layout;
                 ChartBackground* m_backgroundItem;
                 QGraphicsSimpleTextItem* m_titleItem;
             };
             QTCOMMERCIALCHART_END_NAMESPACE
             #endif /* CHARTPRESENTER_H_ */

General Comments 0

Write
Preview

You need to be logged in to leave comments. Login now

No TODOs yet

	Site-wide shortcuts
/	Use quick search box
g h	Goto home page
g g	Goto my private gists page
g G	Goto my public gists page
g 0-9	Goto bookmarked items from 0-9
n r	New repository page
n g	New gist page

	Repositories
g s	Goto summary page
g c	Goto changelog page
g f	Goto files page
g F	Goto files page with file search activated
g p	Goto pull requests page
g o	Goto repository settings
g O	Goto repository access permissions settings
t s	Toggle sidebar on some pages