summaryrefslogtreecommitdiffstats
path: root/examples/charts/dynamicspline/chart.cpp
diff options
context:
space:
mode:
authorMichal Klocek <michal.klocek@qt.io>2018-04-24 12:32:17 +0200
committerMichal Klocek <michal.klocek@qt.io>2018-04-30 13:59:23 +0000
commitd3ea72e28ca82640e50900d42bf0c9ee76aa7f95 (patch)
tree1d72276672b2ef7b1ac76e77283f31d45530cb3c /examples/charts/dynamicspline/chart.cpp
parent8b4ad5a108b53e6964815856b37cf004099ce505 (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/dynamicspline/chart.cpp')
-rw-r--r--examples/charts/dynamicspline/chart.cpp20
1 files changed, 12 insertions, 8 deletions
diff --git a/examples/charts/dynamicspline/chart.cpp b/examples/charts/dynamicspline/chart.cpp
index beba2513..d19b7f02 100644
--- a/examples/charts/dynamicspline/chart.cpp
+++ b/examples/charts/dynamicspline/chart.cpp
@@ -37,7 +37,8 @@
Chart::Chart(QGraphicsItem *parent, Qt::WindowFlags wFlags):
QChart(QChart::ChartTypeCartesian, parent, wFlags),
m_series(0),
- m_axis(new QValueAxis),
+ m_axisX(new QValueAxis()),
+ m_axisY(new QValueAxis()),
m_step(0),
m_x(5),
m_y(1)
@@ -52,11 +53,14 @@ Chart::Chart(QGraphicsItem *parent, Qt::WindowFlags wFlags):
m_series->append(m_x, m_y);
addSeries(m_series);
- createDefaultAxes();
- setAxisX(m_axis, m_series);
- m_axis->setTickCount(5);
- axisX()->setRange(0, 10);
- axisY()->setRange(-5, 10);
+
+ addAxis(m_axisX,Qt::AlignBottom);
+ addAxis(m_axisY,Qt::AlignLeft);
+ m_series->attachAxis(m_axisX);
+ m_series->attachAxis(m_axisY);
+ m_axisX->setTickCount(5);
+ m_axisX->setRange(0, 10);
+ m_axisY->setRange(-5, 10);
m_timer.start();
}
@@ -68,8 +72,8 @@ Chart::~Chart()
void Chart::handleTimeout()
{
- qreal x = plotArea().width() / m_axis->tickCount();
- qreal y = (m_axis->max() - m_axis->min()) / m_axis->tickCount();
+ qreal x = plotArea().width() / m_axisX->tickCount();
+ qreal y = (m_axisX->max() - m_axisX->min()) / m_axisX->tickCount();
m_x += y;
m_y = QRandomGenerator::global()->bounded(5) - 2.5;
m_series->append(m_x, m_y);