HG_REPOSITORIES/LPP/INSTRUMENTATION/USERS/JEANDET/qtcharts Commit - r2068:1370cf739b4f

QML ChartView signals seriesAdded and seriesRemoved

Tero Ahola -

r2068:1370cf739b4f

parent child

Context file:

r2068:1370cf739b4f

Collapse all files

tests/qmlchartproperties/qml/qmlchartproperties/ChartEditorSeries.qml created 644 +64 0

@@ -0,0 +1,64
	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	import QtQuick 1.0
	22	import QtCommercial.Chart 1.1
	23
	24	Flow {
	25	anchors.fill: parent
	26	property variant chart
	27	flow: Flow.TopToBottom
	28	spacing: 5
	29
	30	Button {
	31	text: "add line"
	32	onClicked: addXYSeries(ChartView.SeriesTypeLine, "line");
	33	}
	34	Button {
	35	text: "add spline"
	36	onClicked: addXYSeries(ChartView.SeriesTypeSpline, "spline");
	37	}
	38	Button {
	39	text: "add scatter"
	40	onClicked: addXYSeries(ChartView.SeriesTypeScatter, "scatter");
	41	}
	42	Button {
	43	text: "remove last"
	44	onClicked: {
	45	if (chart.count > 0)
	46	chart.removeSeries(chart.series(chart.count - 1));
	47	else
	48	chart.removeSeries(0);
	49	}
	50	}
	51	Button {
	52	text: "remove all"
	53	onClicked: chart.removeAllSeries();
	54	}
	55
	56	function addXYSeries(type, name) {
	57	var series = chart.createSeries(type, name + " " + chart.count);
	58	for (var i = chart.axisX().min; i < chart.axisX().max; i++) {
	59	var y = Math.random() * (chart.axisY().max - chart.axisY().min) + chart.axisY().min;
	60	var x = Math.random() + i;
	61	series.append(x, y);
	62	}
	63	}
	64	}

plugins/declarative/declarativechart.cpp +30 -2

             #include "qcategoryaxis.h"
             #include "qabstractseries_p.h"
             #include "declarativemargins.h"
+            #include "qchart_p.h"
             #ifndef QT_ON_ARM
                 #include "qdatetimeaxis.h"
             */
             /*!
-              \qmlmethod Axis ChartView::axisX(QAbstractSeries *series)
+              \qmlmethod Axis ChartView::axisX(AbstractSeries series)
               The x-axis of the series.
             */
             /*!
-              \qmlmethod Axis ChartView::axisY(QAbstractSeries *series)
+              \qmlmethod Axis ChartView::axisY(AbstractSeries series)
               The y-axis of the series.
             */
               title.
             */
+            /*!
+              \qmlsignal ChartView::seriesAdded(AbstractSeries series)
+              The \a series has been added to the chart.
+            */
+            /*!
+              \qmlsignal ChartView::seriesRemoved(AbstractSeries series)
+              The \a series has been removed from the chart. Please note that \a series is no longer a valid
+              object after the signal handler has completed.
+            */
             DeclarativeChart::DeclarativeChart(QDeclarativeItem *parent)
                 : QDeclarativeItem(parent),
                   m_chart(new QChart(this))
                 connect(m_minMargins, SIGNAL(bottomChanged(int, int, int, int)), this, SLOT(changeMinimumMargins(int, int, int, int)));
                 connect(m_minMargins, SIGNAL(leftChanged(int, int, int, int)), this, SLOT(changeMinimumMargins(int, int, int, int)));
                 connect(m_minMargins, SIGNAL(rightChanged(int, int, int, int)), this, SLOT(changeMinimumMargins(int, int, int, int)));
+                connect(m_chart->d_ptr->m_dataset, SIGNAL(seriesAdded(QAbstractSeries *, Domain *)), this, SLOT(handleSeriesAdded(QAbstractSeries *, Domain *)));
+                connect(m_chart->d_ptr->m_dataset, SIGNAL(seriesRemoved(QAbstractSeries *)), this, SIGNAL(seriesRemoved(QAbstractSeries *)));
+            }
+            void DeclarativeChart::handleSeriesAdded(QAbstractSeries *series, Domain *domain)
+            {
+                Q_UNUSED(domain)
+                emit seriesAdded(series);
             }
             void DeclarativeChart::changeMinimumMargins(int top, int bottom, int left, int right)
                 return series;
             }
