diff options
author | Heikkinen Miikka <miikka.heikkinen@digia.com> | 2013-05-23 09:11:47 +0300 |
---|---|---|
committer | Miikka Heikkinen <miikka.heikkinen@digia.com> | 2013-05-23 09:18:52 +0300 |
commit | 383eb97e14501d05dab859da7e7372078b0b15e0 (patch) | |
tree | 60026d3fae6b88a76a8ed0e37e81a65d3917f1df /demos | |
parent | 5407eb4cd85a24ddb3ba574718112d25cd4309a2 (diff) |
Fix oscilloscope demos on android
qobject_cast doesn't seem to work properly on android, but there is
no need to use it in oscilloscope demos, static cast works just
as well there.
Change-Id: Ia32c914dcec05dca48103fe8d4edec7c054c8bd8
Reviewed-by: Tomi Korpipää <tomi.korpipaa@digia.com>
Diffstat (limited to 'demos')
-rw-r--r-- | demos/qmloscilloscope/datasource.cpp | 18 | ||||
-rw-r--r-- | demos/quick2oscilloscope/datasource.cpp | 18 |
2 files changed, 18 insertions, 18 deletions
diff --git a/demos/qmloscilloscope/datasource.cpp b/demos/qmloscilloscope/datasource.cpp index e2dcbb1c..d8e21c88 100644 --- a/demos/qmloscilloscope/datasource.cpp +++ b/demos/qmloscilloscope/datasource.cpp @@ -41,16 +41,16 @@ DataSource::DataSource(QDeclarativeView *appViewer, QObject *parent) : void DataSource::update(QAbstractSeries *series) { - QXYSeries *xySeries = qobject_cast<QXYSeries *>(series); - Q_ASSERT(xySeries); + if (series) { + QXYSeries *xySeries = static_cast<QXYSeries *>(series); + m_index++; + if (m_index > m_data.count() - 1) + m_index = 0; - m_index++; - if (m_index > m_data.count() - 1) - m_index = 0; - - QList<QPointF> points = m_data.at(m_index); - // Use replace instead of clear + append, it's optimized for performance - xySeries->replace(points); + QList<QPointF> points = m_data.at(m_index); + // Use replace instead of clear + append, it's optimized for performance + xySeries->replace(points); + } } void DataSource::generateData(int type, int rowCount, int colCount) diff --git a/demos/quick2oscilloscope/datasource.cpp b/demos/quick2oscilloscope/datasource.cpp index 62daf825..162dd157 100644 --- a/demos/quick2oscilloscope/datasource.cpp +++ b/demos/quick2oscilloscope/datasource.cpp @@ -42,16 +42,16 @@ DataSource::DataSource(QQuickView *appViewer, QObject *parent) : void DataSource::update(QAbstractSeries *series) { - QXYSeries *xySeries = qobject_cast<QXYSeries *>(series); - Q_ASSERT(xySeries); + if (series) { + QXYSeries *xySeries = static_cast<QXYSeries *>(series); + m_index++; + if (m_index > m_data.count() - 1) + m_index = 0; - m_index++; - if (m_index > m_data.count() - 1) - m_index = 0; - - QList<QPointF> points = m_data.at(m_index); - // Use replace instead of clear + append, it's optimized for performance - xySeries->replace(points); + QList<QPointF> points = m_data.at(m_index); + // Use replace instead of clear + append, it's optimized for performance + xySeries->replace(points); + } } void DataSource::generateData(int type, int rowCount, int colCount) |