From d1f7bd98a717fcb9ba9b7b12e7f7b9142be7b74b 2012-06-26 10:54:37 From: Tero Ahola Date: 2012-06-26 10:54:37 Subject: [PATCH] Renamed XyPoint to XYPoint --- diff --git a/demos/qmlchart/qml/qmlchart/View2.qml b/demos/qmlchart/qml/qmlchart/View2.qml index c46db83..057027a 100644 --- a/demos/qmlchart/qml/qmlchart/View2.qml +++ b/demos/qmlchart/qml/qmlchart/View2.qml @@ -31,13 +31,13 @@ Rectangle { LineSeries { name: "LineSeries" - XyPoint { x: 0; y: 0 } - XyPoint { x: 1.1; y: 2.1 } - XyPoint { x: 1.9; y: 3.3 } - XyPoint { x: 2.1; y: 2.1 } - XyPoint { x: 2.9; y: 4.9 } - XyPoint { x: 3.4; y: 3.0 } - XyPoint { x: 4.1; y: 3.3 } + XYPoint { x: 0; y: 0 } + XYPoint { x: 1.1; y: 2.1 } + XYPoint { x: 1.9; y: 3.3 } + XYPoint { x: 2.1; y: 2.1 } + XYPoint { x: 2.9; y: 4.9 } + XYPoint { x: 3.4; y: 3.0 } + XYPoint { x: 4.1; y: 3.3 } } } //![1] diff --git a/demos/qmlchart/qml/qmlchart/View3.qml b/demos/qmlchart/qml/qmlchart/View3.qml index 5a30ac8..4ef40b5 100644 --- a/demos/qmlchart/qml/qmlchart/View3.qml +++ b/demos/qmlchart/qml/qmlchart/View3.qml @@ -31,13 +31,13 @@ Rectangle { SplineSeries { name: "SplineSeries" - XyPoint { x: 0; y: 0.3 } - XyPoint { x: 1.1; y: 3.2 } - XyPoint { x: 1.9; y: 2.4 } - XyPoint { x: 2.1; y: 2.1 } - XyPoint { x: 2.9; y: 2.6 } - XyPoint { x: 3.4; y: 2.3 } - XyPoint { x: 4.1; y: 3.1 } + XYPoint { x: 0; y: 0.3 } + XYPoint { x: 1.1; y: 3.2 } + XYPoint { x: 1.9; y: 2.4 } + XYPoint { x: 2.1; y: 2.1 } + XYPoint { x: 2.9; y: 2.6 } + XYPoint { x: 3.4; y: 2.3 } + XYPoint { x: 4.1; y: 3.1 } } } //![1] diff --git a/demos/qmlchart/qml/qmlchart/View4.qml b/demos/qmlchart/qml/qmlchart/View4.qml index 26f128d..a66fa45 100644 --- a/demos/qmlchart/qml/qmlchart/View4.qml +++ b/demos/qmlchart/qml/qmlchart/View4.qml @@ -34,32 +34,32 @@ Rectangle { AreaSeries { name: "Russian" upperSeries: LineSeries { - XyPoint { x: 0; y: 1 } - XyPoint { x: 1; y: 1 } - XyPoint { x: 2; y: 1 } - XyPoint { x: 3; y: 1 } - XyPoint { x: 4; y: 1 } - XyPoint { x: 5; y: 0 } - XyPoint { x: 6; y: 1 } - XyPoint { x: 7; y: 1 } - XyPoint { x: 8; y: 4 } - XyPoint { x: 9; y: 3 } - XyPoint { x: 10; y: 2 } - XyPoint { x: 11; y: 1 } + XYPoint { x: 0; y: 1 } + XYPoint { x: 1; y: 1 } + XYPoint { x: 2; y: 1 } + XYPoint { x: 3; y: 1 } + XYPoint { x: 4; y: 1 } + XYPoint { x: 5; y: 0 } + XYPoint { x: 6; y: 1 } + XYPoint { x: 7; y: 1 } + XYPoint { x: 8; y: 4 } + XYPoint { x: 9; y: 3 } + XYPoint { x: 10; y: 2 } + XYPoint { x: 11; y: 1 } } lowerSeries: LineSeries { - XyPoint { x: 0; y: 0 } - XyPoint { x: 1; y: 0 } - XyPoint { x: 2; y: 0 } - XyPoint { x: 3; y: 0 } - XyPoint { x: 4; y: 0 } - XyPoint { x: 5; y: 0 } - XyPoint { x: 6; y: 0 } - XyPoint { x: 7; y: 0 } - XyPoint { x: 8; y: 0 } - XyPoint { x: 9; y: 0 } - XyPoint { x: 10; y: 0 } - XyPoint { x: 11; y: 0 } + XYPoint { x: 0; y: 0 } + XYPoint { x: 1; y: 0 } + XYPoint { x: 2; y: 0 } + XYPoint { x: 3; y: 0 } + XYPoint { x: 4; y: 0 } + XYPoint { x: 5; y: 0 } + XYPoint { x: 6; y: 0 } + XYPoint { x: 7; y: 0 } + XYPoint { x: 8; y: 0 } + XYPoint { x: 9; y: 0 } + XYPoint { x: 10; y: 0 } + XYPoint { x: 11; y: 0 } } } // ... @@ -69,32 +69,32 @@ Rectangle { id: swedish name: "Swedish" upperSeries: LineSeries { - XyPoint { x: 0; y: 1 } - XyPoint { x: 1; y: 1 } - XyPoint { x: 2; y: 3 } - XyPoint { x: 3; y: 3 } - XyPoint { x: 4; y: 2 } - XyPoint { x: 5; y: 0 } - XyPoint { x: 6; y: 2 } - XyPoint { x: 7; y: 1 } - XyPoint { x: 8; y: 2 } - XyPoint { x: 9; y: 1 } - XyPoint { x: 10; y: 3 } - XyPoint { x: 11; y: 3 } + XYPoint { x: 0; y: 1 } + XYPoint { x: 1; y: 1 } + XYPoint { x: 2; y: 3 } + XYPoint { x: 3; y: 3 } + XYPoint { x: 4; y: 2 } + XYPoint { x: 5; y: 0 } + XYPoint { x: 6; y: 2 } + XYPoint { x: 7; y: 1 } + XYPoint { x: 8; y: 2 } + XYPoint { x: 9; y: 1 } + XYPoint { x: 10; y: 3 } + XYPoint { x: 11; y: 3 } } lowerSeries: LineSeries { - XyPoint { x: 0; y: 0 } - XyPoint { x: 1; y: 0 } - XyPoint { x: 2; y: 0 } - XyPoint { x: 3; y: 0 } - XyPoint { x: 4; y: 0 } - XyPoint { x: 5; y: 0 } - XyPoint { x: 6; y: 0 } - XyPoint { x: 7; y: 0 } - XyPoint { x: 8; y: 0 } - XyPoint { x: 9; y: 0 } - XyPoint { x: 10; y: 0 } - XyPoint { x: 11; y: 0 } + XYPoint { x: 0; y: 0 } + XYPoint { x: 1; y: 0 } + XYPoint { x: 2; y: 0 } + XYPoint { x: 3; y: 0 } + XYPoint { x: 4; y: 0 } + XYPoint { x: 5; y: 0 } + XYPoint { x: 6; y: 0 } + XYPoint { x: 7; y: 0 } + XYPoint { x: 8; y: 0 } + XYPoint { x: 9; y: 0 } + XYPoint { x: 10; y: 0 } + XYPoint { x: 11; y: 0 } } onClicked: { color = "yellow"; @@ -105,32 +105,32 @@ Rectangle { AreaSeries { name: "Finnish" upperSeries: LineSeries { - XyPoint { x: 0; y: 0 } - XyPoint { x: 1; y: 0 } - XyPoint { x: 2; y: 0 } - XyPoint { x: 3; y: 0 } - XyPoint { x: 4; y: 0 } - XyPoint { x: 5; y: 0 } - XyPoint { x: 6; y: 1 } - XyPoint { x: 7; y: 0 } - XyPoint { x: 8; y: 0 } - XyPoint { x: 9; y: 0 } - XyPoint { x: 10; y: 0 } - XyPoint { x: 11; y: 1 } + XYPoint { x: 0; y: 0 } + XYPoint { x: 1; y: 0 } + XYPoint { x: 2; y: 0 } + XYPoint { x: 3; y: 0 } + XYPoint { x: 4; y: 0 } + XYPoint { x: 5; y: 0 } + XYPoint { x: 6; y: 1 } + XYPoint { x: 7; y: 0 } + XYPoint { x: 8; y: 0 } + XYPoint { x: 9; y: 0 } + XYPoint { x: 10; y: 0 } + XYPoint { x: 11; y: 1 } } lowerSeries: LineSeries { - XyPoint { x: 0; y: 0 } - XyPoint { x: 1; y: 0 } - XyPoint { x: 2; y: 0 } - XyPoint { x: 3; y: 0 } - XyPoint { x: 4; y: 0 } - XyPoint { x: 5; y: 0 } - XyPoint { x: 6; y: 0 } - XyPoint { x: 7; y: 0 } - XyPoint { x: 8; y: 0 } - XyPoint { x: 9; y: 0 } - XyPoint { x: 10; y: 0 } - XyPoint { x: 11; y: 0 } + XYPoint { x: 0; y: 0 } + XYPoint { x: 1; y: 0 } + XYPoint { x: 2; y: 0 } + XYPoint { x: 3; y: 0 } + XYPoint { x: 4; y: 0 } + XYPoint { x: 5; y: 0 } + XYPoint { x: 6; y: 0 } + XYPoint { x: 7; y: 0 } + XYPoint { x: 8; y: 0 } + XYPoint { x: 9; y: 0 } + XYPoint { x: 10; y: 0 } + XYPoint { x: 11; y: 0 } } onClicked: { color = "white"; diff --git a/demos/qmlchart/qml/qmlchart/View5.qml b/demos/qmlchart/qml/qmlchart/View5.qml index 80795ae..c496910 100644 --- a/demos/qmlchart/qml/qmlchart/View5.qml +++ b/demos/qmlchart/qml/qmlchart/View5.qml @@ -32,25 +32,25 @@ Rectangle { ScatterSeries { id: scatter1 name: "Scatter1" - XyPoint { x: 1.5; y: 1.5 } - XyPoint { x: 1.5; y: 1.6 } - XyPoint { x: 1.57; y: 1.55 } - XyPoint { x: 1.8; y: 1.8 } - XyPoint { x: 1.9; y: 1.6 } - XyPoint { x: 2.1; y: 1.3 } - XyPoint { x: 2.5; y: 2.1 } + XYPoint { x: 1.5; y: 1.5 } + XYPoint { x: 1.5; y: 1.6 } + XYPoint { x: 1.57; y: 1.55 } + XYPoint { x: 1.8; y: 1.8 } + XYPoint { x: 1.9; y: 1.6 } + XYPoint { x: 2.1; y: 1.3 } + XYPoint { x: 2.5; y: 2.1 } } ScatterSeries { name: "Scatter2" // ... //![1] - XyPoint { x: 2.0; y: 2.0 } - XyPoint { x: 2.0; y: 2.1 } - XyPoint { x: 2.07; y: 2.05 } - XyPoint { x: 2.2; y: 2.9 } - XyPoint { x: 2.4; y: 2.7 } - XyPoint { x: 2.67; y: 2.65 } + XYPoint { x: 2.0; y: 2.0 } + XYPoint { x: 2.0; y: 2.1 } + XYPoint { x: 2.07; y: 2.05 } + XYPoint { x: 2.2; y: 2.9 } + XYPoint { x: 2.4; y: 2.7 } + XYPoint { x: 2.67; y: 2.65 } //![2] } } diff --git a/doc/src/qml.qdoc b/doc/src/qml.qdoc index 37729db..55096e3 100644 --- a/doc/src/qml.qdoc +++ b/doc/src/qml.qdoc @@ -37,7 +37,7 @@
  • AreaSeries
  • ScatterSeries
  • SplineSeries
    • -
  • XyPoint
    • +
  • XYPoint
  • HXYModelMapper
  • VXYModelMapper
    • diff --git a/plugins/declarative/declarativexypoint.cpp b/plugins/declarative/declarativexypoint.cpp index a36508e..40b07e1 100644 --- a/plugins/declarative/declarativexypoint.cpp +++ b/plugins/declarative/declarativexypoint.cpp @@ -23,23 +23,23 @@ QTCOMMERCIALCHART_BEGIN_NAMESPACE /*! - \qmlclass XyPoint QPointF - XyPoint is a convenience element for initializing XY-series with static coordinate data. To + \qmlclass XYPoint QPointF + XYPoint is a convenience element for initializing XY-series with static coordinate data. To manipulate an XY-series dynamically, use it's data manipulation functions instead. \sa LineSeries, AreaSeries, ScatterSeries, SplineSeries */ /*! - \qmlproperty real XyPoint::x + \qmlproperty real XYPoint::x The x-coordinate of the point. */ /*! - \qmlproperty real XyPoint::y + \qmlproperty real XYPoint::y The y-coordinate of the point. */ -DeclarativeXyPoint::DeclarativeXyPoint(QObject *parent) : +DeclarativeXYPoint::DeclarativeXYPoint(QObject *parent) : QObject(parent) { setX(0.0); diff --git a/plugins/declarative/declarativexypoint.h b/plugins/declarative/declarativexypoint.h index be853db..4d02a21 100644 --- a/plugins/declarative/declarativexypoint.h +++ b/plugins/declarative/declarativexypoint.h @@ -28,7 +28,7 @@ QTCOMMERCIALCHART_BEGIN_NAMESPACE -class DeclarativeXyPoint : public QObject, public QPointF +class DeclarativeXYPoint : public QObject, public QPointF { Q_OBJECT // TODO: make the setters change the value, if parented by a series @@ -36,7 +36,7 @@ class DeclarativeXyPoint : public QObject, public QPointF Q_PROPERTY(qreal y READ y WRITE setY /*NOTIFY dataYChanged*/) public: - explicit DeclarativeXyPoint(QObject *parent = 0); + explicit DeclarativeXYPoint(QObject *parent = 0); }; QTCOMMERCIALCHART_END_NAMESPACE diff --git a/plugins/declarative/declarativexyseries.cpp b/plugins/declarative/declarativexyseries.cpp index 8070baf..42de00a 100644 --- a/plugins/declarative/declarativexyseries.cpp +++ b/plugins/declarative/declarativexyseries.cpp @@ -46,8 +46,8 @@ void DeclarativeXySeries::componentComplete() Q_ASSERT(series); foreach(QObject *child, series->children()) { - if (qobject_cast(child)) { - DeclarativeXyPoint *point = qobject_cast(child); + if (qobject_cast(child)) { + DeclarativeXYPoint *point = qobject_cast(child); series->append(point->x(), point->y()); } else if(qobject_cast(child)) { QVXYModelMapper *mapper = qobject_cast(child); diff --git a/plugins/declarative/plugin.cpp b/plugins/declarative/plugin.cpp index 728894b..587ffbf 100644 --- a/plugins/declarative/plugin.cpp +++ b/plugins/declarative/plugin.cpp @@ -48,7 +48,7 @@ public: Q_ASSERT(QLatin1String(uri) == QLatin1String("QtCommercial.Chart")); qmlRegisterType(uri, 1, 0, "ChartView"); - qmlRegisterType(uri, 1, 0, "XyPoint"); + qmlRegisterType(uri, 1, 0, "XYPoint"); qmlRegisterType(uri, 1, 0, "ScatterSeries"); qmlRegisterType(uri, 1, 0, "LineSeries"); qmlRegisterType(uri, 1, 0, "SplineSeries"); diff --git a/src/barchart/qbarseries.cpp b/src/barchart/qbarseries.cpp index 6a7c57d..88813e9 100644 --- a/src/barchart/qbarseries.cpp +++ b/src/barchart/qbarseries.cpp @@ -160,7 +160,7 @@ QTCOMMERCIALCHART_BEGIN_NAMESPACE /*! \qmlmethod BarSet BarSeries::append(string label, VariantList values) - Adds a new bar set with \a label and \a values to \a index. Values can be a list of reals or a list of XyPoints. + Adds a new bar set with \a label and \a values to \a index. Values can be a list of reals or a list of XYPoints. For example: \code myBarSeries.append("set 1", [0, 0.2, 0.2, 0.5, 0.4, 1.5, 0.9]); @@ -170,7 +170,7 @@ QTCOMMERCIALCHART_BEGIN_NAMESPACE /*! \qmlmethod BarSet BarSeries::insert(int index, string label, VariantList values) - Inserts a new bar set with \a label and \a values to \a index. Values can be a list of reals or a list of XyPoints. + Inserts a new bar set with \a label and \a values to \a index. Values can be a list of reals or a list of XYPoints. If index is zero or smaller, the new barset is prepended. If the index is count or bigger, the new barset is appended. \sa BarSeries::append() diff --git a/src/xychart/qxyseries.cpp b/src/xychart/qxyseries.cpp index fe76a5f..e6cfe48 100644 --- a/src/xychart/qxyseries.cpp +++ b/src/xychart/qxyseries.cpp @@ -79,8 +79,8 @@ QTCOMMERCIALCHART_BEGIN_NAMESPACE Signal is emitted when user clicks the \a point on chart. For example: \code LineSeries { - XyPoint { x: 0; y: 0 } - XyPoint { x: 1.1; y: 2.1 } + XYPoint { x: 0; y: 0 } + XYPoint { x: 1.1; y: 2.1 } onClicked: console.log("onClicked: " + point.x + ", " + point.y); } \endcode diff --git a/tests/qmlchartproperties/qml/qmlchartproperties/AreaChart.qml b/tests/qmlchartproperties/qml/qmlchartproperties/AreaChart.qml index e38d58e..55e68ce 100644 --- a/tests/qmlchartproperties/qml/qmlchartproperties/AreaChart.qml +++ b/tests/qmlchartproperties/qml/qmlchartproperties/AreaChart.qml @@ -33,32 +33,32 @@ ChartView { id: areaSeries name: "area 1" upperSeries: LineSeries { - XyPoint { x: 0; y: 1 } - XyPoint { x: 1; y: 1 } - XyPoint { x: 2; y: 3 } - XyPoint { x: 3; y: 3 } - XyPoint { x: 4; y: 2 } - XyPoint { x: 5; y: 0 } - XyPoint { x: 6; y: 2 } - XyPoint { x: 7; y: 1 } - XyPoint { x: 8; y: 2 } - XyPoint { x: 9; y: 1 } - XyPoint { x: 10; y: 3 } - XyPoint { x: 11; y: 3 } + XYPoint { x: 0; y: 1 } + XYPoint { x: 1; y: 1 } + XYPoint { x: 2; y: 3 } + XYPoint { x: 3; y: 3 } + XYPoint { x: 4; y: 2 } + XYPoint { x: 5; y: 0 } + XYPoint { x: 6; y: 2 } + XYPoint { x: 7; y: 1 } + XYPoint { x: 8; y: 2 } + XYPoint { x: 9; y: 1 } + XYPoint { x: 10; y: 3 } + XYPoint { x: 11; y: 3 } } lowerSeries: LineSeries { - XyPoint { x: 0; y: 0 } - XyPoint { x: 1; y: 0 } - XyPoint { x: 2; y: 0 } - XyPoint { x: 3; y: 0 } - XyPoint { x: 4; y: 0 } - XyPoint { x: 5; y: 0 } - XyPoint { x: 6; y: 0 } - XyPoint { x: 7; y: 0 } - XyPoint { x: 8; y: 0 } - XyPoint { x: 9; y: 0 } - XyPoint { x: 10; y: 0 } - XyPoint { x: 11; y: 0 } + XYPoint { x: 0; y: 0 } + XYPoint { x: 1; y: 0 } + XYPoint { x: 2; y: 0 } + XYPoint { x: 3; y: 0 } + XYPoint { x: 4; y: 0 } + XYPoint { x: 5; y: 0 } + XYPoint { x: 6; y: 0 } + XYPoint { x: 7; y: 0 } + XYPoint { x: 8; y: 0 } + XYPoint { x: 9; y: 0 } + XYPoint { x: 10; y: 0 } + XYPoint { x: 11; y: 0 } } onNameChanged: console.log("areaSeries.onNameChanged: " + name); diff --git a/tests/qmlchartproperties/qml/qmlchartproperties/Chart.qml b/tests/qmlchartproperties/qml/qmlchartproperties/Chart.qml index 650f6cd..5f810c8 100644 --- a/tests/qmlchartproperties/qml/qmlchartproperties/Chart.qml +++ b/tests/qmlchartproperties/qml/qmlchartproperties/Chart.qml @@ -29,13 +29,13 @@ ChartView { LineSeries { name: "line" - XyPoint { x: 0; y: 0 } - XyPoint { x: 1.1; y: 2.1 } - XyPoint { x: 1.9; y: 3.3 } - XyPoint { x: 2.1; y: 2.1 } - XyPoint { x: 2.9; y: 4.9 } - XyPoint { x: 3.4; y: 3.0 } - XyPoint { x: 4.1; y: 3.3 } + XYPoint { x: 0; y: 0 } + XYPoint { x: 1.1; y: 2.1 } + XYPoint { x: 1.9; y: 3.3 } + XYPoint { x: 2.1; y: 2.1 } + XYPoint { x: 2.9; y: 4.9 } + XYPoint { x: 3.4; y: 3.0 } + XYPoint { x: 4.1; y: 3.3 } } onVisibleChanged: console.log("chart.onVisibleChanged: " + visible); diff --git a/tests/qmlchartproperties/qml/qmlchartproperties/LineChart.qml b/tests/qmlchartproperties/qml/qmlchartproperties/LineChart.qml index 42e7e6b..359faac 100644 --- a/tests/qmlchartproperties/qml/qmlchartproperties/LineChart.qml +++ b/tests/qmlchartproperties/qml/qmlchartproperties/LineChart.qml @@ -30,13 +30,13 @@ ChartView { LineSeries { id: lineSeries name: "line 1" - XyPoint { x: 0; y: 0 } - XyPoint { x: 1.1; y: 2.1 } - XyPoint { x: 1.9; y: 3.3 } - XyPoint { x: 2.1; y: 2.1 } - XyPoint { x: 2.9; y: 4.9 } - XyPoint { x: 3.4; y: 3.0 } - XyPoint { x: 4.1; y: 3.3 } + XYPoint { x: 0; y: 0 } + XYPoint { x: 1.1; y: 2.1 } + XYPoint { x: 1.9; y: 3.3 } + XYPoint { x: 2.1; y: 2.1 } + XYPoint { x: 2.9; y: 4.9 } + XYPoint { x: 3.4; y: 3.0 } + XYPoint { x: 4.1; y: 3.3 } onNameChanged: console.log("lineSeries.onNameChanged: " + name); onVisibleChanged: console.log("lineSeries.onVisibleChanged: " + visible); @@ -50,12 +50,12 @@ ChartView { LineSeries { name: "line 2" - XyPoint { x: 1.1; y: 1.1 } - XyPoint { x: 1.9; y: 2.3 } - XyPoint { x: 2.1; y: 1.1 } - XyPoint { x: 2.9; y: 3.9 } - XyPoint { x: 3.4; y: 2.0 } - XyPoint { x: 4.1; y: 2.3 } + XYPoint { x: 1.1; y: 1.1 } + XYPoint { x: 1.9; y: 2.3 } + XYPoint { x: 2.1; y: 1.1 } + XYPoint { x: 2.9; y: 3.9 } + XYPoint { x: 3.4; y: 2.0 } + XYPoint { x: 4.1; y: 2.3 } onClicked: console.log(name + ".onClicked: " + point.x + ", " + point.y); } } diff --git a/tests/qmlchartproperties/qml/qmlchartproperties/ScatterChart.qml b/tests/qmlchartproperties/qml/qmlchartproperties/ScatterChart.qml index 3a75f1c..8983961 100644 --- a/tests/qmlchartproperties/qml/qmlchartproperties/ScatterChart.qml +++ b/tests/qmlchartproperties/qml/qmlchartproperties/ScatterChart.qml @@ -30,13 +30,13 @@ ChartView { ScatterSeries { id: scatterSeries name: "scatter 1" - XyPoint { x: 1.5; y: 1.5 } - XyPoint { x: 1.5; y: 1.6 } - XyPoint { x: 1.57; y: 1.55 } - XyPoint { x: 1.8; y: 1.8 } - XyPoint { x: 1.9; y: 1.6 } - XyPoint { x: 2.1; y: 1.3 } - XyPoint { x: 2.5; y: 2.1 } + XYPoint { x: 1.5; y: 1.5 } + XYPoint { x: 1.5; y: 1.6 } + XYPoint { x: 1.57; y: 1.55 } + XYPoint { x: 1.8; y: 1.8 } + XYPoint { x: 1.9; y: 1.6 } + XYPoint { x: 2.1; y: 1.3 } + XYPoint { x: 2.5; y: 2.1 } onNameChanged: console.log("scatterSeries.onNameChanged: " + name); onVisibleChanged: console.log("scatterSeries.onVisibleChanged: " + visible); @@ -51,12 +51,12 @@ ChartView { ScatterSeries { name: "scatter2" - XyPoint { x: 2.0; y: 2.0 } - XyPoint { x: 2.0; y: 2.1 } - XyPoint { x: 2.07; y: 2.05 } - XyPoint { x: 2.2; y: 2.9 } - XyPoint { x: 2.4; y: 2.7 } - XyPoint { x: 2.67; y: 2.65 } + XYPoint { x: 2.0; y: 2.0 } + XYPoint { x: 2.0; y: 2.1 } + XYPoint { x: 2.07; y: 2.05 } + XYPoint { x: 2.2; y: 2.9 } + XYPoint { x: 2.4; y: 2.7 } + XYPoint { x: 2.67; y: 2.65 } onClicked: console.log(name + ".onClicked: " + point.x + ", " + point.y); } } diff --git a/tests/qmlchartproperties/qml/qmlchartproperties/SplineChart.qml b/tests/qmlchartproperties/qml/qmlchartproperties/SplineChart.qml index 750fab2..feca5a4 100644 --- a/tests/qmlchartproperties/qml/qmlchartproperties/SplineChart.qml +++ b/tests/qmlchartproperties/qml/qmlchartproperties/SplineChart.qml @@ -29,13 +29,13 @@ ChartView { SplineSeries { id: splineSeries name: "spline 1" - XyPoint { x: 0; y: 0 } - XyPoint { x: 1.1; y: 2.1 } - XyPoint { x: 1.9; y: 3.3 } - XyPoint { x: 2.1; y: 2.1 } - XyPoint { x: 2.9; y: 4.9 } - XyPoint { x: 3.4; y: 3.0 } - XyPoint { x: 4.1; y: 3.3 } + XYPoint { x: 0; y: 0 } + XYPoint { x: 1.1; y: 2.1 } + XYPoint { x: 1.9; y: 3.3 } + XYPoint { x: 2.1; y: 2.1 } + XYPoint { x: 2.9; y: 4.9 } + XYPoint { x: 3.4; y: 3.0 } + XYPoint { x: 4.1; y: 3.3 } onNameChanged: console.log("splineSeries.onNameChanged: " + name); onVisibleChanged: console.log("splineSeries.onVisibleChanged: " + visible); @@ -49,12 +49,12 @@ ChartView { SplineSeries { name: "spline 2" - XyPoint { x: 1.1; y: 1.1 } - XyPoint { x: 1.9; y: 2.3 } - XyPoint { x: 2.1; y: 1.1 } - XyPoint { x: 2.9; y: 3.9 } - XyPoint { x: 3.4; y: 2.0 } - XyPoint { x: 4.1; y: 2.3 } + XYPoint { x: 1.1; y: 1.1 } + XYPoint { x: 1.9; y: 2.3 } + XYPoint { x: 2.1; y: 1.1 } + XYPoint { x: 2.9; y: 3.9 } + XYPoint { x: 3.4; y: 2.0 } + XYPoint { x: 4.1; y: 2.3 } onClicked: console.log(name + ".onClicked: " + point.x + ", " + point.y); } }