+            void DeclarativeChart::removeSeries(QAbstractSeries *series)
+            {
+                if (series)
+                    m_chart->removeSeries(series);
+                else
+                    qWarning("removeSeries: cannot remove null");
+            }
             void DeclarativeChart::setAxisX(QAbstractAxis *axis, QAbstractSeries *series)
             {
                 if (axis)

plugins/declarative/declarativechart.h +5 -1

             QTCOMMERCIALCHART_BEGIN_NAMESPACE
             class DeclarativeMargins;
+            class Domain;
             class DeclarativeChart : public QDeclarativeItem
             {
                 Q_INVOKABLE QAbstractSeries *series(QString seriesName);
                 Q_INVOKABLE QAbstractSeries *createSeries(DeclarativeChart::SeriesType type, QString name = "");
                 Q_INVOKABLE QAbstractSeries *createSeries(DeclarativeChart::SeriesType type, QString name, QAbstractAxis *axisX, QAbstractAxis *axisY);
-                Q_INVOKABLE void removeSeries(QAbstractSeries *series) { m_chart->removeSeries(series); }
+                Q_INVOKABLE void removeSeries(QAbstractSeries *series);
                 Q_INVOKABLE void removeAllSeries() { m_chart->removeAllSeries(); }
                 Q_INVOKABLE void setAxisX(QAbstractAxis *axis, QAbstractSeries *series = 0);
                 Q_INVOKABLE void setAxisY(QAbstractAxis *axis, QAbstractSeries *series = 0);
                 void dropShadowEnabledChanged(bool enabled);
                 void minimumMarginsChanged();
                 void plotAreaChanged(QRectF plotArea);
+                void seriesAdded(QAbstractSeries* series);
+                void seriesRemoved(QAbstractSeries* series);
             public Q_SLOTS:
                 void changeMinimumMargins(int top, int bottom, int left, int right);
                 void handleAxisXSet(QAbstractAxis *axis);
                 void handleAxisYSet(QAbstractAxis *axis);
+                void handleSeriesAdded(QAbstractSeries *series, Domain *domain);
             private:
                 // Extending QChart with DeclarativeChart is not possible because QObject does not support

src/qabstractseries.cpp +22 -1

@@ -89,7 +89,7 QTCOMMERCIALCHART_BEGIN_NAMESPACE
89	\brief whether the series is visible or not; true by default.	89	\brief whether the series is visible or not; true by default.
90	*/	90	*/
91	/*!	91	/*!
92	\qmlproperty ~~void~~ AbstractSeries::visible	92	\qmlproperty bool AbstractSeries::visible
93	Visibility of the series. True by default.	93	Visibility of the series. True by default.
94	*/	94	*/
95		95
@@ -101,6 +101,27 QTCOMMERCIALCHART_BEGIN_NAMESPACE
101	\qmlsignal AbstractSeries::onVisibleChanged()	101	\qmlsignal AbstractSeries::onVisibleChanged()
102	Emitted when the series visibility changes.	102	Emitted when the series visibility changes.
103	*/	103	*/
		104
		105	/*!
		106	\property QAbstractSeries::opacity
		107	\brief The opacity of the series.
		108	By default the opacity is 1.0. The valid values range from 0.0 (transparent) to 1.0 (opaque).
		109	*/
		110	/*!
		111	\qmlproperty real AbstractSeries::opacity
		112	The opacity of the series. By default the opacity is 1.0.
		113	The valid values range from 0.0 (transparent) to 1.0 (opaque).
		114	*/
		115
		116	/*!
		117	\fn void QAbstractSeries::opacityChanged()
		118	Emitted when the opacity of the series changes.
		119	*/
		120	/*!
		121	\qmlsignal AbstractSeries::onOpacityChanged()
		122	Emitted when the opacity of the series changes.
		123	*/
		124
104	/*!	125	/*!
105	\internal	126	\internal
106	\brief Constructs ChartSeries object with \a parent.	127	\brief Constructs ChartSeries object with \a parent.

src/qchart.h +1 -1

             protected:
                 QScopedPointer<QChartPrivate> d_ptr;
                 friend class QLegend;
-                friend class ChartPresenter;
+                friend class DeclarativeChart;
                 Q_DISABLE_COPY(QChart)
             };

tests/qmlchartproperties/qml/qmlchartproperties/Chart.qml +5 -3

                 id: chartView
                 title: "Chart Title"
                 anchors.fill: parent
-                property variant series: chartView
+                property variant chart: chartView
                 LineSeries {
                     name: "line"
                 onVisibleChanged:                  console.log("chart.onVisibleChanged: " + visible);
                 onTitleColorChanged:               console.log("chart.onTitleColorChanged: " + color);
-                onBackgroundColorChanged:          console.log("chart.onBackgroundColorChanged: " + series.backgroundColor);
+                onBackgroundColorChanged:          console.log("chart.onBackgroundColorChanged: " + chart.backgroundColor);
                 onDropShadowEnabledChanged:        console.log("chart.onDropShadowEnabledChanged: " + enabled);
+                onSeriesAdded:                     console.log("chart.onSeriesAdded: " + series.name);
+                onSeriesRemoved:                   console.log("chart.onSeriesRemoved: " + series.name);
-                legend.onVisibleChanged:           console.log("legend.onVisibleChanged: " + series.legend.visible);
+                legend.onVisibleChanged:           console.log("legend.onVisibleChanged: " + chart.legend.visible);
                 legend.onBackgroundVisibleChanged: console.log("legend.onBackgroundVisibleChanged: " + visible);
                 legend.onColorChanged:             console.log("legend.onColorChanged: " + color);
                 legend.onBorderColorChanged:       console.log("legend.onBorderColorChanged: " + color);

tests/qmlchartproperties/qml/qmlchartproperties/ChartEditor.qml +19 -8

             Item {
                 id: chartEditor
-                property variant series // TODO: rename to chart
+                property variant chart
-                onSeriesChanged: {
+                onChartChanged: {
                     if (loader.item != undefined)
-                        loader.item.chart = series;
+                        loader.item.chart = chart;
                 }
                 function selectButton(button) {
                     legendButton.color = "#79bd8f";
                     axisXButton.color = "#79bd8f";
                     axisYButton.color = "#79bd8f";
+                    seriesButton.color = "#79bd8f";
                     button.color = "#00a388";
                 }
                         onClicked: {
                             selectButton(chartButton);
                             loader.source = "ChartEditorProperties.qml";
-                            loader.item.chart = series;
+                            loader.item.chart = chart;
                         }
                     }
                     Button {
                         onClicked: {
                             selectButton(titleButton);
                             loader.source = "ChartEditorTitle.qml";
-                            loader.item.chart = series;
+                            loader.item.chart = chart;
                         }
                     }
                     Button {
                         onClicked: {
                             selectButton(legendButton);
                             loader.source = "ChartEditorLegend.qml";
-                            loader.item.chartLegend = series.legend;
+                            loader.item.chartLegend = chart.legend;
                         }
                     }
                     Button {
                         onClicked: {
                             selectButton(axisXButton);
                             loader.source = "ChartEditorAxis.qml";
-                            loader.item.axis = series.axisX;
+                            loader.item.axis = chart.axisX;
                         }
                     }
                     Button {
                         onClicked: {
                             selectButton(axisYButton);
                             loader.source = "ChartEditorAxis.qml";
-                            loader.item.axis = series.axisY;
+                            loader.item.axis = chart.axisY;
+                        }
+                    }
+                    Button {
+                        id: seriesButton
+                        text: "Series"
+                        unpressedColor: "#79bd8f"
+                        onClicked: {
+                            selectButton(seriesButton);
+                            loader.source = "ChartEditorSeries.qml";
+                            loader.item.chart = chart;
                         }
                     }
                 }

tests/qmlchartproperties/qml/qmlchartproperties/ChartEditorProperties.qml 0 -4

                     onClicked: chart.titleColor = main.nextColor();
                 }
                 Button {
-                    text: "zoom -"
-                    onClicked: chart.zoom(0.5);
-                Button {
                     text: "top min margin +"
                     onClicked: chart.minimumMargins.top += 5;
                 }

tests/qmlchartproperties/qml/qmlchartproperties/main.qml +10 -2

                         height: parent.height
                         source: "Chart.qml"
                         onStatusChanged: {
-                            if (status == Loader.Ready && editorLoader.status == Loader.Ready && chartLoader.item)
+                            if (status == Loader.Ready && editorLoader.status == Loader.Ready && chartLoader.item) {
+                                if (source.toString().search("Chart.qml") > 0)
+                                    editorLoader.item.chart = chartLoader.item.chart;
+                                else
                                     editorLoader.item.series = chartLoader.item.series;
                             }
                         }
+                    }
                     Loader {
                         id: editorLoader
                         height: parent.height
                         source: "ChartEditor.qml"
                         onStatusChanged: {
-                            if (status == Loader.Ready && chartLoader.status == Loader.Ready && chartLoader.item)
+                            if (status == Loader.Ready && chartLoader.status == Loader.Ready && chartLoader.item) {
+                                if (source.toString().search("ChartEditor.qml") > 0)
+                                    editorLoader.item.chart = chartLoader.item.chart;
+                                else
                                     editorLoader.item.series = chartLoader.item.series;
                             }
                         }
                     }
+                }
                 Row {
                     id: buttonRow

tests/qmlchartproperties/resources.qrc +1 0

                     <file>qml/qmlchartproperties/ChartEditorLegend.qml</file>
                     <file>qml/qmlchartproperties/ChartEditorProperties.qml</file>
                     <file>qml/qmlchartproperties/ChartEditorTitle.qml</file>
+                    <file>qml/qmlchartproperties/ChartEditorSeries.qml</file>
                 </qresource>
             </RCC>

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