diff --git a/plugins/declarative/declarativechart.cpp b/plugins/declarative/declarativechart.cpp index 58b0cd2..1ea5c1a 100644 --- a/plugins/declarative/declarativechart.cpp +++ b/plugins/declarative/declarativechart.cpp @@ -196,25 +196,21 @@ QTCOMMERCIALCHART_BEGIN_NAMESPACE /*! \qmlmethod ChartView::scrollLeft(real pixels) Scrolls to left by \a pixels. This is a convenience function that suits for example for key navigation. - \sa ValueAxis::min, ValueAxis::max, BarCategoryAxis::min, BarCategoryAxis::max */ /*! \qmlmethod ChartView::scrollRight(real pixels) Scrolls to right by \a pixels. This is a convenience function that suits for example for key navigation. - \sa ValueAxis::min, ValueAxis::max, BarCategoryAxis::min, BarCategoryAxis::max */ /*! \qmlmethod ChartView::scrollUp(real pixels) Scrolls up by \a pixels. This is a convenience function that suits for example for key navigation. - \sa ValueAxis::min, ValueAxis::max, BarCategoryAxis::min, BarCategoryAxis::max */ /*! \qmlmethod ChartView::scrollDown(real pixels) Scrolls down by \a pixels. This is a convenience function that suits for example for key navigation. - \sa ValueAxis::min, ValueAxis::max, BarCategoryAxis::min, BarCategoryAxis::max */ /*! diff --git a/src/axis/barcategoryaxis/qbarcategoryaxis.cpp b/src/axis/barcategoryaxis/qbarcategoryaxis.cpp index ae8427b..ba06d69 100644 --- a/src/axis/barcategoryaxis/qbarcategoryaxis.cpp +++ b/src/axis/barcategoryaxis/qbarcategoryaxis.cpp @@ -87,8 +87,7 @@ QTCOMMERCIALCHART_BEGIN_NAMESPACE Defines the minimum value on the axis. */ /*! - \qmlproperty QString Bar if (d->m_chart) - d->m_chart->removeAxis(this);CategoryAxis::min + \qmlproperty string BarCategoryAxis::min Defines the minimum value on the axis. */ @@ -97,7 +96,7 @@ QTCOMMERCIALCHART_BEGIN_NAMESPACE Defines the maximum value on the axis. */ /*! - \qmlproperty QString BarCategoryAxis::max + \qmlproperty string BarCategoryAxis::max Defines the maximum value on the axis. */ diff --git a/src/barchart/qabstractbarseries.cpp b/src/barchart/qabstractbarseries.cpp index 0275a41..ca101a2 100644 --- a/src/barchart/qabstractbarseries.cpp +++ b/src/barchart/qabstractbarseries.cpp @@ -62,6 +62,34 @@ QTCOMMERCIALCHART_BEGIN_NAMESPACE */ /*! + \qmlproperty AbstractAxis AbstractBarSeries::axisX + The x axis used for the series. If you leave both axisX and axisXTop undefined, a BarCategoriesAxis is created for + the series. + \sa axisXTop +*/ + +/*! + \qmlproperty AbstractAxis AbstractBarSeries::axisY + The y axis used for the series. If you leave both axisY and axisYRight undefined, a ValueAxis is created for + the series. + \sa axisYRight +*/ + +/*! + \qmlproperty AbstractAxis AbstractBarSeries::axisXTop + The x axis used for the series, drawn on top of the chart view. Note that you can only provide either axisX or + axisXTop, but not both. + \sa axisX +*/ + +/*! + \qmlproperty AbstractAxis AbstractBarSeries::axisYRight + The y axis used for the series, drawn to the right on the chart view. Note that you can only provide either axisY + or axisYRight, but not both. + \sa axisY +*/ + +/*! \property QAbstractBarSeries::barWidth The width of the bars of the series. The unit of \a width is the unit of x-axis. The minimum width for bars is zero and negative values are treated as zero. Setting the width to zero means that width of the bar on screen diff --git a/src/linechart/qlineseries.cpp b/src/linechart/qlineseries.cpp index 437920c..046285f 100644 --- a/src/linechart/qlineseries.cpp +++ b/src/linechart/qlineseries.cpp @@ -65,18 +65,6 @@ QTCOMMERCIALCHART_BEGIN_NAMESPACE */ /*! - \qmlproperty AbstractAxis LineSeries::axisX - The x axis used for the series. If you leave the x axis undefined, a ValueAxis is created for - the series. -*/ - -/*! - \qmlproperty AbstractAxis LineSeries::axisY - The y axis used for the series. If you leave the y axis undefined, a ValueAxis is created for - the series. -*/ - -/*! \qmlproperty real LineSeries::width The width of the line. By default the width is 2.0. */ diff --git a/src/splinechart/qsplineseries.cpp b/src/splinechart/qsplineseries.cpp index 83a6deb..a0ef9c4 100644 --- a/src/splinechart/qsplineseries.cpp +++ b/src/splinechart/qsplineseries.cpp @@ -62,18 +62,6 @@ */ /*! - \qmlproperty AbstractAxis SplineSeries::axisX - The x axis used for the series. If you leave the x axis undefined, a ValueAxis is created for - the series. -*/ - -/*! - \qmlproperty AbstractAxis SplineSeries::axisY - The y axis used for the series. If you leave the y axis undefined, a ValueAxis is created for - the series. -*/ - -/*! \qmlproperty real SplineSeries::width The width of the line. By default the width is 2.0. */ diff --git a/src/xychart/qxyseries.cpp b/src/xychart/qxyseries.cpp index f7d4a6d..08cfa4b 100644 --- a/src/xychart/qxyseries.cpp +++ b/src/xychart/qxyseries.cpp @@ -40,6 +40,34 @@ QTCOMMERCIALCHART_BEGIN_NAMESPACE */ /*! + \qmlproperty AbstractAxis XYSeries::axisX + The x axis used for the series. If you leave both axisX and axisXTop undefined, a ValueAxis is created for + the series. + \sa axisXTop +*/ + +/*! + \qmlproperty AbstractAxis XYSeries::axisY + The y axis used for the series. If you leave both axisY and axisYRight undefined, a ValueAxis is created for + the series. + \sa axisYRight +*/ + +/*! + \qmlproperty AbstractAxis XYSeries::axisXTop + The x axis used for the series, drawn on top of the chart view. Note that you can only provide either axisX or + axisXTop, but not both. + \sa axisX +*/ + +/*! + \qmlproperty AbstractAxis XYSeries::axisYRight + The y axis used for the series, drawn to the right on the chart view. Note that you can only provide either axisY + or axisYRight, but not both. + \sa axisY +*/ + +/*! \property QXYSeries::pointsVisible Controls if the data points are visible and should be drawn. */