##// 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
140 lines | 4.4 KiB | text/x-c | CppLexer
Miikka Heikkinen
Updated license...
r2854 /****************************************************************************
Michal Klocek
Uninfy examples , updated public API changes
r747 **
Miikka Heikkinen
Updated license...
r2854 ** Copyright (C) 2016 The Qt Company Ltd.
** Contact: https://www.qt.io/licensing/
Michal Klocek
Uninfy examples , updated public API changes
r747 **
Miikka Heikkinen
Updated license...
r2854 ** This file is part of the Qt Charts module of the Qt Toolkit.
Michal Klocek
Uninfy examples , updated public API changes
r747 **
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
Uninfy examples , updated public API changes
r747 **
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/QLineSeries>
#include <QtCharts/QCategoryAxis>
Michal Klocek
Add background to chart...
r69
Titta Heikkala
Qt Charts project file structure change...
r2712 QT_CHARTS_USE_NAMESPACE
Michal Klocek
Add background to chart...
r69
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();
Marek Rosa
Added one more type of label placing on Pie chart
r1712 *series << QPointF(0, 6) << QPointF(9, 4) << QPointF(15, 20) << QPointF(25, 12) << QPointF(29, 26);
Jani Honkonen
more coding style fixes for examples...
r2102 QChart *chart = new QChart();
Jani Honkonen
Fix/hide legend in some examples and demos
r1400 chart->legend()->hide();
Michal Klocek
Uninfy examples , updated public API changes
r747 chart->addSeries(series);
Tero Ahola
Tuned and documented custom chart example
r942 //![1]
Jani Honkonen
Add newlines to examples to make docs nicer
r883
Tero Ahola
Tuned and documented custom chart example
r942 //![2]
// Customize series
QPen pen(QRgb(0xfdb157));
pen.setWidth(5);
series->setPen(pen);
// Customize chart title
Michal Klocek
Adds font handling for chart's titile...
r192 QFont font;
font.setPixelSize(18);
Michal Klocek
Uninfy examples , updated public API changes
r747 chart->setTitleFont(font);
Tero Ahola
Tuned and documented custom chart example
r942 chart->setTitleBrush(QBrush(Qt::white));
chart->setTitle("Customchart example");
Michal Klocek
Change background gradient to use ObjectBoundingMode...
r122
Tero Ahola
Tuned and documented custom chart example
r942 // Customize chart background
Michal Klocek
Change background gradient to use ObjectBoundingMode...
r122 QLinearGradient backgroundGradient;
Jani Honkonen
coding style fixes for examples
r2098 backgroundGradient.setStart(QPointF(0, 0));
backgroundGradient.setFinalStop(QPointF(0, 1));
Tero Ahola
Tuned and documented custom chart example
r942 backgroundGradient.setColorAt(0.0, QRgb(0xd2d0d1));
backgroundGradient.setColorAt(1.0, QRgb(0x4c4547));
Michal Klocek
Change background gradient to use ObjectBoundingMode...
r122 backgroundGradient.setCoordinateMode(QGradient::ObjectBoundingMode);
Michal Klocek
Uninfy examples , updated public API changes
r747 chart->setBackgroundBrush(backgroundGradient);
Miikka Heikkinen
Added plot area background customization to customchart example...
r2502
// Customize plot area background
QLinearGradient plotAreaGradient;
plotAreaGradient.setStart(QPointF(0, 1));
plotAreaGradient.setFinalStop(QPointF(1, 0));
plotAreaGradient.setColorAt(0.0, QRgb(0x555555));
plotAreaGradient.setColorAt(1.0, QRgb(0x55aa55));
plotAreaGradient.setCoordinateMode(QGradient::ObjectBoundingMode);
chart->setPlotAreaBackgroundBrush(plotAreaGradient);
chart->setPlotAreaBackgroundVisible(true);
Tero Ahola
Tuned and documented custom chart example
r942 //![2]
Jani Honkonen
Add newlines to examples to make docs nicer
r883
Tero Ahola
Tuned and documented custom chart example
r942 //![3]
Jani Honkonen
more coding style fixes for examples...
r2102 QCategoryAxis *axisX = new QCategoryAxis();
QCategoryAxis *axisY = new QCategoryAxis();
Michal Klocek
Combines color,axis,custom into one example
r767
Tero Ahola
Tuned and documented custom chart example
r942 // Customize axis label font
QFont labelsFont;
labelsFont.setPixelSize(12);
axisX->setLabelsFont(labelsFont);
axisY->setLabelsFont(labelsFont);
// Customize axis colors
QPen axisPen(QRgb(0xd18952));
axisPen.setWidth(2);
Marek Rosa
QAbstractAxis: renamed Arrow and Axis to line in methods names
r1844 axisX->setLinePen(axisPen);
axisY->setLinePen(axisPen);
Tero Ahola
Tuned and documented custom chart example
r942
// Customize axis label colors
QBrush axisBrush(Qt::white);
axisX->setLabelsBrush(axisBrush);
axisY->setLabelsBrush(axisBrush);
// Customize grid lines and shades
Michal Klocek
Combines color,axis,custom into one example
r767 axisX->setGridLineVisible(false);
axisY->setGridLineVisible(false);
axisY->setShadesPen(Qt::NoPen);
Miikka Heikkinen
Added plot area background customization to customchart example...
r2502 axisY->setShadesBrush(QBrush(QColor(0x99, 0xcc, 0xcc, 0x55)));
Michal Klocek
Combines color,axis,custom into one example
r767 axisY->setShadesVisible(true);
Tero Ahola
Tuned and documented custom chart example
r942 //![3]
Jani Honkonen
Add newlines to examples to make docs nicer
r883
Tero Ahola
Tuned and documented custom chart example
r942 //![4]
Marek Rosa
Updated customchart example. Now it uses QIntervalsAxis
r1702 axisX->append("low", 10);
axisX->append("optimal", 20);
axisX->append("high", 30);
axisX->setRange(0, 30);
axisY->append("slow", 10);
axisY->append("med", 20);
axisY->append("fast", 30);
axisY->setRange(0, 30);
Michal Klocek
Fixes customchart, barcategoryaxisy
r1655
Marek Rosa
Customchart example updated
r1647 chart->setAxisX(axisX, series);
chart->setAxisY(axisY, series);
Tero Ahola
Tuned and documented custom chart example
r942 //![4]
Jani Honkonen
Add newlines to examples to make docs nicer
r883
Tero Ahola
Tuned and documented custom chart example
r942 //![5]
Jani Honkonen
more coding style fixes for examples...
r2102 QChartView *chartView = new QChartView(chart);
Michal Klocek
Uninfy examples , updated public API changes
r747 chartView->setRenderHint(QPainter::Antialiasing);
Tero Ahola
Tuned and documented custom chart example
r942 //![5]
Jani Honkonen
Add newlines to examples to make docs nicer
r883
Tero Ahola
Tuned and documented custom chart example
r942 //![6]
Michal Klocek
Uninfy examples , updated public API changes
r747 QMainWindow window;
Michal Klocek
Add background to chart...
r69 window.setCentralWidget(chartView);
window.resize(400, 300);
window.show();
Tero Ahola
Tuned and documented custom chart example
r942 //![6]
Jani Honkonen
Add newlines to examples to make docs nicer
r883
Michal Klocek
Add background to chart...
r69 return a.exec();
}