##// END OF EJS Templates
Merge remote-tracking branch 'origin/5.6' into 5.7...
Merge remote-tracking branch 'origin/5.6' into 5.7 Conflicts: src/charts/doc/qtcharts.qdocconf Change-Id: If6160b2f643e7df8c32400b97afac229b95b78de

File last commit:

r2854:46147b040d06
r2893:0464d42b101e merge 5.7.0
Show More
wavechart.cpp
78 lines | 2.4 KiB | text/x-c | CppLexer
Miikka Heikkinen
Updated license...
r2854 /****************************************************************************
Michal Klocek
minor. add missing license files
r875 **
Miikka Heikkinen
Updated license...
r2854 ** Copyright (C) 2016 The Qt Company Ltd.
** Contact: https://www.qt.io/licensing/
Michal Klocek
minor. add missing license files
r875 **
Miikka Heikkinen
Updated license...
r2854 ** This file is part of the Qt Charts module of the Qt Toolkit.
Michal Klocek
minor. add missing license files
r875 **
Miikka Heikkinen
Updated license...
r2854 ** $QT_BEGIN_LICENSE:GPL$
Titta Heikkala
Updated license headers...
r2845 ** Commercial License Usage
** Licensees holding valid commercial Qt licenses may use this file in
** accordance with the commercial license agreement provided with the
** Software or, alternatively, in accordance with the terms contained in
** a written agreement between you and The Qt Company. For licensing terms
Miikka Heikkinen
Updated license...
r2854 ** and conditions see https://www.qt.io/terms-conditions. For further
** information use the contact form at https://www.qt.io/contact-us.
**
** GNU General Public License Usage
** Alternatively, this file may be used under the terms of the GNU
** General Public License version 3 or (at your option) any later version
** approved by the KDE Free Qt Foundation. The licenses are as published by
** the Free Software Foundation and appearing in the file LICENSE.GPL3
** included in the packaging of this file. Please review the following
** information to ensure the GNU General Public License requirements will
** be met: https://www.gnu.org/licenses/gpl-3.0.html.
Michal Klocek
minor. add missing license files
r875 **
Titta Heikkala
Updated license headers...
r2845 ** $QT_END_LICENSE$
**
Miikka Heikkinen
Updated license...
r2854 ****************************************************************************/
Michal Klocek
minor. add missing license files
r875
Michal Klocek
Adds test/wavechart
r867 #include "wavechart.h"
#include <cmath>
Titta Heikkala
Qt Charts project file structure change...
r2712 QT_CHARTS_USE_NAMESPACE
Michal Klocek
Adds test/wavechart
r867
#define PI 3.14159265358979
static const int numPoints =100;
WaveChart::WaveChart(QChart* chart, QWidget* parent) :
QChartView(chart, parent),
m_series(new QLineSeries()),
m_wave(0),
m_step(2 * PI / numPoints)
{
QPen blue(Qt::blue);
blue.setWidth(3);
m_series->setPen(blue);
Marek Rosa
removed legend from wavechart and added axes to it
r1622 chart->legend()->setVisible(false);
Michal Klocek
Adds test/wavechart
r867 QTime now = QTime::currentTime();
qsrand((uint) now.msec());
int fluctuate = 100;
for (qreal x = 0; x <= 2 * PI; x += m_step) {
m_series->append(x, fabs(sin(x) * fluctuate));
}
chart->addSeries(m_series);
Marek Rosa
removed legend from wavechart and added axes to it
r1622 chart->createDefaultAxes();
Michal Klocek
Adds test/wavechart
r867
QObject::connect(&m_timer, SIGNAL(timeout()), this, SLOT(update()));
m_timer.setInterval(5000);
m_timer.start();
}
void WaveChart::update()
{
int fluctuate;
Michal Klocek
Fixes and improvments to series API...
r1057 const QList<QPointF>& points = m_series->points();
Michal Klocek
Adds test/wavechart
r867 for (qreal i = 0, x = 0; x <= 2 * PI; x += m_step, i++) {
fluctuate = qrand() % 100;
Michal Klocek
Fixes and improvments to series API...
r1057 m_series->replace(x,points[i].y(),x,fabs(sin(x) * fluctuate));
Michal Klocek
Adds test/wavechart
r867
}
}