diff options
author | Michal Klocek <michal.klocek@qt.io> | 2018-04-24 12:32:17 +0200 |
---|---|---|
committer | Michal Klocek <michal.klocek@qt.io> | 2018-04-30 13:59:23 +0000 |
commit | d3ea72e28ca82640e50900d42bf0c9ee76aa7f95 (patch) | |
tree | 1d72276672b2ef7b1ac76e77283f31d45530cb3c /examples/charts/stackedbarchartdrilldown/drilldownchart.cpp | |
parent | 8b4ad5a108b53e6964815856b37cf004099ce505 (diff) |
Add proper 'deprecated' warnings
Use Q_DECL_DEPRECATED to mark deprecated API. Fix examples to do
not use deprecated functions.
These functions were 'marked' as deprecated when multiple axes
were introduced. Moreover, axis X/Y is an ambiguous term and not necessary
mean Horizontal/Vertical axis. These deprecated methods also create an
issue when given series should be attached to several Horizonal/
Vertical axes and calling them can cause unwanted results.
Change-Id: I639e1b964240b80c2b3b93b74b061da324bca1ff
Reviewed-by: Miikka Heikkinen <miikka.heikkinen@qt.io>
Diffstat (limited to 'examples/charts/stackedbarchartdrilldown/drilldownchart.cpp')
-rw-r--r-- | examples/charts/stackedbarchartdrilldown/drilldownchart.cpp | 19 |
1 files changed, 10 insertions, 9 deletions
diff --git a/examples/charts/stackedbarchartdrilldown/drilldownchart.cpp b/examples/charts/stackedbarchartdrilldown/drilldownchart.cpp index 2af737d2..696b5397 100644 --- a/examples/charts/stackedbarchartdrilldown/drilldownchart.cpp +++ b/examples/charts/stackedbarchartdrilldown/drilldownchart.cpp @@ -29,13 +29,18 @@ #include "drilldownchart.h" #include <QtCharts/QBarCategoryAxis> +#include <QtCharts/QValueAxis> QT_CHARTS_USE_NAMESPACE DrilldownChart::DrilldownChart(QGraphicsItem *parent, Qt::WindowFlags wFlags) : QChart(QChart::ChartTypeCartesian, parent, wFlags), - m_currentSeries(0) + m_currentSeries(0), + m_axisX(new QBarCategoryAxis()), + m_axisY(new QValueAxis()) { + addAxis(m_axisY, Qt::AlignLeft); + addAxis(m_axisX, Qt::AlignBottom); } void DrilldownChart::changeSeries(DrilldownBarSeries *series) @@ -46,15 +51,11 @@ void DrilldownChart::changeSeries(DrilldownBarSeries *series) m_currentSeries = series; // Reset axis - QBarCategoryAxis *axis = new QBarCategoryAxis(); - axis->append(m_currentSeries->categories()); - + m_axisX->setCategories(m_currentSeries->categories()); addSeries(series); - - createDefaultAxes(); - setAxisX(axis, series); - axisY()->setTitleText("Crops"); - + series->attachAxis(m_axisX); + series->attachAxis(m_axisY); + m_axisY->setRange(0,m_currentSeries->maxValue()); setTitle(series->name()); } |