##// END OF EJS Templates
Merge remote-tracking branch 'origin/5.7' into dev...
Merge remote-tracking branch 'origin/5.7' into dev Change-Id: I86dec1064d79704214e885681449ca347b193d66

File last commit:

r2854:46147b040d06
r2895:e9a2e2a5e9c0 merge
Show More
main.cpp
102 lines | 3.1 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
Titta Heikkala
Fix include syntax...
r2714 #include <QtWidgets/QApplication>
#include <QtWidgets/QMainWindow>
#include <QtCharts/QChartView>
#include <QtCharts/QStackedBarSeries>
#include <QtCharts/QBarSet>
#include <QtCharts/QLegend>
#include <QtCharts/QBarCategoryAxis>
sauimone
added missing example files :)
r96
Titta Heikkala
Qt Charts project file structure change...
r2712 QT_CHARTS_USE_NAMESPACE
sauimone
added missing example files :)
r96
int main(int argc, char *argv[])
{
QApplication a(argc, argv);
Jani Honkonen
Add newlines to examples to make docs nicer
r883
Michal Klocek
Uninfy examples , updated public API changes
r747 //![1]
sauimone
politically correct names for barchart examples
r881 QBarSet *set0 = new QBarSet("Jane");
QBarSet *set1 = new QBarSet("John");
QBarSet *set2 = new QBarSet("Axel");
QBarSet *set3 = new QBarSet("Mary");
QBarSet *set4 = new QBarSet("Samantha");
sauimone
added missing example files :)
r96
sauimone
Updated barchart examples and documentation. Also bug fix to barchart model
r387 *set0 << 1 << 2 << 3 << 4 << 5 << 6;
*set1 << 5 << 0 << 0 << 4 << 0 << 7;
*set2 << 3 << 5 << 8 << 13 << 8 << 5;
*set3 << 5 << 6 << 7 << 3 << 4 << 5;
*set4 << 9 << 7 << 5 << 3 << 1 << 2;
sauimone
removed categories from barseries. categories are now only on axis
r1321 //![1]
Jani Honkonen
Add newlines to examples to make docs nicer
r883
sauimone
removed categories from barseries. categories are now only on axis
r1321 //![2]
Jani Honkonen
more coding style fixes for examples...
r2102 QStackedBarSeries *series = new QStackedBarSeries();
sauimone
Renamed appendBarSet to append, removeBarSet to remove
r1194 series->append(set0);
series->append(set1);
series->append(set2);
series->append(set3);
series->append(set4);
sauimone
removed categories from barseries. categories are now only on axis
r1321 //![2]
Jani Honkonen
Add newlines to examples to make docs nicer
r883
sauimone
removed categories from barseries. categories are now only on axis
r1321 //![3]
Jani Honkonen
more coding style fixes for examples...
r2102 QChart *chart = new QChart();
Michal Klocek
Uninfy examples , updated public API changes
r747 chart->addSeries(series);
sauimone
Simple to examples
r1623 chart->setTitle("Simple stackedbarchart example");
sauimone
turned animations on also on vertical barchart examples
r1863 chart->setAnimationOptions(QChart::SeriesAnimations);
sauimone
removed categories from barseries. categories are now only on axis
r1321 //![3]
//![4]
QStringList categories;
categories << "Jan" << "Feb" << "Mar" << "Apr" << "May" << "Jun";
Jani Honkonen
more coding style fixes for examples...
r2102 QBarCategoryAxis *axis = new QBarCategoryAxis();
Michal Klocek
Refactors QAxis to QAbstractAxis...
r1541 axis->append(categories);
sauimone
barchart doc review updates
r1859 chart->createDefaultAxes();
Jani Honkonen
coding style fixes for examples
r2098 chart->setAxisX(axis, series);
Michal Klocek
Uninfy examples , updated public API changes
r747 //![4]
Jani Honkonen
Add newlines to examples to make docs nicer
r883
Michal Klocek
Uninfy examples , updated public API changes
r747 //![5]
sauimone
turned legend on in barchart examples
r891 chart->legend()->setVisible(true);
Tero Ahola
Qml ChartView properties; legend to use Qt alignments
r1357 chart->legend()->setAlignment(Qt::AlignBottom);
Michal Klocek
Uninfy examples , updated public API changes
r747 //![5]
Jani Honkonen
Add newlines to examples to make docs nicer
r883
Michal Klocek
Uninfy examples , updated public API changes
r747 //![6]
Jani Honkonen
more coding style fixes for examples...
r2102 QChartView *chartView = new QChartView(chart);
sauimone
turned legend on in barchart examples
r891 chartView->setRenderHint(QPainter::Antialiasing);
//![6]
//![7]
Michal Klocek
Uninfy examples , updated public API changes
r747 QMainWindow window;
sauimone
updated barchart examples. minor fixes
r276 window.setCentralWidget(chartView);
Titta Heikkala
Fix the geometry for examples and demos...
r2647 window.resize(420, 300);
sauimone
added missing example files :)
r96 window.show();
sauimone
turned legend on in barchart examples
r891 //![7]
Jani Honkonen
Add newlines to examples to make docs nicer
r883
sauimone
added missing example files :)
r96 return a.exec();
}