##// 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/charts.pro src/charts/qchartglobal.h src/chartsqml2/chartsqml2.pro tests/auto/chartdataset/tst_chartdataset.cpp tests/auto/domain/tst_domain.cpp Change-Id: I9bfc63f6e93f9a3b86e53aca218dd3a48bb2ffc1

File last commit:

r2854:46147b040d06
r2898:03a6177a3223 merge master
Show More
main.cpp
71 lines | 2.3 KiB | text/x-c | CppLexer
Miikka Heikkinen
Updated license...
r2854 /****************************************************************************
Jani Honkonen
Add/modify license headers
r830 **
Miikka Heikkinen
Updated license...
r2854 ** Copyright (C) 2016 The Qt Company Ltd.
** Contact: https://www.qt.io/licensing/
Jani Honkonen
Add/modify license headers
r830 **
Miikka Heikkinen
Updated license...
r2854 ** This file is part of the Qt Charts module of the Qt Toolkit.
Jani Honkonen
Add/modify license headers
r830 **
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.
Jani Honkonen
Add/modify license headers
r830 **
Titta Heikkala
Updated license headers...
r2845 ** $QT_END_LICENSE$
**
Miikka Heikkinen
Updated license...
r2854 ****************************************************************************/
Michal Klocek
Uninfy examples , updated public API changes
r747
Jani Honkonen
Add gestures support for zoomlinechart example...
r1187 #include "chart.h"
Michal Klocek
Uninfy examples , updated public API changes
r747 #include "chartview.h"
Titta Heikkala
Fix include syntax...
r2714 #include <QtWidgets/QApplication>
#include <QtWidgets/QMainWindow>
#include <QtCore/QtMath>
#include <QtCharts/QLineSeries>
#include <QtCharts/QValueAxis>
Michal Klocek
Add zoom support...
r67
Titta Heikkala
Qt Charts project file structure change...
r2712 QT_CHARTS_USE_NAMESPACE
Michal Klocek
Add zoom support...
r67
int main(int argc, char *argv[])
{
QApplication a(argc, argv);
Michal Klocek
Uninfy examples , updated public API changes
r747 //![1]
Jani Honkonen
more coding style fixes for examples...
r2102 QLineSeries *series = new QLineSeries();
Jani Honkonen
coding style fixes for examples
r2098 for (int i = 0; i < 500; i++) {
Jani Honkonen
zoomlinechart example: update docs and series data
r1388 QPointF p((qreal) i, qSin(M_PI / 50 * i) * 100);
p.ry() += qrand() % 20;
*series << p;
Tero Ahola
Tuning zoom example (key zooming was removed from QChartView)
r966 }
Michal Klocek
Uninfy examples , updated public API changes
r747 //![1]
Jani Honkonen
Add newlines to examples to make docs nicer
r883
Jani Honkonen
more coding style fixes for examples...
r2102 Chart *chart = new Chart();
Tero Ahola
Tuning zoom example (key zooming was removed from QChartView)
r966 chart->addSeries(series);
chart->setTitle("Zoom in/out example");
Jani Honkonen
Add gestures support for zoomlinechart example...
r1187 chart->setAnimationOptions(QChart::SeriesAnimations);
Jani Honkonen
zoomlinechart example: update docs and series data
r1388 chart->legend()->hide();
Michal Klocek
Fix zoomlinechart example
r1589 chart->createDefaultAxes();
Jani Honkonen
Add newlines to examples to make docs nicer
r883
Jani Honkonen
more coding style fixes for examples...
r2102 ChartView *chartView = new ChartView(chart);
Tero Ahola
Tuning zoom example (key zooming was removed from QChartView)
r966 chartView->setRenderHint(QPainter::Antialiasing);
Jani Honkonen
Add newlines to examples to make docs nicer
r883
Tero Ahola
Tuning zoom example (key zooming was removed from QChartView)
r966 QMainWindow window;
window.setCentralWidget(chartView);
window.resize(400, 300);
Jani Honkonen
Add gestures support for zoomlinechart example...
r1187 window.grabGesture(Qt::PanGesture);
window.grabGesture(Qt::PinchGesture);
Tero Ahola
Tuning zoom example (key zooming was removed from QChartView)
r966 window.show();
Jani Honkonen
Add newlines to examples to make docs nicer
r883
Michal Klocek
Add zoom support...
r67 return a.exec();
}