diff options
27 files changed, 40 insertions, 47 deletions
diff --git a/examples/charts/chartsgallery/doc/src/gallery.qdoc b/examples/charts/chartsgallery/doc/src/gallery.qdoc index e8f2dcbf..fdcb53cf 100644 --- a/examples/charts/chartsgallery/doc/src/gallery.qdoc +++ b/examples/charts/chartsgallery/doc/src/gallery.qdoc @@ -17,6 +17,6 @@ data to populate a number of chart types and interactions for a user. \include examples-run.qdocinc -If you want to implement charts with QML see the \l{QML Charts Example}. +If you want to implement charts with QML see the \l{Charts with QML Gallery}. */ diff --git a/src/charts/areachart/qareaseries.cpp b/src/charts/areachart/qareaseries.cpp index 4a5c087b..704d9744 100644 --- a/src/charts/areachart/qareaseries.cpp +++ b/src/charts/areachart/qareaseries.cpp @@ -31,7 +31,7 @@ QT_BEGIN_NAMESPACE lower boundary is greater than that of the upper boundary. The main point is that the area between these two boundary lines will be filled. - See the \l {AreaChart Example} {area chart example} to learn how to create a simple area chart. + See the \l {Charts with Widgets Gallery} to learn how to create a simple area chart. \image examples_areachart.png */ @@ -60,7 +60,7 @@ QT_BEGIN_NAMESPACE \image examples_qmlchart4.png The following QML shows how to create a simple area chart: - \snippet qmlchart/qml/qmlchart/View4.qml 1 + \snippet qmlchartsgallery/qml/AreaSeries.qml 1 \note Adding the same line series to a chart and area series is not supported. The series used as boundary lines should be defined only for the area series. diff --git a/src/charts/axis/barcategoryaxis/qbarcategoryaxis.cpp b/src/charts/axis/barcategoryaxis/qbarcategoryaxis.cpp index 2cf8fe03..40432f8a 100644 --- a/src/charts/axis/barcategoryaxis/qbarcategoryaxis.cpp +++ b/src/charts/axis/barcategoryaxis/qbarcategoryaxis.cpp @@ -17,7 +17,7 @@ QT_BEGIN_NAMESPACE QBarCategoryAxis can be set up to show an axis line with tick marks, grid lines, and shades. Categories are drawn between the ticks. It can be used also with a line series, as demonstrated - by the \l {Line and BarChart Example} {Line and BarChart Example}. + by the \l {Charts with Widgets Gallery}. The following code illustrates how to use QBarCategoryAxis: \code @@ -501,7 +501,7 @@ void QBarCategoryAxisPrivate::setRange(qreal min, qreal max) void QBarCategoryAxisPrivate::setRange(const QString &minCategory, const QString &maxCategory) { - Q_Q(QBarCategoryAxis); + Q_Q(QBarCategoryAxis); bool changed = false; //special case in case or clearing all categories diff --git a/src/charts/axis/categoryaxis/qcategoryaxis.cpp b/src/charts/axis/categoryaxis/qcategoryaxis.cpp index 5f8b2f8f..bd59f9aa 100644 --- a/src/charts/axis/categoryaxis/qcategoryaxis.cpp +++ b/src/charts/axis/categoryaxis/qcategoryaxis.cpp @@ -52,7 +52,7 @@ QT_BEGIN_NAMESPACE For example: \image examples_qmlaxes3.png - \snippet qmlaxes/qml/qmlaxes/View3.qml 1 + \snippet qmlchartsgallery/qml/CategoryAxis.qml 1 */ /*! diff --git a/src/charts/barchart/horizontal/bar/qhorizontalbarseries.cpp b/src/charts/barchart/horizontal/bar/qhorizontalbarseries.cpp index 0019a7be..bef7d750 100644 --- a/src/charts/barchart/horizontal/bar/qhorizontalbarseries.cpp +++ b/src/charts/barchart/horizontal/bar/qhorizontalbarseries.cpp @@ -21,7 +21,7 @@ QT_BEGIN_NAMESPACE This class draws data as a series of horizontal bars grouped by category, with one bar per category from each bar set added to the series. - See the \l {HorizontalBarChart Example} {horizontal bar chart example} to learn how to create a horizontal bar chart. + See the \l {Charts with Widgets Gallery} to learn how to create a horizontal bar chart. \image examples_horizontalbarchart.png \sa QBarSet, QBarSeries, QPercentBarSeries, QAbstractBarSeries, QStackedBarSeries, QHorizontalStackedBarSeries, QHorizontalPercentBarSeries @@ -39,7 +39,7 @@ QT_BEGIN_NAMESPACE category from each bar set added to the series. The following QML code snippet shows how to create a simple horizontal bar chart: - \snippet qmlchart/qml/qmlchart/View9.qml 1 + \snippet qmlchartsgallery/qml/BarSeriesHorizontal.qml 1 \beginfloatleft \image examples_qmlchart9.png \endfloat diff --git a/src/charts/barchart/horizontal/percent/qhorizontalpercentbarseries.cpp b/src/charts/barchart/horizontal/percent/qhorizontalpercentbarseries.cpp index 88261c81..d9278119 100644 --- a/src/charts/barchart/horizontal/percent/qhorizontalpercentbarseries.cpp +++ b/src/charts/barchart/horizontal/percent/qhorizontalpercentbarseries.cpp @@ -21,7 +21,7 @@ QT_BEGIN_NAMESPACE with the total value of all segments in the stack. Bars with zero value are not drawn. - See the \l {HorizontalPercentBarChart Example} {horizontal percent bar chart example} to learn + See the \l {Charts with Widgets Gallery} to learn how to create a horizontal percent bar chart. \image examples_horizontalpercentbarchart.png @@ -44,7 +44,7 @@ QT_BEGIN_NAMESPACE Bars with zero value are not drawn. The following QML code snippet shows how to create a simple horizontal percent bar chart: - \snippet qmlchart/qml/qmlchart/View11.qml 1 + \snippet qmlchartsgallery/qml/BarSeriesPercentHorizontal.qml 1 \beginfloatleft \image examples_qmlchart11.png \endfloat diff --git a/src/charts/barchart/horizontal/stacked/qhorizontalstackedbarseries.cpp b/src/charts/barchart/horizontal/stacked/qhorizontalstackedbarseries.cpp index 0a8a05b9..214ca860 100644 --- a/src/charts/barchart/horizontal/stacked/qhorizontalstackedbarseries.cpp +++ b/src/charts/barchart/horizontal/stacked/qhorizontalstackedbarseries.cpp @@ -16,7 +16,7 @@ QT_BEGIN_NAMESPACE Each bar set added to the series contributes a single segment to each stacked bar. - See the \l {HorizontalStackedBarChart Example} {horizontal stacked bar chart example} to learn how to create a horizontal stacked bar chart. + See the \l {Charts with Widgets Gallery} to learn how to create a horizontal stacked bar chart. \image examples_horizontalstackedbarchart.png \sa QBarSet, QBarSeries, QPercentBarSeries, QAbstractBarSeries, QStackedBarSeries, QHorizontalPercentBarSeries, QHorizontalBarSeries @@ -33,7 +33,7 @@ QT_BEGIN_NAMESPACE Each bar set added to the series contributes a single segment to each stacked bar. The following QML code snippet shows how to create a simple horizontal stacked bar chart: - \snippet qmlchart/qml/qmlchart/View10.qml 1 + \snippet qmlchartsgallery/qml/BarSeriesStackedHorizontal.qml 1 \beginfloatleft \image examples_qmlchart10.png \endfloat diff --git a/src/charts/barchart/qabstractbarseries.cpp b/src/charts/barchart/qabstractbarseries.cpp index e25765ec..d2f09931 100644 --- a/src/charts/barchart/qabstractbarseries.cpp +++ b/src/charts/barchart/qabstractbarseries.cpp @@ -31,8 +31,7 @@ QT_BEGIN_NAMESPACE If a QValueAxis is used instead of QBarCategoryAxis for the main bar axis, the bars are grouped around the index value of the category. - See the \l {BarChart Example} {bar chart example} to learn how to use the QBarSeries class - to create a simple bar chart. + See the \l {Charts with Widgets Gallery} to learn how to use the QBarSeries class to create a simple bar chart. \image examples_barchart.png \sa QBarSet, QBarSeries, QStackedBarSeries, QPercentBarSeries @@ -59,7 +58,7 @@ QT_BEGIN_NAMESPACE The following QML code snippet shows how to use the BarSeries and BarCategoryAxis type to create a simple bar chart: - \snippet qmlchart/qml/qmlchart/View6.qml 1 + \snippet qmlchartsgallery/qml/BarSeries.qml 1 \beginfloatleft \image examples_qmlchart6.png diff --git a/src/charts/barchart/qvbarmodelmapper.cpp b/src/charts/barchart/qvbarmodelmapper.cpp index 50d978c6..1fe0e886 100644 --- a/src/charts/barchart/qvbarmodelmapper.cpp +++ b/src/charts/barchart/qvbarmodelmapper.cpp @@ -22,7 +22,7 @@ QT_BEGIN_NAMESPACE Therefore, adding or removing a value from a bar set causes the same change to be made in all the bar sets in the bar series. - For more information, see \l{BarModelMapper Example}. + For more information, see \l{Charts with Widgets Gallery}. \sa QHBarModelMapper */ diff --git a/src/charts/barchart/vertical/percent/qpercentbarseries.cpp b/src/charts/barchart/vertical/percent/qpercentbarseries.cpp index c6a7c33a..886597af 100644 --- a/src/charts/barchart/vertical/percent/qpercentbarseries.cpp +++ b/src/charts/barchart/vertical/percent/qpercentbarseries.cpp @@ -22,7 +22,7 @@ QT_BEGIN_NAMESPACE with the total value of all segments in the stack. Bars with zero value are not drawn. - See the \l {PercentbarChart Example} {percent bar chart example} to learn how to create a + See the \l {Charts with Widgets Gallery} to learn how to create a percent bar chart. \image examples_percentbarchart.png @@ -44,7 +44,7 @@ QT_BEGIN_NAMESPACE Bars with zero value are not drawn. The following QML code snippet shows how to create a simple percent bar chart: - \snippet qmlchart/qml/qmlchart/View8.qml 1 + \snippet qmlchartsgallery/qml/BarSeriesPercent.qml 1 \beginfloatleft \image examples_qmlchart8.png \endfloat diff --git a/src/charts/barchart/vertical/stacked/qstackedbarseries.cpp b/src/charts/barchart/vertical/stacked/qstackedbarseries.cpp index c955e8b0..fef29c2d 100644 --- a/src/charts/barchart/vertical/stacked/qstackedbarseries.cpp +++ b/src/charts/barchart/vertical/stacked/qstackedbarseries.cpp @@ -18,7 +18,7 @@ QT_BEGIN_NAMESPACE Each bar set added to the series contributes a single segment to each stacked bar. - See the \l {StackedbarChart Example} {stacked bar chart example} to learn how to create a stacked bar chart. + See the \l {Charts with Widgets Gallery} to learn how to create a stacked bar chart. \image examples_stackedbarchart.png \sa QBarSet, QPercentBarSeries, QAbstractBarSeries @@ -36,7 +36,7 @@ QT_BEGIN_NAMESPACE Each bar set added to the series contributes a single segment to each stacked bar. The following QML shows how to create a simple stacked bar chart: - \snippet qmlchart/qml/qmlchart/View7.qml 1 + \snippet qmlchartsgallery/qml/BarSeriesStacked.qml 1 \beginfloatleft \image examples_qmlchart7.png \endfloat diff --git a/src/charts/boxplotchart/qboxplotseries.cpp b/src/charts/boxplotchart/qboxplotseries.cpp index a6a528d5..8b342c1d 100644 --- a/src/charts/boxplotchart/qboxplotseries.cpp +++ b/src/charts/boxplotchart/qboxplotseries.cpp @@ -29,7 +29,7 @@ QT_BEGIN_NAMESPACE have to be unique. If the same category label is defined for several box-and-whiskers items, only the first one is drawn. - See the \l {Box and Whiskers Example} {box-and-whiskers chart example} to learn how to create a + See the \l {Charts with Widgets Gallery} to learn how to create a box-and-whiskers chart. \image examples_boxplotchart.png diff --git a/src/charts/boxplotchart/qboxset.cpp b/src/charts/boxplotchart/qboxset.cpp index 350c2a25..1620d3e5 100644 --- a/src/charts/boxplotchart/qboxset.cpp +++ b/src/charts/boxplotchart/qboxset.cpp @@ -21,7 +21,7 @@ QT_BEGIN_NAMESPACE The second way is to create an empty QBoxSet instance and specify the values using the setValue() method. - See the \l{Box and Whiskers Example}{box-and-whiskers chart example} to learn how to + See the \l{Charts with Widgets Gallery} to learn how to create a box-and-whiskers chart. \sa QBoxPlotSeries diff --git a/src/charts/candlestickchart/qcandlestickseries.cpp b/src/charts/candlestickchart/qcandlestickseries.cpp index c7573ff0..dd20163a 100644 --- a/src/charts/candlestickchart/qcandlestickseries.cpp +++ b/src/charts/candlestickchart/qcandlestickseries.cpp @@ -33,7 +33,7 @@ QT_BEGIN_NAMESPACE drawn to the same category. When using QValueAxis or QDateTimeAxis, candlestick items sharing a timestamp will overlap each other. - See the \l {Candlestick Chart Example} {candlestick chart example} to learn how to create + See the \l {Charts with Widgets Gallery} to learn how to create a candlestick chart. \image examples_candlestickchart.png diff --git a/src/charts/doc/src/examples-audio.qdoc b/src/charts/doc/src/examples-audio.qdoc index bdf03061..093cff50 100644 --- a/src/charts/doc/src/examples-audio.qdoc +++ b/src/charts/doc/src/examples-audio.qdoc @@ -55,7 +55,7 @@ We set the min to max range on the x-axis from 0 to the XYSeriesIODevice::sampleCount. (Declared in xyseriesiodevice.h as 2000). We then set its title text. - \printto QValueAxis *axisY = new QValueAxis; + \printto auto axisY = new QValueAxis; \section2 The y-axis "Audio Level" diff --git a/src/charts/doc/src/qtcharts-overview.qdoc b/src/charts/doc/src/qtcharts-overview.qdoc index 94c533d1..2228508d 100644 --- a/src/charts/doc/src/qtcharts-overview.qdoc +++ b/src/charts/doc/src/qtcharts-overview.qdoc @@ -61,9 +61,8 @@ Or, in QML: - \snippet qmlpiechart/qml/qmlpiechart/main.qml 1 - \snippet qmlpiechart/qml/qmlpiechart/main.qml 2 - \snippet qmlpiechart/qml/qmlpiechart/main.qml 3 + \snippet qmlchartsgallery/qml/PieChart.qml 1 + \snippet qmlchartsgallery/qml/PieChart.qml 2 You can combine different types of series in one chart. @@ -202,7 +201,7 @@ supported by them. The axis can be used either as a radial or an angular axis. In QML, the corresponding type is PolarChartView. - For more information, see \l{Creating Polar Charts} and \l{Qml Polar Chart}. + For more information, see \l{Creating Polar Charts} and \l{Using Polar Charts with QML}. \section1 Axes @@ -247,7 +246,7 @@ orientation. For more information, see \l{Line Charts with Date and Time Axes}, - \l{Using Logarithmic Value Axes}, \l{Using Multiple Axes}, and \l{Qml Axes}. + \l{Using Logarithmic Value Axes}, \l{Using Multiple Axes}, and \l{Using Axes with QML}. \section1 Legend @@ -268,7 +267,7 @@ QBoxPlotLegendMarker, QCandlestickLegendMarker, and QXYLegendMarker. In QML, legend markers can be modified by creating custom legends, as - illustrated by the \l{Qml Custom Legend} example. + illustrated by the \l{Customizing Legends} example. \section1 Interacting with Charts diff --git a/src/charts/doc/src/qtcharts.qdoc b/src/charts/doc/src/qtcharts.qdoc index 782eb857..e9ce0b06 100644 --- a/src/charts/doc/src/qtcharts.qdoc +++ b/src/charts/doc/src/qtcharts.qdoc @@ -48,7 +48,6 @@ \image examples_qmlpiechart.png \snippet qmlpiechart/qml/qmlpiechart/main.qml 1 \snippet qmlpiechart/qml/qmlpiechart/main.qml 2 - \snippet qmlpiechart/qml/qmlpiechart/main.qml 3 \note Since Qt Creator 3.0 the project created with Qt Quick Application wizard based on Qt Quick 2 template uses QGuiApplication by default. As Qt Charts utilizes Qt Graphics View diff --git a/src/charts/linechart/qlineseries.cpp b/src/charts/linechart/qlineseries.cpp index fa41e401..825a7e52 100644 --- a/src/charts/linechart/qlineseries.cpp +++ b/src/charts/linechart/qlineseries.cpp @@ -41,7 +41,7 @@ QT_BEGIN_NAMESPACE connected by straight lines. The following QML example shows how to create a simple line chart: - \snippet qmlchart/qml/qmlchart/View2.qml 1 + \snippet qmlchartsgallery/qml/PieChart.qml \beginfloatleft \image examples_qmlchart2.png \endfloat diff --git a/src/charts/piechart/qpieseries.cpp b/src/charts/piechart/qpieseries.cpp index ceb511b3..982822b3 100644 --- a/src/charts/piechart/qpieseries.cpp +++ b/src/charts/piechart/qpieseries.cpp @@ -34,7 +34,7 @@ QT_BEGIN_NAMESPACE by setting a starting angle and angle span for the series. A full pie is 360 degrees, where 0 is at 12 a'clock. - See the \l {PieChart Example} {pie chart example} or \l {DonutChart Example} {donut chart example} to learn how to use QPieSeries. + See the \l {Charts with Widgets Gallery} to learn how to use QPieSeries. \image examples_piechart.png \image examples_donutchart.png diff --git a/src/charts/piechart/qpieslice.cpp b/src/charts/piechart/qpieslice.cpp index 2a64b16d..5695c38e 100644 --- a/src/charts/piechart/qpieslice.cpp +++ b/src/charts/piechart/qpieslice.cpp @@ -49,15 +49,12 @@ QT_BEGIN_NAMESPACE slices are customized, all customization will be lost. The PieSlice type should be used as a child of a PieSeries type. For example: - \snippet qmlpiechart/qml/qmlpiechart/main.qml 2 Alternatively, slices can be added to a pie series by using the \l{PieSeries::append()} {PieSeries.append()} method. - \snippet qmlpiechart/qml/qmlpiechart/main.qml 4 In that case, \l{PieSeries::at()}{PieSeries.at()} or \l {PieSeries::find} {PieSeries.find} can be used to access the properties of an individual PieSlice instance. - \snippet qmlpiechart/qml/qmlpiechart/main.qml 5 \sa PieSeries */ diff --git a/src/charts/qchart.cpp b/src/charts/qchart.cpp index 2d125fa5..afb98d08 100644 --- a/src/charts/qchart.cpp +++ b/src/charts/qchart.cpp @@ -23,7 +23,7 @@ QT_BEGIN_NAMESPACE A theme is a built-in collection of UI style related settings applied to all the visual elements of a chart, such as colors, pens, brushes, and fonts of - series, as well as axes, title, and legend. The \l {Chart themes example} + series, as well as axes, title, and legend. The \l {Charts with Widgets Gallery} illustrates how to use themes. \note Changing the theme will overwrite all customizations previously applied diff --git a/src/charts/scatterchart/qscatterseries.cpp b/src/charts/scatterchart/qscatterseries.cpp index b0d95f03..689b67ae 100644 --- a/src/charts/scatterchart/qscatterseries.cpp +++ b/src/charts/scatterchart/qscatterseries.cpp @@ -29,7 +29,7 @@ chart->addSeries(series); \endcode - For more information, see \l{ScatterChart Example} and + For more information, see \l{Charts with Widgets Gallery} and \l {Scatter Interactions Example}. */ /*! @@ -49,9 +49,9 @@ The following QML code shows how to create a chart with two simple scatter series: - \snippet qmlchart/qml/qmlchart/View5.qml 1 + \snippet qmlchartsgallery/qml/ScatterSeries.qml 1 - For more information, see \l{Qml Charts Example}. + For more information, see \l{Charts with QML Gallery}. */ /*! diff --git a/src/charts/splinechart/qsplineseries.cpp b/src/charts/splinechart/qsplineseries.cpp index 8d58808e..4d0c7a8f 100644 --- a/src/charts/splinechart/qsplineseries.cpp +++ b/src/charts/splinechart/qsplineseries.cpp @@ -47,7 +47,7 @@ \image examples_qmlchart3.png The following QML code shows how to create a simple spline chart: - \snippet qmlchart/qml/qmlchart/View3.qml 1 + \snippet qmlchartsgallery/qml/SplineSeries.qml 1 */ /*! diff --git a/src/charts/xychart/qhxymodelmapper.cpp b/src/charts/xychart/qhxymodelmapper.cpp index d6533dca..05039667 100644 --- a/src/charts/xychart/qhxymodelmapper.cpp +++ b/src/charts/xychart/qhxymodelmapper.cpp @@ -21,7 +21,7 @@ QT_BEGIN_NAMESPACE Both model and series properties can be used to manipulate the data. The model mapper keeps the series and the data model in sync. - \sa QVXYModelMapper, QXYSeries, {Model Data Example} + \sa QVXYModelMapper, QXYSeries, {Charts with Widgets Gallery} */ /*! \qmltype HXYModelMapper @@ -40,7 +40,7 @@ QT_BEGIN_NAMESPACE Both model and series properties can be used to manipulate the data. The model mapper keeps the series and the data model in sync. - \sa VXYModelMapper, XYSeries, {Model Data Example} + \sa VXYModelMapper, XYSeries, {Charts with Widgets Gallery} */ /*! diff --git a/src/charts/xychart/qvxymodelmapper.cpp b/src/charts/xychart/qvxymodelmapper.cpp index 34d27bb5..dcc7ebcf 100644 --- a/src/charts/xychart/qvxymodelmapper.cpp +++ b/src/charts/xychart/qvxymodelmapper.cpp @@ -21,7 +21,7 @@ QT_BEGIN_NAMESPACE Both model and series properties can be used to manipulate the data. The model mapper keeps the series and the data model in sync. - \sa QHXYModelMapper, QXYSeries, {Model Data Example} + \sa QHXYModelMapper, QXYSeries, {Charts with Widgets Gallery} */ /*! \qmltype VXYModelMapper @@ -40,7 +40,7 @@ QT_BEGIN_NAMESPACE Both model and series properties can be used to manipulate the data. The model mapper keeps the series and the data model in sync. - \sa HXYModelMapper, XYSeries, {Model Data Example} + \sa HXYModelMapper, XYSeries, {Charts with Widgets Gallery} */ /*! diff --git a/src/chartsqml2/declarativechart.cpp b/src/chartsqml2/declarativechart.cpp index f14d8664..4bd18f81 100644 --- a/src/chartsqml2/declarativechart.cpp +++ b/src/chartsqml2/declarativechart.cpp @@ -67,7 +67,6 @@ QT_BEGIN_NAMESPACE series: \snippet qmlpiechart/qml/qmlpiechart/main.qml 1 \snippet qmlpiechart/qml/qmlpiechart/main.qml 2 - \snippet qmlpiechart/qml/qmlpiechart/main.qml 3 */ /*! diff --git a/src/chartsqml2/declarativepolarchart.cpp b/src/chartsqml2/declarativepolarchart.cpp index 3852390d..2e9ac02a 100644 --- a/src/chartsqml2/declarativepolarchart.cpp +++ b/src/chartsqml2/declarativepolarchart.cpp @@ -40,7 +40,7 @@ QT_BEGIN_NAMESPACE The following QML code shows how to create a polar chart with a spline and scatter series and two value axes: - \snippet qmlpolarchart/qml/qmlpolarchart/View1.qml 1 + \snippet qmlchartsgallery/qml/TwoSeriesPolar.qml 1 */ DeclarativePolarChart::DeclarativePolarChart(QQuickItem *parent) |