##// 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
themewidget.h
88 lines | 2.6 KiB | text/x-c | CLexer
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
Updates chartstheme demo, small refactor
r748
Jani Honkonen
Fix include issues
r1949 #ifndef THEMEWIDGET_H
#define THEMEWIDGET_H
Titta Heikkala
Fix include syntax...
r2714 #include <QtWidgets/QWidget>
#include <QtCharts/QChartGlobal>
Michal Klocek
Updates chartstheme demo, small refactor
r748
Christian Kandeler
Fix compilation with namespaced Qt....
r2774 QT_BEGIN_NAMESPACE
Michal Klocek
Updates chartstheme demo, small refactor
r748 class QComboBox;
class QCheckBox;
Christian Kandeler
Fix compilation with namespaced Qt....
r2774 QT_END_NAMESPACE
Michal Klocek
Updates chartstheme demo, small refactor
r748
Titta Heikkala
Qt Charts project file structure change...
r2712 QT_CHARTS_BEGIN_NAMESPACE
Michal Klocek
Updates chartstheme demo, small refactor
r748 class QChartView;
class QChart;
Titta Heikkala
Qt Charts project file structure change...
r2712 QT_CHARTS_END_NAMESPACE
Michal Klocek
Updates chartstheme demo, small refactor
r748
typedef QPair<QPointF, QString> Data;
typedef QList<Data> DataList;
typedef QList<DataList> DataTable;
Titta Heikkala
Qt Charts project file structure change...
r2712 QT_CHARTS_USE_NAMESPACE
Michal Klocek
Updates chartstheme demo, small refactor
r748
class ThemeWidget: public QWidget
{
Q_OBJECT
public:
explicit ThemeWidget(QWidget *parent = 0);
~ThemeWidget();
sauimone
Q_SIGNALS and Q_SLOTS
r775 private Q_SLOTS:
Michal Klocek
Updates chartstheme demo, small refactor
r748 void updateUI();
private:
Jani Honkonen
coding style fixes for demos
r2099 DataTable generateRandomData(int listCount, int valueMax, int valueCount) const;
QComboBox *createThemeBox() const;
QComboBox *createAnimationBox() const;
QComboBox *createLegendBox() const;
Michal Klocek
Updates chartstheme demo, small refactor
r748 void connectSignals();
Jani Honkonen
coding style fixes for demos
r2099 QChart *createAreaChart() const;
QChart *createBarChart(int valueCount) const;
QChart *createPieChart() const;
QChart *createLineChart() const;
QChart *createSplineChart() const;
QChart *createScatterChart() const;
Michal Klocek
Updates chartstheme demo, small refactor
r748
private:
int m_listCount;
int m_valueMax;
int m_valueCount;
Jani Honkonen
coding style fixes for demos
r2099 QList<QChartView *> m_charts;
Michal Klocek
Updates chartstheme demo, small refactor
r748 DataTable m_dataTable;
QComboBox *m_themeComboBox;
QCheckBox *m_antialiasCheckBox;
QComboBox *m_animatedComboBox;
sauimone
legend pos to theme example, legend padding
r803 QComboBox *m_legendComboBox;
Michal Klocek
Updates chartstheme demo, small refactor
r748 };
Jani Honkonen
Fix include issues
r1949 #endif /* THEMEWIDGET_H */