summaryrefslogtreecommitdiffstats
path: root/demos/qmloscilloscope/qml/qmloscilloscope/ScopeView.qml
diff options
context:
space:
mode:
authorTitta Heikkala <titta.heikkala@digia.com>2014-07-01 07:10:00 +0300
committerTitta Heikkala <titta.heikkala@theqtcompany.com>2014-10-14 13:04:52 +0300
commitc544258484ff4fd5d2b88402fbaa5d154b89a3a2 (patch)
tree7659625abb566dec55d3783ed820b928542d9b2b /demos/qmloscilloscope/qml/qmloscilloscope/ScopeView.qml
parent76339f714f088645e911cee65bdb66055fe029aa (diff)
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 <miikka.heikkinen@theqtcompany.com>
Diffstat (limited to 'demos/qmloscilloscope/qml/qmloscilloscope/ScopeView.qml')
-rw-r--r--demos/qmloscilloscope/qml/qmloscilloscope/ScopeView.qml116
1 files changed, 0 insertions, 116 deletions
diff --git a/demos/qmloscilloscope/qml/qmloscilloscope/ScopeView.qml b/demos/qmloscilloscope/qml/qmloscilloscope/ScopeView.qml
deleted file mode 100644
index f6b249bb..00000000
--- a/demos/qmloscilloscope/qml/qmloscilloscope/ScopeView.qml
+++ /dev/null
@@ -1,116 +0,0 @@
-/****************************************************************************
-**
-** 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$
-**
-****************************************************************************/
-
-import QtQuick 1.0
-import QtCommercial.Chart 1.2
-
-//![1]
-ChartView {
- id: chartView
- animationOptions: ChartView.NoAnimation
- theme: ChartView.ChartThemeDark
-
- ValueAxis {
- id: axisY1
- min: -1
- max: 4
- }
-
- ValueAxis {
- id: axisY2
- min: -10
- max: 5
- }
-
- ValueAxis {
- id: axisX
- min: 0
- max: 1000
- }
-
- LineSeries {
- id: lineSeries1
- name: "signal 1"
- axisX: axisX
- axisY: axisY1
- }
- LineSeries {
- id: lineSeries2
- name: "signal 2"
- axisX: axisX
- axisYRight: axisY2
- }
-// ...
-//![1]
-
- //![2]
- Timer {
- id: refreshTimer
- interval: 1 / 60 * 1000 // 60 Hz
- running: true
- repeat: true
- onTriggered: {
- dataSource.update(chartView.series(0));
- dataSource.update(chartView.series(1));
- }
- }
- //![2]
-
- //![3]
- function changeSeriesType(type) {
- chartView.removeAllSeries();
-
- // Create two new series of the correct type. Axis x is the same for both of the series,
- // but the series have their own y-axes to make it possible to control the y-offset
- // of the "signal sources".
- if (type == "line") {
- chartView.createSeries(ChartView.SeriesTypeLine, "signal 1", axisX, axisY1);
- chartView.createSeries(ChartView.SeriesTypeLine, "signal 2", axisX, axisY2);
- } else if (type == "spline") {
- chartView.createSeries(ChartView.SeriesTypeSpline, "signal 1", axisX, axisY1);
- chartView.createSeries(ChartView.SeriesTypeSpline, "signal 2", axisX, axisY2);
- } else {
- var series1 = chartView.createSeries(ChartView.SeriesTypeScatter, "signal 1", axisX, axisY1);
- series1.markerSize = 3;
- series1.borderColor = "transparent";
- var series2 = chartView.createSeries(ChartView.SeriesTypeScatter, "signal 2", axisX, axisY2);
- series2.markerSize = 3;
- series2.borderColor = "transparent";
- }
- }
-
- function createAxis(min, max) {
- // The following creates a ValueAxis object that can be then set as a x or y axis for a series
- return Qt.createQmlObject("import QtQuick 1.1; import QtCommercial.Chart 1.1; ValueAxis { min: "
- + min + "; max: " + max + " }", chartView);
- }
- //![3]
-
- function setAnimations(enabled) {
- if (enabled)
- chartView.animationOptions = ChartView.SeriesAnimations;
- else
- chartView.animationOptions = ChartView.NoAnimation;
- }
-
- function changeRefreshRate(rate) {
- refreshTimer.interval = 1 / Number(rate) * 1000;
- }
-}