@@ -18,8 +18,8 | |||||
18 | ** |
|
18 | ** | |
19 | ****************************************************************************/ |
|
19 | ****************************************************************************/ | |
20 |
|
20 | |||
21 | #include <QApplication> |
|
21 | #include <QtWidgets/QApplication> | |
22 | #include <QMainWindow> |
|
22 | #include <QtWidgets/QMainWindow> | |
23 | #include <QtCharts/QChartView> |
|
23 | #include <QtCharts/QChartView> | |
24 | #include <QtCharts/QLineSeries> |
|
24 | #include <QtCharts/QLineSeries> | |
25 | #include <QtCharts/QAreaSeries> |
|
25 | #include <QtCharts/QAreaSeries> |
@@ -18,7 +18,7 | |||||
18 | ** |
|
18 | ** | |
19 | ****************************************************************************/ |
|
19 | ****************************************************************************/ | |
20 |
|
20 | |||
21 | #include <QApplication> |
|
21 | #include <QtWidgets/QApplication> | |
22 | #include "widget.h" |
|
22 | #include "widget.h" | |
23 |
|
23 | |||
24 | int main(int argc, char *argv[]) |
|
24 | int main(int argc, char *argv[]) |
@@ -19,13 +19,13 | |||||
19 | ****************************************************************************/ |
|
19 | ****************************************************************************/ | |
20 |
|
20 | |||
21 | #include "widget.h" |
|
21 | #include "widget.h" | |
22 | #include <QAudioDeviceInfo> |
|
22 | #include <QtMultimedia/QAudioDeviceInfo> | |
23 | #include <QAudioInput> |
|
23 | #include <QtMultimedia/QAudioInput> | |
24 | #include <QChartView> |
|
24 | #include <QtCharts/QChartView> | |
25 | #include <QLineSeries> |
|
25 | #include <QtCharts/QLineSeries> | |
26 | #include <QChart> |
|
26 | #include <QtCharts/QChart> | |
27 | #include <QVBoxLayout> |
|
27 | #include <QtWidgets/QVBoxLayout> | |
28 | #include <QValueAxis> |
|
28 | #include <QtCharts/QValueAxis> | |
29 | #include "xyseriesiodevice.h" |
|
29 | #include "xyseriesiodevice.h" | |
30 |
|
30 | |||
31 | QT_CHARTS_USE_NAMESPACE |
|
31 | QT_CHARTS_USE_NAMESPACE |
@@ -21,8 +21,8 | |||||
21 | #ifndef WIDGET_H |
|
21 | #ifndef WIDGET_H | |
22 | #define WIDGET_H |
|
22 | #define WIDGET_H | |
23 |
|
23 | |||
24 | #include <QWidget> |
|
24 | #include <QtWidgets/QWidget> | |
25 | #include <QChartGlobal> |
|
25 | #include <QtCharts/QChartGlobal> | |
26 |
|
26 | |||
27 | QT_CHARTS_BEGIN_NAMESPACE |
|
27 | QT_CHARTS_BEGIN_NAMESPACE | |
28 | class QLineSeries; |
|
28 | class QLineSeries; |
@@ -19,7 +19,7 | |||||
19 | ****************************************************************************/ |
|
19 | ****************************************************************************/ | |
20 |
|
20 | |||
21 | #include "xyseriesiodevice.h" |
|
21 | #include "xyseriesiodevice.h" | |
22 | #include <QXYSeries> |
|
22 | #include <QtCharts/QXYSeries> | |
23 |
|
23 | |||
24 | XYSeriesIODevice::XYSeriesIODevice(QXYSeries * series, QObject *parent) : |
|
24 | XYSeriesIODevice::XYSeriesIODevice(QXYSeries * series, QObject *parent) : | |
25 | QIODevice(parent), |
|
25 | QIODevice(parent), |
@@ -21,8 +21,8 | |||||
21 | #ifndef XYSERIESIODEVICE_H |
|
21 | #ifndef XYSERIESIODEVICE_H | |
22 | #define XYSERIESIODEVICE_H |
|
22 | #define XYSERIESIODEVICE_H | |
23 |
|
23 | |||
24 | #include <QIODevice> |
|
24 | #include <QtCore/QIODevice> | |
25 | #include <QChartGlobal> |
|
25 | #include <QtCharts/QChartGlobal> | |
26 |
|
26 | |||
27 | QT_CHARTS_BEGIN_NAMESPACE |
|
27 | QT_CHARTS_BEGIN_NAMESPACE | |
28 | class QXYSeries; |
|
28 | class QXYSeries; |
@@ -18,13 +18,13 | |||||
18 | ** |
|
18 | ** | |
19 | ****************************************************************************/ |
|
19 | ****************************************************************************/ | |
20 |
|
20 | |||
21 | #include <QApplication> |
|
21 | #include <QtWidgets/QApplication> | |
22 | #include <QMainWindow> |
|
22 | #include <QtWidgets/QMainWindow> | |
23 | #include <QChartView> |
|
23 | #include <QtCharts/QChartView> | |
24 | #include <QBarSeries> |
|
24 | #include <QtCharts/QBarSeries> | |
25 | #include <QBarSet> |
|
25 | #include <QtCharts/QBarSet> | |
26 | #include <QLegend> |
|
26 | #include <QtCharts/QLegend> | |
27 | #include <QBarCategoryAxis> |
|
27 | #include <QtCharts/QBarCategoryAxis> | |
28 |
|
28 | |||
29 | QT_CHARTS_USE_NAMESPACE |
|
29 | QT_CHARTS_USE_NAMESPACE | |
30 |
|
30 |
@@ -19,10 +19,10 | |||||
19 | ****************************************************************************/ |
|
19 | ****************************************************************************/ | |
20 |
|
20 | |||
21 | #include "customtablemodel.h" |
|
21 | #include "customtablemodel.h" | |
22 | #include <QVector> |
|
22 | #include <QtCore/QVector> | |
23 | #include <QTime> |
|
23 | #include <QtCore/QTime> | |
24 | #include <QRect> |
|
24 | #include <QtCore/QRect> | |
25 | #include <QColor> |
|
25 | #include <QtGui/QColor> | |
26 |
|
26 | |||
27 | CustomTableModel::CustomTableModel(QObject *parent) : |
|
27 | CustomTableModel::CustomTableModel(QObject *parent) : | |
28 | QAbstractTableModel(parent) |
|
28 | QAbstractTableModel(parent) |
@@ -21,9 +21,9 | |||||
21 | #ifndef CUSTOMTABLEMODEL_H |
|
21 | #ifndef CUSTOMTABLEMODEL_H | |
22 | #define CUSTOMTABLEMODEL_H |
|
22 | #define CUSTOMTABLEMODEL_H | |
23 |
|
23 | |||
24 | #include <QAbstractTableModel> |
|
24 | #include <QtCore/QAbstractTableModel> | |
25 | #include <QHash> |
|
25 | #include <QtCore/QHash> | |
26 | #include <QRect> |
|
26 | #include <QtCore/QRect> | |
27 |
|
27 | |||
28 | class CustomTableModel : public QAbstractTableModel |
|
28 | class CustomTableModel : public QAbstractTableModel | |
29 | { |
|
29 | { |
@@ -18,7 +18,7 | |||||
18 | ** |
|
18 | ** | |
19 | ****************************************************************************/ |
|
19 | ****************************************************************************/ | |
20 |
|
20 | |||
21 | #include <QApplication> |
|
21 | #include <QtWidgets/QApplication> | |
22 | #include "tablewidget.h" |
|
22 | #include "tablewidget.h" | |
23 |
|
23 | |||
24 | int main(int argc, char *argv[]) |
|
24 | int main(int argc, char *argv[]) |
@@ -20,17 +20,17 | |||||
20 |
|
20 | |||
21 | #include "tablewidget.h" |
|
21 | #include "tablewidget.h" | |
22 | #include "customtablemodel.h" |
|
22 | #include "customtablemodel.h" | |
23 | #include <QGridLayout> |
|
23 | #include <QtWidgets/QGridLayout> | |
24 | #include <QTableView> |
|
24 | #include <QtWidgets/QTableView> | |
25 | #include <QChart> |
|
25 | #include <QtCharts/QChart> | |
26 | #include <QChartView> |
|
26 | #include <QtCharts/QChartView> | |
27 | #include <QLineSeries> |
|
27 | #include <QtCharts/QLineSeries> | |
28 | #include <QVXYModelMapper> |
|
28 | #include <QtCharts/QVXYModelMapper> | |
29 | #include <QBarSeries> |
|
29 | #include <QtCharts/QBarSeries> | |
30 | #include <QBarSet> |
|
30 | #include <QtCharts/QBarSet> | |
31 | #include <QVBarModelMapper> |
|
31 | #include <QtCharts/QVBarModelMapper> | |
32 | #include <QHeaderView> |
|
32 | #include <QtWidgets/QHeaderView> | |
33 | #include <QBarCategoryAxis> |
|
33 | #include <QtCharts/QBarCategoryAxis> | |
34 |
|
34 | |||
35 | QT_CHARTS_USE_NAMESPACE |
|
35 | QT_CHARTS_USE_NAMESPACE | |
36 |
|
36 |
@@ -21,7 +21,7 | |||||
21 | #ifndef TABLEWIDGET_H |
|
21 | #ifndef TABLEWIDGET_H | |
22 | #define TABLEWIDGET_H |
|
22 | #define TABLEWIDGET_H | |
23 |
|
23 | |||
24 | #include <QWidget> |
|
24 | #include <QtWidgets/QWidget> | |
25 |
|
25 | |||
26 | class TableWidget : public QWidget |
|
26 | class TableWidget : public QWidget | |
27 | { |
|
27 | { |
@@ -21,8 +21,8 | |||||
21 | #ifndef BOXDATAREADER_H |
|
21 | #ifndef BOXDATAREADER_H | |
22 | #define BOXDATAREADER_H |
|
22 | #define BOXDATAREADER_H | |
23 |
|
23 | |||
24 | #include <QTextStream> |
|
24 | #include <QtCore/QTextStream> | |
25 | #include <QBoxSet> |
|
25 | #include <QtCharts/QBoxSet> | |
26 |
|
26 | |||
27 | QT_CHARTS_USE_NAMESPACE |
|
27 | QT_CHARTS_USE_NAMESPACE | |
28 |
|
28 |
@@ -18,14 +18,14 | |||||
18 | ** |
|
18 | ** | |
19 | ****************************************************************************/ |
|
19 | ****************************************************************************/ | |
20 |
|
20 | |||
21 | #include <QApplication> |
|
21 | #include <QtWidgets/QApplication> | |
22 | #include <QMainWindow> |
|
22 | #include <QtWidgets/QMainWindow> | |
23 | #include <QChartView> |
|
23 | #include <QtCharts/QChartView> | |
24 | #include <QBoxPlotSeries> |
|
24 | #include <QtCharts/QBoxPlotSeries> | |
25 | #include <QBoxSet> |
|
25 | #include <QtCharts/QBoxSet> | |
26 | #include <QLegend> |
|
26 | #include <QtCharts/QLegend> | |
27 | #include <QBarCategoryAxis> |
|
27 | #include <QtCharts/QBarCategoryAxis> | |
28 | #include <QFile> |
|
28 | #include <QtCore/QFile> | |
29 |
|
29 | |||
30 | #include "boxdatareader.h" |
|
30 | #include "boxdatareader.h" | |
31 |
|
31 |
@@ -19,10 +19,10 | |||||
19 | ****************************************************************************/ |
|
19 | ****************************************************************************/ | |
20 |
|
20 | |||
21 | #include "callout.h" |
|
21 | #include "callout.h" | |
22 | #include <QPainter> |
|
22 | #include <QtGui/QPainter> | |
23 | #include <QFontMetrics> |
|
23 | #include <QtGui/QFontMetrics> | |
24 | #include <QGraphicsSceneMouseEvent> |
|
24 | #include <QtWidgets/QGraphicsSceneMouseEvent> | |
25 | #include <QMouseEvent> |
|
25 | #include <QtGui/QMouseEvent> | |
26 |
|
26 | |||
27 | Callout::Callout(QGraphicsItem * parent): |
|
27 | Callout::Callout(QGraphicsItem * parent): | |
28 | QGraphicsItem(parent) |
|
28 | QGraphicsItem(parent) |
@@ -21,8 +21,8 | |||||
21 | #ifndef CALLOUT_H |
|
21 | #ifndef CALLOUT_H | |
22 | #define CALLOUT_H |
|
22 | #define CALLOUT_H | |
23 |
|
23 | |||
24 | #include <QGraphicsItem> |
|
24 | #include <QtWidgets/QGraphicsItem> | |
25 | #include <QFont> |
|
25 | #include <QtGui/QFont> | |
26 |
|
26 | |||
27 | class QGraphicsSceneMouseEvent; |
|
27 | class QGraphicsSceneMouseEvent; | |
28 |
|
28 |
@@ -18,7 +18,7 | |||||
18 | ** |
|
18 | ** | |
19 | ****************************************************************************/ |
|
19 | ****************************************************************************/ | |
20 |
|
20 | |||
21 | #include <QApplication> |
|
21 | #include <QtWidgets/QApplication> | |
22 | #include "view.h" |
|
22 | #include "view.h" | |
23 |
|
23 | |||
24 | int main(int argc, char *argv[]) |
|
24 | int main(int argc, char *argv[]) |
@@ -19,14 +19,14 | |||||
19 | ****************************************************************************/ |
|
19 | ****************************************************************************/ | |
20 |
|
20 | |||
21 | #include "view.h" |
|
21 | #include "view.h" | |
22 | #include <QResizeEvent> |
|
22 | #include <QtGui/QResizeEvent> | |
23 | #include <QGraphicsScene> |
|
23 | #include <QtWidgets/QGraphicsScene> | |
24 | #include <QChart> |
|
24 | #include <QtCharts/QChart> | |
25 | #include <QLineSeries> |
|
25 | #include <QtCharts/QLineSeries> | |
26 | #include <QSplineSeries> |
|
26 | #include <QtCharts/QSplineSeries> | |
27 | #include <QGraphicsTextItem> |
|
27 | #include <QtWidgets/QGraphicsTextItem> | |
28 | #include "callout.h" |
|
28 | #include "callout.h" | |
29 | #include <QMouseEvent> |
|
29 | #include <QtGui/QMouseEvent> | |
30 |
|
30 | |||
31 | View::View(QWidget *parent) |
|
31 | View::View(QWidget *parent) | |
32 | : QGraphicsView(new QGraphicsScene, parent), |
|
32 | : QGraphicsView(new QGraphicsScene, parent), |
@@ -20,8 +20,8 | |||||
20 |
|
20 | |||
21 | #ifndef VIEW_H |
|
21 | #ifndef VIEW_H | |
22 | #define VIEW_H |
|
22 | #define VIEW_H | |
23 | #include <QGraphicsView> |
|
23 | #include <QtWidgets/QGraphicsView> | |
24 | #include <QChartGlobal> |
|
24 | #include <QtCharts/QChartGlobal> | |
25 |
|
25 | |||
26 | QT_CHARTS_BEGIN_NAMESPACE |
|
26 | QT_CHARTS_BEGIN_NAMESPACE | |
27 | class QChart; |
|
27 | class QChart; |
@@ -19,9 +19,9 | |||||
19 | ****************************************************************************/ |
|
19 | ****************************************************************************/ | |
20 |
|
20 | |||
21 | #include "chart.h" |
|
21 | #include "chart.h" | |
22 | #include <QValueAxis> |
|
22 | #include <QtCharts/QValueAxis> | |
23 | #include <QAbstractAxis> |
|
23 | #include <QtCharts/QAbstractAxis> | |
24 |
#include < |
|
24 | #include <QtCore/QtMath> | |
25 |
|
25 | |||
26 | Chart::Chart(QGraphicsItem *parent, Qt::WindowFlags wFlags, QLineSeries *series) |
|
26 | Chart::Chart(QGraphicsItem *parent, Qt::WindowFlags wFlags, QLineSeries *series) | |
27 | : QChart(QChart::ChartTypeCartesian, parent, wFlags), m_series(series) |
|
27 | : QChart(QChart::ChartTypeCartesian, parent, wFlags), m_series(series) |
@@ -21,8 +21,8 | |||||
21 | #ifndef CHART_H |
|
21 | #ifndef CHART_H | |
22 | #define CHART_H |
|
22 | #define CHART_H | |
23 |
|
23 | |||
24 | #include <QChart> |
|
24 | #include <QtCharts/QChart> | |
25 | #include <QLineSeries> |
|
25 | #include <QtCharts/QLineSeries> | |
26 |
|
26 | |||
27 | QT_CHARTS_USE_NAMESPACE |
|
27 | QT_CHARTS_USE_NAMESPACE | |
28 |
|
28 |
@@ -19,7 +19,7 | |||||
19 | ****************************************************************************/ |
|
19 | ****************************************************************************/ | |
20 |
|
20 | |||
21 | #include "chartview.h" |
|
21 | #include "chartview.h" | |
22 | #include <QMouseEvent> |
|
22 | #include <QtGui/QMouseEvent> | |
23 | #include "chart.h" |
|
23 | #include "chart.h" | |
24 |
|
24 | |||
25 | ChartView::ChartView(Chart *chart, QWidget *parent) : |
|
25 | ChartView::ChartView(Chart *chart, QWidget *parent) : |
@@ -21,7 +21,7 | |||||
21 | #ifndef CHARTVIEW_H |
|
21 | #ifndef CHARTVIEW_H | |
22 | #define CHARTVIEW_H |
|
22 | #define CHARTVIEW_H | |
23 |
|
23 | |||
24 | #include <QChartView> |
|
24 | #include <QtCharts/QChartView> | |
25 |
|
25 | |||
26 | class Chart; |
|
26 | class Chart; | |
27 |
|
27 |
@@ -18,11 +18,11 | |||||
18 | ** |
|
18 | ** | |
19 | ****************************************************************************/ |
|
19 | ****************************************************************************/ | |
20 |
|
20 | |||
21 | #include <QApplication> |
|
21 | #include <QtWidgets/QApplication> | |
22 | #include <QMainWindow> |
|
22 | #include <QtWidgets/QMainWindow> | |
23 | #include <QLineSeries> |
|
23 | #include <QtCharts/QLineSeries> | |
24 |
|
24 | |||
25 | #include <QValueAxis> |
|
25 | #include <QtCharts/QValueAxis> | |
26 |
|
26 | |||
27 | #include "chart.h" |
|
27 | #include "chart.h" | |
28 | #include "chartview.h" |
|
28 | #include "chartview.h" |
@@ -19,8 +19,8 | |||||
19 | ****************************************************************************/ |
|
19 | ****************************************************************************/ | |
20 |
|
20 | |||
21 | #include "themewidget.h" |
|
21 | #include "themewidget.h" | |
22 | #include <QApplication> |
|
22 | #include <QtWidgets/QApplication> | |
23 | #include <QMainWindow> |
|
23 | #include <QtWidgets/QMainWindow> | |
24 |
|
24 | |||
25 | int main(int argc, char *argv[]) |
|
25 | int main(int argc, char *argv[]) | |
26 | { |
|
26 | { |
@@ -20,28 +20,28 | |||||
20 |
|
20 | |||
21 | #include "themewidget.h" |
|
21 | #include "themewidget.h" | |
22 |
|
22 | |||
23 | #include <QChartView> |
|
23 | #include <QtCharts/QChartView> | |
24 | #include <QPieSeries> |
|
24 | #include <QtCharts/QPieSeries> | |
25 | #include <QPieSlice> |
|
25 | #include <QtCharts/QPieSlice> | |
26 | #include <QAbstractBarSeries> |
|
26 | #include <QtCharts/QAbstractBarSeries> | |
27 | #include <QPercentBarSeries> |
|
27 | #include <QtCharts/QPercentBarSeries> | |
28 | #include <QStackedBarSeries> |
|
28 | #include <QtCharts/QStackedBarSeries> | |
29 | #include <QBarSeries> |
|
29 | #include <QtCharts/QBarSeries> | |
30 | #include <QBarSet> |
|
30 | #include <QtCharts/QBarSet> | |
31 | #include <QLineSeries> |
|
31 | #include <QtCharts/QLineSeries> | |
32 | #include <QSplineSeries> |
|
32 | #include <QtCharts/QSplineSeries> | |
33 | #include <QScatterSeries> |
|
33 | #include <QtCharts/QScatterSeries> | |
34 | #include <QAreaSeries> |
|
34 | #include <QtCharts/QAreaSeries> | |
35 | #include <QLegend> |
|
35 | #include <QtCharts/QLegend> | |
36 | #include <QGridLayout> |
|
36 | #include <QtWidgets/QGridLayout> | |
37 | #include <QFormLayout> |
|
37 | #include <QtWidgets/QFormLayout> | |
38 | #include <QComboBox> |
|
38 | #include <QtWidgets/QComboBox> | |
39 | #include <QSpinBox> |
|
39 | #include <QtWidgets/QSpinBox> | |
40 | #include <QCheckBox> |
|
40 | #include <QtWidgets/QCheckBox> | |
41 | #include <QGroupBox> |
|
41 | #include <QtWidgets/QGroupBox> | |
42 | #include <QLabel> |
|
42 | #include <QtWidgets/QLabel> | |
43 | #include <QTime> |
|
43 | #include <QtCore/QTime> | |
44 | #include <QBarCategoryAxis> |
|
44 | #include <QtCharts/QBarCategoryAxis> | |
45 |
|
45 | |||
46 | ThemeWidget::ThemeWidget(QWidget *parent) : |
|
46 | ThemeWidget::ThemeWidget(QWidget *parent) : | |
47 | QWidget(parent), |
|
47 | QWidget(parent), |
@@ -21,8 +21,8 | |||||
21 | #ifndef THEMEWIDGET_H |
|
21 | #ifndef THEMEWIDGET_H | |
22 | #define THEMEWIDGET_H |
|
22 | #define THEMEWIDGET_H | |
23 |
|
23 | |||
24 | #include <QWidget> |
|
24 | #include <QtWidgets/QWidget> | |
25 | #include <QChartGlobal> |
|
25 | #include <QtCharts/QChartGlobal> | |
26 |
|
26 | |||
27 | class QComboBox; |
|
27 | class QComboBox; | |
28 | class QCheckBox; |
|
28 | class QCheckBox; |
@@ -18,11 +18,11 | |||||
18 | ** |
|
18 | ** | |
19 | ****************************************************************************/ |
|
19 | ****************************************************************************/ | |
20 |
|
20 | |||
21 | #include <QApplication> |
|
21 | #include <QtWidgets/QApplication> | |
22 | #include <QMainWindow> |
|
22 | #include <QtWidgets/QMainWindow> | |
23 | #include <QChartView> |
|
23 | #include <QtCharts/QChartView> | |
24 | #include <QLineSeries> |
|
24 | #include <QtCharts/QLineSeries> | |
25 | #include <QCategoryAxis> |
|
25 | #include <QtCharts/QCategoryAxis> | |
26 |
|
26 | |||
27 | QT_CHARTS_USE_NAMESPACE |
|
27 | QT_CHARTS_USE_NAMESPACE | |
28 |
|
28 |
@@ -18,16 +18,16 | |||||
18 | ** |
|
18 | ** | |
19 | ****************************************************************************/ |
|
19 | ****************************************************************************/ | |
20 |
|
20 | |||
21 | #include <QApplication> |
|
21 | #include <QtWidgets/QApplication> | |
22 | #include <QMainWindow> |
|
22 | #include <QtWidgets/QMainWindow> | |
23 | #include <QChartView> |
|
23 | #include <QtCharts/QChartView> | |
24 | #include <QLineSeries> |
|
24 | #include <QtCharts/QLineSeries> | |
25 | #include <QDateTime> |
|
25 | #include <QtCore/QDateTime> | |
26 | #include <QDateTimeAxis> |
|
26 | #include <QtCharts/QDateTimeAxis> | |
27 | #include <QFile> |
|
27 | #include <QtCore/QFile> | |
28 | #include <QTextStream> |
|
28 | #include <QtCore/QTextStream> | |
29 | #include <QDebug> |
|
29 | #include <QtCore/QDebug> | |
30 | #include <QValueAxis> |
|
30 | #include <QtCharts/QValueAxis> | |
31 |
|
31 | |||
32 | QT_CHARTS_USE_NAMESPACE |
|
32 | QT_CHARTS_USE_NAMESPACE | |
33 |
|
33 |
@@ -19,8 +19,8 | |||||
19 | ****************************************************************************/ |
|
19 | ****************************************************************************/ | |
20 | #include "donutbreakdownchart.h" |
|
20 | #include "donutbreakdownchart.h" | |
21 | #include "mainslice.h" |
|
21 | #include "mainslice.h" | |
22 | #include <QPieSlice> |
|
22 | #include <QtCharts/QPieSlice> | |
23 | #include <QPieLegendMarker> |
|
23 | #include <QtCharts/QPieLegendMarker> | |
24 |
|
24 | |||
25 | QT_CHARTS_USE_NAMESPACE |
|
25 | QT_CHARTS_USE_NAMESPACE | |
26 |
|
26 |
@@ -20,8 +20,8 | |||||
20 | #ifndef DONUTBREAKDOWNCHART_H |
|
20 | #ifndef DONUTBREAKDOWNCHART_H | |
21 | #define DONUTBREAKDOWNCHART_H |
|
21 | #define DONUTBREAKDOWNCHART_H | |
22 |
|
22 | |||
23 | #include <QChart> |
|
23 | #include <QtCharts/QChart> | |
24 | #include <QPieSeries> |
|
24 | #include <QtCharts/QPieSeries> | |
25 |
|
25 | |||
26 | QT_CHARTS_USE_NAMESPACE |
|
26 | QT_CHARTS_USE_NAMESPACE | |
27 |
|
27 |
@@ -17,10 +17,10 | |||||
17 | ** $QT_END_LICENSE$ |
|
17 | ** $QT_END_LICENSE$ | |
18 | ** |
|
18 | ** | |
19 | ****************************************************************************/ |
|
19 | ****************************************************************************/ | |
20 | #include <QApplication> |
|
20 | #include <QtWidgets/QApplication> | |
21 | #include <QMainWindow> |
|
21 | #include <QtWidgets/QMainWindow> | |
22 | #include <QStatusBar> |
|
22 | #include <QtWidgets/QStatusBar> | |
23 | #include <QChartView> |
|
23 | #include <QtCharts/QChartView> | |
24 | #include "donutbreakdownchart.h" |
|
24 | #include "donutbreakdownchart.h" | |
25 |
|
25 | |||
26 | QT_CHARTS_USE_NAMESPACE |
|
26 | QT_CHARTS_USE_NAMESPACE |
@@ -21,8 +21,8 | |||||
21 | #ifndef MAINSLICE_H |
|
21 | #ifndef MAINSLICE_H | |
22 | #define MAINSLICE_H |
|
22 | #define MAINSLICE_H | |
23 |
|
23 | |||
24 | #include <QPieSlice> |
|
24 | #include <QtCharts/QPieSlice> | |
25 | #include <QPieSeries> |
|
25 | #include <QtCharts/QPieSeries> | |
26 |
|
26 | |||
27 | QT_CHARTS_USE_NAMESPACE |
|
27 | QT_CHARTS_USE_NAMESPACE | |
28 |
|
28 |
@@ -18,12 +18,12 | |||||
18 | ** |
|
18 | ** | |
19 | ****************************************************************************/ |
|
19 | ****************************************************************************/ | |
20 |
|
20 | |||
21 | #include <QApplication> |
|
21 | #include <QtWidgets/QApplication> | |
22 | #include <QMainWindow> |
|
22 | #include <QtWidgets/QMainWindow> | |
23 | #include <QChartView> |
|
23 | #include <QtCharts/QChartView> | |
24 | #include <QPieSeries> |
|
24 | #include <QtCharts/QPieSeries> | |
25 | #include <QPieSlice> |
|
25 | #include <QtCharts/QPieSlice> | |
26 | #include <QDebug> |
|
26 | #include <QtCore/QDebug> | |
27 | QT_CHARTS_USE_NAMESPACE |
|
27 | QT_CHARTS_USE_NAMESPACE | |
28 |
|
28 | |||
29 | int main(int argc, char *argv[]) |
|
29 | int main(int argc, char *argv[]) |
@@ -19,11 +19,11 | |||||
19 | ****************************************************************************/ |
|
19 | ****************************************************************************/ | |
20 |
|
20 | |||
21 | #include "chart.h" |
|
21 | #include "chart.h" | |
22 | #include <QAbstractAxis> |
|
22 | #include <QtCharts/QAbstractAxis> | |
23 | #include <QSplineSeries> |
|
23 | #include <QtCharts/QSplineSeries> | |
24 | #include <QValueAxis> |
|
24 | #include <QtCharts/QValueAxis> | |
25 | #include <QTime> |
|
25 | #include <QtCore/QTime> | |
26 | #include <QDebug> |
|
26 | #include <QtCore/QDebug> | |
27 |
|
27 | |||
28 | Chart::Chart(QGraphicsItem *parent, Qt::WindowFlags wFlags): |
|
28 | Chart::Chart(QGraphicsItem *parent, Qt::WindowFlags wFlags): | |
29 | QChart(QChart::ChartTypeCartesian, parent, wFlags), |
|
29 | QChart(QChart::ChartTypeCartesian, parent, wFlags), |
@@ -21,8 +21,8 | |||||
21 | #ifndef CHART_H |
|
21 | #ifndef CHART_H | |
22 | #define CHART_H |
|
22 | #define CHART_H | |
23 |
|
23 | |||
24 | #include <QChart> |
|
24 | #include <QtCharts/QChart> | |
25 | #include <QTimer> |
|
25 | #include <QtCore/QTimer> | |
26 |
|
26 | |||
27 | QT_CHARTS_BEGIN_NAMESPACE |
|
27 | QT_CHARTS_BEGIN_NAMESPACE | |
28 | class QSplineSeries; |
|
28 | class QSplineSeries; |
@@ -19,9 +19,9 | |||||
19 | ****************************************************************************/ |
|
19 | ****************************************************************************/ | |
20 |
|
20 | |||
21 | #include "chart.h" |
|
21 | #include "chart.h" | |
22 | #include <QChartView> |
|
22 | #include <QtCharts/QChartView> | |
23 | #include <QApplication> |
|
23 | #include <QtWidgets/QApplication> | |
24 | #include <QMainWindow> |
|
24 | #include <QtWidgets/QMainWindow> | |
25 |
|
25 | |||
26 | QT_CHARTS_USE_NAMESPACE |
|
26 | QT_CHARTS_USE_NAMESPACE | |
27 |
|
27 |
@@ -18,15 +18,15 | |||||
18 | ** |
|
18 | ** | |
19 | ****************************************************************************/ |
|
19 | ****************************************************************************/ | |
20 |
|
20 | |||
21 | #include <QApplication> |
|
21 | #include <QtWidgets/QApplication> | |
22 | #include <QMainWindow> |
|
22 | #include <QtWidgets/QMainWindow> | |
23 | #include <QChartView> |
|
23 | #include <QtCharts/QChartView> | |
24 | #include <QBarSeries> |
|
24 | #include <QtCharts/QBarSeries> | |
25 | #include <QBarSet> |
|
25 | #include <QtCharts/QBarSet> | |
26 | #include <QLegend> |
|
26 | #include <QtCharts/QLegend> | |
27 | #include <QBarCategoryAxis> |
|
27 | #include <QtCharts/QBarCategoryAxis> | |
28 | #include <QValueAxis> |
|
28 | #include <QtCharts/QValueAxis> | |
29 | #include <QHorizontalBarSeries> |
|
29 | #include <QtCharts/QHorizontalBarSeries> | |
30 |
|
30 | |||
31 | QT_CHARTS_USE_NAMESPACE |
|
31 | QT_CHARTS_USE_NAMESPACE | |
32 |
|
32 |
@@ -18,14 +18,14 | |||||
18 | ** |
|
18 | ** | |
19 | ****************************************************************************/ |
|
19 | ****************************************************************************/ | |
20 |
|
20 | |||
21 | #include <QApplication> |
|
21 | #include <QtWidgets/QApplication> | |
22 | #include <QMainWindow> |
|
22 | #include <QtWidgets/QMainWindow> | |
23 | #include <QChartView> |
|
23 | #include <QtCharts/QChartView> | |
24 | #include <QBarSeries> |
|
24 | #include <QtCharts/QBarSeries> | |
25 | #include <QBarSet> |
|
25 | #include <QtCharts/QBarSet> | |
26 | #include <QLegend> |
|
26 | #include <QtCharts/QLegend> | |
27 | #include <QBarCategoryAxis> |
|
27 | #include <QtCharts/QBarCategoryAxis> | |
28 | #include <QHorizontalPercentBarSeries> |
|
28 | #include <QtCharts/QHorizontalPercentBarSeries> | |
29 |
|
29 | |||
30 | QT_CHARTS_USE_NAMESPACE |
|
30 | QT_CHARTS_USE_NAMESPACE | |
31 |
|
31 |
@@ -18,14 +18,14 | |||||
18 | ** |
|
18 | ** | |
19 | ****************************************************************************/ |
|
19 | ****************************************************************************/ | |
20 |
|
20 | |||
21 | #include <QApplication> |
|
21 | #include <QtWidgets/QApplication> | |
22 | #include <QMainWindow> |
|
22 | #include <QtWidgets/QMainWindow> | |
23 | #include <QChartView> |
|
23 | #include <QtCharts/QChartView> | |
24 | #include <QBarSeries> |
|
24 | #include <QtCharts/QBarSeries> | |
25 | #include <QBarSet> |
|
25 | #include <QtCharts/QBarSet> | |
26 | #include <QLegend> |
|
26 | #include <QtCharts/QLegend> | |
27 | #include <QBarCategoryAxis> |
|
27 | #include <QtCharts/QBarCategoryAxis> | |
28 | #include <QHorizontalStackedBarSeries> |
|
28 | #include <QtCharts/QHorizontalStackedBarSeries> | |
29 |
|
29 | |||
30 | QT_CHARTS_USE_NAMESPACE |
|
30 | QT_CHARTS_USE_NAMESPACE | |
31 |
|
31 |
@@ -20,8 +20,8 | |||||
20 |
|
20 | |||
21 | #include "mainwidget.h" |
|
21 | #include "mainwidget.h" | |
22 |
|
22 | |||
23 | #include <QApplication> |
|
23 | #include <QtWidgets/QApplication> | |
24 | #include <QMainWindow> |
|
24 | #include <QtWidgets/QMainWindow> | |
25 |
|
25 | |||
26 | QT_CHARTS_USE_NAMESPACE |
|
26 | QT_CHARTS_USE_NAMESPACE | |
27 |
|
27 |
@@ -19,15 +19,15 | |||||
19 | ****************************************************************************/ |
|
19 | ****************************************************************************/ | |
20 |
|
20 | |||
21 | #include "mainwidget.h" |
|
21 | #include "mainwidget.h" | |
22 | #include <QChart> |
|
22 | #include <QtCharts/QChart> | |
23 | #include <QChartView> |
|
23 | #include <QtCharts/QChartView> | |
24 | #include <QPushButton> |
|
24 | #include <QtWidgets/QPushButton> | |
25 | #include <QLabel> |
|
25 | #include <QtWidgets/QLabel> | |
26 | #include <QDebug> |
|
26 | #include <QtCore/QDebug> | |
27 | #include <QBarSet> |
|
27 | #include <QtCharts/QBarSet> | |
28 | #include <QBarSeries> |
|
28 | #include <QtCharts/QBarSeries> | |
29 | #include <QLegend> |
|
29 | #include <QtCharts/QLegend> | |
30 | #include <QFormLayout> |
|
30 | #include <QtWidgets/QFormLayout> | |
31 |
|
31 | |||
32 | QT_CHARTS_USE_NAMESPACE |
|
32 | QT_CHARTS_USE_NAMESPACE | |
33 |
|
33 |
@@ -21,16 +21,16 | |||||
21 | #ifndef MAINWIDGET_H |
|
21 | #ifndef MAINWIDGET_H | |
22 | #define MAINWIDGET_H |
|
22 | #define MAINWIDGET_H | |
23 |
|
23 | |||
24 |
#include |
|
24 | #include <QtCharts/QChartGlobal> | |
25 |
#include |
|
25 | #include <QtCharts/QChart> | |
26 |
#include |
|
26 | #include <QtCharts/QChartView> | |
27 | #include <QWidget> |
|
27 | #include <QtWidgets/QWidget> | |
28 | #include <QGraphicsWidget> |
|
28 | #include <QtWidgets/QGraphicsWidget> | |
29 | #include <QGridLayout> |
|
29 | #include <QtWidgets/QGridLayout> | |
30 | #include <QGraphicsGridLayout> |
|
30 | #include <QtWidgets/QGraphicsGridLayout> | |
31 | #include <QDoubleSpinBox> |
|
31 | #include <QtWidgets/QDoubleSpinBox> | |
32 | #include <QGroupBox> |
|
32 | #include <QtWidgets/QGroupBox> | |
33 | #include <QBarSeries> |
|
33 | #include <QtCharts/QBarSeries> | |
34 |
|
34 | |||
35 | QT_CHARTS_USE_NAMESPACE |
|
35 | QT_CHARTS_USE_NAMESPACE | |
36 |
|
36 |
@@ -20,8 +20,8 | |||||
20 |
|
20 | |||
21 | #include "mainwidget.h" |
|
21 | #include "mainwidget.h" | |
22 |
|
22 | |||
23 | #include <QApplication> |
|
23 | #include <QtWidgets/QApplication> | |
24 | #include <QMainWindow> |
|
24 | #include <QtWidgets/QMainWindow> | |
25 |
|
25 | |||
26 | int main(int argc, char *argv[]) |
|
26 | int main(int argc, char *argv[]) | |
27 | { |
|
27 | { |
@@ -19,17 +19,17 | |||||
19 | ****************************************************************************/ |
|
19 | ****************************************************************************/ | |
20 |
|
20 | |||
21 | #include "mainwidget.h" |
|
21 | #include "mainwidget.h" | |
22 | #include <QChart> |
|
22 | #include <QtCharts/QChart> | |
23 | #include <QChartView> |
|
23 | #include <QtCharts/QChartView> | |
24 | #include <QPushButton> |
|
24 | #include <QtWidgets/QPushButton> | |
25 | #include <QLabel> |
|
25 | #include <QtWidgets/QLabel> | |
26 | #include <QDebug> |
|
26 | #include <QtCore/QDebug> | |
27 | #include <QLegend> |
|
27 | #include <QtCharts/QLegend> | |
28 | #include <QFormLayout> |
|
28 | #include <QtWidgets/QFormLayout> | |
29 | #include <QLegendMarker> |
|
29 | #include <QtCharts/QLegendMarker> | |
30 | #include <QLineSeries> |
|
30 | #include <QtCharts/QLineSeries> | |
31 | #include <QXYLegendMarker> |
|
31 | #include <QtCharts/QXYLegendMarker> | |
32 |
#include < |
|
32 | #include <QtCore/QtMath> | |
33 |
|
33 | |||
34 | QT_CHARTS_USE_NAMESPACE |
|
34 | QT_CHARTS_USE_NAMESPACE | |
35 |
|
35 |
@@ -21,16 +21,16 | |||||
21 | #ifndef MAINWIDGET_H |
|
21 | #ifndef MAINWIDGET_H | |
22 | #define MAINWIDGET_H |
|
22 | #define MAINWIDGET_H | |
23 |
|
23 | |||
24 |
#include |
|
24 | #include <QtCharts/QChartGlobal> | |
25 |
#include |
|
25 | #include <QtCharts/QChart> | |
26 |
#include |
|
26 | #include <QtCharts/QChartView> | |
27 | #include <QWidget> |
|
27 | #include <QtWidgets/QWidget> | |
28 | #include <QGraphicsWidget> |
|
28 | #include <QtWidgets/QGraphicsWidget> | |
29 | #include <QGridLayout> |
|
29 | #include <QtWidgets/QGridLayout> | |
30 | #include <QGraphicsGridLayout> |
|
30 | #include <QtWidgets/QGraphicsGridLayout> | |
31 | #include <QDoubleSpinBox> |
|
31 | #include <QtWidgets/QDoubleSpinBox> | |
32 | #include <QGroupBox> |
|
32 | #include <QtWidgets/QGroupBox> | |
33 | #include <QLineSeries> |
|
33 | #include <QtCharts/QLineSeries> | |
34 |
|
34 | |||
35 | QT_CHARTS_USE_NAMESPACE |
|
35 | QT_CHARTS_USE_NAMESPACE | |
36 |
|
36 |
@@ -18,15 +18,15 | |||||
18 | ** |
|
18 | ** | |
19 | ****************************************************************************/ |
|
19 | ****************************************************************************/ | |
20 |
|
20 | |||
21 | #include <QApplication> |
|
21 | #include <QtWidgets/QApplication> | |
22 | #include <QMainWindow> |
|
22 | #include <QtWidgets/QMainWindow> | |
23 | #include <QChartView> |
|
23 | #include <QtCharts/QChartView> | |
24 | #include <QBarSeries> |
|
24 | #include <QtCharts/QBarSeries> | |
25 | #include <QBarSet> |
|
25 | #include <QtCharts/QBarSet> | |
26 | #include <QLineSeries> |
|
26 | #include <QtCharts/QLineSeries> | |
27 | #include <QLegend> |
|
27 | #include <QtCharts/QLegend> | |
28 | #include <QBarCategoryAxis> |
|
28 | #include <QtCharts/QBarCategoryAxis> | |
29 | #include <QValueAxis> |
|
29 | #include <QtCharts/QValueAxis> | |
30 |
|
30 | |||
31 | QT_CHARTS_USE_NAMESPACE |
|
31 | QT_CHARTS_USE_NAMESPACE | |
32 |
|
32 |
@@ -18,10 +18,10 | |||||
18 | ** |
|
18 | ** | |
19 | ****************************************************************************/ |
|
19 | ****************************************************************************/ | |
20 |
|
20 | |||
21 | #include <QApplication> |
|
21 | #include <QtWidgets/QApplication> | |
22 | #include <QMainWindow> |
|
22 | #include <QtWidgets/QMainWindow> | |
23 | #include <QChartView> |
|
23 | #include <QtCharts/QChartView> | |
24 | #include <QLineSeries> |
|
24 | #include <QtCharts/QLineSeries> | |
25 |
|
25 | |||
26 | QT_CHARTS_USE_NAMESPACE |
|
26 | QT_CHARTS_USE_NAMESPACE | |
27 |
|
27 |
@@ -18,12 +18,12 | |||||
18 | ** |
|
18 | ** | |
19 | ****************************************************************************/ |
|
19 | ****************************************************************************/ | |
20 |
|
20 | |||
21 | #include <QApplication> |
|
21 | #include <QtWidgets/QApplication> | |
22 | #include <QMainWindow> |
|
22 | #include <QtWidgets/QMainWindow> | |
23 | #include <QChartView> |
|
23 | #include <QtCharts/QChartView> | |
24 | #include <QLineSeries> |
|
24 | #include <QtCharts/QLineSeries> | |
25 | #include <QValueAxis> |
|
25 | #include <QtCharts/QValueAxis> | |
26 | #include <QLogValueAxis> |
|
26 | #include <QtCharts/QLogValueAxis> | |
27 |
|
27 | |||
28 | QT_CHARTS_USE_NAMESPACE |
|
28 | QT_CHARTS_USE_NAMESPACE | |
29 |
|
29 | |||
@@ -69,6 +69,7 int main(int argc, char *argv[]) | |||||
69 | window.setCentralWidget(chartView); |
|
69 | window.setCentralWidget(chartView); | |
70 | window.resize(400, 300); |
|
70 | window.resize(400, 300); | |
71 | window.show(); |
|
71 | window.show(); | |
|
72 | ||||
72 | //![5] |
|
73 | //![5] | |
73 |
|
74 | |||
74 | return a.exec(); |
|
75 | return a.exec(); |
@@ -19,10 +19,10 | |||||
19 | ****************************************************************************/ |
|
19 | ****************************************************************************/ | |
20 |
|
20 | |||
21 | #include "customtablemodel.h" |
|
21 | #include "customtablemodel.h" | |
22 | #include <QVector> |
|
22 | #include <QtCore/QVector> | |
23 | #include <QTime> |
|
23 | #include <QtCore/QTime> | |
24 | #include <QRect> |
|
24 | #include <QtCore/QRect> | |
25 | #include <QColor> |
|
25 | #include <QtGui/QColor> | |
26 |
|
26 | |||
27 | CustomTableModel::CustomTableModel(QObject *parent) : |
|
27 | CustomTableModel::CustomTableModel(QObject *parent) : | |
28 | QAbstractTableModel(parent) |
|
28 | QAbstractTableModel(parent) |
@@ -21,9 +21,9 | |||||
21 | #ifndef CUSTOMTABLEMODEL_H |
|
21 | #ifndef CUSTOMTABLEMODEL_H | |
22 | #define CUSTOMTABLEMODEL_H |
|
22 | #define CUSTOMTABLEMODEL_H | |
23 |
|
23 | |||
24 | #include <QAbstractTableModel> |
|
24 | #include <QtCore/QAbstractTableModel> | |
25 | #include <QHash> |
|
25 | #include <QtCore/QHash> | |
26 | #include <QRect> |
|
26 | #include <QtCore/QRect> | |
27 |
|
27 | |||
28 | class CustomTableModel : public QAbstractTableModel |
|
28 | class CustomTableModel : public QAbstractTableModel | |
29 | { |
|
29 | { |
@@ -18,7 +18,7 | |||||
18 | ** |
|
18 | ** | |
19 | ****************************************************************************/ |
|
19 | ****************************************************************************/ | |
20 |
|
20 | |||
21 | #include <QApplication> |
|
21 | #include <QtWidgets/QApplication> | |
22 | #include "tablewidget.h" |
|
22 | #include "tablewidget.h" | |
23 |
|
23 | |||
24 | int main(int argc, char *argv[]) |
|
24 | int main(int argc, char *argv[]) |
@@ -20,13 +20,13 | |||||
20 |
|
20 | |||
21 | #include "tablewidget.h" |
|
21 | #include "tablewidget.h" | |
22 | #include "customtablemodel.h" |
|
22 | #include "customtablemodel.h" | |
23 | #include <QGridLayout> |
|
23 | #include <QtWidgets/QGridLayout> | |
24 | #include <QTableView> |
|
24 | #include <QtWidgets/QTableView> | |
25 | #include <QChart> |
|
25 | #include <QtCharts/QChart> | |
26 | #include <QChartView> |
|
26 | #include <QtCharts/QChartView> | |
27 | #include <QLineSeries> |
|
27 | #include <QtCharts/QLineSeries> | |
28 | #include <QVXYModelMapper> |
|
28 | #include <QtCharts/QVXYModelMapper> | |
29 | #include <QHeaderView> |
|
29 | #include <QtWidgets/QHeaderView> | |
30 |
|
30 | |||
31 | QT_CHARTS_USE_NAMESPACE |
|
31 | QT_CHARTS_USE_NAMESPACE | |
32 |
|
32 |
@@ -21,7 +21,7 | |||||
21 | #ifndef TABLEWIDGET_H |
|
21 | #ifndef TABLEWIDGET_H | |
22 | #define TABLEWIDGET_H |
|
22 | #define TABLEWIDGET_H | |
23 |
|
23 | |||
24 | #include <QWidget> |
|
24 | #include <QtWidgets/QWidget> | |
25 |
|
25 | |||
26 | class TableWidget : public QWidget |
|
26 | class TableWidget : public QWidget | |
27 | { |
|
27 | { |
@@ -18,13 +18,13 | |||||
18 | ** |
|
18 | ** | |
19 | ****************************************************************************/ |
|
19 | ****************************************************************************/ | |
20 |
|
20 | |||
21 | #include <QApplication> |
|
21 | #include <QtWidgets/QApplication> | |
22 | #include <QMainWindow> |
|
22 | #include <QtWidgets/QMainWindow> | |
23 | #include <QChartView> |
|
23 | #include <QtCharts/QChartView> | |
24 | #include <QLineSeries> |
|
24 | #include <QtCharts/QLineSeries> | |
25 | #include <QSplineSeries> |
|
25 | #include <QtCharts/QSplineSeries> | |
26 | #include <QValueAxis> |
|
26 | #include <QtCharts/QValueAxis> | |
27 | #include <QCategoryAxis> |
|
27 | #include <QtCharts/QCategoryAxis> | |
28 |
|
28 | |||
29 | QT_CHARTS_USE_NAMESPACE |
|
29 | QT_CHARTS_USE_NAMESPACE | |
30 |
|
30 |
@@ -17,7 +17,7 | |||||
17 | ** $QT_END_LICENSE$ |
|
17 | ** $QT_END_LICENSE$ | |
18 | ** |
|
18 | ** | |
19 | ****************************************************************************/ |
|
19 | ****************************************************************************/ | |
20 | #include <QApplication> |
|
20 | #include <QtWidgets/QApplication> | |
21 | #include "widget.h" |
|
21 | #include "widget.h" | |
22 |
|
22 | |||
23 | int main(int argc, char *argv[]) |
|
23 | int main(int argc, char *argv[]) |
@@ -18,14 +18,14 | |||||
18 | ** |
|
18 | ** | |
19 | ****************************************************************************/ |
|
19 | ****************************************************************************/ | |
20 | #include "widget.h" |
|
20 | #include "widget.h" | |
21 | #include <QChartView> |
|
21 | #include <QtCharts/QChartView> | |
22 | #include <QChart> |
|
22 | #include <QtCharts/QChart> | |
23 | #include <QLegend> |
|
23 | #include <QtCharts/QLegend> | |
24 | #include <QPieSeries> |
|
24 | #include <QtCharts/QPieSeries> | |
25 | #include <QPieSlice> |
|
25 | #include <QtCharts/QPieSlice> | |
26 | #include <QTime> |
|
26 | #include <QtCore/QTime> | |
27 | #include <QGridLayout> |
|
27 | #include <QtWidgets/QGridLayout> | |
28 | #include <QTimer> |
|
28 | #include <QtCore/QTimer> | |
29 |
|
29 | |||
30 | QT_CHARTS_USE_NAMESPACE |
|
30 | QT_CHARTS_USE_NAMESPACE | |
31 |
|
31 |
@@ -20,8 +20,8 | |||||
20 | #ifndef WIDGET_H |
|
20 | #ifndef WIDGET_H | |
21 | #define WIDGET_H |
|
21 | #define WIDGET_H | |
22 |
|
22 | |||
23 | #include <QWidget> |
|
23 | #include <QtWidgets/QWidget> | |
24 | #include <QPieSeries> |
|
24 | #include <QtCharts/QPieSeries> | |
25 |
|
25 | |||
26 | class QTimer; |
|
26 | class QTimer; | |
27 |
|
27 |
@@ -18,13 +18,13 | |||||
18 | ** |
|
18 | ** | |
19 | ****************************************************************************/ |
|
19 | ****************************************************************************/ | |
20 |
|
20 | |||
21 | #include <QApplication> |
|
21 | #include <QtWidgets/QApplication> | |
22 | #include <QMainWindow> |
|
22 | #include <QtWidgets/QMainWindow> | |
23 | #include <QChartView> |
|
23 | #include <QtCharts/QChartView> | |
24 | #include <QPercentBarSeries> |
|
24 | #include <QtCharts/QPercentBarSeries> | |
25 | #include <QBarSet> |
|
25 | #include <QtCharts/QBarSet> | |
26 | #include <QLegend> |
|
26 | #include <QtCharts/QLegend> | |
27 | #include <QBarCategoryAxis> |
|
27 | #include <QtCharts/QBarCategoryAxis> | |
28 |
|
28 | |||
29 | QT_CHARTS_USE_NAMESPACE |
|
29 | QT_CHARTS_USE_NAMESPACE | |
30 |
|
30 |
@@ -18,11 +18,11 | |||||
18 | ** |
|
18 | ** | |
19 | ****************************************************************************/ |
|
19 | ****************************************************************************/ | |
20 |
|
20 | |||
21 | #include <QApplication> |
|
21 | #include <QtWidgets/QApplication> | |
22 | #include <QMainWindow> |
|
22 | #include <QtWidgets/QMainWindow> | |
23 | #include <QChartView> |
|
23 | #include <QtCharts/QChartView> | |
24 | #include <QPieSeries> |
|
24 | #include <QtCharts/QPieSeries> | |
25 | #include <QPieSlice> |
|
25 | #include <QtCharts/QPieSlice> | |
26 |
|
26 | |||
27 | QT_CHARTS_USE_NAMESPACE |
|
27 | QT_CHARTS_USE_NAMESPACE | |
28 |
|
28 |
@@ -18,10 +18,10 | |||||
18 | ** |
|
18 | ** | |
19 | ****************************************************************************/ |
|
19 | ****************************************************************************/ | |
20 | #include "brushtool.h" |
|
20 | #include "brushtool.h" | |
21 | #include <QPushButton> |
|
21 | #include <QtWidgets/QPushButton> | |
22 | #include <QFormLayout> |
|
22 | #include <QtWidgets/QFormLayout> | |
23 | #include <QComboBox> |
|
23 | #include <QtWidgets/QComboBox> | |
24 | #include <QColorDialog> |
|
24 | #include <QtWidgets/QColorDialog> | |
25 |
|
25 | |||
26 | BrushTool::BrushTool(QString title, QWidget *parent) |
|
26 | BrushTool::BrushTool(QString title, QWidget *parent) | |
27 | : QWidget(parent) |
|
27 | : QWidget(parent) |
@@ -20,8 +20,8 | |||||
20 | #ifndef BRUSHTOOL_H |
|
20 | #ifndef BRUSHTOOL_H | |
21 | #define BRUSHTOOL_H |
|
21 | #define BRUSHTOOL_H | |
22 |
|
22 | |||
23 | #include <QWidget> |
|
23 | #include <QtWidgets/QWidget> | |
24 | #include <QBrush> |
|
24 | #include <QtGui/QBrush> | |
25 |
|
25 | |||
26 | class QPushButton; |
|
26 | class QPushButton; | |
27 | class QComboBox; |
|
27 | class QComboBox; |
@@ -20,7 +20,7 | |||||
20 | #ifndef CUSTOMSLICE_H |
|
20 | #ifndef CUSTOMSLICE_H | |
21 | #define CUSTOMSLICE_H |
|
21 | #define CUSTOMSLICE_H | |
22 |
|
22 | |||
23 | #include <QPieSlice> |
|
23 | #include <QtCharts/QPieSlice> | |
24 |
|
24 | |||
25 | QT_CHARTS_USE_NAMESPACE |
|
25 | QT_CHARTS_USE_NAMESPACE | |
26 |
|
26 |
@@ -19,8 +19,8 | |||||
19 | ****************************************************************************/ |
|
19 | ****************************************************************************/ | |
20 |
|
20 | |||
21 | #include "mainwidget.h" |
|
21 | #include "mainwidget.h" | |
22 | #include <QApplication> |
|
22 | #include <QtWidgets/QApplication> | |
23 | #include <QMainWindow> |
|
23 | #include <QtWidgets/QMainWindow> | |
24 |
|
24 | |||
25 | int main(int argc, char *argv[]) |
|
25 | int main(int argc, char *argv[]) | |
26 | { |
|
26 | { |
@@ -21,16 +21,16 | |||||
21 | #include "customslice.h" |
|
21 | #include "customslice.h" | |
22 | #include "pentool.h" |
|
22 | #include "pentool.h" | |
23 | #include "brushtool.h" |
|
23 | #include "brushtool.h" | |
24 | #include <QPushButton> |
|
24 | #include <QtWidgets/QPushButton> | |
25 | #include <QComboBox> |
|
25 | #include <QtWidgets/QComboBox> | |
26 | #include <QCheckBox> |
|
26 | #include <QtWidgets/QCheckBox> | |
27 | #include <QLineEdit> |
|
27 | #include <QtWidgets/QLineEdit> | |
28 | #include <QGroupBox> |
|
28 | #include <QtWidgets/QGroupBox> | |
29 | #include <QDoubleSpinBox> |
|
29 | #include <QtWidgets/QDoubleSpinBox> | |
30 | #include <QFormLayout> |
|
30 | #include <QtWidgets/QFormLayout> | |
31 | #include <QFontDialog> |
|
31 | #include <QtWidgets/QFontDialog> | |
32 | #include <QChartView> |
|
32 | #include <QtCharts/QChartView> | |
33 | #include <QPieSeries> |
|
33 | #include <QtCharts/QPieSeries> | |
34 |
|
34 | |||
35 | QT_CHARTS_USE_NAMESPACE |
|
35 | QT_CHARTS_USE_NAMESPACE | |
36 |
|
36 |
@@ -20,8 +20,8 | |||||
20 | #ifndef MAINWIDGET_H |
|
20 | #ifndef MAINWIDGET_H | |
21 | #define MAINWIDGET_H |
|
21 | #define MAINWIDGET_H | |
22 |
|
22 | |||
23 | #include <QWidget> |
|
23 | #include <QtWidgets/QWidget> | |
24 | #include <QChartGlobal> |
|
24 | #include <QtCharts/QChartGlobal> | |
25 |
|
25 | |||
26 | class QLineEdit; |
|
26 | class QLineEdit; | |
27 | class QPushButton; |
|
27 | class QPushButton; |
@@ -19,11 +19,11 | |||||
19 | ****************************************************************************/ |
|
19 | ****************************************************************************/ | |
20 |
|
20 | |||
21 | #include "pentool.h" |
|
21 | #include "pentool.h" | |
22 | #include <QPushButton> |
|
22 | #include <QtWidgets/QPushButton> | |
23 | #include <QDoubleSpinBox> |
|
23 | #include <QtWidgets/QDoubleSpinBox> | |
24 | #include <QComboBox> |
|
24 | #include <QtWidgets/QComboBox> | |
25 | #include <QFormLayout> |
|
25 | #include <QtWidgets/QFormLayout> | |
26 | #include <QColorDialog> |
|
26 | #include <QtWidgets/QColorDialog> | |
27 |
|
27 | |||
28 | PenTool::PenTool(QString title, QWidget *parent) |
|
28 | PenTool::PenTool(QString title, QWidget *parent) | |
29 | : QWidget(parent) |
|
29 | : QWidget(parent) |
@@ -20,8 +20,8 | |||||
20 | #ifndef PENTOOL_H |
|
20 | #ifndef PENTOOL_H | |
21 | #define PENTOOL_H |
|
21 | #define PENTOOL_H | |
22 |
|
22 | |||
23 | #include <QWidget> |
|
23 | #include <QtWidgets/QWidget> | |
24 | #include <QPen> |
|
24 | #include <QtGui/QPen> | |
25 |
|
25 | |||
26 | class QPushButton; |
|
26 | class QPushButton; | |
27 | class QDoubleSpinBox; |
|
27 | class QDoubleSpinBox; |
@@ -20,7 +20,7 | |||||
20 | #ifndef DRILLDOWNCHART_H |
|
20 | #ifndef DRILLDOWNCHART_H | |
21 | #define DRILLDOWNCHART_H |
|
21 | #define DRILLDOWNCHART_H | |
22 |
|
22 | |||
23 | #include <QChart> |
|
23 | #include <QtCharts/QChart> | |
24 |
|
24 | |||
25 | QT_CHARTS_BEGIN_NAMESPACE |
|
25 | QT_CHARTS_BEGIN_NAMESPACE | |
26 | class QAbstractSeries; |
|
26 | class QAbstractSeries; |
@@ -20,7 +20,7 | |||||
20 | #ifndef DRILLDOWNSLICE_H |
|
20 | #ifndef DRILLDOWNSLICE_H | |
21 | #define DRILLDOWNSLICE_H |
|
21 | #define DRILLDOWNSLICE_H | |
22 |
|
22 | |||
23 | #include <QPieSlice> |
|
23 | #include <QtCharts/QPieSlice> | |
24 |
|
24 | |||
25 | QT_CHARTS_BEGIN_NAMESPACE |
|
25 | QT_CHARTS_BEGIN_NAMESPACE | |
26 | class QAbstractSeries; |
|
26 | class QAbstractSeries; |
@@ -20,12 +20,12 | |||||
20 |
|
20 | |||
21 | #include "drilldownchart.h" |
|
21 | #include "drilldownchart.h" | |
22 | #include "drilldownslice.h" |
|
22 | #include "drilldownslice.h" | |
23 | #include <QApplication> |
|
23 | #include <QtWidgets/QApplication> | |
24 | #include <QMainWindow> |
|
24 | #include <QtWidgets/QMainWindow> | |
25 | #include <QTime> |
|
25 | #include <QtCore/QTime> | |
26 | #include <QChartView> |
|
26 | #include <QtCharts/QChartView> | |
27 | #include <QLegend> |
|
27 | #include <QtCharts/QLegend> | |
28 | #include <QPieSeries> |
|
28 | #include <QtCharts/QPieSeries> | |
29 |
|
29 | |||
30 | QT_CHARTS_USE_NAMESPACE |
|
30 | QT_CHARTS_USE_NAMESPACE | |
31 |
|
31 |
@@ -19,10 +19,10 | |||||
19 | ****************************************************************************/ |
|
19 | ****************************************************************************/ | |
20 |
|
20 | |||
21 | #include "chartview.h" |
|
21 | #include "chartview.h" | |
22 | #include <QMouseEvent> |
|
22 | #include <QtGui/QMouseEvent> | |
23 | #include <QDebug> |
|
23 | #include <QtCore/QDebug> | |
24 | #include <QAbstractAxis> |
|
24 | #include <QtCharts/QAbstractAxis> | |
25 | #include <QValueAxis> |
|
25 | #include <QtCharts/QValueAxis> | |
26 |
|
26 | |||
27 | QT_CHARTS_USE_NAMESPACE |
|
27 | QT_CHARTS_USE_NAMESPACE | |
28 |
|
28 |
@@ -21,8 +21,8 | |||||
21 | #ifndef CHARTVIEW_H |
|
21 | #ifndef CHARTVIEW_H | |
22 | #define CHARTVIEW_H |
|
22 | #define CHARTVIEW_H | |
23 |
|
23 | |||
24 | #include <QChartView> |
|
24 | #include <QtCharts/QChartView> | |
25 | #include <QPolarChart> |
|
25 | #include <QtCharts/QPolarChart> | |
26 |
|
26 | |||
27 | QT_CHARTS_USE_NAMESPACE |
|
27 | QT_CHARTS_USE_NAMESPACE | |
28 |
|
28 |
@@ -19,15 +19,15 | |||||
19 | ****************************************************************************/ |
|
19 | ****************************************************************************/ | |
20 |
|
20 | |||
21 | #include "chartview.h" |
|
21 | #include "chartview.h" | |
22 | #include <QApplication> |
|
22 | #include <QtWidgets/QApplication> | |
23 | #include <QMainWindow> |
|
23 | #include <QtWidgets/QMainWindow> | |
24 | #include <QScatterSeries> |
|
24 | #include <QtCharts/QScatterSeries> | |
25 | #include <QLineSeries> |
|
25 | #include <QtCharts/QLineSeries> | |
26 | #include <QSplineSeries> |
|
26 | #include <QtCharts/QSplineSeries> | |
27 | #include <QAreaSeries> |
|
27 | #include <QtCharts/QAreaSeries> | |
28 | #include <QValueAxis> |
|
28 | #include <QtCharts/QValueAxis> | |
29 | #include <QPolarChart> |
|
29 | #include <QtCharts/QPolarChart> | |
30 | #include <QDebug> |
|
30 | #include <QtCore/QDebug> | |
31 |
|
31 | |||
32 | QT_CHARTS_USE_NAMESPACE |
|
32 | QT_CHARTS_USE_NAMESPACE | |
33 |
|
33 |
@@ -18,7 +18,7 | |||||
18 | ** |
|
18 | ** | |
19 | ****************************************************************************/ |
|
19 | ****************************************************************************/ | |
20 |
|
20 | |||
21 | #include <QApplication> |
|
21 | #include <QtWidgets/QApplication> | |
22 | #include <QtCore/QDir> |
|
22 | #include <QtCore/QDir> | |
23 | #include <QtQuick/QQuickView> |
|
23 | #include <QtQuick/QQuickView> | |
24 | #include <QtQml/QQmlEngine> |
|
24 | #include <QtQml/QQmlEngine> |
@@ -18,8 +18,8 | |||||
18 | ** |
|
18 | ** | |
19 | ****************************************************************************/ |
|
19 | ****************************************************************************/ | |
20 |
|
20 | |||
21 | #include <QApplication> |
|
21 | #include <QtWidgets/QApplication> | |
22 | #include <QDir> |
|
22 | #include <QtCore/QDir> | |
23 | #include <QtQuick/QQuickView> |
|
23 | #include <QtQuick/QQuickView> | |
24 | #include <QtQml/QQmlEngine> |
|
24 | #include <QtQml/QQmlEngine> | |
25 |
|
25 |
@@ -19,12 +19,12 | |||||
19 | ****************************************************************************/ |
|
19 | ****************************************************************************/ | |
20 |
|
20 | |||
21 | #include "datasource.h" |
|
21 | #include "datasource.h" | |
22 | #include <QXYSeries> |
|
22 | #include <QtCharts/QXYSeries> | |
23 | #include <QAreaSeries> |
|
23 | #include <QtCharts/QAreaSeries> | |
24 | #include <QtQuick/QQuickView> |
|
24 | #include <QtQuick/QQuickView> | |
25 | #include <QtQuick/QQuickItem> |
|
25 | #include <QtQuick/QQuickItem> | |
26 | #include <QDebug> |
|
26 | #include <QtCore/QDebug> | |
27 |
#include < |
|
27 | #include <QtCore/QtMath> | |
28 |
|
28 | |||
29 | QT_CHARTS_USE_NAMESPACE |
|
29 | QT_CHARTS_USE_NAMESPACE | |
30 |
|
30 |
@@ -21,8 +21,8 | |||||
21 | #ifndef DATASOURCE_H |
|
21 | #ifndef DATASOURCE_H | |
22 | #define DATASOURCE_H |
|
22 | #define DATASOURCE_H | |
23 |
|
23 | |||
24 | #include <QObject> |
|
24 | #include <QtCore/QObject> | |
25 | #include <QAbstractSeries> |
|
25 | #include <QtCharts/QAbstractSeries> | |
26 |
|
26 | |||
27 | class QQuickView; |
|
27 | class QQuickView; | |
28 |
|
28 |
@@ -20,7 +20,7 | |||||
20 |
|
20 | |||
21 | #include <QtWidgets/QApplication> |
|
21 | #include <QtWidgets/QApplication> | |
22 | #include <QtQuick/QQuickView> |
|
22 | #include <QtQuick/QQuickView> | |
23 | #include <QDebug> |
|
23 | #include <QtCore/QDebug> | |
24 | #include <QtCore/QDir> |
|
24 | #include <QtCore/QDir> | |
25 | #include <QtQml/QQmlContext> |
|
25 | #include <QtQml/QQmlContext> | |
26 | #include <QtQml/QQmlEngine> |
|
26 | #include <QtQml/QQmlEngine> |
@@ -19,11 +19,11 | |||||
19 | ****************************************************************************/ |
|
19 | ****************************************************************************/ | |
20 |
|
20 | |||
21 | #include "chartview.h" |
|
21 | #include "chartview.h" | |
22 | #include <QScatterSeries> |
|
22 | #include <QtCharts/QScatterSeries> | |
23 | #include <QLegendMarker> |
|
23 | #include <QtCharts/QLegendMarker> | |
24 | #include <QImage> |
|
24 | #include <QtGui/QImage> | |
25 | #include <QPainter> |
|
25 | #include <QtGui/QPainter> | |
26 |
#include < |
|
26 | #include <QtCore/QtMath> | |
27 |
|
27 | |||
28 | const float Pi = 3.14159f; |
|
28 | const float Pi = 3.14159f; | |
29 |
|
29 |
@@ -21,7 +21,7 | |||||
21 | #ifndef CHARTVIEW_H |
|
21 | #ifndef CHARTVIEW_H | |
22 | #define CHARTVIEW_H |
|
22 | #define CHARTVIEW_H | |
23 |
|
23 | |||
24 | #include <QChartView> |
|
24 | #include <QtCharts/QChartView> | |
25 |
|
25 | |||
26 | QT_CHARTS_USE_NAMESPACE |
|
26 | QT_CHARTS_USE_NAMESPACE | |
27 |
|
27 |
@@ -18,8 +18,8 | |||||
18 | ** |
|
18 | ** | |
19 | ****************************************************************************/ |
|
19 | ****************************************************************************/ | |
20 |
|
20 | |||
21 | #include <QApplication> |
|
21 | #include <QtWidgets/QApplication> | |
22 | #include <QMainWindow> |
|
22 | #include <QtWidgets/QMainWindow> | |
23 | #include "chartview.h" |
|
23 | #include "chartview.h" | |
24 |
|
24 | |||
25 | QT_CHARTS_USE_NAMESPACE |
|
25 | QT_CHARTS_USE_NAMESPACE |
@@ -19,8 +19,8 | |||||
19 | ****************************************************************************/ |
|
19 | ****************************************************************************/ | |
20 |
|
20 | |||
21 | #include "chartview.h" |
|
21 | #include "chartview.h" | |
22 |
#include < |
|
22 | #include <QtCore/QtMath> | |
23 | #include <QDebug> |
|
23 | #include <QtCore/QDebug> | |
24 |
|
24 | |||
25 | QT_CHARTS_USE_NAMESPACE |
|
25 | QT_CHARTS_USE_NAMESPACE | |
26 |
|
26 |
@@ -21,9 +21,9 | |||||
21 | #ifndef CHARTVIEW_H |
|
21 | #ifndef CHARTVIEW_H | |
22 | #define CHARTVIEW_H |
|
22 | #define CHARTVIEW_H | |
23 |
|
23 | |||
24 | #include <QChartGlobal> |
|
24 | #include <QtCharts/QChartGlobal> | |
25 | #include <QChartView> |
|
25 | #include <QtCharts/QChartView> | |
26 | #include <QScatterSeries> |
|
26 | #include <QtCharts/QScatterSeries> | |
27 |
|
27 | |||
28 | QT_CHARTS_USE_NAMESPACE |
|
28 | QT_CHARTS_USE_NAMESPACE | |
29 |
|
29 |
@@ -18,8 +18,8 | |||||
18 | ** |
|
18 | ** | |
19 | ****************************************************************************/ |
|
19 | ****************************************************************************/ | |
20 |
|
20 | |||
21 | #include <QApplication> |
|
21 | #include <QtWidgets/QApplication> | |
22 | #include <QMainWindow> |
|
22 | #include <QtWidgets/QMainWindow> | |
23 | #include "chartview.h" |
|
23 | #include "chartview.h" | |
24 |
|
24 | |||
25 | int main(int argc, char *argv[]) |
|
25 | int main(int argc, char *argv[]) |
@@ -18,10 +18,10 | |||||
18 | ** |
|
18 | ** | |
19 | ****************************************************************************/ |
|
19 | ****************************************************************************/ | |
20 |
|
20 | |||
21 | #include <QApplication> |
|
21 | #include <QtWidgets/QApplication> | |
22 | #include <QMainWindow> |
|
22 | #include <QtWidgets/QMainWindow> | |
23 | #include <QChartView> |
|
23 | #include <QtCharts/QChartView> | |
24 | #include <QSplineSeries> |
|
24 | #include <QtCharts/QSplineSeries> | |
25 |
|
25 | |||
26 | QT_CHARTS_USE_NAMESPACE |
|
26 | QT_CHARTS_USE_NAMESPACE | |
27 |
|
27 |
@@ -18,13 +18,13 | |||||
18 | ** |
|
18 | ** | |
19 | ****************************************************************************/ |
|
19 | ****************************************************************************/ | |
20 |
|
20 | |||
21 | #include <QApplication> |
|
21 | #include <QtWidgets/QApplication> | |
22 | #include <QMainWindow> |
|
22 | #include <QtWidgets/QMainWindow> | |
23 | #include <QChartView> |
|
23 | #include <QtCharts/QChartView> | |
24 | #include <QStackedBarSeries> |
|
24 | #include <QtCharts/QStackedBarSeries> | |
25 | #include <QBarSet> |
|
25 | #include <QtCharts/QBarSet> | |
26 | #include <QLegend> |
|
26 | #include <QtCharts/QLegend> | |
27 | #include <QBarCategoryAxis> |
|
27 | #include <QtCharts/QBarCategoryAxis> | |
28 |
|
28 | |||
29 | QT_CHARTS_USE_NAMESPACE |
|
29 | QT_CHARTS_USE_NAMESPACE | |
30 |
|
30 |
@@ -19,7 +19,7 | |||||
19 | ****************************************************************************/ |
|
19 | ****************************************************************************/ | |
20 |
|
20 | |||
21 | #include "drilldownchart.h" |
|
21 | #include "drilldownchart.h" | |
22 | #include <QBarCategoryAxis> |
|
22 | #include <QtCharts/QBarCategoryAxis> | |
23 |
|
23 | |||
24 | QT_CHARTS_USE_NAMESPACE |
|
24 | QT_CHARTS_USE_NAMESPACE | |
25 |
|
25 |
@@ -21,7 +21,7 | |||||
21 | #ifndef DRILLDOWNCHART_H |
|
21 | #ifndef DRILLDOWNCHART_H | |
22 | #define DRILLDOWNCHART_H |
|
22 | #define DRILLDOWNCHART_H | |
23 |
|
23 | |||
24 | #include <QChart> |
|
24 | #include <QtCharts/QChart> | |
25 | #include "drilldownseries.h" |
|
25 | #include "drilldownseries.h" | |
26 |
|
26 | |||
27 | QT_CHARTS_USE_NAMESPACE |
|
27 | QT_CHARTS_USE_NAMESPACE |
@@ -21,8 +21,8 | |||||
21 | #ifndef DRILLDOWNSERIES_H |
|
21 | #ifndef DRILLDOWNSERIES_H | |
22 | #define DRILLDOWNSERIES_H |
|
22 | #define DRILLDOWNSERIES_H | |
23 |
|
23 | |||
24 | #include <QStackedBarSeries> |
|
24 | #include <QtCharts/QStackedBarSeries> | |
25 | #include <QMap> |
|
25 | #include <QtCore/QMap> | |
26 |
|
26 | |||
27 | QT_CHARTS_USE_NAMESPACE |
|
27 | QT_CHARTS_USE_NAMESPACE | |
28 |
|
28 |
@@ -18,11 +18,11 | |||||
18 | ** |
|
18 | ** | |
19 | ****************************************************************************/ |
|
19 | ****************************************************************************/ | |
20 |
|
20 | |||
21 | #include <QApplication> |
|
21 | #include <QtWidgets/QApplication> | |
22 | #include <QMainWindow> |
|
22 | #include <QtWidgets/QMainWindow> | |
23 | #include <QChartView> |
|
23 | #include <QtCharts/QChartView> | |
24 | #include <QBarSet> |
|
24 | #include <QtCharts/QBarSet> | |
25 | #include <QLegend> |
|
25 | #include <QtCharts/QLegend> | |
26 | #include "drilldownseries.h" |
|
26 | #include "drilldownseries.h" | |
27 | #include "drilldownchart.h" |
|
27 | #include "drilldownchart.h" | |
28 |
|
28 |
@@ -18,14 +18,14 | |||||
18 | ** |
|
18 | ** | |
19 | ****************************************************************************/ |
|
19 | ****************************************************************************/ | |
20 |
|
20 | |||
21 | #include <QApplication> |
|
21 | #include <QtWidgets/QApplication> | |
22 | #include <QMainWindow> |
|
22 | #include <QtWidgets/QMainWindow> | |
23 | #include <QChartView> |
|
23 | #include <QtCharts/QChartView> | |
24 | #include <QBarSeries> |
|
24 | #include <QtCharts/QBarSeries> | |
25 | #include <QBarSet> |
|
25 | #include <QtCharts/QBarSet> | |
26 | #include <QLegend> |
|
26 | #include <QtCharts/QLegend> | |
27 | #include <QBarCategoryAxis> |
|
27 | #include <QtCharts/QBarCategoryAxis> | |
28 | #include <QStackedBarSeries> |
|
28 | #include <QtCharts/QStackedBarSeries> | |
29 |
|
29 | |||
30 | QT_CHARTS_USE_NAMESPACE |
|
30 | QT_CHARTS_USE_NAMESPACE | |
31 |
|
31 |
@@ -19,9 +19,9 | |||||
19 | ****************************************************************************/ |
|
19 | ****************************************************************************/ | |
20 |
|
20 | |||
21 | #include "chart.h" |
|
21 | #include "chart.h" | |
22 | #include <QGesture> |
|
22 | #include <QtWidgets/QGesture> | |
23 | #include <QGraphicsScene> |
|
23 | #include <QtWidgets/QGraphicsScene> | |
24 | #include <QGraphicsView> |
|
24 | #include <QtWidgets/QGraphicsView> | |
25 |
|
25 | |||
26 | Chart::Chart(QGraphicsItem *parent, Qt::WindowFlags wFlags) |
|
26 | Chart::Chart(QGraphicsItem *parent, Qt::WindowFlags wFlags) | |
27 | : QChart(QChart::ChartTypeCartesian, parent, wFlags) |
|
27 | : QChart(QChart::ChartTypeCartesian, parent, wFlags) |
@@ -21,7 +21,7 | |||||
21 | #ifndef CHART_H |
|
21 | #ifndef CHART_H | |
22 | #define CHART_H |
|
22 | #define CHART_H | |
23 |
|
23 | |||
24 | #include <QChart> |
|
24 | #include <QtCharts/QChart> | |
25 |
|
25 | |||
26 | class QGestureEvent; |
|
26 | class QGestureEvent; | |
27 |
|
27 |
@@ -19,7 +19,7 | |||||
19 | ****************************************************************************/ |
|
19 | ****************************************************************************/ | |
20 |
|
20 | |||
21 | #include "chartview.h" |
|
21 | #include "chartview.h" | |
22 | #include <QMouseEvent> |
|
22 | #include <QtGui/QMouseEvent> | |
23 |
|
23 | |||
24 | ChartView::ChartView(QChart *chart, QWidget *parent) : |
|
24 | ChartView::ChartView(QChart *chart, QWidget *parent) : | |
25 | QChartView(chart, parent), |
|
25 | QChartView(chart, parent), |
@@ -21,8 +21,8 | |||||
21 | #ifndef CHARTVIEW_H |
|
21 | #ifndef CHARTVIEW_H | |
22 | #define CHARTVIEW_H |
|
22 | #define CHARTVIEW_H | |
23 |
|
23 | |||
24 | #include <QChartView> |
|
24 | #include <QtCharts/QChartView> | |
25 | #include <QRubberBand> |
|
25 | #include <QtWidgets/QRubberBand> | |
26 |
|
26 | |||
27 | QT_CHARTS_USE_NAMESPACE |
|
27 | QT_CHARTS_USE_NAMESPACE | |
28 |
|
28 |
@@ -20,11 +20,11 | |||||
20 |
|
20 | |||
21 | #include "chart.h" |
|
21 | #include "chart.h" | |
22 | #include "chartview.h" |
|
22 | #include "chartview.h" | |
23 | #include <QApplication> |
|
23 | #include <QtWidgets/QApplication> | |
24 | #include <QMainWindow> |
|
24 | #include <QtWidgets/QMainWindow> | |
25 |
#include < |
|
25 | #include <QtCore/QtMath> | |
26 | #include <QLineSeries> |
|
26 | #include <QtCharts/QLineSeries> | |
27 | #include <QValueAxis> |
|
27 | #include <QtCharts/QValueAxis> | |
28 |
|
28 | |||
29 | QT_CHARTS_USE_NAMESPACE |
|
29 | QT_CHARTS_USE_NAMESPACE | |
30 |
|
30 |
@@ -20,7 +20,7 | |||||
20 |
|
20 | |||
21 | #include "qchartsplugin.h" |
|
21 | #include "qchartsplugin.h" | |
22 | #include <QtCharts/QChartView> |
|
22 | #include <QtCharts/QChartView> | |
23 | #include <QtPlugin> |
|
23 | #include <QtCore/QtPlugin> | |
24 |
|
24 | |||
25 | QT_CHARTS_USE_NAMESPACE |
|
25 | QT_CHARTS_USE_NAMESPACE | |
26 |
|
26 |
@@ -21,7 +21,7 | |||||
21 | #ifndef QCHARTSPLUGIN_H |
|
21 | #ifndef QCHARTSPLUGIN_H | |
22 | #define QCHARTSPLUGIN_H |
|
22 | #define QCHARTSPLUGIN_H | |
23 |
|
23 | |||
24 | #include <QDesignerCustomWidgetInterface> |
|
24 | #include <QtDesigner/QDesignerCustomWidgetInterface> | |
25 |
|
25 | |||
26 | class QChartsPlugin: public QObject, public QDesignerCustomWidgetInterface |
|
26 | class QChartsPlugin: public QObject, public QDesignerCustomWidgetInterface | |
27 | { |
|
27 | { |
@@ -18,9 +18,9 | |||||
18 | ** |
|
18 | ** | |
19 | ****************************************************************************/ |
|
19 | ****************************************************************************/ | |
20 |
|
20 | |||
21 |
#include |
|
21 | #include <private/axisanimation_p.h> | |
22 |
#include |
|
22 | #include <private/chartaxiselement_p.h> | |
23 |
#include |
|
23 | #include <private/qabstractaxis_p.h> | |
24 |
|
24 | |||
25 | Q_DECLARE_METATYPE(QVector<qreal>) |
|
25 | Q_DECLARE_METATYPE(QVector<qreal>) | |
26 |
|
26 |
@@ -30,8 +30,8 | |||||
30 | #ifndef AXISANIMATION_H |
|
30 | #ifndef AXISANIMATION_H | |
31 | #define AXISANIMATION_H |
|
31 | #define AXISANIMATION_H | |
32 |
|
32 | |||
33 |
#include |
|
33 | #include <private/chartanimation_p.h> | |
34 | #include <QPointF> |
|
34 | #include <QtCore/QPointF> | |
35 |
|
35 | |||
36 | QT_CHARTS_BEGIN_NAMESPACE |
|
36 | QT_CHARTS_BEGIN_NAMESPACE | |
37 |
|
37 |
@@ -18,8 +18,8 | |||||
18 | ** |
|
18 | ** | |
19 | ****************************************************************************/ |
|
19 | ****************************************************************************/ | |
20 |
|
20 | |||
21 |
#include |
|
21 | #include <private/baranimation_p.h> | |
22 |
#include |
|
22 | #include <private/abstractbarchartitem_p.h> | |
23 |
|
23 | |||
24 | Q_DECLARE_METATYPE(QVector<QRectF>) |
|
24 | Q_DECLARE_METATYPE(QVector<QRectF>) | |
25 |
|
25 |
@@ -30,7 +30,7 | |||||
30 | #ifndef BARANIMATION_P_H |
|
30 | #ifndef BARANIMATION_P_H | |
31 | #define BARANIMATION_P_H |
|
31 | #define BARANIMATION_P_H | |
32 |
|
32 | |||
33 |
#include |
|
33 | #include <private/chartanimation_p.h> | |
34 |
|
34 | |||
35 | QT_CHARTS_BEGIN_NAMESPACE |
|
35 | QT_CHARTS_BEGIN_NAMESPACE | |
36 |
|
36 |
@@ -18,10 +18,10 | |||||
18 | ** |
|
18 | ** | |
19 | ****************************************************************************/ |
|
19 | ****************************************************************************/ | |
20 |
|
20 | |||
21 |
#include |
|
21 | #include <private/boxplotanimation_p.h> | |
22 |
#include |
|
22 | #include <private/boxplotchartitem_p.h> | |
23 |
#include |
|
23 | #include <private/boxwhiskersdata_p.h> | |
24 |
#include |
|
24 | #include <private/boxwhiskersanimation_p.h> | |
25 |
|
25 | |||
26 | QT_CHARTS_BEGIN_NAMESPACE |
|
26 | QT_CHARTS_BEGIN_NAMESPACE | |
27 |
|
27 |
@@ -30,10 +30,10 | |||||
30 | #ifndef BOXPLOTANIMATION_P_H |
|
30 | #ifndef BOXPLOTANIMATION_P_H | |
31 | #define BOXPLOTANIMATION_P_H |
|
31 | #define BOXPLOTANIMATION_P_H | |
32 |
|
32 | |||
33 |
#include |
|
33 | #include <private/chartanimation_p.h> | |
34 |
#include |
|
34 | #include <private/boxwhiskers_p.h> | |
35 |
#include |
|
35 | #include <private/boxwhiskersdata_p.h> | |
36 |
#include |
|
36 | #include <private/boxwhiskersanimation_p.h> | |
37 |
|
37 | |||
38 | QT_CHARTS_BEGIN_NAMESPACE |
|
38 | QT_CHARTS_BEGIN_NAMESPACE | |
39 |
|
39 |
@@ -18,10 +18,10 | |||||
18 | ** |
|
18 | ** | |
19 | ****************************************************************************/ |
|
19 | ****************************************************************************/ | |
20 |
|
20 | |||
21 |
#include |
|
21 | #include <private/boxwhiskersanimation_p.h> | |
22 |
#include |
|
22 | #include <private/boxplotanimation_p.h> | |
23 |
#include |
|
23 | #include <private/boxplotchartitem_p.h> | |
24 |
#include |
|
24 | #include <private/boxwhiskersdata_p.h> | |
25 |
|
25 | |||
26 | Q_DECLARE_METATYPE(QVector<QRectF>) |
|
26 | Q_DECLARE_METATYPE(QVector<QRectF>) | |
27 | Q_DECLARE_METATYPE(QT_CHARTS_NAMESPACE::BoxWhiskersData) |
|
27 | Q_DECLARE_METATYPE(QT_CHARTS_NAMESPACE::BoxWhiskersData) |
@@ -30,9 +30,9 | |||||
30 | #ifndef BOXWHISKERSANIMATION_P_H |
|
30 | #ifndef BOXWHISKERSANIMATION_P_H | |
31 | #define BOXWHISKERSANIMATION_P_H |
|
31 | #define BOXWHISKERSANIMATION_P_H | |
32 |
|
32 | |||
33 |
#include |
|
33 | #include <private/chartanimation_p.h> | |
34 |
#include |
|
34 | #include <private/boxwhiskers_p.h> | |
35 |
#include |
|
35 | #include <private/boxwhiskersdata_p.h> | |
36 |
|
36 | |||
37 | QT_CHARTS_BEGIN_NAMESPACE |
|
37 | QT_CHARTS_BEGIN_NAMESPACE | |
38 |
|
38 |
@@ -18,7 +18,7 | |||||
18 | ** |
|
18 | ** | |
19 | ****************************************************************************/ |
|
19 | ****************************************************************************/ | |
20 |
|
20 | |||
21 |
#include |
|
21 | #include <private/chartanimation_p.h> | |
22 |
|
22 | |||
23 | QT_CHARTS_BEGIN_NAMESPACE |
|
23 | QT_CHARTS_BEGIN_NAMESPACE | |
24 |
|
24 |
@@ -30,8 +30,8 | |||||
30 | #ifndef CHARTANIMATION_H |
|
30 | #ifndef CHARTANIMATION_H | |
31 | #define CHARTANIMATION_H |
|
31 | #define CHARTANIMATION_H | |
32 |
|
32 | |||
33 |
#include |
|
33 | #include <QtCharts/QChartGlobal> | |
34 | #include <QVariantAnimation> |
|
34 | #include <QtCore/QVariantAnimation> | |
35 |
|
35 | |||
36 | QT_CHARTS_BEGIN_NAMESPACE |
|
36 | QT_CHARTS_BEGIN_NAMESPACE | |
37 |
|
37 |
@@ -18,9 +18,9 | |||||
18 | ** |
|
18 | ** | |
19 | ****************************************************************************/ |
|
19 | ****************************************************************************/ | |
20 |
|
20 | |||
21 |
#include |
|
21 | #include <private/pieanimation_p.h> | |
22 |
#include |
|
22 | #include <private/piesliceanimation_p.h> | |
23 |
#include |
|
23 | #include <private/piechartitem_p.h> | |
24 |
|
24 | |||
25 | QT_CHARTS_BEGIN_NAMESPACE |
|
25 | QT_CHARTS_BEGIN_NAMESPACE | |
26 |
|
26 |
@@ -30,9 +30,9 | |||||
30 | #ifndef PIEANIMATION_P_H |
|
30 | #ifndef PIEANIMATION_P_H | |
31 | #define PIEANIMATION_P_H |
|
31 | #define PIEANIMATION_P_H | |
32 |
|
32 | |||
33 |
#include |
|
33 | #include <private/chartanimation_p.h> | |
34 |
#include |
|
34 | #include <private/piechartitem_p.h> | |
35 |
#include |
|
35 | #include <private/piesliceanimation_p.h> | |
36 |
|
36 | |||
37 | QT_CHARTS_BEGIN_NAMESPACE |
|
37 | QT_CHARTS_BEGIN_NAMESPACE | |
38 |
|
38 |
@@ -18,8 +18,8 | |||||
18 | ** |
|
18 | ** | |
19 | ****************************************************************************/ |
|
19 | ****************************************************************************/ | |
20 |
|
20 | |||
21 |
#include |
|
21 | #include <private/piesliceanimation_p.h> | |
22 |
#include |
|
22 | #include <private/piechartitem_p.h> | |
23 |
|
23 | |||
24 | Q_DECLARE_METATYPE(QT_CHARTS_NAMESPACE::PieSliceData) |
|
24 | Q_DECLARE_METATYPE(QT_CHARTS_NAMESPACE::PieSliceData) | |
25 |
|
25 |
@@ -30,8 +30,8 | |||||
30 | #ifndef PIESLICEANIMATION_P_H |
|
30 | #ifndef PIESLICEANIMATION_P_H | |
31 | #define PIESLICEANIMATION_P_H |
|
31 | #define PIESLICEANIMATION_P_H | |
32 |
|
32 | |||
33 |
#include |
|
33 | #include <private/chartanimation_p.h> | |
34 |
#include |
|
34 | #include <private/piesliceitem_p.h> | |
35 |
|
35 | |||
36 | QT_CHARTS_BEGIN_NAMESPACE |
|
36 | QT_CHARTS_BEGIN_NAMESPACE | |
37 |
|
37 |
@@ -18,9 +18,9 | |||||
18 | ** |
|
18 | ** | |
19 | ****************************************************************************/ |
|
19 | ****************************************************************************/ | |
20 |
|
20 | |||
21 |
#include |
|
21 | #include <private/scatteranimation_p.h> | |
22 |
#include |
|
22 | #include <private/scatterchartitem_p.h> | |
23 | #include <QDebug> |
|
23 | #include <QtCore/QDebug> | |
24 |
|
24 | |||
25 | QT_CHARTS_BEGIN_NAMESPACE |
|
25 | QT_CHARTS_BEGIN_NAMESPACE | |
26 |
|
26 |
@@ -29,7 +29,7 | |||||
29 |
|
29 | |||
30 | #ifndef SCATTERANIMATION_P_H |
|
30 | #ifndef SCATTERANIMATION_P_H | |
31 | #define SCATTERANIMATION_P_H |
|
31 | #define SCATTERANIMATION_P_H | |
32 |
#include |
|
32 | #include <private/xyanimation_p.h> | |
33 |
|
33 | |||
34 | QT_CHARTS_BEGIN_NAMESPACE |
|
34 | QT_CHARTS_BEGIN_NAMESPACE | |
35 |
|
35 |
@@ -18,9 +18,9 | |||||
18 | ** |
|
18 | ** | |
19 | ****************************************************************************/ |
|
19 | ****************************************************************************/ | |
20 |
|
20 | |||
21 |
#include |
|
21 | #include <private/splineanimation_p.h> | |
22 |
#include |
|
22 | #include <private/splinechartitem_p.h> | |
23 | #include <QDebug> |
|
23 | #include <QtCore/QDebug> | |
24 |
|
24 | |||
25 | Q_DECLARE_METATYPE(QVector<QPointF>) |
|
25 | Q_DECLARE_METATYPE(QVector<QPointF>) | |
26 | Q_DECLARE_METATYPE(SplineVector) |
|
26 | Q_DECLARE_METATYPE(SplineVector) |
@@ -29,8 +29,8 | |||||
29 |
|
29 | |||
30 | #ifndef SPLINEANIMATION_P_H |
|
30 | #ifndef SPLINEANIMATION_P_H | |
31 | #define SPLINEANIMATION_P_H |
|
31 | #define SPLINEANIMATION_P_H | |
32 |
#include |
|
32 | #include <private/xyanimation_p.h> | |
33 | #include <QPointF> |
|
33 | #include <QtCore/QPointF> | |
34 |
|
34 | |||
35 | typedef QPair<QVector<QPointF >, QVector<QPointF > > SplineVector; |
|
35 | typedef QPair<QVector<QPointF >, QVector<QPointF > > SplineVector; | |
36 |
|
36 |
@@ -18,9 +18,9 | |||||
18 | ** |
|
18 | ** | |
19 | ****************************************************************************/ |
|
19 | ****************************************************************************/ | |
20 |
|
20 | |||
21 |
#include |
|
21 | #include <private/xyanimation_p.h> | |
22 |
#include |
|
22 | #include <private/xychart_p.h> | |
23 | #include <QDebug> |
|
23 | #include <QtCore/QDebug> | |
24 |
|
24 | |||
25 | Q_DECLARE_METATYPE(QVector<QPointF>) |
|
25 | Q_DECLARE_METATYPE(QVector<QPointF>) | |
26 |
|
26 |
@@ -30,8 +30,8 | |||||
30 | #ifndef XYANIMATION_P_H |
|
30 | #ifndef XYANIMATION_P_H | |
31 | #define XYANIMATION_P_H |
|
31 | #define XYANIMATION_P_H | |
32 |
|
32 | |||
33 |
#include |
|
33 | #include <private/chartanimation_p.h> | |
34 | #include <QPointF> |
|
34 | #include <QtCore/QPointF> | |
35 |
|
35 | |||
36 | QT_CHARTS_BEGIN_NAMESPACE |
|
36 | QT_CHARTS_BEGIN_NAMESPACE | |
37 |
|
37 |
@@ -18,15 +18,15 | |||||
18 | ** |
|
18 | ** | |
19 | ****************************************************************************/ |
|
19 | ****************************************************************************/ | |
20 |
|
20 | |||
21 |
#include |
|
21 | #include <private/areachartitem_p.h> | |
22 |
#include |
|
22 | #include <QtCharts/QAreaSeries> | |
23 |
#include |
|
23 | #include <private/qareaseries_p.h> | |
24 |
#include |
|
24 | #include <QtCharts/QLineSeries> | |
25 |
#include |
|
25 | #include <private/chartpresenter_p.h> | |
26 |
#include |
|
26 | #include <private/abstractdomain_p.h> | |
27 | #include <QPainter> |
|
27 | #include <QtGui/QPainter> | |
28 | #include <QGraphicsSceneMouseEvent> |
|
28 | #include <QtWidgets/QGraphicsSceneMouseEvent> | |
29 | #include <QDebug> |
|
29 | #include <QtCore/QDebug> | |
30 |
|
30 | |||
31 |
|
31 | |||
32 | QT_CHARTS_BEGIN_NAMESPACE |
|
32 | QT_CHARTS_BEGIN_NAMESPACE |
@@ -30,10 +30,10 | |||||
30 | #ifndef AREACHARTITEM_H |
|
30 | #ifndef AREACHARTITEM_H | |
31 | #define AREACHARTITEM_H |
|
31 | #define AREACHARTITEM_H | |
32 |
|
32 | |||
33 |
#include |
|
33 | #include <QtCharts/QChartGlobal> | |
34 |
#include |
|
34 | #include <private/linechartitem_p.h> | |
35 |
#include |
|
35 | #include <QtCharts/QAreaSeries> | |
36 | #include <QPen> |
|
36 | #include <QtGui/QPen> | |
37 |
|
37 | |||
38 | QT_CHARTS_BEGIN_NAMESPACE |
|
38 | QT_CHARTS_BEGIN_NAMESPACE | |
39 |
|
39 |
@@ -18,16 +18,16 | |||||
18 | ** |
|
18 | ** | |
19 | ****************************************************************************/ |
|
19 | ****************************************************************************/ | |
20 |
|
20 | |||
21 |
#include |
|
21 | #include <QtCharts/QAreaSeries> | |
22 |
#include |
|
22 | #include <private/qareaseries_p.h> | |
23 |
#include |
|
23 | #include <QtCharts/QLineSeries> | |
24 |
#include |
|
24 | #include <private/areachartitem_p.h> | |
25 |
#include |
|
25 | #include <private/abstractdomain_p.h> | |
26 |
#include |
|
26 | #include <private/chartdataset_p.h> | |
27 |
#include |
|
27 | #include <private/charttheme_p.h> | |
28 |
#include |
|
28 | #include <QtCharts/QValueAxis> | |
29 |
#include |
|
29 | #include <QtCharts/QAreaLegendMarker> | |
30 |
#include |
|
30 | #include <private/qchart_p.h> | |
31 |
|
31 | |||
32 | QT_CHARTS_BEGIN_NAMESPACE |
|
32 | QT_CHARTS_BEGIN_NAMESPACE | |
33 |
|
33 |
@@ -21,10 +21,10 | |||||
21 | #ifndef QAREASERIES_H |
|
21 | #ifndef QAREASERIES_H | |
22 | #define QAREASERIES_H |
|
22 | #define QAREASERIES_H | |
23 |
|
23 | |||
24 |
#include <QtCharts/ |
|
24 | #include <QtCharts/QChartGlobal> | |
25 |
#include <QtCharts/ |
|
25 | #include <QtCharts/QAbstractSeries> | |
26 | #include <QPen> |
|
26 | #include <QtGui/QPen> | |
27 | #include <QBrush> |
|
27 | #include <QtGui/QBrush> | |
28 |
|
28 | |||
29 | QT_CHARTS_BEGIN_NAMESPACE |
|
29 | QT_CHARTS_BEGIN_NAMESPACE | |
30 | class QLineSeries; |
|
30 | class QLineSeries; |
@@ -30,11 +30,12 | |||||
30 | #ifndef QAREASERIES_P_H |
|
30 | #ifndef QAREASERIES_P_H | |
31 | #define QAREASERIES_P_H |
|
31 | #define QAREASERIES_P_H | |
32 |
|
32 | |||
33 |
#include |
|
33 | #include <private/qabstractseries_p.h> | |
34 |
|
34 | |||
35 | QT_CHARTS_BEGIN_NAMESPACE |
|
35 | QT_CHARTS_BEGIN_NAMESPACE | |
36 |
|
36 | |||
37 | class QAreaSeries; |
|
37 | class QAreaSeries; | |
|
38 | class QLineSeries; | |||
38 |
|
39 | |||
39 | class QAreaSeriesPrivate: public QAbstractSeriesPrivate |
|
40 | class QAreaSeriesPrivate: public QAbstractSeriesPrivate | |
40 | { |
|
41 | { |
@@ -18,12 +18,12 | |||||
18 | ** |
|
18 | ** | |
19 | ****************************************************************************/ |
|
19 | ****************************************************************************/ | |
20 |
|
20 | |||
21 |
#include |
|
21 | #include <private/chartbarcategoryaxisx_p.h> | |
22 |
#include |
|
22 | #include <private/chartpresenter_p.h> | |
23 |
#include |
|
23 | #include <private/qbarcategoryaxis_p.h> | |
24 |
#include |
|
24 | #include <private/abstractchartlayout_p.h> | |
25 | #include <QDebug> |
|
25 | #include <QtCore/QDebug> | |
26 |
#include < |
|
26 | #include <QtCore/QtMath> | |
27 |
|
27 | |||
28 | QT_CHARTS_BEGIN_NAMESPACE |
|
28 | QT_CHARTS_BEGIN_NAMESPACE | |
29 |
|
29 |
@@ -30,7 +30,7 | |||||
30 | #ifndef CHARTBARCATEGORYAXISX_H |
|
30 | #ifndef CHARTBARCATEGORYAXISX_H | |
31 | #define CHARTBARCATEGORYAXISX_H |
|
31 | #define CHARTBARCATEGORYAXISX_H | |
32 |
|
32 | |||
33 |
#include |
|
33 | #include <private/horizontalaxis_p.h> | |
34 |
|
34 | |||
35 | QT_CHARTS_BEGIN_NAMESPACE |
|
35 | QT_CHARTS_BEGIN_NAMESPACE | |
36 |
|
36 |
@@ -18,12 +18,12 | |||||
18 | ** |
|
18 | ** | |
19 | ****************************************************************************/ |
|
19 | ****************************************************************************/ | |
20 |
|
20 | |||
21 |
#include |
|
21 | #include <private/chartbarcategoryaxisy_p.h> | |
22 |
#include |
|
22 | #include <private/chartpresenter_p.h> | |
23 |
#include |
|
23 | #include <private/qbarcategoryaxis_p.h> | |
24 |
#include |
|
24 | #include <private/abstractchartlayout_p.h> | |
25 |
#include < |
|
25 | #include <QtCore/QtMath> | |
26 | #include <QDebug> |
|
26 | #include <QtCore/QDebug> | |
27 |
|
27 | |||
28 | QT_CHARTS_BEGIN_NAMESPACE |
|
28 | QT_CHARTS_BEGIN_NAMESPACE | |
29 |
|
29 |
@@ -30,7 +30,7 | |||||
30 | #ifndef CHARTBARCATEGORYAXISY_H |
|
30 | #ifndef CHARTBARCATEGORYAXISY_H | |
31 | #define CHARTBARCATEGORYAXISY_H |
|
31 | #define CHARTBARCATEGORYAXISY_H | |
32 |
|
32 | |||
33 |
#include |
|
33 | #include <private/verticalaxis_p.h> | |
34 |
|
34 | |||
35 | QT_CHARTS_BEGIN_NAMESPACE |
|
35 | QT_CHARTS_BEGIN_NAMESPACE | |
36 |
|
36 |
@@ -18,13 +18,13 | |||||
18 | ** |
|
18 | ** | |
19 | ****************************************************************************/ |
|
19 | ****************************************************************************/ | |
20 |
|
20 | |||
21 |
#include |
|
21 | #include <QtCharts/QBarCategoryAxis> | |
22 |
#include |
|
22 | #include <private/qbarcategoryaxis_p.h> | |
23 |
#include |
|
23 | #include <private/chartbarcategoryaxisx_p.h> | |
24 |
#include |
|
24 | #include <private/chartbarcategoryaxisy_p.h> | |
25 |
#include |
|
25 | #include <private/abstractdomain_p.h> | |
26 |
#include |
|
26 | #include <QtCharts/QChart> | |
27 |
#include < |
|
27 | #include <QtCore/QtMath> | |
28 |
|
28 | |||
29 | QT_CHARTS_BEGIN_NAMESPACE |
|
29 | QT_CHARTS_BEGIN_NAMESPACE | |
30 | /*! |
|
30 | /*! |
@@ -21,7 +21,7 | |||||
21 | #ifndef QBARCATEGORYAXIS_H |
|
21 | #ifndef QBARCATEGORYAXIS_H | |
22 | #define QBARCATEGORYAXIS_H |
|
22 | #define QBARCATEGORYAXIS_H | |
23 |
|
23 | |||
24 |
#include <QtCharts/ |
|
24 | #include <QtCharts/QAbstractAxis> | |
25 |
|
25 | |||
26 | QT_CHARTS_BEGIN_NAMESPACE |
|
26 | QT_CHARTS_BEGIN_NAMESPACE | |
27 |
|
27 |
@@ -30,8 +30,8 | |||||
30 | #ifndef QBARCATEGORYAXIS_P_H |
|
30 | #ifndef QBARCATEGORYAXIS_P_H | |
31 | #define QBARCATEGORYAXIS_P_H |
|
31 | #define QBARCATEGORYAXIS_P_H | |
32 |
|
32 | |||
33 |
#include < |
|
33 | #include <QtCharts/QBarCategoryAxis> | |
34 |
#include |
|
34 | #include <private/qabstractaxis_p.h> | |
35 |
|
35 | |||
36 | QT_CHARTS_BEGIN_NAMESPACE |
|
36 | QT_CHARTS_BEGIN_NAMESPACE | |
37 |
|
37 |
@@ -18,17 +18,17 | |||||
18 | ** |
|
18 | ** | |
19 | ****************************************************************************/ |
|
19 | ****************************************************************************/ | |
20 |
|
20 | |||
21 |
#include |
|
21 | #include <private/cartesianchartaxis_p.h> | |
22 |
#include |
|
22 | #include <QtCharts/QAbstractAxis> | |
23 |
#include |
|
23 | #include <private/qabstractaxis_p.h> | |
24 |
#include |
|
24 | #include <private/chartpresenter_p.h> | |
25 |
#include |
|
25 | #include <private/abstractchartlayout_p.h> | |
26 |
#include |
|
26 | #include <private/abstractdomain_p.h> | |
27 |
#include |
|
27 | #include <private/linearrowitem_p.h> | |
28 | #include <QValueAxis> |
|
28 | #include <QtCharts/QValueAxis> | |
29 | #include <QLogValueAxis> |
|
29 | #include <QtCharts/QLogValueAxis> | |
30 | #include <QGraphicsLayout> |
|
30 | #include <QtWidgets/QGraphicsLayout> | |
31 | #include <QTextDocument> |
|
31 | #include <QtGui/QTextDocument> | |
32 |
|
32 | |||
33 | QT_CHARTS_BEGIN_NAMESPACE |
|
33 | QT_CHARTS_BEGIN_NAMESPACE | |
34 |
|
34 |
@@ -30,8 +30,8 | |||||
30 | #ifndef CARTESIANCHARTAXIS_H |
|
30 | #ifndef CARTESIANCHARTAXIS_H | |
31 | #define CARTESIANCHARTAXIS_H |
|
31 | #define CARTESIANCHARTAXIS_H | |
32 |
|
32 | |||
33 |
#include |
|
33 | #include <QtCharts/QChartGlobal> | |
34 |
#include |
|
34 | #include <private/chartaxiselement_p.h> | |
35 |
|
35 | |||
36 | QT_CHARTS_BEGIN_NAMESPACE |
|
36 | QT_CHARTS_BEGIN_NAMESPACE | |
37 |
|
37 |
@@ -18,13 +18,13 | |||||
18 | ** |
|
18 | ** | |
19 | ****************************************************************************/ |
|
19 | ****************************************************************************/ | |
20 |
|
20 | |||
21 |
#include |
|
21 | #include <private/chartcategoryaxisx_p.h> | |
22 |
#include |
|
22 | #include <QtCharts/QCategoryAxis> | |
23 |
#include |
|
23 | #include <QtCharts/QAbstractAxis> | |
24 |
#include |
|
24 | #include <private/chartpresenter_p.h> | |
25 |
#include |
|
25 | #include <private/abstractchartlayout_p.h> | |
26 | #include <QGraphicsLayout> |
|
26 | #include <QtWidgets/QGraphicsLayout> | |
27 |
#include < |
|
27 | #include <QtCore/QtMath> | |
28 |
|
28 | |||
29 | QT_CHARTS_BEGIN_NAMESPACE |
|
29 | QT_CHARTS_BEGIN_NAMESPACE | |
30 |
|
30 |
@@ -30,7 +30,7 | |||||
30 | #ifndef CHARTCATEGORYAXISX_H |
|
30 | #ifndef CHARTCATEGORYAXISX_H | |
31 | #define CHARTCATEGORYAXISX_H |
|
31 | #define CHARTCATEGORYAXISX_H | |
32 |
|
32 | |||
33 |
#include |
|
33 | #include <private/horizontalaxis_p.h> | |
34 |
|
34 | |||
35 | QT_CHARTS_BEGIN_NAMESPACE |
|
35 | QT_CHARTS_BEGIN_NAMESPACE | |
36 |
|
36 |
@@ -18,14 +18,14 | |||||
18 | ** |
|
18 | ** | |
19 | ****************************************************************************/ |
|
19 | ****************************************************************************/ | |
20 |
|
20 | |||
21 |
#include |
|
21 | #include <private/chartcategoryaxisy_p.h> | |
22 |
#include |
|
22 | #include <QtCharts/QCategoryAxis> | |
23 |
#include |
|
23 | #include <QtCharts/QAbstractAxis> | |
24 |
#include |
|
24 | #include <private/chartpresenter_p.h> | |
25 |
#include |
|
25 | #include <private/abstractchartlayout_p.h> | |
26 | #include <QGraphicsLayout> |
|
26 | #include <QtWidgets/QGraphicsLayout> | |
27 |
#include < |
|
27 | #include <QtCore/QtMath> | |
28 | #include <QDebug> |
|
28 | #include <QtCore/QDebug> | |
29 |
|
29 | |||
30 | QT_CHARTS_BEGIN_NAMESPACE |
|
30 | QT_CHARTS_BEGIN_NAMESPACE | |
31 |
|
31 |
@@ -30,7 +30,7 | |||||
30 | #ifndef CHARTCATEGORYAXISY_H |
|
30 | #ifndef CHARTCATEGORYAXISY_H | |
31 | #define CHARTCATEGORYAXISY_H |
|
31 | #define CHARTCATEGORYAXISY_H | |
32 |
|
32 | |||
33 |
#include |
|
33 | #include <private/verticalaxis_p.h> | |
34 |
|
34 | |||
35 | QT_CHARTS_BEGIN_NAMESPACE |
|
35 | QT_CHARTS_BEGIN_NAMESPACE | |
36 |
|
36 |
@@ -18,11 +18,11 | |||||
18 | ** |
|
18 | ** | |
19 | ****************************************************************************/ |
|
19 | ****************************************************************************/ | |
20 |
|
20 | |||
21 |
#include |
|
21 | #include <private/polarchartcategoryaxisangular_p.h> | |
22 |
#include |
|
22 | #include <private/chartpresenter_p.h> | |
23 |
#include |
|
23 | #include <private/abstractchartlayout_p.h> | |
24 |
#include |
|
24 | #include <QtCharts/QCategoryAxis> | |
25 | #include <QDebug> |
|
25 | #include <QtCore/QDebug> | |
26 |
|
26 | |||
27 | QT_CHARTS_BEGIN_NAMESPACE |
|
27 | QT_CHARTS_BEGIN_NAMESPACE | |
28 |
|
28 |
@@ -30,7 +30,7 | |||||
30 | #ifndef POLARCHARTCATEGORYAXISANGULAR_P_H |
|
30 | #ifndef POLARCHARTCATEGORYAXISANGULAR_P_H | |
31 | #define POLARCHARTCATEGORYAXISANGULAR_P_H |
|
31 | #define POLARCHARTCATEGORYAXISANGULAR_P_H | |
32 |
|
32 | |||
33 |
#include |
|
33 | #include <private/polarchartaxisangular_p.h> | |
34 |
|
34 | |||
35 | QT_CHARTS_BEGIN_NAMESPACE |
|
35 | QT_CHARTS_BEGIN_NAMESPACE | |
36 |
|
36 |
@@ -18,11 +18,11 | |||||
18 | ** |
|
18 | ** | |
19 | ****************************************************************************/ |
|
19 | ****************************************************************************/ | |
20 |
|
20 | |||
21 |
#include |
|
21 | #include <private/polarchartcategoryaxisradial_p.h> | |
22 |
#include |
|
22 | #include <private/chartpresenter_p.h> | |
23 |
#include |
|
23 | #include <private/abstractchartlayout_p.h> | |
24 |
#include |
|
24 | #include <QtCharts/QCategoryAxis> | |
25 | #include <QDebug> |
|
25 | #include <QtCore/QDebug> | |
26 |
|
26 | |||
27 | QT_CHARTS_BEGIN_NAMESPACE |
|
27 | QT_CHARTS_BEGIN_NAMESPACE | |
28 |
|
28 |
@@ -30,7 +30,7 | |||||
30 | #ifndef POLARCHARTCATEGORYAXISRADIAL_P_H |
|
30 | #ifndef POLARCHARTCATEGORYAXISRADIAL_P_H | |
31 | #define POLARCHARTCATEGORYAXISRADIAL_P_H |
|
31 | #define POLARCHARTCATEGORYAXISRADIAL_P_H | |
32 |
|
32 | |||
33 |
#include |
|
33 | #include <private/polarchartaxisradial_p.h> | |
34 |
|
34 | |||
35 | QT_CHARTS_BEGIN_NAMESPACE |
|
35 | QT_CHARTS_BEGIN_NAMESPACE | |
36 |
|
36 |
@@ -18,15 +18,15 | |||||
18 | ** |
|
18 | ** | |
19 | ****************************************************************************/ |
|
19 | ****************************************************************************/ | |
20 |
|
20 | |||
21 |
#include |
|
21 | #include <QtCharts/QCategoryAxis> | |
22 |
#include |
|
22 | #include <private/qcategoryaxis_p.h> | |
23 |
#include |
|
23 | #include <private/chartcategoryaxisx_p.h> | |
24 |
#include |
|
24 | #include <private/chartcategoryaxisy_p.h> | |
25 |
#include |
|
25 | #include <private/polarchartcategoryaxisangular_p.h> | |
26 |
#include |
|
26 | #include <private/polarchartcategoryaxisradial_p.h> | |
27 |
#include |
|
27 | #include <QtCharts/QChart> | |
28 |
#include < |
|
28 | #include <QtCore/QtMath> | |
29 | #include <QDebug> |
|
29 | #include <QtCore/QDebug> | |
30 |
|
30 | |||
31 | QT_CHARTS_BEGIN_NAMESPACE |
|
31 | QT_CHARTS_BEGIN_NAMESPACE | |
32 | /*! |
|
32 | /*! |
@@ -21,8 +21,8 | |||||
21 | #ifndef QCATEGORYAXIS_H |
|
21 | #ifndef QCATEGORYAXIS_H | |
22 | #define QCATEGORYAXIS_H |
|
22 | #define QCATEGORYAXIS_H | |
23 |
|
23 | |||
24 |
#include <QtCharts/ |
|
24 | #include <QtCharts/QAbstractAxis> | |
25 |
#include <QtCharts/ |
|
25 | #include <QtCharts/QValueAxis> | |
26 |
|
26 | |||
27 | QT_CHARTS_BEGIN_NAMESPACE |
|
27 | QT_CHARTS_BEGIN_NAMESPACE | |
28 |
|
28 |
@@ -30,8 +30,8 | |||||
30 | #ifndef QCATEGORYAXIS_P_H |
|
30 | #ifndef QCATEGORYAXIS_P_H | |
31 | #define QCATEGORYAXIS_P_H |
|
31 | #define QCATEGORYAXIS_P_H | |
32 |
|
32 | |||
33 |
#include < |
|
33 | #include <QtCharts/QCategoryAxis> | |
34 |
#include |
|
34 | #include <private/qvalueaxis_p.h> | |
35 |
|
35 | |||
36 | QT_CHARTS_BEGIN_NAMESPACE |
|
36 | QT_CHARTS_BEGIN_NAMESPACE | |
37 |
|
37 |
@@ -18,13 +18,13 | |||||
18 | ** |
|
18 | ** | |
19 | ****************************************************************************/ |
|
19 | ****************************************************************************/ | |
20 |
|
20 | |||
21 |
#include |
|
21 | #include <private/chartaxiselement_p.h> | |
22 |
#include |
|
22 | #include <private/qabstractaxis_p.h> | |
23 |
#include |
|
23 | #include <private/chartpresenter_p.h> | |
24 |
#include |
|
24 | #include <private/abstractchartlayout_p.h> | |
25 |
#include < |
|
25 | #include <QtCore/QtMath> | |
26 | #include <QDateTime> |
|
26 | #include <QtCore/QDateTime> | |
27 | #include <QTextDocument> |
|
27 | #include <QtGui/QTextDocument> | |
28 |
|
28 | |||
29 | QT_CHARTS_BEGIN_NAMESPACE |
|
29 | QT_CHARTS_BEGIN_NAMESPACE | |
30 |
|
30 |
@@ -30,12 +30,12 | |||||
30 | #ifndef CHARTAXISELEMENT_H |
|
30 | #ifndef CHARTAXISELEMENT_H | |
31 | #define CHARTAXISELEMENT_H |
|
31 | #define CHARTAXISELEMENT_H | |
32 |
|
32 | |||
33 |
#include |
|
33 | #include <QtCharts/QChartGlobal> | |
34 |
#include |
|
34 | #include <private/chartelement_p.h> | |
35 |
#include |
|
35 | #include <private/axisanimation_p.h> | |
36 | #include <QGraphicsItem> |
|
36 | #include <QtWidgets/QGraphicsItem> | |
37 | #include <QGraphicsLayoutItem> |
|
37 | #include <QtWidgets/QGraphicsLayoutItem> | |
38 | #include <QFont> |
|
38 | #include <QtGui/QFont> | |
39 |
|
39 | |||
40 | QT_CHARTS_BEGIN_NAMESPACE |
|
40 | QT_CHARTS_BEGIN_NAMESPACE | |
41 |
|
41 |
@@ -18,13 +18,13 | |||||
18 | ** |
|
18 | ** | |
19 | ****************************************************************************/ |
|
19 | ****************************************************************************/ | |
20 |
|
20 | |||
21 |
#include |
|
21 | #include <private/chartdatetimeaxisx_p.h> | |
22 |
#include |
|
22 | #include <private/chartpresenter_p.h> | |
23 |
#include |
|
23 | #include <QtCharts/QDateTimeAxis> | |
24 |
#include |
|
24 | #include <private/abstractchartlayout_p.h> | |
25 | #include <QGraphicsLayout> |
|
25 | #include <QtWidgets/QGraphicsLayout> | |
26 | #include <QDateTime> |
|
26 | #include <QtCore/QDateTime> | |
27 |
#include < |
|
27 | #include <QtCore/QtMath> | |
28 |
|
28 | |||
29 | QT_CHARTS_BEGIN_NAMESPACE |
|
29 | QT_CHARTS_BEGIN_NAMESPACE | |
30 |
|
30 |
@@ -30,7 +30,7 | |||||
30 | #ifndef CHARTDATETIMEAXISX_H |
|
30 | #ifndef CHARTDATETIMEAXISX_H | |
31 | #define CHARTDATETIMEAXISX_H |
|
31 | #define CHARTDATETIMEAXISX_H | |
32 |
|
32 | |||
33 |
#include |
|
33 | #include <private/horizontalaxis_p.h> | |
34 |
|
34 | |||
35 | QT_CHARTS_BEGIN_NAMESPACE |
|
35 | QT_CHARTS_BEGIN_NAMESPACE | |
36 |
|
36 |
@@ -18,13 +18,13 | |||||
18 | ** |
|
18 | ** | |
19 | ****************************************************************************/ |
|
19 | ****************************************************************************/ | |
20 |
|
20 | |||
21 |
#include |
|
21 | #include <private/chartdatetimeaxisy_p.h> | |
22 |
#include |
|
22 | #include <private/chartpresenter_p.h> | |
23 |
#include |
|
23 | #include <QtCharts/QDateTimeAxis> | |
24 |
#include |
|
24 | #include <private/abstractchartlayout_p.h> | |
25 | #include <QGraphicsLayout> |
|
25 | #include <QtWidgets/QGraphicsLayout> | |
26 | #include <QDateTime> |
|
26 | #include <QtCore/QDateTime> | |
27 |
#include < |
|
27 | #include <QtCore/QtMath> | |
28 |
|
28 | |||
29 | QT_CHARTS_BEGIN_NAMESPACE |
|
29 | QT_CHARTS_BEGIN_NAMESPACE | |
30 |
|
30 |
@@ -30,7 +30,7 | |||||
30 | #ifndef CHARTDATETIMEAXISY_H |
|
30 | #ifndef CHARTDATETIMEAXISY_H | |
31 | #define CHARTDATETIMEAXISY_H |
|
31 | #define CHARTDATETIMEAXISY_H | |
32 |
|
32 | |||
33 |
#include |
|
33 | #include <private/verticalaxis_p.h> | |
34 |
|
34 | |||
35 | QT_CHARTS_BEGIN_NAMESPACE |
|
35 | QT_CHARTS_BEGIN_NAMESPACE | |
36 |
|
36 |
@@ -18,10 +18,10 | |||||
18 | ** |
|
18 | ** | |
19 | ****************************************************************************/ |
|
19 | ****************************************************************************/ | |
20 |
|
20 | |||
21 |
#include |
|
21 | #include <private/polarchartdatetimeaxisangular_p.h> | |
22 |
#include |
|
22 | #include <private/chartpresenter_p.h> | |
23 |
#include |
|
23 | #include <private/abstractchartlayout_p.h> | |
24 |
#include |
|
24 | #include <QtCharts/QDateTimeAxis> | |
25 |
|
25 | |||
26 | QT_CHARTS_BEGIN_NAMESPACE |
|
26 | QT_CHARTS_BEGIN_NAMESPACE | |
27 |
|
27 |
@@ -30,7 +30,7 | |||||
30 | #ifndef POLARCHARTDATETIMEAXISANGULAR_P_H |
|
30 | #ifndef POLARCHARTDATETIMEAXISANGULAR_P_H | |
31 | #define POLARCHARTDATETIMEAXISANGULAR_P_H |
|
31 | #define POLARCHARTDATETIMEAXISANGULAR_P_H | |
32 |
|
32 | |||
33 |
#include |
|
33 | #include <private/polarchartaxisangular_p.h> | |
34 |
|
34 | |||
35 | QT_CHARTS_BEGIN_NAMESPACE |
|
35 | QT_CHARTS_BEGIN_NAMESPACE | |
36 |
|
36 |
@@ -18,10 +18,10 | |||||
18 | ** |
|
18 | ** | |
19 | ****************************************************************************/ |
|
19 | ****************************************************************************/ | |
20 |
|
20 | |||
21 |
#include |
|
21 | #include <private/polarchartdatetimeaxisradial_p.h> | |
22 |
#include |
|
22 | #include <private/chartpresenter_p.h> | |
23 |
#include |
|
23 | #include <private/abstractchartlayout_p.h> | |
24 |
#include |
|
24 | #include <QtCharts/QDateTimeAxis> | |
25 |
|
25 | |||
26 | QT_CHARTS_BEGIN_NAMESPACE |
|
26 | QT_CHARTS_BEGIN_NAMESPACE | |
27 |
|
27 |
@@ -30,7 +30,7 | |||||
30 | #ifndef POLARCHARTDATETIMEAXISRADIAL_P_H |
|
30 | #ifndef POLARCHARTDATETIMEAXISRADIAL_P_H | |
31 | #define POLARCHARTDATETIMEAXISRADIAL_P_H |
|
31 | #define POLARCHARTDATETIMEAXISRADIAL_P_H | |
32 |
|
32 | |||
33 |
#include |
|
33 | #include <private/polarchartaxisradial_p.h> | |
34 |
|
34 | |||
35 | QT_CHARTS_BEGIN_NAMESPACE |
|
35 | QT_CHARTS_BEGIN_NAMESPACE | |
36 |
|
36 |
@@ -18,14 +18,14 | |||||
18 | ** |
|
18 | ** | |
19 | ****************************************************************************/ |
|
19 | ****************************************************************************/ | |
20 |
|
20 | |||
21 |
#include |
|
21 | #include <QtCharts/QDateTimeAxis> | |
22 |
#include |
|
22 | #include <private/qdatetimeaxis_p.h> | |
23 |
#include |
|
23 | #include <private/chartdatetimeaxisx_p.h> | |
24 |
#include |
|
24 | #include <private/chartdatetimeaxisy_p.h> | |
25 |
#include |
|
25 | #include <private/polarchartdatetimeaxisangular_p.h> | |
26 |
#include |
|
26 | #include <private/polarchartdatetimeaxisradial_p.h> | |
27 |
#include |
|
27 | #include <private/abstractdomain_p.h> | |
28 |
#include |
|
28 | #include <QtCharts/QChart> | |
29 | #include <float.h> |
|
29 | #include <float.h> | |
30 | #include <cmath> |
|
30 | #include <cmath> | |
31 |
|
31 |
@@ -21,7 +21,7 | |||||
21 | #ifndef QDATETIMEAXIS_H |
|
21 | #ifndef QDATETIMEAXIS_H | |
22 | #define QDATETIMEAXIS_H |
|
22 | #define QDATETIMEAXIS_H | |
23 |
|
23 | |||
24 |
#include <QtCharts/ |
|
24 | #include <QtCharts/QAbstractAxis> | |
25 |
|
25 | |||
26 | class QDateTime; |
|
26 | class QDateTime; | |
27 |
|
27 |
@@ -30,9 +30,9 | |||||
30 | #ifndef QDATETIMEAXIS_P_H |
|
30 | #ifndef QDATETIMEAXIS_P_H | |
31 | #define QDATETIMEAXIS_P_H |
|
31 | #define QDATETIMEAXIS_P_H | |
32 |
|
32 | |||
33 |
#include |
|
33 | #include <QtCharts/QDateTimeAxis> | |
34 |
#include |
|
34 | #include <private/qabstractaxis_p.h> | |
35 | #include <QDateTime> |
|
35 | #include <QtCore/QDateTime> | |
36 |
|
36 | |||
37 | QT_CHARTS_BEGIN_NAMESPACE |
|
37 | QT_CHARTS_BEGIN_NAMESPACE | |
38 |
|
38 |
@@ -18,11 +18,11 | |||||
18 | ** |
|
18 | ** | |
19 | ****************************************************************************/ |
|
19 | ****************************************************************************/ | |
20 |
|
20 | |||
21 |
#include |
|
21 | #include <private/horizontalaxis_p.h> | |
22 |
#include |
|
22 | #include <private/qabstractaxis_p.h> | |
23 |
#include |
|
23 | #include <private/chartpresenter_p.h> | |
24 |
#include < |
|
24 | #include <QtCore/QtMath> | |
25 | #include <QDebug> |
|
25 | #include <QtCore/QDebug> | |
26 |
|
26 | |||
27 | QT_CHARTS_BEGIN_NAMESPACE |
|
27 | QT_CHARTS_BEGIN_NAMESPACE | |
28 |
|
28 |
@@ -30,7 +30,7 | |||||
30 | #ifndef HORIZONTALAXIS_P_H_ |
|
30 | #ifndef HORIZONTALAXIS_P_H_ | |
31 | #define HORIZONTALAXIS_P_H_ |
|
31 | #define HORIZONTALAXIS_P_H_ | |
32 |
|
32 | |||
33 |
#include |
|
33 | #include <private/cartesianchartaxis_p.h> | |
34 |
|
34 | |||
35 | QT_CHARTS_BEGIN_NAMESPACE |
|
35 | QT_CHARTS_BEGIN_NAMESPACE | |
36 |
|
36 |
@@ -30,9 +30,9 | |||||
30 | #ifndef LINEARROWITEM_P_H |
|
30 | #ifndef LINEARROWITEM_P_H | |
31 | #define LINEARROWITEM_P_H |
|
31 | #define LINEARROWITEM_P_H | |
32 |
|
32 | |||
33 |
#include |
|
33 | #include <private/chartaxiselement_p.h> | |
34 |
#include |
|
34 | #include <private/qabstractaxis_p.h> | |
35 | #include <QGraphicsLineItem> |
|
35 | #include <QtWidgets/QGraphicsLineItem> | |
36 |
|
36 | |||
37 | QT_CHARTS_BEGIN_NAMESPACE |
|
37 | QT_CHARTS_BEGIN_NAMESPACE | |
38 |
|
38 |
@@ -18,13 +18,13 | |||||
18 | ** |
|
18 | ** | |
19 | ****************************************************************************/ |
|
19 | ****************************************************************************/ | |
20 |
|
20 | |||
21 |
#include |
|
21 | #include <private/chartlogvalueaxisx_p.h> | |
22 |
#include |
|
22 | #include <private/chartpresenter_p.h> | |
23 |
#include |
|
23 | #include <QtCharts/QLogValueAxis> | |
24 |
#include |
|
24 | #include <private/abstractchartlayout_p.h> | |
25 | #include <QGraphicsLayout> |
|
25 | #include <QtWidgets/QGraphicsLayout> | |
26 |
#include < |
|
26 | #include <QtCore/QtMath> | |
27 | #include <QDebug> |
|
27 | #include <QtCore/QDebug> | |
28 |
|
28 | |||
29 | QT_CHARTS_BEGIN_NAMESPACE |
|
29 | QT_CHARTS_BEGIN_NAMESPACE | |
30 |
|
30 |
@@ -30,7 +30,7 | |||||
30 | #ifndef CHARTLOGVALUEAXISX_H |
|
30 | #ifndef CHARTLOGVALUEAXISX_H | |
31 | #define CHARTLOGVALUEAXISX_H |
|
31 | #define CHARTLOGVALUEAXISX_H | |
32 |
|
32 | |||
33 |
#include |
|
33 | #include <private/horizontalaxis_p.h> | |
34 |
|
34 | |||
35 | QT_CHARTS_BEGIN_NAMESPACE |
|
35 | QT_CHARTS_BEGIN_NAMESPACE | |
36 |
|
36 |
@@ -18,13 +18,13 | |||||
18 | ** |
|
18 | ** | |
19 | ****************************************************************************/ |
|
19 | ****************************************************************************/ | |
20 |
|
20 | |||
21 |
#include |
|
21 | #include <private/chartlogvalueaxisy_p.h> | |
22 |
#include |
|
22 | #include <private/chartpresenter_p.h> | |
23 |
#include |
|
23 | #include <QtCharts/QLogValueAxis> | |
24 |
#include |
|
24 | #include <private/abstractchartlayout_p.h> | |
25 | #include <QGraphicsLayout> |
|
25 | #include <QtWidgets/QGraphicsLayout> | |
26 |
#include < |
|
26 | #include <QtCore/QtMath> | |
27 | #include <QDebug> |
|
27 | #include <QtCore/QDebug> | |
28 |
|
28 | |||
29 | QT_CHARTS_BEGIN_NAMESPACE |
|
29 | QT_CHARTS_BEGIN_NAMESPACE | |
30 |
|
30 |
@@ -30,7 +30,7 | |||||
30 | #ifndef CHARTLOGVALUEAXISY_H |
|
30 | #ifndef CHARTLOGVALUEAXISY_H | |
31 | #define CHARTLOGVALUEAXISY_H |
|
31 | #define CHARTLOGVALUEAXISY_H | |
32 |
|
32 | |||
33 |
#include |
|
33 | #include <private/verticalaxis_p.h> | |
34 |
|
34 | |||
35 | QT_CHARTS_BEGIN_NAMESPACE |
|
35 | QT_CHARTS_BEGIN_NAMESPACE | |
36 |
|
36 |
@@ -18,12 +18,12 | |||||
18 | ** |
|
18 | ** | |
19 | ****************************************************************************/ |
|
19 | ****************************************************************************/ | |
20 |
|
20 | |||
21 |
#include |
|
21 | #include <private/polarchartlogvalueaxisangular_p.h> | |
22 |
#include |
|
22 | #include <private/abstractchartlayout_p.h> | |
23 |
#include |
|
23 | #include <private/chartpresenter_p.h> | |
24 |
#include |
|
24 | #include <QtCharts/QLogValueAxis> | |
25 |
#include < |
|
25 | #include <QtCore/QtMath> | |
26 | #include <QDebug> |
|
26 | #include <QtCore/QDebug> | |
27 |
|
27 | |||
28 | QT_CHARTS_BEGIN_NAMESPACE |
|
28 | QT_CHARTS_BEGIN_NAMESPACE | |
29 |
|
29 |
@@ -30,7 +30,7 | |||||
30 | #ifndef POLARCHARTLOGVALUEAXISANGULAR_P_H |
|
30 | #ifndef POLARCHARTLOGVALUEAXISANGULAR_P_H | |
31 | #define POLARCHARTLOGVALUEAXISANGULAR_P_H |
|
31 | #define POLARCHARTLOGVALUEAXISANGULAR_P_H | |
32 |
|
32 | |||
33 |
#include |
|
33 | #include <private/polarchartaxisangular_p.h> | |
34 |
|
34 | |||
35 | QT_CHARTS_BEGIN_NAMESPACE |
|
35 | QT_CHARTS_BEGIN_NAMESPACE | |
36 |
|
36 |
@@ -18,12 +18,12 | |||||
18 | ** |
|
18 | ** | |
19 | ****************************************************************************/ |
|
19 | ****************************************************************************/ | |
20 |
|
20 | |||
21 |
#include |
|
21 | #include <private/polarchartlogvalueaxisradial_p.h> | |
22 |
#include |
|
22 | #include <private/abstractchartlayout_p.h> | |
23 |
#include |
|
23 | #include <private/chartpresenter_p.h> | |
24 |
#include |
|
24 | #include <QtCharts/QLogValueAxis> | |
25 |
#include < |
|
25 | #include <QtCore/QtMath> | |
26 | #include <QDebug> |
|
26 | #include <QtCore/QDebug> | |
27 |
|
27 | |||
28 | QT_CHARTS_BEGIN_NAMESPACE |
|
28 | QT_CHARTS_BEGIN_NAMESPACE | |
29 |
|
29 |
@@ -30,7 +30,7 | |||||
30 | #ifndef POLARCHARTLOGVALUEAXISRADIAL_P_H |
|
30 | #ifndef POLARCHARTLOGVALUEAXISRADIAL_P_H | |
31 | #define POLARCHARTLOGVALUEAXISRADIAL_P_H |
|
31 | #define POLARCHARTLOGVALUEAXISRADIAL_P_H | |
32 |
|
32 | |||
33 |
#include |
|
33 | #include <private/polarchartaxisradial_p.h> | |
34 |
|
34 | |||
35 | QT_CHARTS_BEGIN_NAMESPACE |
|
35 | QT_CHARTS_BEGIN_NAMESPACE | |
36 |
|
36 |
@@ -18,13 +18,13 | |||||
18 | ** |
|
18 | ** | |
19 | ****************************************************************************/ |
|
19 | ****************************************************************************/ | |
20 |
|
20 | |||
21 |
#include |
|
21 | #include <QtCharts/QLogValueAxis> | |
22 |
#include |
|
22 | #include <private/qlogvalueaxis_p.h> | |
23 |
#include |
|
23 | #include <private/chartlogvalueaxisx_p.h> | |
24 |
#include |
|
24 | #include <private/chartlogvalueaxisy_p.h> | |
25 |
#include |
|
25 | #include <private/polarchartlogvalueaxisangular_p.h> | |
26 |
#include |
|
26 | #include <private/polarchartlogvalueaxisradial_p.h> | |
27 |
#include |
|
27 | #include <private/abstractdomain_p.h> | |
28 | #include <float.h> |
|
28 | #include <float.h> | |
29 | #include <cmath> |
|
29 | #include <cmath> | |
30 |
|
30 |
@@ -21,7 +21,7 | |||||
21 | #ifndef QLOGVALUEAXIS_H |
|
21 | #ifndef QLOGVALUEAXIS_H | |
22 | #define QLOGVALUEAXIS_H |
|
22 | #define QLOGVALUEAXIS_H | |
23 |
|
23 | |||
24 |
#include <QtCharts/ |
|
24 | #include <QtCharts/QAbstractAxis> | |
25 |
|
25 | |||
26 | class QDateTime; |
|
26 | class QDateTime; | |
27 |
|
27 |
@@ -30,8 +30,8 | |||||
30 | #ifndef QLOGVALUEAXIS_P_H |
|
30 | #ifndef QLOGVALUEAXIS_P_H | |
31 | #define QLOGVALUEAXIS_P_H |
|
31 | #define QLOGVALUEAXIS_P_H | |
32 |
|
32 | |||
33 |
#include < |
|
33 | #include <QtCharts/QLogValueAxis> | |
34 |
#include |
|
34 | #include <private/qabstractaxis_p.h> | |
35 |
|
35 | |||
36 | QT_CHARTS_BEGIN_NAMESPACE |
|
36 | QT_CHARTS_BEGIN_NAMESPACE | |
37 |
|
37 |
@@ -18,9 +18,9 | |||||
18 | ** |
|
18 | ** | |
19 | ****************************************************************************/ |
|
19 | ****************************************************************************/ | |
20 |
|
20 | |||
21 |
#include |
|
21 | #include <private/polarchartaxis_p.h> | |
22 |
#include |
|
22 | #include <private/qabstractaxis_p.h> | |
23 |
#include |
|
23 | #include <private/chartpresenter_p.h> | |
24 |
|
24 | |||
25 | QT_CHARTS_BEGIN_NAMESPACE |
|
25 | QT_CHARTS_BEGIN_NAMESPACE | |
26 |
|
26 |
@@ -30,7 +30,7 | |||||
30 | #ifndef POLARCHARTAXIS_P_H |
|
30 | #ifndef POLARCHARTAXIS_P_H | |
31 | #define POLARCHARTAXIS_P_H |
|
31 | #define POLARCHARTAXIS_P_H | |
32 |
|
32 | |||
33 |
#include |
|
33 | #include <private/chartaxiselement_p.h> | |
34 |
|
34 | |||
35 | QT_CHARTS_BEGIN_NAMESPACE |
|
35 | QT_CHARTS_BEGIN_NAMESPACE | |
36 |
|
36 |
@@ -18,14 +18,14 | |||||
18 | ** |
|
18 | ** | |
19 | ****************************************************************************/ |
|
19 | ****************************************************************************/ | |
20 |
|
20 | |||
21 |
#include |
|
21 | #include <private/polarchartaxisangular_p.h> | |
22 |
#include |
|
22 | #include <private/chartpresenter_p.h> | |
23 |
#include |
|
23 | #include <private/abstractchartlayout_p.h> | |
24 |
#include |
|
24 | #include <QtCharts/QAbstractAxis> | |
25 |
#include |
|
25 | #include <private/qabstractaxis_p.h> | |
26 | #include <QDebug> |
|
26 | #include <QtCore/QDebug> | |
27 |
#include < |
|
27 | #include <QtCore/QtMath> | |
28 | #include <QTextDocument> |
|
28 | #include <QtGui/QTextDocument> | |
29 |
|
29 | |||
30 | QT_CHARTS_BEGIN_NAMESPACE |
|
30 | QT_CHARTS_BEGIN_NAMESPACE | |
31 |
|
31 |
@@ -30,8 +30,8 | |||||
30 | #ifndef POLARCHARTAXISANGULAR_P_H |
|
30 | #ifndef POLARCHARTAXISANGULAR_P_H | |
31 | #define POLARCHARTAXISANGULAR_P_H |
|
31 | #define POLARCHARTAXISANGULAR_P_H | |
32 |
|
32 | |||
33 |
#include |
|
33 | #include <private/polarchartaxis_p.h> | |
34 |
#include |
|
34 | #include <QtCharts/QValueAxis> | |
35 |
|
35 | |||
36 | QT_CHARTS_BEGIN_NAMESPACE |
|
36 | QT_CHARTS_BEGIN_NAMESPACE | |
37 |
|
37 |
@@ -18,12 +18,12 | |||||
18 | ** |
|
18 | ** | |
19 | ****************************************************************************/ |
|
19 | ****************************************************************************/ | |
20 |
|
20 | |||
21 |
#include |
|
21 | #include <private/polarchartaxisradial_p.h> | |
22 |
#include |
|
22 | #include <private/chartpresenter_p.h> | |
23 |
#include |
|
23 | #include <private/abstractchartlayout_p.h> | |
24 |
#include |
|
24 | #include <private/qabstractaxis_p.h> | |
25 |
#include |
|
25 | #include <private/linearrowitem_p.h> | |
26 | #include <QTextDocument> |
|
26 | #include <QtGui/QTextDocument> | |
27 |
|
27 | |||
28 | QT_CHARTS_BEGIN_NAMESPACE |
|
28 | QT_CHARTS_BEGIN_NAMESPACE | |
29 |
|
29 |
@@ -30,8 +30,8 | |||||
30 | #ifndef POLARCHARTAXISRADIAL_P_H |
|
30 | #ifndef POLARCHARTAXISRADIAL_P_H | |
31 | #define POLARCHARTAXISRADIAL_P_H |
|
31 | #define POLARCHARTAXISRADIAL_P_H | |
32 |
|
32 | |||
33 |
#include |
|
33 | #include <private/polarchartaxis_p.h> | |
34 |
#include |
|
34 | #include <QtCharts/QValueAxis> | |
35 |
|
35 | |||
36 | QT_CHARTS_BEGIN_NAMESPACE |
|
36 | QT_CHARTS_BEGIN_NAMESPACE | |
37 |
|
37 |
@@ -18,11 +18,11 | |||||
18 | ** |
|
18 | ** | |
19 | ****************************************************************************/ |
|
19 | ****************************************************************************/ | |
20 |
|
20 | |||
21 |
#include |
|
21 | #include <QtCharts/QAbstractAxis> | |
22 |
#include |
|
22 | #include <private/qabstractaxis_p.h> | |
23 |
#include |
|
23 | #include <private/chartdataset_p.h> | |
24 |
#include |
|
24 | #include <private/charttheme_p.h> | |
25 |
#include |
|
25 | #include <private/qchart_p.h> | |
26 |
|
26 | |||
27 | QT_CHARTS_BEGIN_NAMESPACE |
|
27 | QT_CHARTS_BEGIN_NAMESPACE | |
28 |
|
28 |
@@ -21,10 +21,10 | |||||
21 | #ifndef QABSTRACTAXIS_H |
|
21 | #ifndef QABSTRACTAXIS_H | |
22 | #define QABSTRACTAXIS_H |
|
22 | #define QABSTRACTAXIS_H | |
23 |
|
23 | |||
24 |
#include <QtCharts/ |
|
24 | #include <QtCharts/QChartGlobal> | |
25 | #include <QPen> |
|
25 | #include <QtGui/QPen> | |
26 | #include <QFont> |
|
26 | #include <QtGui/QFont> | |
27 | #include <QVariant> |
|
27 | #include <QtCore/QVariant> | |
28 |
|
28 | |||
29 | QT_CHARTS_BEGIN_NAMESPACE |
|
29 | QT_CHARTS_BEGIN_NAMESPACE | |
30 |
|
30 |
@@ -30,10 +30,10 | |||||
30 | #ifndef QABSTRACTAXIS_P_H |
|
30 | #ifndef QABSTRACTAXIS_P_H | |
31 | #define QABSTRACTAXIS_P_H |
|
31 | #define QABSTRACTAXIS_P_H | |
32 |
|
32 | |||
33 |
#include |
|
33 | #include <QtCharts/QAbstractAxis> | |
34 |
#include |
|
34 | #include <private/chartaxiselement_p.h> | |
35 |
#include |
|
35 | #include <QtCharts/QChart> | |
36 | #include <QDebug> |
|
36 | #include <QtCore/QDebug> | |
37 |
|
37 | |||
38 | class QGraphicsItem; |
|
38 | class QGraphicsItem; | |
39 |
|
39 |
@@ -18,14 +18,14 | |||||
18 | ** |
|
18 | ** | |
19 | ****************************************************************************/ |
|
19 | ****************************************************************************/ | |
20 |
|
20 | |||
21 |
#include |
|
21 | #include <private/chartvalueaxisx_p.h> | |
22 |
#include |
|
22 | #include <QtCharts/QAbstractAxis> | |
23 |
#include |
|
23 | #include <private/chartpresenter_p.h> | |
24 |
#include |
|
24 | #include <QtCharts/QValueAxis> | |
25 |
#include |
|
25 | #include <private/abstractchartlayout_p.h> | |
26 | #include <QGraphicsLayout> |
|
26 | #include <QtWidgets/QGraphicsLayout> | |
27 |
#include < |
|
27 | #include <QtCore/QtMath> | |
28 | #include <QDebug> |
|
28 | #include <QtCore/QDebug> | |
29 |
|
29 | |||
30 |
|
30 | |||
31 | QT_CHARTS_BEGIN_NAMESPACE |
|
31 | QT_CHARTS_BEGIN_NAMESPACE |
@@ -30,7 +30,7 | |||||
30 | #ifndef CHARTVALUEAXISX_H |
|
30 | #ifndef CHARTVALUEAXISX_H | |
31 | #define CHARTVALUEAXISX_H |
|
31 | #define CHARTVALUEAXISX_H | |
32 |
|
32 | |||
33 |
#include |
|
33 | #include <private/horizontalaxis_p.h> | |
34 |
|
34 | |||
35 | QT_CHARTS_BEGIN_NAMESPACE |
|
35 | QT_CHARTS_BEGIN_NAMESPACE | |
36 |
|
36 |
@@ -18,14 +18,14 | |||||
18 | ** |
|
18 | ** | |
19 | ****************************************************************************/ |
|
19 | ****************************************************************************/ | |
20 |
|
20 | |||
21 |
#include |
|
21 | #include <private/chartvalueaxisy_p.h> | |
22 |
#include |
|
22 | #include <QtCharts/QAbstractAxis> | |
23 |
#include |
|
23 | #include <private/chartpresenter_p.h> | |
24 |
#include |
|
24 | #include <QtCharts/QValueAxis> | |
25 |
#include |
|
25 | #include <private/abstractchartlayout_p.h> | |
26 | #include <QGraphicsLayout> |
|
26 | #include <QtWidgets/QGraphicsLayout> | |
27 |
#include < |
|
27 | #include <QtCore/QtMath> | |
28 | #include <QDebug> |
|
28 | #include <QtCore/QDebug> | |
29 |
|
29 | |||
30 | QT_CHARTS_BEGIN_NAMESPACE |
|
30 | QT_CHARTS_BEGIN_NAMESPACE | |
31 |
|
31 |
@@ -30,7 +30,7 | |||||
30 | #ifndef CHARTVALUEAXISY_H |
|
30 | #ifndef CHARTVALUEAXISY_H | |
31 | #define CHARTVALUEAXISY_H |
|
31 | #define CHARTVALUEAXISY_H | |
32 |
|
32 | |||
33 |
#include |
|
33 | #include <private/verticalaxis_p.h> | |
34 |
|
34 | |||
35 | QT_CHARTS_BEGIN_NAMESPACE |
|
35 | QT_CHARTS_BEGIN_NAMESPACE | |
36 |
|
36 |
@@ -18,9 +18,9 | |||||
18 | ** |
|
18 | ** | |
19 | ****************************************************************************/ |
|
19 | ****************************************************************************/ | |
20 |
|
20 | |||
21 |
#include |
|
21 | #include <private/polarchartvalueaxisangular_p.h> | |
22 |
#include |
|
22 | #include <private/chartpresenter_p.h> | |
23 |
#include |
|
23 | #include <private/abstractchartlayout_p.h> | |
24 |
|
24 | |||
25 | QT_CHARTS_BEGIN_NAMESPACE |
|
25 | QT_CHARTS_BEGIN_NAMESPACE | |
26 |
|
26 |
@@ -30,7 +30,7 | |||||
30 | #ifndef POLARCHARTVALUEAXISANGULAR_P_H |
|
30 | #ifndef POLARCHARTVALUEAXISANGULAR_P_H | |
31 | #define POLARCHARTVALUEAXISANGULAR_P_H |
|
31 | #define POLARCHARTVALUEAXISANGULAR_P_H | |
32 |
|
32 | |||
33 |
#include |
|
33 | #include <private/polarchartaxisangular_p.h> | |
34 |
|
34 | |||
35 | QT_CHARTS_BEGIN_NAMESPACE |
|
35 | QT_CHARTS_BEGIN_NAMESPACE | |
36 |
|
36 |
@@ -18,9 +18,9 | |||||
18 | ** |
|
18 | ** | |
19 | ****************************************************************************/ |
|
19 | ****************************************************************************/ | |
20 |
|
20 | |||
21 |
#include |
|
21 | #include <private/polarchartvalueaxisradial_p.h> | |
22 |
#include |
|
22 | #include <private/chartpresenter_p.h> | |
23 |
#include |
|
23 | #include <private/abstractchartlayout_p.h> | |
24 |
|
24 | |||
25 | QT_CHARTS_BEGIN_NAMESPACE |
|
25 | QT_CHARTS_BEGIN_NAMESPACE | |
26 |
|
26 |
@@ -30,7 +30,7 | |||||
30 | #ifndef POLARCHARTVALUEAXISRADIAL_P_H |
|
30 | #ifndef POLARCHARTVALUEAXISRADIAL_P_H | |
31 | #define POLARCHARTVALUEAXISRADIAL_P_H |
|
31 | #define POLARCHARTVALUEAXISRADIAL_P_H | |
32 |
|
32 | |||
33 |
#include |
|
33 | #include <private/polarchartaxisradial_p.h> | |
34 |
|
34 | |||
35 | QT_CHARTS_BEGIN_NAMESPACE |
|
35 | QT_CHARTS_BEGIN_NAMESPACE | |
36 |
|
36 |
@@ -18,16 +18,16 | |||||
18 | ** |
|
18 | ** | |
19 | ****************************************************************************/ |
|
19 | ****************************************************************************/ | |
20 |
|
20 | |||
21 |
#include |
|
21 | #include <QtCharts/QValueAxis> | |
22 |
#include |
|
22 | #include <private/qvalueaxis_p.h> | |
23 |
#include |
|
23 | #include <private/chartvalueaxisx_p.h> | |
24 |
#include |
|
24 | #include <private/chartvalueaxisy_p.h> | |
25 |
#include |
|
25 | #include <private/abstractdomain_p.h> | |
26 |
#include |
|
26 | #include <private/polarchartvalueaxisangular_p.h> | |
27 |
#include |
|
27 | #include <private/polarchartvalueaxisradial_p.h> | |
28 |
#include |
|
28 | #include <private/chartdataset_p.h> | |
29 |
#include |
|
29 | #include <private/chartpresenter_p.h> | |
30 |
#include |
|
30 | #include <private/charttheme_p.h> | |
31 |
|
31 | |||
32 |
|
32 | |||
33 | QT_CHARTS_BEGIN_NAMESPACE |
|
33 | QT_CHARTS_BEGIN_NAMESPACE |
@@ -21,7 +21,7 | |||||
21 | #ifndef QVALUEAXIS_H |
|
21 | #ifndef QVALUEAXIS_H | |
22 | #define QVALUEAXIS_H |
|
22 | #define QVALUEAXIS_H | |
23 |
|
23 | |||
24 |
#include <QtCharts/ |
|
24 | #include <QtCharts/QAbstractAxis> | |
25 |
|
25 | |||
26 | QT_CHARTS_BEGIN_NAMESPACE |
|
26 | QT_CHARTS_BEGIN_NAMESPACE | |
27 |
|
27 |
@@ -30,8 +30,8 | |||||
30 | #ifndef QVALUEAXIS_P_H |
|
30 | #ifndef QVALUEAXIS_P_H | |
31 | #define QVALUEAXIS_P_H |
|
31 | #define QVALUEAXIS_P_H | |
32 |
|
32 | |||
33 |
#include < |
|
33 | #include <QtCharts/QValueAxis> | |
34 |
#include |
|
34 | #include <private/qabstractaxis_p.h> | |
35 |
|
35 | |||
36 | QT_CHARTS_BEGIN_NAMESPACE |
|
36 | QT_CHARTS_BEGIN_NAMESPACE | |
37 |
|
37 |
@@ -18,10 +18,10 | |||||
18 | ** |
|
18 | ** | |
19 | ****************************************************************************/ |
|
19 | ****************************************************************************/ | |
20 |
|
20 | |||
21 |
#include |
|
21 | #include <private/verticalaxis_p.h> | |
22 |
#include |
|
22 | #include <QtCharts/QAbstractAxis> | |
23 |
#include |
|
23 | #include <private/chartpresenter_p.h> | |
24 | #include <QDebug> |
|
24 | #include <QtCore/QDebug> | |
25 |
|
25 | |||
26 | QT_CHARTS_BEGIN_NAMESPACE |
|
26 | QT_CHARTS_BEGIN_NAMESPACE | |
27 |
|
27 |
@@ -30,7 +30,7 | |||||
30 | #ifndef VERTICALAXIS_P_H_ |
|
30 | #ifndef VERTICALAXIS_P_H_ | |
31 | #define VERTICALAXIS_P_H_ |
|
31 | #define VERTICALAXIS_P_H_ | |
32 |
|
32 | |||
33 |
#include |
|
33 | #include <private/cartesianchartaxis_p.h> | |
34 |
|
34 | |||
35 | QT_CHARTS_BEGIN_NAMESPACE |
|
35 | QT_CHARTS_BEGIN_NAMESPACE | |
36 |
|
36 |
@@ -18,19 +18,20 | |||||
18 | ** |
|
18 | ** | |
19 | ****************************************************************************/ |
|
19 | ****************************************************************************/ | |
20 |
|
20 | |||
21 |
#include |
|
21 | #include <private/abstractbarchartitem_p.h> | |
22 |
#include |
|
22 | #include <private/bar_p.h> | |
23 | #include "qbarset.h" |
|
23 | #include <QtCharts/QBarSet> | |
24 |
#include |
|
24 | #include <private/qbarset_p.h> | |
25 |
#include |
|
25 | #include <QtCharts/QAbstractBarSeries> | |
26 |
#include |
|
26 | #include <private/qabstractbarseries_p.h> | |
27 |
#include |
|
27 | #include <QtCharts/QChart> | |
28 |
#include |
|
28 | #include <private/chartpresenter_p.h> | |
29 |
#include |
|
29 | #include <private/charttheme_p.h> | |
30 |
#include |
|
30 | #include <private/baranimation_p.h> | |
31 | #include "chartdataset_p.h" |
|
31 | ||
32 | #include <QPainter> |
|
32 | #include <private/chartdataset_p.h> | |
33 |
#include <Q |
|
33 | #include <QtGui/QPainter> | |
|
34 | #include <QtGui/QTextDocument> | |||
34 |
|
35 | |||
35 | QT_CHARTS_BEGIN_NAMESPACE |
|
36 | QT_CHARTS_BEGIN_NAMESPACE | |
36 |
|
37 |
@@ -31,10 +31,10 | |||||
31 | #ifndef ABSTRACTBARCHARTITEM_H |
|
31 | #ifndef ABSTRACTBARCHARTITEM_H | |
32 | #define ABSTRACTBARCHARTITEM_H |
|
32 | #define ABSTRACTBARCHARTITEM_H | |
33 |
|
33 | |||
34 |
#include |
|
34 | #include <private/chartitem_p.h> | |
35 |
#include |
|
35 | #include <QtCharts/QAbstractBarSeries> | |
36 | #include <QPen> |
|
36 | #include <QtGui/QPen> | |
37 | #include <QBrush> |
|
37 | #include <QtGui/QBrush> | |
38 |
|
38 | |||
39 | QT_CHARTS_BEGIN_NAMESPACE |
|
39 | QT_CHARTS_BEGIN_NAMESPACE | |
40 |
|
40 |
@@ -18,9 +18,9 | |||||
18 | ** |
|
18 | ** | |
19 | ****************************************************************************/ |
|
19 | ****************************************************************************/ | |
20 |
|
20 | |||
21 |
#include |
|
21 | #include <private/bar_p.h> | |
22 | #include <QPainter> |
|
22 | #include <QtGui/QPainter> | |
23 | #include <QGraphicsSceneEvent> |
|
23 | #include <QtWidgets/QGraphicsSceneEvent> | |
24 |
|
24 | |||
25 | QT_CHARTS_BEGIN_NAMESPACE |
|
25 | QT_CHARTS_BEGIN_NAMESPACE | |
26 |
|
26 |
@@ -30,8 +30,8 | |||||
30 | #ifndef BAR_H |
|
30 | #ifndef BAR_H | |
31 | #define BAR_H |
|
31 | #define BAR_H | |
32 |
|
32 | |||
33 |
#include |
|
33 | #include <QtCharts/QChartGlobal> | |
34 | #include <QGraphicsRectItem> |
|
34 | #include <QtWidgets/QGraphicsRectItem> | |
35 |
|
35 | |||
36 | QT_CHARTS_BEGIN_NAMESPACE |
|
36 | QT_CHARTS_BEGIN_NAMESPACE | |
37 |
|
37 |
@@ -18,10 +18,10 | |||||
18 | ** |
|
18 | ** | |
19 | ****************************************************************************/ |
|
19 | ****************************************************************************/ | |
20 |
|
20 | |||
21 |
#include |
|
21 | #include <private/horizontalbarchartitem_p.h> | |
22 |
#include |
|
22 | #include <private/qabstractbarseries_p.h> | |
23 |
#include |
|
23 | #include <private/qbarset_p.h> | |
24 |
#include |
|
24 | #include <private/bar_p.h> | |
25 |
|
25 | |||
26 | QT_CHARTS_BEGIN_NAMESPACE |
|
26 | QT_CHARTS_BEGIN_NAMESPACE | |
27 |
|
27 |
@@ -30,8 +30,8 | |||||
30 | #ifndef HORIZONTALBARCHARTITEM_H |
|
30 | #ifndef HORIZONTALBARCHARTITEM_H | |
31 | #define HORIZONTALBARCHARTITEM_H |
|
31 | #define HORIZONTALBARCHARTITEM_H | |
32 |
|
32 | |||
33 |
#include |
|
33 | #include <private/abstractbarchartitem_p.h> | |
34 | #include <QGraphicsItem> |
|
34 | #include <QtWidgets/QGraphicsItem> | |
35 |
|
35 | |||
36 | QT_CHARTS_BEGIN_NAMESPACE |
|
36 | QT_CHARTS_BEGIN_NAMESPACE | |
37 |
|
37 |
@@ -18,13 +18,13 | |||||
18 | ** |
|
18 | ** | |
19 | ****************************************************************************/ |
|
19 | ****************************************************************************/ | |
20 |
|
20 | |||
21 |
#include |
|
21 | #include <QtCharts/QHorizontalBarSeries> | |
22 |
#include |
|
22 | #include <private/qhorizontalbarseries_p.h> | |
23 |
#include |
|
23 | #include <private/horizontalbarchartitem_p.h> | |
24 |
#include |
|
24 | #include <QtCharts/QBarCategoryAxis> | |
25 |
|
25 | |||
26 |
#include |
|
26 | #include <private/chartdataset_p.h> | |
27 |
#include |
|
27 | #include <private/charttheme_p.h> | |
28 |
|
28 | |||
29 |
|
29 | |||
30 | QT_CHARTS_BEGIN_NAMESPACE |
|
30 | QT_CHARTS_BEGIN_NAMESPACE |
@@ -21,7 +21,7 | |||||
21 | #ifndef QHORIZONTALBARSERIES_H |
|
21 | #ifndef QHORIZONTALBARSERIES_H | |
22 | #define QHORIZONTALBARSERIES_H |
|
22 | #define QHORIZONTALBARSERIES_H | |
23 |
|
23 | |||
24 |
#include <QtCharts/ |
|
24 | #include <QtCharts/QAbstractBarSeries> | |
25 |
|
25 | |||
26 | QT_CHARTS_BEGIN_NAMESPACE |
|
26 | QT_CHARTS_BEGIN_NAMESPACE | |
27 |
|
27 |
@@ -30,8 +30,8 | |||||
30 | #ifndef QHORIZONTALBARSERIES_P_H |
|
30 | #ifndef QHORIZONTALBARSERIES_P_H | |
31 | #define QHORIZONTALBARSERIES_P_H |
|
31 | #define QHORIZONTALBARSERIES_P_H | |
32 |
|
32 | |||
33 |
#include |
|
33 | #include <private/qabstractbarseries_p.h> | |
34 |
#include |
|
34 | #include <private/abstractdomain_p.h> | |
35 |
|
35 | |||
36 | QT_CHARTS_BEGIN_NAMESPACE |
|
36 | QT_CHARTS_BEGIN_NAMESPACE | |
37 |
|
37 |
@@ -18,10 +18,10 | |||||
18 | ** |
|
18 | ** | |
19 | ****************************************************************************/ |
|
19 | ****************************************************************************/ | |
20 |
|
20 | |||
21 |
#include |
|
21 | #include <private/horizontalpercentbarchartitem_p.h> | |
22 |
#include |
|
22 | #include <private/qabstractbarseries_p.h> | |
23 |
#include |
|
23 | #include <private/qbarset_p.h> | |
24 |
#include |
|
24 | #include <private/bar_p.h> | |
25 |
|
25 | |||
26 | QT_CHARTS_BEGIN_NAMESPACE |
|
26 | QT_CHARTS_BEGIN_NAMESPACE | |
27 |
|
27 |
@@ -30,8 +30,8 | |||||
30 | #ifndef HORIZONTALPERCENTBARCHARTITEM_P_H |
|
30 | #ifndef HORIZONTALPERCENTBARCHARTITEM_P_H | |
31 | #define HORIZONTALPERCENTBARCHARTITEM_P_H |
|
31 | #define HORIZONTALPERCENTBARCHARTITEM_P_H | |
32 |
|
32 | |||
33 |
#include |
|
33 | #include <private/abstractbarchartitem_p.h> | |
34 | #include <QGraphicsItem> |
|
34 | #include <QtWidgets/QGraphicsItem> | |
35 |
|
35 | |||
36 | QT_CHARTS_BEGIN_NAMESPACE |
|
36 | QT_CHARTS_BEGIN_NAMESPACE | |
37 |
|
37 |
@@ -17,12 +17,12 | |||||
17 | ** $QT_END_LICENSE$ |
|
17 | ** $QT_END_LICENSE$ | |
18 | ** |
|
18 | ** | |
19 | ****************************************************************************/ |
|
19 | ****************************************************************************/ | |
20 |
#include |
|
20 | #include <QtCharts/QHorizontalPercentBarSeries> | |
21 |
#include |
|
21 | #include <private/qhorizontalpercentbarseries_p.h> | |
22 |
#include |
|
22 | #include <private/horizontalpercentbarchartitem_p.h> | |
23 |
|
23 | |||
24 |
#include |
|
24 | #include <private/chartdataset_p.h> | |
25 |
#include |
|
25 | #include <private/charttheme_p.h> | |
26 |
|
26 | |||
27 | QT_CHARTS_BEGIN_NAMESPACE |
|
27 | QT_CHARTS_BEGIN_NAMESPACE | |
28 |
|
28 |
@@ -21,7 +21,7 | |||||
21 | #ifndef QHORIZONTALPERCENTBARSERIES_H |
|
21 | #ifndef QHORIZONTALPERCENTBARSERIES_H | |
22 | #define QHORIZONTALPERCENTBARSERIES_H |
|
22 | #define QHORIZONTALPERCENTBARSERIES_H | |
23 |
|
23 | |||
24 |
#include <QtCharts/ |
|
24 | #include <QtCharts/QAbstractBarSeries> | |
25 |
|
25 | |||
26 | QT_CHARTS_BEGIN_NAMESPACE |
|
26 | QT_CHARTS_BEGIN_NAMESPACE | |
27 |
|
27 |
@@ -30,8 +30,8 | |||||
30 | #ifndef QHORIZONTALPERCENTBARSERIES_P_H |
|
30 | #ifndef QHORIZONTALPERCENTBARSERIES_P_H | |
31 | #define QHORIZONTALPERCENTBARSERIES_P_H |
|
31 | #define QHORIZONTALPERCENTBARSERIES_P_H | |
32 |
|
32 | |||
33 |
#include |
|
33 | #include <private/qabstractbarseries_p.h> | |
34 |
#include |
|
34 | #include <private/abstractdomain_p.h> | |
35 |
|
35 | |||
36 | QT_CHARTS_BEGIN_NAMESPACE |
|
36 | QT_CHARTS_BEGIN_NAMESPACE | |
37 |
|
37 |
@@ -18,10 +18,10 | |||||
18 | ** |
|
18 | ** | |
19 | ****************************************************************************/ |
|
19 | ****************************************************************************/ | |
20 |
|
20 | |||
21 |
#include |
|
21 | #include <private/horizontalstackedbarchartitem_p.h> | |
22 |
#include |
|
22 | #include <private/qabstractbarseries_p.h> | |
23 |
#include |
|
23 | #include <private/qbarset_p.h> | |
24 |
#include |
|
24 | #include <private/bar_p.h> | |
25 |
|
25 | |||
26 | QT_CHARTS_BEGIN_NAMESPACE |
|
26 | QT_CHARTS_BEGIN_NAMESPACE | |
27 |
|
27 |
@@ -30,8 +30,8 | |||||
30 | #ifndef HORIZONTALSTACKEDBARCHARTITEM_P_H |
|
30 | #ifndef HORIZONTALSTACKEDBARCHARTITEM_P_H | |
31 | #define HORIZONTALSTACKEDBARCHARTITEM_P_H |
|
31 | #define HORIZONTALSTACKEDBARCHARTITEM_P_H | |
32 |
|
32 | |||
33 |
#include |
|
33 | #include <private/abstractbarchartitem_p.h> | |
34 | #include <QGraphicsItem> |
|
34 | #include <QtWidgets/QGraphicsItem> | |
35 |
|
35 | |||
36 | QT_CHARTS_BEGIN_NAMESPACE |
|
36 | QT_CHARTS_BEGIN_NAMESPACE | |
37 |
|
37 |
@@ -17,12 +17,12 | |||||
17 | ** $QT_END_LICENSE$ |
|
17 | ** $QT_END_LICENSE$ | |
18 | ** |
|
18 | ** | |
19 | ****************************************************************************/ |
|
19 | ****************************************************************************/ | |
20 |
#include |
|
20 | #include <QtCharts/QHorizontalStackedBarSeries> | |
21 |
#include |
|
21 | #include <private/qhorizontalstackedbarseries_p.h> | |
22 |
#include |
|
22 | #include <private/horizontalstackedbarchartitem_p.h> | |
23 |
|
23 | |||
24 |
#include |
|
24 | #include <private/chartdataset_p.h> | |
25 |
#include |
|
25 | #include <private/charttheme_p.h> | |
26 |
|
26 | |||
27 | QT_CHARTS_BEGIN_NAMESPACE |
|
27 | QT_CHARTS_BEGIN_NAMESPACE | |
28 | /*! |
|
28 | /*! |
@@ -21,7 +21,7 | |||||
21 | #ifndef QHORIZONTALSTACKEDBARSERIES_H |
|
21 | #ifndef QHORIZONTALSTACKEDBARSERIES_H | |
22 | #define QHORIZONTALSTACKEDBARSERIES_H |
|
22 | #define QHORIZONTALSTACKEDBARSERIES_H | |
23 |
|
23 | |||
24 |
#include <QtCharts/ |
|
24 | #include <QtCharts/QAbstractBarSeries> | |
25 |
|
25 | |||
26 | QT_CHARTS_BEGIN_NAMESPACE |
|
26 | QT_CHARTS_BEGIN_NAMESPACE | |
27 |
|
27 |
@@ -30,8 +30,8 | |||||
30 | #ifndef QHORIZONTALSTACKEDBARSERIES_P_H |
|
30 | #ifndef QHORIZONTALSTACKEDBARSERIES_P_H | |
31 | #define QHORIZONTALSTACKEDBARSERIES_P_H |
|
31 | #define QHORIZONTALSTACKEDBARSERIES_P_H | |
32 |
|
32 | |||
33 |
#include |
|
33 | #include <private/qabstractbarseries_p.h> | |
34 |
#include |
|
34 | #include <private/abstractdomain_p.h> | |
35 |
|
35 | |||
36 | QT_CHARTS_BEGIN_NAMESPACE |
|
36 | QT_CHARTS_BEGIN_NAMESPACE | |
37 |
|
37 |
@@ -18,19 +18,19 | |||||
18 | ** |
|
18 | ** | |
19 | ****************************************************************************/ |
|
19 | ****************************************************************************/ | |
20 |
|
20 | |||
21 |
#include |
|
21 | #include <QtCharts/QAbstractBarSeries> | |
22 |
#include |
|
22 | #include <private/qabstractbarseries_p.h> | |
23 | #include "qbarset.h" |
|
23 | #include <QtCharts/QBarSet> | |
24 |
#include |
|
24 | #include <private/qbarset_p.h> | |
25 |
#include |
|
25 | #include <private/abstractdomain_p.h> | |
26 |
#include |
|
26 | #include <private/chartdataset_p.h> | |
27 |
#include |
|
27 | #include <private/charttheme_p.h> | |
28 |
#include |
|
28 | #include <QtCharts/QValueAxis> | |
29 |
#include |
|
29 | #include <QtCharts/QBarCategoryAxis> | |
30 |
#include |
|
30 | #include <QtCharts/QBarLegendMarker> | |
31 |
#include |
|
31 | #include <private/baranimation_p.h> | |
32 |
#include |
|
32 | #include <private/abstractbarchartitem_p.h> | |
33 |
#include |
|
33 | #include <private/qchart_p.h> | |
34 |
|
34 | |||
35 | QT_CHARTS_BEGIN_NAMESPACE |
|
35 | QT_CHARTS_BEGIN_NAMESPACE | |
36 |
|
36 |
@@ -21,8 +21,8 | |||||
21 | #ifndef QABSTRACTBARSERIES_H |
|
21 | #ifndef QABSTRACTBARSERIES_H | |
22 | #define QABSTRACTBARSERIES_H |
|
22 | #define QABSTRACTBARSERIES_H | |
23 |
|
23 | |||
24 |
#include <QtCharts/ |
|
24 | #include <QtCharts/QAbstractSeries> | |
25 | #include <QStringList> |
|
25 | #include <QtCore/QStringList> | |
26 |
|
26 | |||
27 | QT_CHARTS_BEGIN_NAMESPACE |
|
27 | QT_CHARTS_BEGIN_NAMESPACE | |
28 |
|
28 |
@@ -30,10 +30,10 | |||||
30 | #ifndef QABSTRACTBARSERIES_P_H |
|
30 | #ifndef QABSTRACTBARSERIES_P_H | |
31 | #define QABSTRACTBARSERIES_P_H |
|
31 | #define QABSTRACTBARSERIES_P_H | |
32 |
|
32 | |||
33 |
#include <QtCharts/ |
|
33 | #include <QtCharts/QAbstractBarSeries> | |
34 |
#include |
|
34 | #include <private/qabstractseries_p.h> | |
35 | #include <QStringList> |
|
35 | #include <QtCore/QStringList> | |
36 | #include <QAbstractSeries> |
|
36 | #include <QtCharts/QAbstractSeries> | |
37 |
|
37 | |||
38 | QT_CHARTS_BEGIN_NAMESPACE |
|
38 | QT_CHARTS_BEGIN_NAMESPACE | |
39 |
|
39 |
@@ -18,12 +18,12 | |||||
18 | ** |
|
18 | ** | |
19 | ****************************************************************************/ |
|
19 | ****************************************************************************/ | |
20 |
|
20 | |||
21 |
#include |
|
21 | #include <QtCharts/QBarModelMapper> | |
22 |
#include |
|
22 | #include <private/qbarmodelmapper_p.h> | |
23 |
#include |
|
23 | #include <QtCharts/QAbstractBarSeries> | |
24 | #include "qbarset.h" |
|
24 | #include <QtCharts/QBarSet> | |
25 |
#include |
|
25 | #include <QtCharts/QChart> | |
26 | #include <QAbstractItemModel> |
|
26 | #include <QtCore/QAbstractItemModel> | |
27 |
|
27 | |||
28 | QT_CHARTS_BEGIN_NAMESPACE |
|
28 | QT_CHARTS_BEGIN_NAMESPACE | |
29 |
|
29 |
@@ -21,8 +21,8 | |||||
21 | #ifndef QBARMODELMAPPER_H |
|
21 | #ifndef QBARMODELMAPPER_H | |
22 | #define QBARMODELMAPPER_H |
|
22 | #define QBARMODELMAPPER_H | |
23 |
|
23 | |||
24 |
#include <QtCharts/ |
|
24 | #include <QtCharts/QChartGlobal> | |
25 | #include <QObject> |
|
25 | #include <QtCore/QObject> | |
26 |
|
26 | |||
27 | class QAbstractItemModel; |
|
27 | class QAbstractItemModel; | |
28 |
|
28 |
@@ -30,8 +30,8 | |||||
30 | #ifndef QBARMODELMAPPER_P_H |
|
30 | #ifndef QBARMODELMAPPER_P_H | |
31 | #define QBARMODELMAPPER_P_H |
|
31 | #define QBARMODELMAPPER_P_H | |
32 |
|
32 | |||
33 | #include <QObject> |
|
33 | #include <QtCore/QObject> | |
34 |
#include |
|
34 | #include <QtCharts/QBarModelMapper> | |
35 |
|
35 | |||
36 | class QModelIndex; |
|
36 | class QModelIndex; | |
37 |
|
37 |
@@ -18,10 +18,10 | |||||
18 | ** |
|
18 | ** | |
19 | ****************************************************************************/ |
|
19 | ****************************************************************************/ | |
20 |
|
20 | |||
21 | #include "qbarset.h" |
|
21 | #include <QtCharts/QBarSet> | |
22 |
#include |
|
22 | #include <private/qbarset_p.h> | |
23 |
#include |
|
23 | #include <private/charthelpers_p.h> | |
24 |
#include |
|
24 | #include <private/qchart_p.h> | |
25 |
|
25 | |||
26 | QT_CHARTS_BEGIN_NAMESPACE |
|
26 | QT_CHARTS_BEGIN_NAMESPACE | |
27 |
|
27 |
@@ -21,10 +21,10 | |||||
21 | #ifndef QBARSET_H |
|
21 | #ifndef QBARSET_H | |
22 | #define QBARSET_H |
|
22 | #define QBARSET_H | |
23 |
|
23 | |||
24 |
#include <QtCharts/ |
|
24 | #include <QtCharts/QChartGlobal> | |
25 | #include <QPen> |
|
25 | #include <QtGui/QPen> | |
26 | #include <QBrush> |
|
26 | #include <QtGui/QBrush> | |
27 | #include <QFont> |
|
27 | #include <QtGui/QFont> | |
28 |
|
28 | |||
29 | QT_CHARTS_BEGIN_NAMESPACE |
|
29 | QT_CHARTS_BEGIN_NAMESPACE | |
30 | class QBarSetPrivate; |
|
30 | class QBarSetPrivate; |
@@ -30,11 +30,11 | |||||
30 | #ifndef QBARSET_P_H |
|
30 | #ifndef QBARSET_P_H | |
31 | #define QBARSET_P_H |
|
31 | #define QBARSET_P_H | |
32 |
|
32 | |||
33 |
#include < |
|
33 | #include <QtCharts/QBarSet> | |
34 | #include <QMap> |
|
34 | #include <QtCore/QMap> | |
35 | #include <QPen> |
|
35 | #include <QtGui/QPen> | |
36 | #include <QBrush> |
|
36 | #include <QtGui/QBrush> | |
37 | #include <QFont> |
|
37 | #include <QtGui/QFont> | |
38 |
|
38 | |||
39 | QT_CHARTS_BEGIN_NAMESPACE |
|
39 | QT_CHARTS_BEGIN_NAMESPACE | |
40 |
|
40 |
@@ -18,7 +18,7 | |||||
18 | ** |
|
18 | ** | |
19 | ****************************************************************************/ |
|
19 | ****************************************************************************/ | |
20 |
|
20 | |||
21 |
#include |
|
21 | #include <QtCharts/QHBarModelMapper> | |
22 |
|
22 | |||
23 | QT_CHARTS_BEGIN_NAMESPACE |
|
23 | QT_CHARTS_BEGIN_NAMESPACE | |
24 |
|
24 |
@@ -18,7 +18,7 | |||||
18 | ** |
|
18 | ** | |
19 | ****************************************************************************/ |
|
19 | ****************************************************************************/ | |
20 |
|
20 | |||
21 |
#include |
|
21 | #include <QtCharts/QVBarModelMapper> | |
22 |
|
22 | |||
23 | QT_CHARTS_BEGIN_NAMESPACE |
|
23 | QT_CHARTS_BEGIN_NAMESPACE | |
24 |
|
24 |
@@ -18,11 +18,11 | |||||
18 | ** |
|
18 | ** | |
19 | ****************************************************************************/ |
|
19 | ****************************************************************************/ | |
20 |
|
20 | |||
21 |
#include |
|
21 | #include <private/barchartitem_p.h> | |
22 |
#include |
|
22 | #include <private/bar_p.h> | |
23 |
#include |
|
23 | #include <private/qabstractbarseries_p.h> | |
24 | #include "qbarset.h" |
|
24 | #include <QtCharts/QBarSet> | |
25 |
#include |
|
25 | #include <private/qbarset_p.h> | |
26 |
|
26 | |||
27 | QT_CHARTS_BEGIN_NAMESPACE |
|
27 | QT_CHARTS_BEGIN_NAMESPACE | |
28 |
|
28 |
@@ -31,9 +31,9 | |||||
31 | #ifndef BARCHARTITEM_H |
|
31 | #ifndef BARCHARTITEM_H | |
32 | #define BARCHARTITEM_H |
|
32 | #define BARCHARTITEM_H | |
33 |
|
33 | |||
34 |
#include |
|
34 | #include <private/abstractbarchartitem_p.h> | |
35 |
#include < |
|
35 | #include <QtCharts/QStackedBarSeries> | |
36 | #include <QGraphicsItem> |
|
36 | #include <QtWidgets/QGraphicsItem> | |
37 |
|
37 | |||
38 | QT_CHARTS_BEGIN_NAMESPACE |
|
38 | QT_CHARTS_BEGIN_NAMESPACE | |
39 |
|
39 |
@@ -18,13 +18,13 | |||||
18 | ** |
|
18 | ** | |
19 | ****************************************************************************/ |
|
19 | ****************************************************************************/ | |
20 |
|
20 | |||
21 |
#include |
|
21 | #include <QtCharts/QBarSeries> | |
22 |
#include |
|
22 | #include <private/qbarseries_p.h> | |
23 |
#include |
|
23 | #include <private/barchartitem_p.h> | |
24 |
#include |
|
24 | #include <private/chartdataset_p.h> | |
25 |
#include |
|
25 | #include <private/charttheme_p.h> | |
26 |
#include |
|
26 | #include <QtCharts/QValueAxis> | |
27 |
#include |
|
27 | #include <QtCharts/QBarCategoryAxis> | |
28 |
|
28 | |||
29 | QT_CHARTS_BEGIN_NAMESPACE |
|
29 | QT_CHARTS_BEGIN_NAMESPACE | |
30 |
|
30 |
@@ -21,7 +21,7 | |||||
21 | #ifndef QBARSERIES_H |
|
21 | #ifndef QBARSERIES_H | |
22 | #define QBARSERIES_H |
|
22 | #define QBARSERIES_H | |
23 |
|
23 | |||
24 |
#include <QtCharts/ |
|
24 | #include <QtCharts/QAbstractBarSeries> | |
25 |
|
25 | |||
26 | QT_CHARTS_BEGIN_NAMESPACE |
|
26 | QT_CHARTS_BEGIN_NAMESPACE | |
27 |
|
27 |
@@ -30,8 +30,8 | |||||
30 | #ifndef QBARSERIES_P_H |
|
30 | #ifndef QBARSERIES_P_H | |
31 | #define QBARSERIES_P_H |
|
31 | #define QBARSERIES_P_H | |
32 |
|
32 | |||
33 |
#include |
|
33 | #include <private/qabstractbarseries_p.h> | |
34 |
#include |
|
34 | #include <private/abstractdomain_p.h> | |
35 |
|
35 | |||
36 | QT_CHARTS_BEGIN_NAMESPACE |
|
36 | QT_CHARTS_BEGIN_NAMESPACE | |
37 |
|
37 |
@@ -18,11 +18,11 | |||||
18 | ** |
|
18 | ** | |
19 | ****************************************************************************/ |
|
19 | ****************************************************************************/ | |
20 |
|
20 | |||
21 |
#include |
|
21 | #include <private/percentbarchartitem_p.h> | |
22 |
#include |
|
22 | #include <private/bar_p.h> | |
23 |
#include |
|
23 | #include <private/qabstractbarseries_p.h> | |
24 | #include "qbarset.h" |
|
24 | #include <QtCharts/QBarSet> | |
25 |
#include |
|
25 | #include <private/qbarset_p.h> | |
26 |
|
26 | |||
27 | QT_CHARTS_BEGIN_NAMESPACE |
|
27 | QT_CHARTS_BEGIN_NAMESPACE | |
28 |
|
28 |
@@ -31,8 +31,8 | |||||
31 | #ifndef PERCENTBARCHARTITEM_H |
|
31 | #ifndef PERCENTBARCHARTITEM_H | |
32 | #define PERCENTBARCHARTITEM_H |
|
32 | #define PERCENTBARCHARTITEM_H | |
33 |
|
33 | |||
34 |
#include |
|
34 | #include <private/abstractbarchartitem_p.h> | |
35 | #include <QGraphicsItem> |
|
35 | #include <QtWidgets/QGraphicsItem> | |
36 |
|
36 | |||
37 | QT_CHARTS_BEGIN_NAMESPACE |
|
37 | QT_CHARTS_BEGIN_NAMESPACE | |
38 |
|
38 |
@@ -18,12 +18,12 | |||||
18 | ** |
|
18 | ** | |
19 | ****************************************************************************/ |
|
19 | ****************************************************************************/ | |
20 |
|
20 | |||
21 |
#include |
|
21 | #include <QtCharts/QPercentBarSeries> | |
22 |
#include |
|
22 | #include <private/qpercentbarseries_p.h> | |
23 |
#include |
|
23 | #include <private/percentbarchartitem_p.h> | |
24 |
#include |
|
24 | #include <private/chartdataset_p.h> | |
25 |
#include |
|
25 | #include <private/charttheme_p.h> | |
26 |
#include |
|
26 | #include <QtCharts/QValueAxis> | |
27 |
|
27 | |||
28 | QT_CHARTS_BEGIN_NAMESPACE |
|
28 | QT_CHARTS_BEGIN_NAMESPACE | |
29 |
|
29 |
@@ -21,8 +21,8 | |||||
21 | #ifndef QPERCENTBARSERIES_H |
|
21 | #ifndef QPERCENTBARSERIES_H | |
22 | #define QPERCENTBARSERIES_H |
|
22 | #define QPERCENTBARSERIES_H | |
23 |
|
23 | |||
24 | #include <QStringList> |
|
24 | #include <QtCore/QStringList> | |
25 |
#include <QtCharts/ |
|
25 | #include <QtCharts/QAbstractBarSeries> | |
26 |
|
26 | |||
27 | QT_CHARTS_BEGIN_NAMESPACE |
|
27 | QT_CHARTS_BEGIN_NAMESPACE | |
28 |
|
28 |
@@ -30,8 +30,8 | |||||
30 | #ifndef QPERCENTBARSERIES_P_H |
|
30 | #ifndef QPERCENTBARSERIES_P_H | |
31 | #define QPERCENTBARSERIES_P_H |
|
31 | #define QPERCENTBARSERIES_P_H | |
32 |
|
32 | |||
33 |
#include |
|
33 | #include <private/qabstractbarseries_p.h> | |
34 |
#include |
|
34 | #include <private/abstractdomain_p.h> | |
35 |
|
35 | |||
36 | QT_CHARTS_BEGIN_NAMESPACE |
|
36 | QT_CHARTS_BEGIN_NAMESPACE | |
37 |
|
37 |
@@ -18,12 +18,12 | |||||
18 | ** |
|
18 | ** | |
19 | ****************************************************************************/ |
|
19 | ****************************************************************************/ | |
20 |
|
20 | |||
21 |
#include |
|
21 | #include <QtCharts/QStackedBarSeries> | |
22 |
#include |
|
22 | #include <private/qstackedbarseries_p.h> | |
23 |
#include |
|
23 | #include <private/stackedbarchartitem_p.h> | |
24 |
#include |
|
24 | #include <private/chartdataset_p.h> | |
25 |
#include |
|
25 | #include <private/charttheme_p.h> | |
26 |
#include |
|
26 | #include <QtCharts/QValueAxis> | |
27 |
|
27 | |||
28 | QT_CHARTS_BEGIN_NAMESPACE |
|
28 | QT_CHARTS_BEGIN_NAMESPACE | |
29 |
|
29 |
@@ -21,8 +21,8 | |||||
21 | #ifndef QSTACKEDBARSERIES_H |
|
21 | #ifndef QSTACKEDBARSERIES_H | |
22 | #define QSTACKEDBARSERIES_H |
|
22 | #define QSTACKEDBARSERIES_H | |
23 |
|
23 | |||
24 | #include <QStringList> |
|
24 | #include <QtCore/QStringList> | |
25 |
#include <QtCharts/ |
|
25 | #include <QtCharts/QAbstractBarSeries> | |
26 |
|
26 | |||
27 | QT_CHARTS_BEGIN_NAMESPACE |
|
27 | QT_CHARTS_BEGIN_NAMESPACE | |
28 |
|
28 |
@@ -30,8 +30,8 | |||||
30 | #ifndef QSTACKEDBARSERIES_P_H |
|
30 | #ifndef QSTACKEDBARSERIES_P_H | |
31 | #define QSTACKEDBARSERIES_P_H |
|
31 | #define QSTACKEDBARSERIES_P_H | |
32 |
|
32 | |||
33 |
#include |
|
33 | #include <private/qabstractbarseries_p.h> | |
34 |
#include |
|
34 | #include <private/abstractdomain_p.h> | |
35 |
|
35 | |||
36 | QT_CHARTS_BEGIN_NAMESPACE |
|
36 | QT_CHARTS_BEGIN_NAMESPACE | |
37 |
|
37 |
@@ -18,11 +18,11 | |||||
18 | ** |
|
18 | ** | |
19 | ****************************************************************************/ |
|
19 | ****************************************************************************/ | |
20 |
|
20 | |||
21 |
#include |
|
21 | #include <private/stackedbarchartitem_p.h> | |
22 |
#include |
|
22 | #include <private/bar_p.h> | |
23 |
#include |
|
23 | #include <private/qbarset_p.h> | |
24 |
#include |
|
24 | #include <private/qabstractbarseries_p.h> | |
25 | #include "qbarset.h" |
|
25 | #include <QtCharts/QBarSet> | |
26 |
|
26 | |||
27 | QT_CHARTS_BEGIN_NAMESPACE |
|
27 | QT_CHARTS_BEGIN_NAMESPACE | |
28 |
|
28 |
@@ -31,9 +31,9 | |||||
31 | #ifndef STACKEDBARCHARTITEM_H |
|
31 | #ifndef STACKEDBARCHARTITEM_H | |
32 | #define STACKEDBARCHARTITEM_H |
|
32 | #define STACKEDBARCHARTITEM_H | |
33 |
|
33 | |||
34 |
#include |
|
34 | #include <private/abstractbarchartitem_p.h> | |
35 |
#include < |
|
35 | #include <QtCharts/QStackedBarSeries> | |
36 | #include <QGraphicsItem> |
|
36 | #include <QtWidgets/QGraphicsItem> | |
37 |
|
37 | |||
38 | QT_CHARTS_BEGIN_NAMESPACE |
|
38 | QT_CHARTS_BEGIN_NAMESPACE | |
39 |
|
39 |
@@ -18,14 +18,14 | |||||
18 | ** |
|
18 | ** | |
19 | ****************************************************************************/ |
|
19 | ****************************************************************************/ | |
20 |
|
20 | |||
21 |
#include |
|
21 | #include <private/boxplotchartitem_p.h> | |
22 |
#include |
|
22 | #include <private/qboxplotseries_p.h> | |
23 |
#include |
|
23 | #include <private/bar_p.h> | |
24 |
#include |
|
24 | #include <private/qboxset_p.h> | |
25 |
#include |
|
25 | #include <private/qabstractbarseries_p.h> | |
26 | #include "qboxset.h" |
|
26 | #include <QtCharts/QBoxSet> | |
27 |
#include |
|
27 | #include <private/boxwhiskers_p.h> | |
28 | #include <QPainter> |
|
28 | #include <QtGui/QPainter> | |
29 |
|
29 | |||
30 | QT_CHARTS_BEGIN_NAMESPACE |
|
30 | QT_CHARTS_BEGIN_NAMESPACE | |
31 |
|
31 |
@@ -31,12 +31,12 | |||||
31 | #ifndef BOXPLOTCHARTITEM_H |
|
31 | #ifndef BOXPLOTCHARTITEM_H | |
32 | #define BOXPLOTCHARTITEM_H |
|
32 | #define BOXPLOTCHARTITEM_H | |
33 |
|
33 | |||
34 |
#include |
|
34 | #include <private/boxwhiskers_p.h> | |
35 |
#include |
|
35 | #include <QtCharts/QBoxPlotSeries> | |
36 |
#include |
|
36 | #include <private/chartitem_p.h> | |
37 |
#include |
|
37 | #include <private/boxplotanimation_p.h> | |
38 | #include "qboxset.h" |
|
38 | #include <QtCharts/QBoxSet> | |
39 | #include <QGraphicsItem> |
|
39 | #include <QtWidgets/QGraphicsItem> | |
40 |
|
40 | |||
41 | QT_CHARTS_BEGIN_NAMESPACE |
|
41 | QT_CHARTS_BEGIN_NAMESPACE | |
42 |
|
42 |
@@ -18,9 +18,9 | |||||
18 | ** |
|
18 | ** | |
19 | ****************************************************************************/ |
|
19 | ****************************************************************************/ | |
20 |
|
20 | |||
21 |
#include |
|
21 | #include <private/boxwhiskers_p.h> | |
22 | #include <QPainter> |
|
22 | #include <QtGui/QPainter> | |
23 | #include <QWidget> |
|
23 | #include <QtWidgets/QWidget> | |
24 |
|
24 | |||
25 | QT_CHARTS_BEGIN_NAMESPACE |
|
25 | QT_CHARTS_BEGIN_NAMESPACE | |
26 |
|
26 |
@@ -30,14 +30,14 | |||||
30 | #ifndef BOXWHISKERS_H |
|
30 | #ifndef BOXWHISKERS_H | |
31 | #define BOXWHISKERS_H |
|
31 | #define BOXWHISKERS_H | |
32 |
|
32 | |||
33 |
#include |
|
33 | #include <private/boxwhiskersdata_p.h> | |
34 |
#include |
|
34 | #include <QtCharts/QChartGlobal> | |
35 |
#include |
|
35 | #include <private/abstractdomain_p.h> | |
36 | #include <QBoxSet> |
|
36 | #include <QtCharts/QBoxSet> | |
37 | #include <QGraphicsRectItem> |
|
37 | #include <QtWidgets/QGraphicsRectItem> | |
38 | #include <QGraphicsLineItem> |
|
38 | #include <QtWidgets/QGraphicsLineItem> | |
39 | #include <QGraphicsLayoutItem> |
|
39 | #include <QtWidgets/QGraphicsLayoutItem> | |
40 | #include <QPainterPath> |
|
40 | #include <QtGui/QPainterPath> | |
41 |
|
41 | |||
42 | QT_CHARTS_BEGIN_NAMESPACE |
|
42 | QT_CHARTS_BEGIN_NAMESPACE | |
43 |
|
43 |
@@ -30,8 +30,8 | |||||
30 | #ifndef BOXWHISKERSDATA_P_H |
|
30 | #ifndef BOXWHISKERSDATA_P_H | |
31 | #define BOXWHISKERSDATA_P_H |
|
31 | #define BOXWHISKERSDATA_P_H | |
32 |
|
32 | |||
33 |
#include |
|
33 | #include <QtCharts/QChartGlobal> | |
34 | #include <QSizeF> |
|
34 | #include <QtCore/QSizeF> | |
35 |
|
35 | |||
36 | QT_CHARTS_BEGIN_NAMESPACE |
|
36 | QT_CHARTS_BEGIN_NAMESPACE | |
37 |
|
37 |
@@ -18,12 +18,12 | |||||
18 | ** |
|
18 | ** | |
19 | ****************************************************************************/ |
|
19 | ****************************************************************************/ | |
20 |
|
20 | |||
21 |
#include |
|
21 | #include <QtCharts/QBoxPlotModelMapper> | |
22 |
#include |
|
22 | #include <private/qboxplotmodelmapper_p.h> | |
23 |
#include |
|
23 | #include <QtCharts/QBoxPlotSeries> | |
24 | #include "qboxset.h" |
|
24 | #include <QtCharts/QBoxSet> | |
25 |
#include |
|
25 | #include <QtCharts/QChart> | |
26 | #include <QAbstractItemModel> |
|
26 | #include <QtCore/QAbstractItemModel> | |
27 |
|
27 | |||
28 | QT_CHARTS_BEGIN_NAMESPACE |
|
28 | QT_CHARTS_BEGIN_NAMESPACE | |
29 |
|
29 |
@@ -21,8 +21,8 | |||||
21 | #ifndef QBOXPLOTMODELMAPPER_H |
|
21 | #ifndef QBOXPLOTMODELMAPPER_H | |
22 | #define QBOXPLOTMODELMAPPER_H |
|
22 | #define QBOXPLOTMODELMAPPER_H | |
23 |
|
23 | |||
24 |
#include <QtCharts/ |
|
24 | #include <QtCharts/QChartGlobal> | |
25 | #include <QObject> |
|
25 | #include <QtCore/QObject> | |
26 |
|
26 | |||
27 | class QAbstractItemModel; |
|
27 | class QAbstractItemModel; | |
28 |
|
28 |
@@ -30,8 +30,8 | |||||
30 | #ifndef QBOXPLOTMODELMAPPER_P_H |
|
30 | #ifndef QBOXPLOTMODELMAPPER_P_H | |
31 | #define QBOXPLOTMODELMAPPER_P_H |
|
31 | #define QBOXPLOTMODELMAPPER_P_H | |
32 |
|
32 | |||
33 | #include <QObject> |
|
33 | #include <QtCore/QObject> | |
34 |
#include < |
|
34 | #include <QtCharts/QBoxPlotModelMapper> | |
35 |
|
35 | |||
36 | class QModelIndex; |
|
36 | class QModelIndex; | |
37 |
|
37 |
@@ -18,19 +18,19 | |||||
18 | ** |
|
18 | ** | |
19 | ****************************************************************************/ |
|
19 | ****************************************************************************/ | |
20 |
|
20 | |||
21 |
#include |
|
21 | #include <QtCharts/QBoxPlotSeries> | |
22 |
#include |
|
22 | #include <private/qboxplotseries_p.h> | |
23 |
#include |
|
23 | #include <QtCharts/QBoxPlotLegendMarker> | |
24 |
#include |
|
24 | #include <QtCharts/QBarCategoryAxis> | |
25 |
#include |
|
25 | #include <private/boxplotchartitem_p.h> | |
26 |
#include |
|
26 | #include <private/chartdataset_p.h> | |
27 |
#include |
|
27 | #include <private/charttheme_p.h> | |
28 |
#include |
|
28 | #include <QtCharts/QValueAxis> | |
29 |
#include |
|
29 | #include <private/charttheme_p.h> | |
30 |
#include |
|
30 | #include <private/boxplotanimation_p.h> | |
31 |
#include |
|
31 | #include <private/qchart_p.h> | |
32 | #include "qboxset.h" |
|
32 | #include <QtCharts/QBoxSet> | |
33 |
#include |
|
33 | #include <private/qboxset_p.h> | |
34 |
|
34 | |||
35 | QT_CHARTS_BEGIN_NAMESPACE |
|
35 | QT_CHARTS_BEGIN_NAMESPACE | |
36 |
|
36 |
@@ -21,9 +21,9 | |||||
21 | #ifndef QBOXPLOTSERIES_H |
|
21 | #ifndef QBOXPLOTSERIES_H | |
22 | #define QBOXPLOTSERIES_H |
|
22 | #define QBOXPLOTSERIES_H | |
23 |
|
23 | |||
24 |
#include <QtCharts/ |
|
24 | #include <QtCharts/QChartGlobal> | |
25 |
#include <QtCharts/ |
|
25 | #include <QtCharts/QBoxSet> | |
26 |
#include <QtCharts/ |
|
26 | #include <QtCharts/QAbstractSeries> | |
27 |
|
27 | |||
28 | QT_CHARTS_BEGIN_NAMESPACE |
|
28 | QT_CHARTS_BEGIN_NAMESPACE | |
29 |
|
29 |
@@ -30,10 +30,10 | |||||
30 | #ifndef QBOXPLOTSERIES_P_H |
|
30 | #ifndef QBOXPLOTSERIES_P_H | |
31 | #define QBOXPLOTSERIES_P_H |
|
31 | #define QBOXPLOTSERIES_P_H | |
32 |
|
32 | |||
33 |
#include |
|
33 | #include <QtCharts/QBoxPlotSeries> | |
34 |
#include |
|
34 | #include <private/qabstractbarseries_p.h> | |
35 |
#include |
|
35 | #include <private/abstractdomain_p.h> | |
36 | #include "qbarset.h" |
|
36 | #include <QtCharts/QBarSet> | |
37 |
|
37 | |||
38 | QT_CHARTS_BEGIN_NAMESPACE |
|
38 | QT_CHARTS_BEGIN_NAMESPACE | |
39 |
|
39 |
@@ -18,9 +18,9 | |||||
18 | ** |
|
18 | ** | |
19 | ****************************************************************************/ |
|
19 | ****************************************************************************/ | |
20 |
|
20 | |||
21 | #include "qboxset.h" |
|
21 | #include <QtCharts/QBoxSet> | |
22 |
#include |
|
22 | #include <private/qboxset_p.h> | |
23 |
#include |
|
23 | #include <private/charthelpers_p.h> | |
24 |
|
24 | |||
25 | QT_CHARTS_BEGIN_NAMESPACE |
|
25 | QT_CHARTS_BEGIN_NAMESPACE | |
26 |
|
26 |
@@ -21,10 +21,10 | |||||
21 | #ifndef QBOXSET_H |
|
21 | #ifndef QBOXSET_H | |
22 | #define QBOXSET_H |
|
22 | #define QBOXSET_H | |
23 |
|
23 | |||
24 |
#include <QtCharts/ |
|
24 | #include <QtCharts/QChartGlobal> | |
25 | #include <QPen> |
|
25 | #include <QtGui/QPen> | |
26 | #include <QBrush> |
|
26 | #include <QtGui/QBrush> | |
27 | #include <QFont> |
|
27 | #include <QtGui/QFont> | |
28 |
|
28 | |||
29 | QT_CHARTS_BEGIN_NAMESPACE |
|
29 | QT_CHARTS_BEGIN_NAMESPACE | |
30 | class QBoxSetPrivate; |
|
30 | class QBoxSetPrivate; |
@@ -30,11 +30,11 | |||||
30 | #ifndef QBOXSET_P_H |
|
30 | #ifndef QBOXSET_P_H | |
31 | #define QBOXSET_P_H |
|
31 | #define QBOXSET_P_H | |
32 |
|
32 | |||
33 |
#include < |
|
33 | #include <QtCharts/QBoxSet> | |
34 | #include <QMap> |
|
34 | #include <QtCore/QMap> | |
35 | #include <QPen> |
|
35 | #include <QtGui/QPen> | |
36 | #include <QBrush> |
|
36 | #include <QtGui/QBrush> | |
37 | #include <QFont> |
|
37 | #include <QtGui/QFont> | |
38 |
|
38 | |||
39 | QT_CHARTS_BEGIN_NAMESPACE |
|
39 | QT_CHARTS_BEGIN_NAMESPACE | |
40 |
|
40 |
@@ -18,7 +18,7 | |||||
18 | ** |
|
18 | ** | |
19 | ****************************************************************************/ |
|
19 | ****************************************************************************/ | |
20 |
|
20 | |||
21 |
#include |
|
21 | #include <QtCharts/QVBoxPlotModelMapper> | |
22 |
|
22 | |||
23 | QT_CHARTS_BEGIN_NAMESPACE |
|
23 | QT_CHARTS_BEGIN_NAMESPACE | |
24 |
|
24 |
@@ -18,11 +18,11 | |||||
18 | ** |
|
18 | ** | |
19 | ****************************************************************************/ |
|
19 | ****************************************************************************/ | |
20 |
|
20 | |||
21 |
#include |
|
21 | #include <private/chartbackground_p.h> | |
22 |
#include |
|
22 | #include <private/chartconfig_p.h> | |
23 | #include <QPen> |
|
23 | #include <QtGui/QPen> | |
24 | #include <QBrush> |
|
24 | #include <QtGui/QBrush> | |
25 | #include <QPainter> |
|
25 | #include <QtGui/QPainter> | |
26 | #include <QGraphicsDropShadowEffect> |
|
26 | #include <QGraphicsDropShadowEffect> | |
27 |
|
27 | |||
28 | QT_CHARTS_BEGIN_NAMESPACE |
|
28 | QT_CHARTS_BEGIN_NAMESPACE |
@@ -30,8 +30,8 | |||||
30 | #ifndef CHARTBACKGROUND_H |
|
30 | #ifndef CHARTBACKGROUND_H | |
31 | #define CHARTBACKGROUND_H |
|
31 | #define CHARTBACKGROUND_H | |
32 |
|
32 | |||
33 |
#include |
|
33 | #include <QtCharts/QChartGlobal> | |
34 | #include <QGraphicsRectItem> |
|
34 | #include <QtWidgets/QGraphicsRectItem> | |
35 |
|
35 | |||
36 | class QGraphicsDropShadowEffect; |
|
36 | class QGraphicsDropShadowEffect; | |
37 | QT_CHARTS_BEGIN_NAMESPACE |
|
37 | QT_CHARTS_BEGIN_NAMESPACE |
@@ -30,7 +30,7 | |||||
30 | #ifndef CHARTCONFIG_H |
|
30 | #ifndef CHARTCONFIG_H | |
31 | #define CHARTCONFIG_H |
|
31 | #define CHARTCONFIG_H | |
32 |
|
32 | |||
33 |
#include |
|
33 | #include <QtCharts/QChartGlobal> | |
34 |
|
34 | |||
35 | QT_CHARTS_BEGIN_NAMESPACE |
|
35 | QT_CHARTS_BEGIN_NAMESPACE | |
36 |
|
36 |
@@ -18,31 +18,31 | |||||
18 | ** |
|
18 | ** | |
19 | ****************************************************************************/ |
|
19 | ****************************************************************************/ | |
20 |
|
20 | |||
21 |
#include |
|
21 | #include <private/chartdataset_p.h> | |
22 |
#include |
|
22 | #include <private/chartpresenter_p.h> | |
23 |
#include |
|
23 | #include <QtCharts/QChart> | |
24 |
#include |
|
24 | #include <private/qchart_p.h> | |
25 |
#include |
|
25 | #include <QtCharts/QValueAxis> | |
26 |
#include |
|
26 | #include <QtCharts/QBarCategoryAxis> | |
27 |
#include |
|
27 | #include <private/qvalueaxis_p.h> | |
28 |
#include |
|
28 | #include <QtCharts/QCategoryAxis> | |
29 |
#include |
|
29 | #include <private/qabstractseries_p.h> | |
30 |
#include |
|
30 | #include <QtCharts/QAbstractBarSeries> | |
31 |
#include |
|
31 | #include <QtCharts/QStackedBarSeries> | |
32 |
#include |
|
32 | #include <QtCharts/QPercentBarSeries> | |
33 |
#include |
|
33 | #include <QtCharts/QPieSeries> | |
34 |
#include |
|
34 | #include <private/chartitem_p.h> | |
35 |
#include |
|
35 | #include <private/xydomain_p.h> | |
36 |
#include |
|
36 | #include <private/xypolardomain_p.h> | |
37 |
#include |
|
37 | #include <private/xlogydomain_p.h> | |
38 |
#include |
|
38 | #include <private/logxydomain_p.h> | |
39 |
#include |
|
39 | #include <private/logxlogydomain_p.h> | |
40 |
#include |
|
40 | #include <private/xlogypolardomain_p.h> | |
41 |
#include |
|
41 | #include <private/logxypolardomain_p.h> | |
42 |
#include |
|
42 | #include <private/logxlogypolardomain_p.h> | |
43 |
|
43 | |||
44 | #ifndef QT_ON_ARM |
|
44 | #ifndef QT_ON_ARM | |
45 |
#include |
|
45 | #include <QtCharts/QDateTimeAxis> | |
46 | #endif |
|
46 | #endif | |
47 |
|
47 | |||
48 | QT_CHARTS_BEGIN_NAMESPACE |
|
48 | QT_CHARTS_BEGIN_NAMESPACE |
@@ -30,10 +30,10 | |||||
30 | #ifndef CHARTDATASET_P_H |
|
30 | #ifndef CHARTDATASET_P_H | |
31 | #define CHARTDATASET_P_H |
|
31 | #define CHARTDATASET_P_H | |
32 |
|
32 | |||
33 |
#include |
|
33 | #include <QtCharts/QAbstractSeries> | |
34 |
#include |
|
34 | #include <private/abstractdomain_p.h> | |
35 |
#include |
|
35 | #include <private/qabstractaxis_p.h> | |
36 | #include <QVector> |
|
36 | #include <QtCore/QVector> | |
37 |
|
37 | |||
38 | QT_CHARTS_BEGIN_NAMESPACE |
|
38 | QT_CHARTS_BEGIN_NAMESPACE | |
39 |
|
39 |
@@ -18,9 +18,9 | |||||
18 | ** |
|
18 | ** | |
19 | ****************************************************************************/ |
|
19 | ****************************************************************************/ | |
20 |
|
20 | |||
21 |
#include |
|
21 | #include <private/chartelement_p.h> | |
22 |
#include |
|
22 | #include <private/chartpresenter_p.h> | |
23 |
#include |
|
23 | #include <private/abstractdomain_p.h> | |
24 |
|
24 | |||
25 | QT_CHARTS_BEGIN_NAMESPACE |
|
25 | QT_CHARTS_BEGIN_NAMESPACE | |
26 |
|
26 |
@@ -30,9 +30,9 | |||||
30 | #ifndef CHARTELEMENT_H |
|
30 | #ifndef CHARTELEMENT_H | |
31 | #define CHARTELEMENT_H |
|
31 | #define CHARTELEMENT_H | |
32 |
|
32 | |||
33 |
#include |
|
33 | #include <QtCharts/QChartGlobal> | |
34 | #include <QObject> |
|
34 | #include <QtCore/QObject> | |
35 | #include <QRect> |
|
35 | #include <QtCore/QRect> | |
36 | #include <QGraphicsObject> |
|
36 | #include <QGraphicsObject> | |
37 |
|
37 | |||
38 | QT_CHARTS_BEGIN_NAMESPACE |
|
38 | QT_CHARTS_BEGIN_NAMESPACE |
@@ -30,8 +30,8 | |||||
30 | #ifndef CHARTHELPERS_P_H |
|
30 | #ifndef CHARTHELPERS_P_H | |
31 | #define CHARTHELPERS_P_H |
|
31 | #define CHARTHELPERS_P_H | |
32 |
|
32 | |||
33 |
#include < |
|
33 | #include <QtCore/QtNumeric> | |
34 | #include <QPointF> |
|
34 | #include <QtCore/QPointF> | |
35 |
|
35 | |||
36 | static inline bool isValidValue(qreal value) |
|
36 | static inline bool isValidValue(qreal value) | |
37 | { |
|
37 | { |
@@ -18,9 +18,9 | |||||
18 | ** |
|
18 | ** | |
19 | ****************************************************************************/ |
|
19 | ****************************************************************************/ | |
20 |
|
20 | |||
21 |
#include |
|
21 | #include <private/chartitem_p.h> | |
22 |
#include |
|
22 | #include <private/qabstractseries_p.h> | |
23 |
#include |
|
23 | #include <private/abstractdomain_p.h> | |
24 |
|
24 | |||
25 | QT_CHARTS_BEGIN_NAMESPACE |
|
25 | QT_CHARTS_BEGIN_NAMESPACE | |
26 |
|
26 |
@@ -30,9 +30,9 | |||||
30 | #ifndef CHARTITEM_H |
|
30 | #ifndef CHARTITEM_H | |
31 | #define CHARTITEM_H |
|
31 | #define CHARTITEM_H | |
32 |
|
32 | |||
33 |
#include |
|
33 | #include <private/chartelement_p.h> | |
34 |
#include |
|
34 | #include <private/chartpresenter_p.h> | |
35 | #include <QGraphicsItem> |
|
35 | #include <QtWidgets/QGraphicsItem> | |
36 |
|
36 | |||
37 | QT_CHARTS_BEGIN_NAMESPACE |
|
37 | QT_CHARTS_BEGIN_NAMESPACE | |
38 |
|
38 |
@@ -17,23 +17,23 | |||||
17 | ** $QT_END_LICENSE$ |
|
17 | ** $QT_END_LICENSE$ | |
18 | ** |
|
18 | ** | |
19 | ****************************************************************************/ |
|
19 | ****************************************************************************/ | |
20 |
#include |
|
20 | #include <private/chartpresenter_p.h> | |
21 |
#include |
|
21 | #include <QtCharts/QChart> | |
22 |
#include |
|
22 | #include <private/chartitem_p.h> | |
23 |
#include |
|
23 | #include <private/qchart_p.h> | |
24 |
#include |
|
24 | #include <QtCharts/QAbstractAxis> | |
25 |
#include |
|
25 | #include <private/qabstractaxis_p.h> | |
26 |
#include |
|
26 | #include <private/chartdataset_p.h> | |
27 |
#include |
|
27 | #include <private/chartanimation_p.h> | |
28 |
#include |
|
28 | #include <private/qabstractseries_p.h> | |
29 |
#include |
|
29 | #include <QtCharts/QAreaSeries> | |
30 |
#include |
|
30 | #include <private/chartaxiselement_p.h> | |
31 |
#include |
|
31 | #include <private/chartbackground_p.h> | |
32 |
#include |
|
32 | #include <private/cartesianchartlayout_p.h> | |
33 |
#include |
|
33 | #include <private/polarchartlayout_p.h> | |
34 |
#include |
|
34 | #include <private/charttitle_p.h> | |
35 | #include <QTimer> |
|
35 | #include <QtCore/QTimer> | |
36 | #include <QTextDocument> |
|
36 | #include <QtGui/QTextDocument> | |
37 |
|
37 | |||
38 | QT_CHARTS_BEGIN_NAMESPACE |
|
38 | QT_CHARTS_BEGIN_NAMESPACE | |
39 |
|
39 |
@@ -30,11 +30,11 | |||||
30 | #ifndef CHARTPRESENTER_H |
|
30 | #ifndef CHARTPRESENTER_H | |
31 | #define CHARTPRESENTER_H |
|
31 | #define CHARTPRESENTER_H | |
32 |
|
32 | |||
33 |
#include |
|
33 | #include <QtCharts/QChartGlobal> | |
34 |
#include |
|
34 | #include <QtCharts/QChart> //because of QChart::ChartThemeId | |
35 | #include <QRectF> |
|
35 | #include <QtCore/QRectF> | |
36 | #include <QMargins> |
|
36 | #include <QtCore/QMargins> | |
37 | #include <QLocale> |
|
37 | #include <QtCore/QLocale> | |
38 |
|
38 | |||
39 | QT_CHARTS_BEGIN_NAMESPACE |
|
39 | QT_CHARTS_BEGIN_NAMESPACE | |
40 |
|
40 |
@@ -17,19 +17,19 | |||||
17 | ** $QT_END_LICENSE$ |
|
17 | ** $QT_END_LICENSE$ | |
18 | ** |
|
18 | ** | |
19 | ****************************************************************************/ |
|
19 | ****************************************************************************/ | |
20 |
#include |
|
20 | #include <private/qabstractseries_p.h> | |
21 |
#include |
|
21 | #include <private/qabstractaxis_p.h> | |
22 | #include <QTime> |
|
22 | #include <QtCore/QTime> | |
23 | //themes |
|
23 | //themes | |
24 |
#include |
|
24 | #include <private/chartthemesystem_p.h> | |
25 |
#include |
|
25 | #include <private/chartthemelight_p.h> | |
26 |
#include |
|
26 | #include <private/chartthemebluecerulean_p.h> | |
27 |
#include |
|
27 | #include <private/chartthemedark_p.h> | |
28 |
#include |
|
28 | #include <private/chartthemebrownsand_p.h> | |
29 |
#include |
|
29 | #include <private/chartthemebluencs_p.h> | |
30 |
#include |
|
30 | #include <private/chartthemehighcontrast_p.h> | |
31 |
#include |
|
31 | #include <private/chartthemeblueicy_p.h> | |
32 |
#include |
|
32 | #include <private/chartthemeqt_p.h> | |
33 |
|
33 | |||
34 | QT_CHARTS_BEGIN_NAMESPACE |
|
34 | QT_CHARTS_BEGIN_NAMESPACE | |
35 |
|
35 |
@@ -30,10 +30,10 | |||||
30 | #ifndef CHARTTHEMEMANAGER_H |
|
30 | #ifndef CHARTTHEMEMANAGER_H | |
31 | #define CHARTTHEMEMANAGER_H |
|
31 | #define CHARTTHEMEMANAGER_H | |
32 |
|
32 | |||
33 |
#include |
|
33 | #include <QtCharts/QChartGlobal> | |
34 |
#include |
|
34 | #include <QtCharts/QChart> | |
35 | #include <QColor> |
|
35 | #include <QtGui/QColor> | |
36 | #include <QGradientStops> |
|
36 | #include <QtGui/QGradientStops> | |
37 |
|
37 | |||
38 | QT_CHARTS_BEGIN_NAMESPACE |
|
38 | QT_CHARTS_BEGIN_NAMESPACE | |
39 | class ChartTheme; |
|
39 | class ChartTheme; |
@@ -18,12 +18,12 | |||||
18 | ** |
|
18 | ** | |
19 | ****************************************************************************/ |
|
19 | ****************************************************************************/ | |
20 |
|
20 | |||
21 |
#include |
|
21 | #include <private/charttitle_p.h> | |
22 |
#include |
|
22 | #include <private/chartpresenter_p.h> | |
23 | #include <QFont> |
|
23 | #include <QtGui/QFont> | |
24 | #include <QFontMetrics> |
|
24 | #include <QtGui/QFontMetrics> | |
25 | #include <QDebug> |
|
25 | #include <QtCore/QDebug> | |
26 | #include <QTextDocument> |
|
26 | #include <QtGui/QTextDocument> | |
27 |
|
27 | |||
28 | QT_CHARTS_BEGIN_NAMESPACE |
|
28 | QT_CHARTS_BEGIN_NAMESPACE | |
29 |
|
29 |
@@ -30,8 +30,8 | |||||
30 | #ifndef CHARTTITLE_P_H_ |
|
30 | #ifndef CHARTTITLE_P_H_ | |
31 | #define CHARTTITLE_P_H_ |
|
31 | #define CHARTTITLE_P_H_ | |
32 |
|
32 | |||
33 |
#include |
|
33 | #include <QtCharts/QChartGlobal> | |
34 | #include <QGraphicsTextItem> |
|
34 | #include <QtWidgets/QGraphicsTextItem> | |
35 |
|
35 | |||
36 | QT_CHARTS_BEGIN_NAMESPACE |
|
36 | QT_CHARTS_BEGIN_NAMESPACE | |
37 |
|
37 |
@@ -18,9 +18,9 | |||||
18 | ** |
|
18 | ** | |
19 | ****************************************************************************/ |
|
19 | ****************************************************************************/ | |
20 |
|
20 | |||
21 |
#include |
|
21 | #include <private/abstractdomain_p.h> | |
22 |
#include |
|
22 | #include <private/qabstractaxis_p.h> | |
23 |
#include < |
|
23 | #include <QtCore/QtMath> | |
24 |
|
24 | |||
25 | QT_CHARTS_BEGIN_NAMESPACE |
|
25 | QT_CHARTS_BEGIN_NAMESPACE | |
26 |
|
26 |
@@ -29,10 +29,10 | |||||
29 |
|
29 | |||
30 | #ifndef ABSTRACTDOMAIN_H |
|
30 | #ifndef ABSTRACTDOMAIN_H | |
31 | #define ABSTRACTDOMAIN_H |
|
31 | #define ABSTRACTDOMAIN_H | |
32 |
#include |
|
32 | #include <QtCharts/QChartGlobal> | |
33 | #include <QRectF> |
|
33 | #include <QtCore/QRectF> | |
34 | #include <QSizeF> |
|
34 | #include <QtCore/QSizeF> | |
35 | #include <QDebug> |
|
35 | #include <QtCore/QDebug> | |
36 |
|
36 | |||
37 | QT_CHARTS_BEGIN_NAMESPACE |
|
37 | QT_CHARTS_BEGIN_NAMESPACE | |
38 |
|
38 |
@@ -18,10 +18,10 | |||||
18 | ** |
|
18 | ** | |
19 | ****************************************************************************/ |
|
19 | ****************************************************************************/ | |
20 |
|
20 | |||
21 |
#include |
|
21 | #include <private/logxlogydomain_p.h> | |
22 |
#include |
|
22 | #include <private/qabstractaxis_p.h> | |
23 |
#include |
|
23 | #include <QtCharts/QLogValueAxis> | |
24 |
#include < |
|
24 | #include <QtCore/QtMath> | |
25 |
|
25 | |||
26 | QT_CHARTS_BEGIN_NAMESPACE |
|
26 | QT_CHARTS_BEGIN_NAMESPACE | |
27 |
|
27 |
@@ -29,9 +29,9 | |||||
29 |
|
29 | |||
30 | #ifndef LOGXLOGYDOMAIN_H |
|
30 | #ifndef LOGXLOGYDOMAIN_H | |
31 | #define LOGXLOGYDOMAIN_H |
|
31 | #define LOGXLOGYDOMAIN_H | |
32 |
#include |
|
32 | #include <private/abstractdomain_p.h> | |
33 | #include <QRectF> |
|
33 | #include <QtCore/QRectF> | |
34 | #include <QSizeF> |
|
34 | #include <QtCore/QSizeF> | |
35 |
|
35 | |||
36 | QT_CHARTS_BEGIN_NAMESPACE |
|
36 | QT_CHARTS_BEGIN_NAMESPACE | |
37 |
|
37 |
@@ -18,10 +18,10 | |||||
18 | ** |
|
18 | ** | |
19 | ****************************************************************************/ |
|
19 | ****************************************************************************/ | |
20 |
|
20 | |||
21 |
#include |
|
21 | #include <private/logxlogypolardomain_p.h> | |
22 |
#include |
|
22 | #include <private/qabstractaxis_p.h> | |
23 |
#include |
|
23 | #include <QtCharts/QLogValueAxis> | |
24 |
#include < |
|
24 | #include <QtCore/QtMath> | |
25 |
|
25 | |||
26 | QT_CHARTS_BEGIN_NAMESPACE |
|
26 | QT_CHARTS_BEGIN_NAMESPACE | |
27 |
|
27 |
@@ -29,9 +29,9 | |||||
29 |
|
29 | |||
30 | #ifndef LOGXLOGYPOLARDOMAIN_H |
|
30 | #ifndef LOGXLOGYPOLARDOMAIN_H | |
31 | #define LOGXLOGYPOLARDOMAIN_H |
|
31 | #define LOGXLOGYPOLARDOMAIN_H | |
32 |
#include |
|
32 | #include <private/polardomain_p.h> | |
33 | #include <QRectF> |
|
33 | #include <QtCore/QRectF> | |
34 | #include <QSizeF> |
|
34 | #include <QtCore/QSizeF> | |
35 |
|
35 | |||
36 | QT_CHARTS_BEGIN_NAMESPACE |
|
36 | QT_CHARTS_BEGIN_NAMESPACE | |
37 |
|
37 |
@@ -18,10 +18,10 | |||||
18 | ** |
|
18 | ** | |
19 | ****************************************************************************/ |
|
19 | ****************************************************************************/ | |
20 |
|
20 | |||
21 |
#include |
|
21 | #include <private/logxydomain_p.h> | |
22 |
#include |
|
22 | #include <private/qabstractaxis_p.h> | |
23 |
#include |
|
23 | #include <QtCharts/QLogValueAxis> | |
24 |
#include < |
|
24 | #include <QtCore/QtMath> | |
25 |
|
25 | |||
26 | QT_CHARTS_BEGIN_NAMESPACE |
|
26 | QT_CHARTS_BEGIN_NAMESPACE | |
27 |
|
27 |
@@ -29,9 +29,9 | |||||
29 |
|
29 | |||
30 | #ifndef LOGXYDOMAIN_H |
|
30 | #ifndef LOGXYDOMAIN_H | |
31 | #define LOGXYDOMAIN_H |
|
31 | #define LOGXYDOMAIN_H | |
32 |
#include |
|
32 | #include <private/abstractdomain_p.h> | |
33 | #include <QRectF> |
|
33 | #include <QtCore/QRectF> | |
34 | #include <QSizeF> |
|
34 | #include <QtCore/QSizeF> | |
35 |
|
35 | |||
36 | QT_CHARTS_BEGIN_NAMESPACE |
|
36 | QT_CHARTS_BEGIN_NAMESPACE | |
37 |
|
37 |
@@ -18,10 +18,10 | |||||
18 | ** |
|
18 | ** | |
19 | ****************************************************************************/ |
|
19 | ****************************************************************************/ | |
20 |
|
20 | |||
21 |
#include |
|
21 | #include <private/logxypolardomain_p.h> | |
22 |
#include |
|
22 | #include <private/qabstractaxis_p.h> | |
23 |
#include |
|
23 | #include <QtCharts/QLogValueAxis> | |
24 |
#include < |
|
24 | #include <QtCore/QtMath> | |
25 |
|
25 | |||
26 | QT_CHARTS_BEGIN_NAMESPACE |
|
26 | QT_CHARTS_BEGIN_NAMESPACE | |
27 |
|
27 |
@@ -29,9 +29,9 | |||||
29 |
|
29 | |||
30 | #ifndef LOGXYPOLARDOMAIN_H |
|
30 | #ifndef LOGXYPOLARDOMAIN_H | |
31 | #define LOGXYPOLARDOMAIN_H |
|
31 | #define LOGXYPOLARDOMAIN_H | |
32 |
#include |
|
32 | #include <private/polardomain_p.h> | |
33 | #include <QRectF> |
|
33 | #include <QtCore/QRectF> | |
34 | #include <QSizeF> |
|
34 | #include <QtCore/QSizeF> | |
35 |
|
35 | |||
36 | QT_CHARTS_BEGIN_NAMESPACE |
|
36 | QT_CHARTS_BEGIN_NAMESPACE | |
37 |
|
37 |
@@ -18,9 +18,9 | |||||
18 | ** |
|
18 | ** | |
19 | ****************************************************************************/ |
|
19 | ****************************************************************************/ | |
20 |
|
20 | |||
21 |
#include |
|
21 | #include <private/polardomain_p.h> | |
22 |
#include |
|
22 | #include <private/qabstractaxis_p.h> | |
23 |
#include < |
|
23 | #include <QtCore/QtMath> | |
24 |
|
24 | |||
25 | QT_CHARTS_BEGIN_NAMESPACE |
|
25 | QT_CHARTS_BEGIN_NAMESPACE | |
26 |
|
26 |
@@ -29,9 +29,9 | |||||
29 |
|
29 | |||
30 | #ifndef POLARDOMAIN_H |
|
30 | #ifndef POLARDOMAIN_H | |
31 | #define POLARDOMAIN_H |
|
31 | #define POLARDOMAIN_H | |
32 |
#include |
|
32 | #include <private/abstractdomain_p.h> | |
33 | #include <QRectF> |
|
33 | #include <QtCore/QRectF> | |
34 | #include <QSizeF> |
|
34 | #include <QtCore/QSizeF> | |
35 |
|
35 | |||
36 | QT_CHARTS_BEGIN_NAMESPACE |
|
36 | QT_CHARTS_BEGIN_NAMESPACE | |
37 |
|
37 |
@@ -18,10 +18,10 | |||||
18 | ** |
|
18 | ** | |
19 | ****************************************************************************/ |
|
19 | ****************************************************************************/ | |
20 |
|
20 | |||
21 |
#include |
|
21 | #include <private/xlogydomain_p.h> | |
22 |
#include |
|
22 | #include <private/qabstractaxis_p.h> | |
23 |
#include |
|
23 | #include <QtCharts/QLogValueAxis> | |
24 |
#include < |
|
24 | #include <QtCore/QtMath> | |
25 |
|
25 | |||
26 | QT_CHARTS_BEGIN_NAMESPACE |
|
26 | QT_CHARTS_BEGIN_NAMESPACE | |
27 |
|
27 |
@@ -29,9 +29,9 | |||||
29 |
|
29 | |||
30 | #ifndef XLOGYDOMAIN_H |
|
30 | #ifndef XLOGYDOMAIN_H | |
31 | #define XLOGYDOMAIN_H |
|
31 | #define XLOGYDOMAIN_H | |
32 |
#include |
|
32 | #include <private/abstractdomain_p.h> | |
33 | #include <QRectF> |
|
33 | #include <QtCore/QRectF> | |
34 | #include <QSizeF> |
|
34 | #include <QtCore/QSizeF> | |
35 |
|
35 | |||
36 | QT_CHARTS_BEGIN_NAMESPACE |
|
36 | QT_CHARTS_BEGIN_NAMESPACE | |
37 |
|
37 |
@@ -18,10 +18,10 | |||||
18 | ** |
|
18 | ** | |
19 | ****************************************************************************/ |
|
19 | ****************************************************************************/ | |
20 |
|
20 | |||
21 |
#include |
|
21 | #include <private/xlogypolardomain_p.h> | |
22 |
#include |
|
22 | #include <private/qabstractaxis_p.h> | |
23 |
#include |
|
23 | #include <QtCharts/QLogValueAxis> | |
24 |
#include < |
|
24 | #include <QtCore/QtMath> | |
25 |
|
25 | |||
26 | QT_CHARTS_BEGIN_NAMESPACE |
|
26 | QT_CHARTS_BEGIN_NAMESPACE | |
27 |
|
27 |
@@ -29,9 +29,9 | |||||
29 |
|
29 | |||
30 | #ifndef XLOGYPOLARDOMAIN_H |
|
30 | #ifndef XLOGYPOLARDOMAIN_H | |
31 | #define XLOGYPOLARDOMAIN_H |
|
31 | #define XLOGYPOLARDOMAIN_H | |
32 |
#include |
|
32 | #include <private/polardomain_p.h> | |
33 | #include <QRectF> |
|
33 | #include <QtCore/QRectF> | |
34 | #include <QSizeF> |
|
34 | #include <QtCore/QSizeF> | |
35 |
|
35 | |||
36 | QT_CHARTS_BEGIN_NAMESPACE |
|
36 | QT_CHARTS_BEGIN_NAMESPACE | |
37 |
|
37 |
@@ -18,9 +18,9 | |||||
18 | ** |
|
18 | ** | |
19 | ****************************************************************************/ |
|
19 | ****************************************************************************/ | |
20 |
|
20 | |||
21 |
#include |
|
21 | #include <private/xydomain_p.h> | |
22 |
#include |
|
22 | #include <private/qabstractaxis_p.h> | |
23 |
#include < |
|
23 | #include <QtCore/QtMath> | |
24 |
|
24 | |||
25 | QT_CHARTS_BEGIN_NAMESPACE |
|
25 | QT_CHARTS_BEGIN_NAMESPACE | |
26 |
|
26 |
@@ -29,9 +29,9 | |||||
29 |
|
29 | |||
30 | #ifndef XYDOMAIN_H |
|
30 | #ifndef XYDOMAIN_H | |
31 | #define XYDOMAIN_H |
|
31 | #define XYDOMAIN_H | |
32 |
#include |
|
32 | #include <private/abstractdomain_p.h> | |
33 | #include <QRectF> |
|
33 | #include <QtCore/QRectF> | |
34 | #include <QSizeF> |
|
34 | #include <QtCore/QSizeF> | |
35 |
|
35 | |||
36 | QT_CHARTS_BEGIN_NAMESPACE |
|
36 | QT_CHARTS_BEGIN_NAMESPACE | |
37 |
|
37 |
@@ -18,9 +18,9 | |||||
18 | ** |
|
18 | ** | |
19 | ****************************************************************************/ |
|
19 | ****************************************************************************/ | |
20 |
|
20 | |||
21 |
#include |
|
21 | #include <private/xypolardomain_p.h> | |
22 |
#include |
|
22 | #include <private/qabstractaxis_p.h> | |
23 |
#include < |
|
23 | #include <QtCore/QtMath> | |
24 |
|
24 | |||
25 | QT_CHARTS_BEGIN_NAMESPACE |
|
25 | QT_CHARTS_BEGIN_NAMESPACE | |
26 |
|
26 |
@@ -29,8 +29,8 | |||||
29 |
|
29 | |||
30 | #ifndef XYPOLARDOMAIN_H |
|
30 | #ifndef XYPOLARDOMAIN_H | |
31 | #define XYPOLARDOMAIN_H |
|
31 | #define XYPOLARDOMAIN_H | |
32 |
#include |
|
32 | #include <private/polardomain_p.h> | |
33 | #include <QRectF> |
|
33 | #include <QtCore/QRectF> | |
34 |
|
34 | |||
35 | QT_CHARTS_BEGIN_NAMESPACE |
|
35 | QT_CHARTS_BEGIN_NAMESPACE | |
36 |
|
36 |
@@ -18,13 +18,13 | |||||
18 | ** |
|
18 | ** | |
19 | ****************************************************************************/ |
|
19 | ****************************************************************************/ | |
20 |
|
20 | |||
21 |
#include |
|
21 | #include <private/abstractchartlayout_p.h> | |
22 |
#include |
|
22 | #include <private/chartpresenter_p.h> | |
23 |
#include |
|
23 | #include <private/qlegend_p.h> | |
24 |
#include |
|
24 | #include <private/chartaxiselement_p.h> | |
25 |
#include |
|
25 | #include <private/charttitle_p.h> | |
26 |
#include |
|
26 | #include <private/chartbackground_p.h> | |
27 | #include <QDebug> |
|
27 | #include <QtCore/QDebug> | |
28 |
|
28 | |||
29 | QT_CHARTS_BEGIN_NAMESPACE |
|
29 | QT_CHARTS_BEGIN_NAMESPACE | |
30 |
|
30 |
@@ -30,9 +30,9 | |||||
30 | #ifndef ABSTRACTCHARTLAYOUT_H |
|
30 | #ifndef ABSTRACTCHARTLAYOUT_H | |
31 | #define ABSTRACTCHARTLAYOUT_H |
|
31 | #define ABSTRACTCHARTLAYOUT_H | |
32 |
|
32 | |||
33 | #include <QGraphicsLayout> |
|
33 | #include <QtWidgets/QGraphicsLayout> | |
34 | #include <QMargins> |
|
34 | #include <QtCore/QMargins> | |
35 |
#include |
|
35 | #include <QtCharts/QChartGlobal> | |
36 |
|
36 | |||
37 | QT_CHARTS_BEGIN_NAMESPACE |
|
37 | QT_CHARTS_BEGIN_NAMESPACE | |
38 |
|
38 |
@@ -18,10 +18,10 | |||||
18 | ** |
|
18 | ** | |
19 | ****************************************************************************/ |
|
19 | ****************************************************************************/ | |
20 |
|
20 | |||
21 |
#include |
|
21 | #include <private/cartesianchartlayout_p.h> | |
22 |
#include |
|
22 | #include <private/chartpresenter_p.h> | |
23 |
#include |
|
23 | #include <private/chartaxiselement_p.h> | |
24 | #include <QDebug> |
|
24 | #include <QtCore/QDebug> | |
25 |
|
25 | |||
26 | QT_CHARTS_BEGIN_NAMESPACE |
|
26 | QT_CHARTS_BEGIN_NAMESPACE | |
27 |
|
27 |
@@ -30,7 +30,7 | |||||
30 | #ifndef CARTESIANCHARTLAYOUT_H |
|
30 | #ifndef CARTESIANCHARTLAYOUT_H | |
31 | #define CARTESIANCHARTLAYOUT_H |
|
31 | #define CARTESIANCHARTLAYOUT_H | |
32 |
|
32 | |||
33 |
#include |
|
33 | #include <private/abstractchartlayout_p.h> | |
34 |
|
34 | |||
35 | QT_CHARTS_BEGIN_NAMESPACE |
|
35 | QT_CHARTS_BEGIN_NAMESPACE | |
36 |
|
36 |
@@ -18,10 +18,10 | |||||
18 | ** |
|
18 | ** | |
19 | ****************************************************************************/ |
|
19 | ****************************************************************************/ | |
20 |
|
20 | |||
21 |
#include |
|
21 | #include <private/polarchartlayout_p.h> | |
22 |
#include |
|
22 | #include <private/chartpresenter_p.h> | |
23 |
#include |
|
23 | #include <private/polarchartaxis_p.h> | |
24 | #include <QDebug> |
|
24 | #include <QtCore/QDebug> | |
25 |
|
25 | |||
26 | QT_CHARTS_BEGIN_NAMESPACE |
|
26 | QT_CHARTS_BEGIN_NAMESPACE | |
27 |
|
27 |
@@ -30,7 +30,7 | |||||
30 | #ifndef POLARCHARTLAYOUT_H |
|
30 | #ifndef POLARCHARTLAYOUT_H | |
31 | #define POLARCHARTLAYOUT_H |
|
31 | #define POLARCHARTLAYOUT_H | |
32 |
|
32 | |||
33 |
#include |
|
33 | #include <private/abstractchartlayout_p.h> | |
34 |
|
34 | |||
35 | QT_CHARTS_BEGIN_NAMESPACE |
|
35 | QT_CHARTS_BEGIN_NAMESPACE | |
36 |
|
36 |
@@ -18,14 +18,14 | |||||
18 | ** |
|
18 | ** | |
19 | ****************************************************************************/ |
|
19 | ****************************************************************************/ | |
20 |
|
20 | |||
21 |
#include |
|
21 | #include <private/legendlayout_p.h> | |
22 |
#include |
|
22 | #include <private/chartpresenter_p.h> | |
23 |
#include |
|
23 | #include <private/qlegend_p.h> | |
24 |
#include |
|
24 | #include <private/abstractchartlayout_p.h> | |
25 |
|
25 | |||
26 |
#include |
|
26 | #include <private/qlegendmarker_p.h> | |
27 |
#include |
|
27 | #include <private/legendmarkeritem_p.h> | |
28 |
#include |
|
28 | #include <QtCharts/QLegendMarker> | |
29 |
|
29 | |||
30 | QT_CHARTS_BEGIN_NAMESPACE |
|
30 | QT_CHARTS_BEGIN_NAMESPACE | |
31 |
|
31 |
@@ -29,8 +29,8 | |||||
29 |
|
29 | |||
30 | #ifndef LEGENDLAYOUT_H |
|
30 | #ifndef LEGENDLAYOUT_H | |
31 | #define LEGENDLAYOUT_H |
|
31 | #define LEGENDLAYOUT_H | |
32 | #include <QGraphicsLayout> |
|
32 | #include <QtWidgets/QGraphicsLayout> | |
33 |
#include |
|
33 | #include <QtCharts/QChartGlobal> | |
34 |
|
34 | |||
35 | QT_CHARTS_BEGIN_NAMESPACE |
|
35 | QT_CHARTS_BEGIN_NAMESPACE | |
36 |
|
36 |
@@ -18,17 +18,17 | |||||
18 | ** |
|
18 | ** | |
19 | ****************************************************************************/ |
|
19 | ****************************************************************************/ | |
20 |
|
20 | |||
21 | #include <QPainter> |
|
21 | #include <QtGui/QPainter> | |
22 | #include <QGraphicsSceneEvent> |
|
22 | #include <QtWidgets/QGraphicsSceneEvent> | |
23 | #include <QGraphicsTextItem> |
|
23 | #include <QtWidgets/QGraphicsTextItem> | |
24 | #include <QTextDocument> |
|
24 | #include <QtGui/QTextDocument> | |
25 |
|
25 | |||
26 | #include "qlegend.h" |
|
26 | #include <QtCharts/QLegend> | |
27 |
#include |
|
27 | #include <private/qlegend_p.h> | |
28 |
#include |
|
28 | #include <QtCharts/QLegendMarker> | |
29 |
#include |
|
29 | #include <private/qlegendmarker_p.h> | |
30 |
#include |
|
30 | #include <private/legendmarkeritem_p.h> | |
31 |
#include |
|
31 | #include <private/chartpresenter_p.h> | |
32 |
|
32 | |||
33 | QT_CHARTS_BEGIN_NAMESPACE |
|
33 | QT_CHARTS_BEGIN_NAMESPACE | |
34 |
|
34 |
@@ -30,13 +30,13 | |||||
30 | #ifndef LEGENDMARKERITEM_P_H |
|
30 | #ifndef LEGENDMARKERITEM_P_H | |
31 | #define LEGENDMARKERITEM_P_H |
|
31 | #define LEGENDMARKERITEM_P_H | |
32 |
|
32 | |||
33 |
#include < |
|
33 | #include <QtCharts/QChartGlobal> | |
34 | #include <QGraphicsObject> |
|
34 | #include <QGraphicsObject> | |
35 | #include <QFont> |
|
35 | #include <QtGui/QFont> | |
36 | #include <QBrush> |
|
36 | #include <QtGui/QBrush> | |
37 | #include <QPen> |
|
37 | #include <QtGui/QPen> | |
38 | #include <QGraphicsTextItem> |
|
38 | #include <QtWidgets/QGraphicsTextItem> | |
39 | #include <QGraphicsLayoutItem> |
|
39 | #include <QtWidgets/QGraphicsLayoutItem> | |
40 |
|
40 | |||
41 | QT_CHARTS_BEGIN_NAMESPACE |
|
41 | QT_CHARTS_BEGIN_NAMESPACE | |
42 |
|
42 |
@@ -18,13 +18,13 | |||||
18 | ** |
|
18 | ** | |
19 | ****************************************************************************/ |
|
19 | ****************************************************************************/ | |
20 |
|
20 | |||
21 | #include <QDebug> |
|
21 | #include <QtCore/QDebug> | |
22 | #include <QGraphicsSceneMouseEvent> |
|
22 | #include <QtWidgets/QGraphicsSceneMouseEvent> | |
23 | #include <QGraphicsScene> |
|
23 | #include <QtWidgets/QGraphicsScene> | |
24 | #include <QLegendMarker> |
|
24 | #include <QtCharts/QLegendMarker> | |
25 |
#include |
|
25 | #include <private/qlegendmarker_p.h> | |
26 |
#include |
|
26 | #include <private/legendmarkeritem_p.h> | |
27 |
#include |
|
27 | #include <private/legendscroller_p.h> | |
28 |
|
28 | |||
29 | QT_CHARTS_BEGIN_NAMESPACE |
|
29 | QT_CHARTS_BEGIN_NAMESPACE | |
30 |
|
30 |
@@ -32,8 +32,8 | |||||
32 | #define LEGENDSCROLLER_P_H |
|
32 | #define LEGENDSCROLLER_P_H | |
33 |
|
33 | |||
34 | #include <QtCharts/qlegend.h> |
|
34 | #include <QtCharts/qlegend.h> | |
35 |
#include |
|
35 | #include <private/qlegend_p.h> | |
36 |
#include |
|
36 | #include <private/scroller_p.h> | |
37 |
|
37 | |||
38 | QT_CHARTS_BEGIN_NAMESPACE |
|
38 | QT_CHARTS_BEGIN_NAMESPACE | |
39 |
|
39 |
@@ -18,10 +18,10 | |||||
18 | ** |
|
18 | ** | |
19 | ****************************************************************************/ |
|
19 | ****************************************************************************/ | |
20 |
|
20 | |||
21 |
#include |
|
21 | #include <QtCharts/QAreaLegendMarker> | |
22 |
#include |
|
22 | #include <private/qarealegendmarker_p.h> | |
23 |
#include |
|
23 | #include <private/qareaseries_p.h> | |
24 | #include <QAreaSeries> |
|
24 | #include <QtCharts/QAreaSeries> | |
25 |
|
25 | |||
26 | QT_CHARTS_BEGIN_NAMESPACE |
|
26 | QT_CHARTS_BEGIN_NAMESPACE | |
27 |
|
27 |
@@ -21,7 +21,7 | |||||
21 | #ifndef QAREALEGENDMARKER_H |
|
21 | #ifndef QAREALEGENDMARKER_H | |
22 | #define QAREALEGENDMARKER_H |
|
22 | #define QAREALEGENDMARKER_H | |
23 |
|
23 | |||
24 |
#include <QtCharts/ |
|
24 | #include <QtCharts/QChartGlobal> | |
25 | #include <QtCharts/QLegendMarker> |
|
25 | #include <QtCharts/QLegendMarker> | |
26 | #include <QtCharts/QAreaSeries> |
|
26 | #include <QtCharts/QAreaSeries> | |
27 |
|
27 |
@@ -30,10 +30,10 | |||||
30 | #ifndef QAREALEGENDMARKER_P_H |
|
30 | #ifndef QAREALEGENDMARKER_P_H | |
31 | #define QAREALEGENDMARKER_P_H |
|
31 | #define QAREALEGENDMARKER_P_H | |
32 |
|
32 | |||
33 |
#include |
|
33 | #include <QtCharts/QChartGlobal> | |
34 |
#include |
|
34 | #include <private/qlegendmarker_p.h> | |
35 |
#include |
|
35 | #include <private/legendmarkeritem_p.h> | |
36 | #include <QAreaSeries> |
|
36 | #include <QtCharts/QAreaSeries> | |
37 |
|
37 | |||
38 | QT_CHARTS_BEGIN_NAMESPACE |
|
38 | QT_CHARTS_BEGIN_NAMESPACE | |
39 |
|
39 |
@@ -18,10 +18,10 | |||||
18 | ** |
|
18 | ** | |
19 | ****************************************************************************/ |
|
19 | ****************************************************************************/ | |
20 |
|
20 | |||
21 |
#include |
|
21 | #include <QtCharts/QBarLegendMarker> | |
22 |
#include |
|
22 | #include <private/qbarlegendmarker_p.h> | |
23 | #include <QAbstractBarSeries> |
|
23 | #include <QtCharts/QAbstractBarSeries> | |
24 | #include <QBarSet> |
|
24 | #include <QtCharts/QBarSet> | |
25 |
|
25 | |||
26 | QT_CHARTS_BEGIN_NAMESPACE |
|
26 | QT_CHARTS_BEGIN_NAMESPACE | |
27 |
|
27 |
@@ -20,7 +20,7 | |||||
20 | #ifndef QBARLEGENDMARKER_H |
|
20 | #ifndef QBARLEGENDMARKER_H | |
21 | #define QBARLEGENDMARKER_H |
|
21 | #define QBARLEGENDMARKER_H | |
22 |
|
22 | |||
23 |
#include <QtCharts/ |
|
23 | #include <QtCharts/QChartGlobal> | |
24 | #include <QtCharts/QLegendMarker> |
|
24 | #include <QtCharts/QLegendMarker> | |
25 | #include <QtCharts/QAbstractBarSeries> |
|
25 | #include <QtCharts/QAbstractBarSeries> | |
26 | #include <QtCharts/QBarSet> |
|
26 | #include <QtCharts/QBarSet> |
@@ -30,11 +30,11 | |||||
30 | #ifndef QBARLEGENDMARKER_P_H |
|
30 | #ifndef QBARLEGENDMARKER_P_H | |
31 | #define QBARLEGENDMARKER_P_H |
|
31 | #define QBARLEGENDMARKER_P_H | |
32 |
|
32 | |||
33 |
#include |
|
33 | #include <QtCharts/QChartGlobal> | |
34 |
#include |
|
34 | #include <private/qlegendmarker_p.h> | |
35 |
#include |
|
35 | #include <private/legendmarkeritem_p.h> | |
36 | #include <QAbstractBarSeries> |
|
36 | #include <QtCharts/QAbstractBarSeries> | |
37 | #include <QBarSet> |
|
37 | #include <QtCharts/QBarSet> | |
38 |
|
38 | |||
39 | QT_CHARTS_BEGIN_NAMESPACE |
|
39 | QT_CHARTS_BEGIN_NAMESPACE | |
40 |
|
40 |
@@ -18,10 +18,10 | |||||
18 | ** |
|
18 | ** | |
19 | ****************************************************************************/ |
|
19 | ****************************************************************************/ | |
20 |
|
20 | |||
21 |
#include |
|
21 | #include <QtCharts/QBoxPlotLegendMarker> | |
22 |
#include |
|
22 | #include <private/qboxplotlegendmarker_p.h> | |
23 |
#include |
|
23 | #include <QtCharts/QBoxPlotSeries> | |
24 |
#include |
|
24 | #include <private/qboxplotseries_p.h> | |
25 |
|
25 | |||
26 | QT_CHARTS_BEGIN_NAMESPACE |
|
26 | QT_CHARTS_BEGIN_NAMESPACE | |
27 |
|
27 |
@@ -21,7 +21,7 | |||||
21 | #ifndef QBOXPLOTLEGENDMARKER_H |
|
21 | #ifndef QBOXPLOTLEGENDMARKER_H | |
22 | #define QBOXPLOTLEGENDMARKER_H |
|
22 | #define QBOXPLOTLEGENDMARKER_H | |
23 |
|
23 | |||
24 |
#include <QtCharts/ |
|
24 | #include <QtCharts/QChartGlobal> | |
25 | #include <QtCharts/QLegendMarker> |
|
25 | #include <QtCharts/QLegendMarker> | |
26 | #include <QtCharts/QBoxPlotSeries> |
|
26 | #include <QtCharts/QBoxPlotSeries> | |
27 |
|
27 |
@@ -30,10 +30,10 | |||||
30 | #ifndef QBOXPLOTLEGENDMARKER_P_H |
|
30 | #ifndef QBOXPLOTLEGENDMARKER_P_H | |
31 | #define QBOXPLOTLEGENDMARKER_P_H |
|
31 | #define QBOXPLOTLEGENDMARKER_P_H | |
32 |
|
32 | |||
33 |
#include |
|
33 | #include <QtCharts/QChartGlobal> | |
34 |
#include |
|
34 | #include <private/qlegendmarker_p.h> | |
35 |
#include |
|
35 | #include <private/legendmarkeritem_p.h> | |
36 | #include <QBoxPlotSeries> |
|
36 | #include <QtCharts/QBoxPlotSeries> | |
37 |
|
37 | |||
38 | QT_CHARTS_BEGIN_NAMESPACE |
|
38 | QT_CHARTS_BEGIN_NAMESPACE | |
39 |
|
39 |
@@ -18,21 +18,21 | |||||
18 | ** |
|
18 | ** | |
19 | ****************************************************************************/ |
|
19 | ****************************************************************************/ | |
20 |
|
20 | |||
21 | #include "qlegend.h" |
|
21 | #include <QtCharts/QLegend> | |
22 |
#include |
|
22 | #include <private/qlegend_p.h> | |
23 |
#include |
|
23 | #include <QtCharts/QAbstractSeries> | |
24 |
#include |
|
24 | #include <private/qabstractseries_p.h> | |
25 |
#include |
|
25 | #include <private/qchart_p.h> | |
26 |
#include |
|
26 | #include <private/legendlayout_p.h> | |
27 |
#include |
|
27 | #include <private/chartpresenter_p.h> | |
28 |
#include |
|
28 | #include <private/abstractchartlayout_p.h> | |
29 |
#include |
|
29 | #include <QtCharts/QLegendMarker> | |
30 |
#include |
|
30 | #include <private/qlegendmarker_p.h> | |
31 |
#include |
|
31 | #include <private/legendmarkeritem_p.h> | |
32 |
#include |
|
32 | #include <private/chartdataset_p.h> | |
33 | #include <QPainter> |
|
33 | #include <QtGui/QPainter> | |
34 | #include <QPen> |
|
34 | #include <QtGui/QPen> | |
35 | #include <QGraphicsItemGroup> |
|
35 | #include <QtWidgets/QGraphicsItemGroup> | |
36 |
|
36 | |||
37 | QT_CHARTS_BEGIN_NAMESPACE |
|
37 | QT_CHARTS_BEGIN_NAMESPACE | |
38 |
|
38 |
@@ -21,10 +21,10 | |||||
21 | #ifndef QLEGEND_H |
|
21 | #ifndef QLEGEND_H | |
22 | #define QLEGEND_H |
|
22 | #define QLEGEND_H | |
23 |
|
23 | |||
24 |
#include <QtCharts/ |
|
24 | #include <QtCharts/QChartGlobal> | |
25 | #include <QGraphicsWidget> |
|
25 | #include <QtWidgets/QGraphicsWidget> | |
26 | #include <QPen> |
|
26 | #include <QtGui/QPen> | |
27 | #include <QBrush> |
|
27 | #include <QtGui/QBrush> | |
28 |
|
28 | |||
29 | QT_CHARTS_BEGIN_NAMESPACE |
|
29 | QT_CHARTS_BEGIN_NAMESPACE | |
30 |
|
30 |
@@ -30,7 +30,7 | |||||
30 | #ifndef QLEGEND_P_H |
|
30 | #ifndef QLEGEND_P_H | |
31 | #define QLEGEND_P_H |
|
31 | #define QLEGEND_P_H | |
32 |
|
32 | |||
33 | #include "qlegend.h" |
|
33 | #include <QtCharts/QLegend> | |
34 |
|
34 | |||
35 | QT_CHARTS_BEGIN_NAMESPACE |
|
35 | QT_CHARTS_BEGIN_NAMESPACE | |
36 |
|
36 |
@@ -18,15 +18,15 | |||||
18 | ** |
|
18 | ** | |
19 | ****************************************************************************/ |
|
19 | ****************************************************************************/ | |
20 |
|
20 | |||
21 |
#include |
|
21 | #include <QtCharts/QLegendMarker> | |
22 |
#include |
|
22 | #include <private/qlegendmarker_p.h> | |
23 |
#include |
|
23 | #include <private/legendmarkeritem_p.h> | |
24 | #include "qlegend.h" |
|
24 | #include <QtCharts/QLegend> | |
25 |
#include |
|
25 | #include <private/qlegend_p.h> | |
26 |
#include |
|
26 | #include <private/legendlayout_p.h> | |
27 | #include <QFontMetrics> |
|
27 | #include <QtGui/QFontMetrics> | |
28 | #include <QGraphicsSceneEvent> |
|
28 | #include <QtWidgets/QGraphicsSceneEvent> | |
29 | #include <QAbstractSeries> |
|
29 | #include <QtCharts/QAbstractSeries> | |
30 |
|
30 | |||
31 | QT_CHARTS_BEGIN_NAMESPACE |
|
31 | QT_CHARTS_BEGIN_NAMESPACE | |
32 |
|
32 |
@@ -21,11 +21,11 | |||||
21 | #ifndef QLEGENDMARKER_H |
|
21 | #ifndef QLEGENDMARKER_H | |
22 | #define QLEGENDMARKER_H |
|
22 | #define QLEGENDMARKER_H | |
23 |
|
23 | |||
24 |
#include <QtCharts/ |
|
24 | #include <QtCharts/QChartGlobal> | |
25 | #include <QObject> |
|
25 | #include <QtCore/QObject> | |
26 | #include <QPen> |
|
26 | #include <QtGui/QPen> | |
27 | #include <QBrush> |
|
27 | #include <QtGui/QBrush> | |
28 | #include <QFont> |
|
28 | #include <QtGui/QFont> | |
29 |
|
29 | |||
30 | QT_CHARTS_BEGIN_NAMESPACE |
|
30 | QT_CHARTS_BEGIN_NAMESPACE | |
31 |
|
31 |
@@ -30,11 +30,11 | |||||
30 | #ifndef QLEGENDMARKERPRIVATE_H |
|
30 | #ifndef QLEGENDMARKERPRIVATE_H | |
31 | #define QLEGENDMARKERPRIVATE_H |
|
31 | #define QLEGENDMARKERPRIVATE_H | |
32 |
|
32 | |||
33 |
#include |
|
33 | #include <QtCharts/QChartGlobal> | |
34 | #include <QGraphicsObject> |
|
34 | #include <QGraphicsObject> | |
35 | #include <QBrush> |
|
35 | #include <QtGui/QBrush> | |
36 | #include <QPen> |
|
36 | #include <QtGui/QPen> | |
37 | #include <QGraphicsLayoutItem> |
|
37 | #include <QtWidgets/QGraphicsLayoutItem> | |
38 |
|
38 | |||
39 | QT_CHARTS_BEGIN_NAMESPACE |
|
39 | QT_CHARTS_BEGIN_NAMESPACE | |
40 |
|
40 |
@@ -18,10 +18,10 | |||||
18 | ** |
|
18 | ** | |
19 | ****************************************************************************/ |
|
19 | ****************************************************************************/ | |
20 |
|
20 | |||
21 |
#include |
|
21 | #include <QtCharts/QPieLegendMarker> | |
22 |
#include |
|
22 | #include <private/qpielegendmarker_p.h> | |
23 | #include <QPieSeries> |
|
23 | #include <QtCharts/QPieSeries> | |
24 | #include <QPieSlice> |
|
24 | #include <QtCharts/QPieSlice> | |
25 |
|
25 | |||
26 | QT_CHARTS_BEGIN_NAMESPACE |
|
26 | QT_CHARTS_BEGIN_NAMESPACE | |
27 |
|
27 |
@@ -21,7 +21,7 | |||||
21 | #ifndef QPIELEGENDMARKER_H |
|
21 | #ifndef QPIELEGENDMARKER_H | |
22 | #define QPIELEGENDMARKER_H |
|
22 | #define QPIELEGENDMARKER_H | |
23 |
|
23 | |||
24 |
#include <QtCharts/ |
|
24 | #include <QtCharts/QChartGlobal> | |
25 | #include <QtCharts/QLegendMarker> |
|
25 | #include <QtCharts/QLegendMarker> | |
26 | #include <QtCharts/QPieSeries> |
|
26 | #include <QtCharts/QPieSeries> | |
27 | #include <QtCharts/QPieSlice> |
|
27 | #include <QtCharts/QPieSlice> |
@@ -30,11 +30,11 | |||||
30 | #ifndef QPIELEGENDMARKER_P_H |
|
30 | #ifndef QPIELEGENDMARKER_P_H | |
31 | #define QPIELEGENDMARKER_P_H |
|
31 | #define QPIELEGENDMARKER_P_H | |
32 |
|
32 | |||
33 |
#include |
|
33 | #include <QtCharts/QChartGlobal> | |
34 |
#include |
|
34 | #include <private/qlegendmarker_p.h> | |
35 |
#include |
|
35 | #include <private/legendmarkeritem_p.h> | |
36 | #include <QPieSeries> |
|
36 | #include <QtCharts/QPieSeries> | |
37 | #include <QPieSlice> |
|
37 | #include <QtCharts/QPieSlice> | |
38 |
|
38 | |||
39 | QT_CHARTS_BEGIN_NAMESPACE |
|
39 | QT_CHARTS_BEGIN_NAMESPACE | |
40 |
|
40 |
@@ -18,10 +18,10 | |||||
18 | ** |
|
18 | ** | |
19 | ****************************************************************************/ |
|
19 | ****************************************************************************/ | |
20 |
|
20 | |||
21 |
#include |
|
21 | #include <QtCharts/QXYLegendMarker> | |
22 |
#include |
|
22 | #include <private/qxylegendmarker_p.h> | |
23 |
#include |
|
23 | #include <private/qxyseries_p.h> | |
24 | #include <QXYSeries> |
|
24 | #include <QtCharts/QXYSeries> | |
25 |
|
25 | |||
26 | QT_CHARTS_BEGIN_NAMESPACE |
|
26 | QT_CHARTS_BEGIN_NAMESPACE | |
27 |
|
27 |
@@ -21,7 +21,7 | |||||
21 | #ifndef QXYLEGENDMARKER_H |
|
21 | #ifndef QXYLEGENDMARKER_H | |
22 | #define QXYLEGENDMARKER_H |
|
22 | #define QXYLEGENDMARKER_H | |
23 |
|
23 | |||
24 |
#include <QtCharts/ |
|
24 | #include <QtCharts/QChartGlobal> | |
25 | #include <QtCharts/QLegendMarker> |
|
25 | #include <QtCharts/QLegendMarker> | |
26 | #include <QtCharts/QXYSeries> |
|
26 | #include <QtCharts/QXYSeries> | |
27 |
|
27 |
@@ -30,10 +30,10 | |||||
30 | #ifndef QXYLEGENDMARKER_P_H |
|
30 | #ifndef QXYLEGENDMARKER_P_H | |
31 | #define QXYLEGENDMARKER_P_H |
|
31 | #define QXYLEGENDMARKER_P_H | |
32 |
|
32 | |||
33 |
#include |
|
33 | #include <QtCharts/QChartGlobal> | |
34 |
#include |
|
34 | #include <private/qlegendmarker_p.h> | |
35 |
#include |
|
35 | #include <private/legendmarkeritem_p.h> | |
36 | #include <QXYSeries> |
|
36 | #include <QtCharts/QXYSeries> | |
37 |
|
37 | |||
38 | QT_CHARTS_BEGIN_NAMESPACE |
|
38 | QT_CHARTS_BEGIN_NAMESPACE | |
39 |
|
39 |
@@ -18,15 +18,15 | |||||
18 | ** |
|
18 | ** | |
19 | ****************************************************************************/ |
|
19 | ****************************************************************************/ | |
20 |
|
20 | |||
21 |
#include |
|
21 | #include <private/linechartitem_p.h> | |
22 |
#include |
|
22 | #include <QtCharts/QLineSeries> | |
23 |
#include |
|
23 | #include <private/qlineseries_p.h> | |
24 |
#include |
|
24 | #include <private/chartpresenter_p.h> | |
25 |
#include |
|
25 | #include <private/polardomain_p.h> | |
26 |
#include |
|
26 | #include <private/chartthememanager_p.h> | |
27 |
#include |
|
27 | #include <private/charttheme_p.h> | |
28 | #include <QPainter> |
|
28 | #include <QtGui/QPainter> | |
29 | #include <QGraphicsSceneMouseEvent> |
|
29 | #include <QtWidgets/QGraphicsSceneMouseEvent> | |
30 |
|
30 | |||
31 | QT_CHARTS_BEGIN_NAMESPACE |
|
31 | QT_CHARTS_BEGIN_NAMESPACE | |
32 |
|
32 |
@@ -30,10 +30,10 | |||||
30 | #ifndef LINECHARTITEM_H |
|
30 | #ifndef LINECHARTITEM_H | |
31 | #define LINECHARTITEM_H |
|
31 | #define LINECHARTITEM_H | |
32 |
|
32 | |||
33 |
#include |
|
33 | #include <QtCharts/QChartGlobal> | |
34 |
#include |
|
34 | #include <private/xychart_p.h> | |
35 |
#include |
|
35 | #include <QtCharts/QChart> | |
36 | #include <QPen> |
|
36 | #include <QtGui/QPen> | |
37 |
|
37 | |||
38 | QT_CHARTS_BEGIN_NAMESPACE |
|
38 | QT_CHARTS_BEGIN_NAMESPACE | |
39 |
|
39 |
@@ -18,12 +18,12 | |||||
18 | ** |
|
18 | ** | |
19 | ****************************************************************************/ |
|
19 | ****************************************************************************/ | |
20 |
|
20 | |||
21 |
#include |
|
21 | #include <QtCharts/QLineSeries> | |
22 |
#include |
|
22 | #include <private/qlineseries_p.h> | |
23 |
#include |
|
23 | #include <private/linechartitem_p.h> | |
24 |
#include |
|
24 | #include <private/chartdataset_p.h> | |
25 |
#include |
|
25 | #include <private/charttheme_p.h> | |
26 |
#include |
|
26 | #include <private/qchart_p.h> | |
27 | QT_CHARTS_BEGIN_NAMESPACE |
|
27 | QT_CHARTS_BEGIN_NAMESPACE | |
28 |
|
28 | |||
29 | /*! |
|
29 | /*! |
@@ -21,9 +21,9 | |||||
21 | #ifndef QLINESERIES_H |
|
21 | #ifndef QLINESERIES_H | |
22 | #define QLINESERIES_H |
|
22 | #define QLINESERIES_H | |
23 |
|
23 | |||
24 |
#include <QtCharts/ |
|
24 | #include <QtCharts/QChartGlobal> | |
25 |
#include <QtCharts/ |
|
25 | #include <QtCharts/QXYSeries> | |
26 | #include <QPen> |
|
26 | #include <QtGui/QPen> | |
27 |
|
27 | |||
28 | QT_CHARTS_BEGIN_NAMESPACE |
|
28 | QT_CHARTS_BEGIN_NAMESPACE | |
29 |
|
29 |
@@ -30,7 +30,7 | |||||
30 | #ifndef QLINESERIES_P_H |
|
30 | #ifndef QLINESERIES_P_H | |
31 | #define QLINESERIES_P_H |
|
31 | #define QLINESERIES_P_H | |
32 |
|
32 | |||
33 |
#include |
|
33 | #include <private/qxyseries_p.h> | |
34 |
|
34 | |||
35 | QT_CHARTS_BEGIN_NAMESPACE |
|
35 | QT_CHARTS_BEGIN_NAMESPACE | |
36 |
|
36 |
@@ -18,17 +18,17 | |||||
18 | ** |
|
18 | ** | |
19 | ****************************************************************************/ |
|
19 | ****************************************************************************/ | |
20 |
|
20 | |||
21 |
#include |
|
21 | #include <private/piechartitem_p.h> | |
22 |
#include |
|
22 | #include <private/piesliceitem_p.h> | |
23 | #include "qpieslice.h" |
|
23 | #include <QtCharts/QPieSlice> | |
24 |
#include |
|
24 | #include <private/qpieslice_p.h> | |
25 |
#include |
|
25 | #include <QtCharts/QPieSeries> | |
26 |
#include |
|
26 | #include <private/qpieseries_p.h> | |
27 |
#include |
|
27 | #include <private/chartpresenter_p.h> | |
28 |
#include |
|
28 | #include <private/chartdataset_p.h> | |
29 |
#include |
|
29 | #include <private/pieanimation_p.h> | |
30 | #include <QPainter> |
|
30 | #include <QtGui/QPainter> | |
31 | #include <QTimer> |
|
31 | #include <QtCore/QTimer> | |
32 |
|
32 | |||
33 | QT_CHARTS_BEGIN_NAMESPACE |
|
33 | QT_CHARTS_BEGIN_NAMESPACE | |
34 |
|
34 |
@@ -30,10 +30,10 | |||||
30 | #ifndef PIECHARTITEM_H |
|
30 | #ifndef PIECHARTITEM_H | |
31 | #define PIECHARTITEM_H |
|
31 | #define PIECHARTITEM_H | |
32 |
|
32 | |||
33 |
#include |
|
33 | #include <QtCharts/QPieSeries> | |
34 |
#include |
|
34 | #include <private/chartitem_p.h> | |
35 |
#include |
|
35 | #include <private/piesliceitem_p.h> | |
36 | #include <QPointer> |
|
36 | #include <QtCore/QPointer> | |
37 |
|
37 | |||
38 | class QGraphicsItem; |
|
38 | class QGraphicsItem; | |
39 | QT_CHARTS_BEGIN_NAMESPACE |
|
39 | QT_CHARTS_BEGIN_NAMESPACE |
@@ -30,10 +30,10 | |||||
30 | #ifndef PIESLICEDATA_P_H |
|
30 | #ifndef PIESLICEDATA_P_H | |
31 | #define PIESLICEDATA_P_H |
|
31 | #define PIESLICEDATA_P_H | |
32 |
|
32 | |||
33 |
#include < |
|
33 | #include <QtCharts/QChartGlobal> | |
34 |
#include < |
|
34 | #include <QtCharts/QPieSlice> | |
35 | #include <QPen> |
|
35 | #include <QtGui/QPen> | |
36 | #include <QBrush> |
|
36 | #include <QtGui/QBrush> | |
37 |
|
37 | |||
38 | QT_CHARTS_BEGIN_NAMESPACE |
|
38 | QT_CHARTS_BEGIN_NAMESPACE | |
39 |
|
39 |
@@ -18,17 +18,17 | |||||
18 | ** |
|
18 | ** | |
19 | ****************************************************************************/ |
|
19 | ****************************************************************************/ | |
20 |
|
20 | |||
21 |
#include |
|
21 | #include <private/piesliceitem_p.h> | |
22 |
#include |
|
22 | #include <private/piechartitem_p.h> | |
23 |
#include |
|
23 | #include <QtCharts/QPieSeries> | |
24 | #include "qpieslice.h" |
|
24 | #include <QtCharts/QPieSlice> | |
25 |
#include |
|
25 | #include <private/chartpresenter_p.h> | |
26 | #include <QPainter> |
|
26 | #include <QtGui/QPainter> | |
27 |
#include < |
|
27 | #include <QtCore/QtMath> | |
28 | #include <QGraphicsSceneEvent> |
|
28 | #include <QtWidgets/QGraphicsSceneEvent> | |
29 | #include <QTime> |
|
29 | #include <QtCore/QTime> | |
30 | #include <QTextDocument> |
|
30 | #include <QtGui/QTextDocument> | |
31 | #include <QDebug> |
|
31 | #include <QtCore/QDebug> | |
32 |
|
32 | |||
33 | QT_CHARTS_BEGIN_NAMESPACE |
|
33 | QT_CHARTS_BEGIN_NAMESPACE | |
34 |
|
34 |
@@ -30,14 +30,14 | |||||
30 | #ifndef PIESLICEITEM_H |
|
30 | #ifndef PIESLICEITEM_H | |
31 | #define PIESLICEITEM_H |
|
31 | #define PIESLICEITEM_H | |
32 |
|
32 | |||
33 |
#include |
|
33 | #include <QtCharts/QChartGlobal> | |
34 |
#include |
|
34 | #include <private/charttheme_p.h> | |
35 |
#include |
|
35 | #include <QtCharts/QPieSeries> | |
36 |
#include |
|
36 | #include <private/pieslicedata_p.h> | |
37 | #include <QGraphicsItem> |
|
37 | #include <QtWidgets/QGraphicsItem> | |
38 | #include <QRectF> |
|
38 | #include <QtCore/QRectF> | |
39 | #include <QColor> |
|
39 | #include <QtGui/QColor> | |
40 | #include <QPen> |
|
40 | #include <QtGui/QPen> | |
41 |
|
41 | |||
42 | #define PIESLICE_LABEL_GAP 5 |
|
42 | #define PIESLICE_LABEL_GAP 5 | |
43 |
|
43 |
@@ -18,7 +18,7 | |||||
18 | ** |
|
18 | ** | |
19 | ****************************************************************************/ |
|
19 | ****************************************************************************/ | |
20 |
|
20 | |||
21 |
#include |
|
21 | #include <QtCharts/QHPieModelMapper> | |
22 |
|
22 | |||
23 | QT_CHARTS_BEGIN_NAMESPACE |
|
23 | QT_CHARTS_BEGIN_NAMESPACE | |
24 |
|
24 |
@@ -21,7 +21,7 | |||||
21 | #ifndef QHPIEMODELMAPPER_H |
|
21 | #ifndef QHPIEMODELMAPPER_H | |
22 | #define QHPIEMODELMAPPER_H |
|
22 | #define QHPIEMODELMAPPER_H | |
23 |
|
23 | |||
24 |
#include <QtCharts/ |
|
24 | #include <QtCharts/QPieModelMapper> | |
25 |
|
25 | |||
26 | QT_CHARTS_BEGIN_NAMESPACE |
|
26 | QT_CHARTS_BEGIN_NAMESPACE | |
27 | /* Comment line for syncqt to generate the fwd-include correctly, due to QTBUG-22432 */ |
|
27 | /* Comment line for syncqt to generate the fwd-include correctly, due to QTBUG-22432 */ |
@@ -18,11 +18,11 | |||||
18 | ** |
|
18 | ** | |
19 | ****************************************************************************/ |
|
19 | ****************************************************************************/ | |
20 |
|
20 | |||
21 |
#include |
|
21 | #include <QtCharts/QPieModelMapper> | |
22 |
#include |
|
22 | #include <private/qpiemodelmapper_p.h> | |
23 |
#include |
|
23 | #include <QtCharts/QPieSeries> | |
24 | #include "qpieslice.h" |
|
24 | #include <QtCharts/QPieSlice> | |
25 | #include <QAbstractItemModel> |
|
25 | #include <QtCore/QAbstractItemModel> | |
26 |
|
26 | |||
27 | QT_CHARTS_BEGIN_NAMESPACE |
|
27 | QT_CHARTS_BEGIN_NAMESPACE | |
28 |
|
28 |
@@ -21,8 +21,8 | |||||
21 | #ifndef QPIEMODELMAPPER_H |
|
21 | #ifndef QPIEMODELMAPPER_H | |
22 | #define QPIEMODELMAPPER_H |
|
22 | #define QPIEMODELMAPPER_H | |
23 |
|
23 | |||
24 |
#include <QtCharts/ |
|
24 | #include <QtCharts/QChartGlobal> | |
25 | #include <QObject> |
|
25 | #include <QtCore/QObject> | |
26 |
|
26 | |||
27 | class QAbstractItemModel; |
|
27 | class QAbstractItemModel; | |
28 |
|
28 |
@@ -30,8 +30,8 | |||||
30 | #ifndef QPIEMODELMAPPER_P_H |
|
30 | #ifndef QPIEMODELMAPPER_P_H | |
31 | #define QPIEMODELMAPPER_P_H |
|
31 | #define QPIEMODELMAPPER_P_H | |
32 |
|
32 | |||
33 | #include <QObject> |
|
33 | #include <QtCore/QObject> | |
34 |
#include < |
|
34 | #include <QtCharts/QPieModelMapper> | |
35 |
|
35 | |||
36 | class QModelIndex; |
|
36 | class QModelIndex; | |
37 |
|
37 |
@@ -18,18 +18,18 | |||||
18 | ** |
|
18 | ** | |
19 | ****************************************************************************/ |
|
19 | ****************************************************************************/ | |
20 |
|
20 | |||
21 |
#include |
|
21 | #include <QtCharts/QPieSeries> | |
22 |
#include |
|
22 | #include <private/qpieseries_p.h> | |
23 | #include "qpieslice.h" |
|
23 | #include <QtCharts/QPieSlice> | |
24 |
#include |
|
24 | #include <private/qpieslice_p.h> | |
25 |
#include |
|
25 | #include <private/pieslicedata_p.h> | |
26 |
#include |
|
26 | #include <private/chartdataset_p.h> | |
27 |
#include |
|
27 | #include <private/charttheme_p.h> | |
28 |
#include |
|
28 | #include <QtCharts/QAbstractAxis> | |
29 |
#include |
|
29 | #include <private/pieanimation_p.h> | |
30 |
#include |
|
30 | #include <private/charthelpers_p.h> | |
31 |
|
31 | |||
32 |
#include |
|
32 | #include <QtCharts/QPieLegendMarker> | |
33 |
|
33 | |||
34 | QT_CHARTS_BEGIN_NAMESPACE |
|
34 | QT_CHARTS_BEGIN_NAMESPACE | |
35 |
|
35 |
@@ -21,7 +21,7 | |||||
21 | #ifndef QPIESERIES_H |
|
21 | #ifndef QPIESERIES_H | |
22 | #define QPIESERIES_H |
|
22 | #define QPIESERIES_H | |
23 |
|
23 | |||
24 |
#include <QtCharts/ |
|
24 | #include <QtCharts/QAbstractSeries> | |
25 | #include <QtCharts/QPieSlice> |
|
25 | #include <QtCharts/QPieSlice> | |
26 |
|
26 | |||
27 | QT_CHARTS_BEGIN_NAMESPACE |
|
27 | QT_CHARTS_BEGIN_NAMESPACE |
@@ -30,8 +30,8 | |||||
30 | #ifndef QPIESERIES_P_H |
|
30 | #ifndef QPIESERIES_P_H | |
31 | #define QPIESERIES_P_H |
|
31 | #define QPIESERIES_P_H | |
32 |
|
32 | |||
33 |
#include |
|
33 | #include <QtCharts/QPieSeries> | |
34 |
#include |
|
34 | #include <private/qabstractseries_p.h> | |
35 |
|
35 | |||
36 | QT_CHARTS_BEGIN_NAMESPACE |
|
36 | QT_CHARTS_BEGIN_NAMESPACE | |
37 | class QLegendPrivate; |
|
37 | class QLegendPrivate; |
@@ -18,8 +18,8 | |||||
18 | ** |
|
18 | ** | |
19 | ****************************************************************************/ |
|
19 | ****************************************************************************/ | |
20 |
|
20 | |||
21 | #include "qpieslice.h" |
|
21 | #include <QtCharts/QPieSlice> | |
22 |
#include |
|
22 | #include <private/qpieslice_p.h> | |
23 |
|
23 | |||
24 | QT_CHARTS_BEGIN_NAMESPACE |
|
24 | QT_CHARTS_BEGIN_NAMESPACE | |
25 |
|
25 |
@@ -21,11 +21,11 | |||||
21 | #ifndef QPIESLICE_H |
|
21 | #ifndef QPIESLICE_H | |
22 | #define QPIESLICE_H |
|
22 | #define QPIESLICE_H | |
23 |
|
23 | |||
24 |
#include <QtCharts/ |
|
24 | #include <QtCharts/QChartGlobal> | |
25 | #include <QObject> |
|
25 | #include <QtCore/QObject> | |
26 | #include <QPen> |
|
26 | #include <QtGui/QPen> | |
27 | #include <QBrush> |
|
27 | #include <QtGui/QBrush> | |
28 | #include <QFont> |
|
28 | #include <QtGui/QFont> | |
29 |
|
29 | |||
30 | QT_CHARTS_BEGIN_NAMESPACE |
|
30 | QT_CHARTS_BEGIN_NAMESPACE | |
31 | class QPieSlicePrivate; |
|
31 | class QPieSlicePrivate; |
@@ -30,9 +30,9 | |||||
30 | #ifndef QPIESLICE_P_H |
|
30 | #ifndef QPIESLICE_P_H | |
31 | #define QPIESLICE_P_H |
|
31 | #define QPIESLICE_P_H | |
32 |
|
32 | |||
33 | #include <QObject> |
|
33 | #include <QtCore/QObject> | |
34 | #include "qpieslice.h" |
|
34 | #include <QtCharts/QPieSlice> | |
35 |
#include |
|
35 | #include <private/pieslicedata_p.h> | |
36 |
|
36 | |||
37 | QT_CHARTS_BEGIN_NAMESPACE |
|
37 | QT_CHARTS_BEGIN_NAMESPACE | |
38 | class QPieSeries; |
|
38 | class QPieSeries; |
@@ -18,7 +18,7 | |||||
18 | ** |
|
18 | ** | |
19 | ****************************************************************************/ |
|
19 | ****************************************************************************/ | |
20 |
|
20 | |||
21 |
#include |
|
21 | #include <QtCharts/QVPieModelMapper> | |
22 |
|
22 | |||
23 | QT_CHARTS_BEGIN_NAMESPACE |
|
23 | QT_CHARTS_BEGIN_NAMESPACE | |
24 |
|
24 |
@@ -21,7 +21,7 | |||||
21 | #ifndef QVPIEMODELMAPPER_H |
|
21 | #ifndef QVPIEMODELMAPPER_H | |
22 | #define QVPIEMODELMAPPER_H |
|
22 | #define QVPIEMODELMAPPER_H | |
23 |
|
23 | |||
24 |
#include <QtCharts/ |
|
24 | #include <QtCharts/QPieModelMapper> | |
25 |
|
25 | |||
26 | QT_CHARTS_BEGIN_NAMESPACE |
|
26 | QT_CHARTS_BEGIN_NAMESPACE | |
27 | /* Comment line for syncqt to generate the fwd-include correctly, due to QTBUG-22432 */ |
|
27 | /* Comment line for syncqt to generate the fwd-include correctly, due to QTBUG-22432 */ |
@@ -18,16 +18,16 | |||||
18 | ** |
|
18 | ** | |
19 | ****************************************************************************/ |
|
19 | ****************************************************************************/ | |
20 |
|
20 | |||
21 |
#include |
|
21 | #include <QtCharts/QAbstractSeries> | |
22 |
#include |
|
22 | #include <private/qabstractseries_p.h> | |
23 |
#include |
|
23 | #include <private/chartdataset_p.h> | |
24 |
#include |
|
24 | #include <QtCharts/QChart> | |
25 |
#include |
|
25 | #include <private/qchart_p.h> | |
26 |
#include |
|
26 | #include <private/chartitem_p.h> | |
27 |
#include |
|
27 | #include <private/xydomain_p.h> | |
28 |
#include |
|
28 | #include <private/xlogydomain_p.h> | |
29 |
#include |
|
29 | #include <private/logxydomain_p.h> | |
30 |
#include |
|
30 | #include <private/logxlogydomain_p.h> | |
31 |
|
31 | |||
32 | QT_CHARTS_BEGIN_NAMESPACE |
|
32 | QT_CHARTS_BEGIN_NAMESPACE | |
33 |
|
33 |
@@ -21,10 +21,10 | |||||
21 | #ifndef QABSTRACTSERIES_H |
|
21 | #ifndef QABSTRACTSERIES_H | |
22 | #define QABSTRACTSERIES_H |
|
22 | #define QABSTRACTSERIES_H | |
23 |
|
23 | |||
24 |
#include <QtCharts/ |
|
24 | #include <QtCharts/QChartGlobal> | |
25 |
#include <QtCharts/ |
|
25 | #include <QtCharts/QAbstractAxis> | |
26 | #include <QObject> |
|
26 | #include <QtCore/QObject> | |
27 | #include <QPen> |
|
27 | #include <QtGui/QPen> | |
28 |
|
28 | |||
29 | QT_CHARTS_BEGIN_NAMESPACE |
|
29 | QT_CHARTS_BEGIN_NAMESPACE | |
30 |
|
30 |
@@ -30,9 +30,9 | |||||
30 | #ifndef QABSTRACTSERIES_P_H |
|
30 | #ifndef QABSTRACTSERIES_P_H | |
31 | #define QABSTRACTSERIES_P_H |
|
31 | #define QABSTRACTSERIES_P_H | |
32 |
|
32 | |||
33 |
#include |
|
33 | #include <QtCharts/QAbstractSeries> | |
34 |
#include |
|
34 | #include <QtCharts/QChart> | |
35 |
#include |
|
35 | #include <private/abstractdomain_p.h> | |
36 |
|
36 | |||
37 | class QGraphicsItem; |
|
37 | class QGraphicsItem; | |
38 |
|
38 |
@@ -18,17 +18,17 | |||||
18 | ** |
|
18 | ** | |
19 | ****************************************************************************/ |
|
19 | ****************************************************************************/ | |
20 |
|
20 | |||
21 |
#include |
|
21 | #include <QtCharts/QChart> | |
22 |
#include |
|
22 | #include <private/qchart_p.h> | |
23 |
#include |
|
23 | #include <private/legendscroller_p.h> | |
24 |
#include |
|
24 | #include <private/qlegend_p.h> | |
25 |
#include |
|
25 | #include <private/chartbackground_p.h> | |
26 |
#include |
|
26 | #include <QtCharts/QAbstractAxis> | |
27 |
#include |
|
27 | #include <private/abstractchartlayout_p.h> | |
28 |
#include |
|
28 | #include <private/charttheme_p.h> | |
29 |
#include |
|
29 | #include <private/chartpresenter_p.h> | |
30 |
#include |
|
30 | #include <private/chartdataset_p.h> | |
31 | #include <QGraphicsScene> |
|
31 | #include <QtWidgets/QGraphicsScene> | |
32 | #include <QGraphicsSceneResizeEvent> |
|
32 | #include <QGraphicsSceneResizeEvent> | |
33 |
|
33 | |||
34 | QT_CHARTS_BEGIN_NAMESPACE |
|
34 | QT_CHARTS_BEGIN_NAMESPACE |
@@ -23,8 +23,8 | |||||
23 |
|
23 | |||
24 | #include <QtCharts/QAbstractSeries> |
|
24 | #include <QtCharts/QAbstractSeries> | |
25 | #include <QtCharts/QLegend> |
|
25 | #include <QtCharts/QLegend> | |
26 | #include <QGraphicsWidget> |
|
26 | #include <QtWidgets/QGraphicsWidget> | |
27 | #include <QMargins> |
|
27 | #include <QtCore/QMargins> | |
28 |
|
28 | |||
29 | class QGraphicsSceneResizeEvent; |
|
29 | class QGraphicsSceneResizeEvent; | |
30 |
|
30 |
@@ -30,8 +30,8 | |||||
30 | #ifndef QCHART_P_H |
|
30 | #ifndef QCHART_P_H | |
31 | #define QCHART_P_H |
|
31 | #define QCHART_P_H | |
32 |
|
32 | |||
33 |
#include |
|
33 | #include <QtCharts/QChartGlobal> | |
34 |
#include |
|
34 | #include <QtCharts/QChart> | |
35 |
|
35 | |||
36 | QT_CHARTS_BEGIN_NAMESPACE |
|
36 | QT_CHARTS_BEGIN_NAMESPACE | |
37 |
|
37 |
@@ -21,7 +21,7 | |||||
21 | #ifndef QCHARTGLOBAL_H |
|
21 | #ifndef QCHARTGLOBAL_H | |
22 | #define QCHARTGLOBAL_H |
|
22 | #define QCHARTGLOBAL_H | |
23 |
|
23 | |||
24 |
#include < |
|
24 | #include <QtCore/QtGlobal> | |
25 |
|
25 | |||
26 | #define QT_CHARTS_VERSION_STR "2.0.0" |
|
26 | #define QT_CHARTS_VERSION_STR "2.0.0" | |
27 | /* |
|
27 | /* |
@@ -18,11 +18,11 | |||||
18 | ** |
|
18 | ** | |
19 | ****************************************************************************/ |
|
19 | ****************************************************************************/ | |
20 |
|
20 | |||
21 |
#include |
|
21 | #include <QtCharts/QChartView> | |
22 |
#include |
|
22 | #include <private/qchartview_p.h> | |
23 |
#include |
|
23 | #include <private/qchart_p.h> | |
24 | #include <QGraphicsScene> |
|
24 | #include <QtWidgets/QGraphicsScene> | |
25 | #include <QRubberBand> |
|
25 | #include <QtWidgets/QRubberBand> | |
26 |
|
26 | |||
27 | /*! |
|
27 | /*! | |
28 | \enum QChartView::RubberBand |
|
28 | \enum QChartView::RubberBand |
@@ -24,7 +24,7 | |||||
24 | #include <QtCharts/QAbstractAxis> |
|
24 | #include <QtCharts/QAbstractAxis> | |
25 | #include <QtCharts/QAbstractSeries> |
|
25 | #include <QtCharts/QAbstractSeries> | |
26 | #include <QtCharts/QChart> |
|
26 | #include <QtCharts/QChart> | |
27 | #include <QGraphicsView> |
|
27 | #include <QtWidgets/QGraphicsView> | |
28 |
|
28 | |||
29 | class QGraphicsScene; |
|
29 | class QGraphicsScene; | |
30 | class QRubberBand; |
|
30 | class QRubberBand; |
@@ -30,7 +30,7 | |||||
30 | #ifndef QCHARTVIEW_P_H |
|
30 | #ifndef QCHARTVIEW_P_H | |
31 | #define QCHARTVIEW_P_H |
|
31 | #define QCHARTVIEW_P_H | |
32 |
|
32 | |||
33 |
#include |
|
33 | #include <QtCharts/QChartView> | |
34 |
|
34 | |||
35 | class QGraphicsScene; |
|
35 | class QGraphicsScene; | |
36 | class ChartPresenter; |
|
36 | class ChartPresenter; |
@@ -18,8 +18,8 | |||||
18 | ** |
|
18 | ** | |
19 | ****************************************************************************/ |
|
19 | ****************************************************************************/ | |
20 |
|
20 | |||
21 |
#include |
|
21 | #include <QtCharts/QPolarChart> | |
22 |
#include |
|
22 | #include <QtCharts/QAbstractAxis> | |
23 |
|
23 | |||
24 | QT_CHARTS_BEGIN_NAMESPACE |
|
24 | QT_CHARTS_BEGIN_NAMESPACE | |
25 |
|
25 |
@@ -21,7 +21,7 | |||||
21 | #ifndef QPOLARCHART_H |
|
21 | #ifndef QPOLARCHART_H | |
22 | #define QPOLARCHART_H |
|
22 | #define QPOLARCHART_H | |
23 |
|
23 | |||
24 |
#include <QtCharts/ |
|
24 | #include <QtCharts/QChart> | |
25 |
|
25 | |||
26 | QT_CHARTS_BEGIN_NAMESPACE |
|
26 | QT_CHARTS_BEGIN_NAMESPACE | |
27 |
|
27 |
@@ -18,13 +18,13 | |||||
18 | ** |
|
18 | ** | |
19 | ****************************************************************************/ |
|
19 | ****************************************************************************/ | |
20 |
|
20 | |||
21 |
#include |
|
21 | #include <QtCharts/QScatterSeries> | |
22 |
#include |
|
22 | #include <private/qscatterseries_p.h> | |
23 |
#include |
|
23 | #include <private/scatterchartitem_p.h> | |
24 |
#include |
|
24 | #include <private/chartdataset_p.h> | |
25 |
#include |
|
25 | #include <private/charttheme_p.h> | |
26 |
#include |
|
26 | #include <private/scatteranimation_p.h> | |
27 |
#include |
|
27 | #include <private/qchart_p.h> | |
28 |
|
28 | |||
29 | /*! |
|
29 | /*! | |
30 | \class QScatterSeries |
|
30 | \class QScatterSeries |
@@ -21,7 +21,7 | |||||
21 | #ifndef QSCATTERSERIES_H |
|
21 | #ifndef QSCATTERSERIES_H | |
22 | #define QSCATTERSERIES_H |
|
22 | #define QSCATTERSERIES_H | |
23 |
|
23 | |||
24 |
#include <QtCharts/ |
|
24 | #include <QtCharts/QChartGlobal> | |
25 | #include <QtCharts/qxyseries.h> |
|
25 | #include <QtCharts/qxyseries.h> | |
26 |
|
26 | |||
27 | QT_CHARTS_BEGIN_NAMESPACE |
|
27 | QT_CHARTS_BEGIN_NAMESPACE |
@@ -30,7 +30,7 | |||||
30 | #ifndef QSCATTERSERIES_P_H |
|
30 | #ifndef QSCATTERSERIES_P_H | |
31 | #define QSCATTERSERIES_P_H |
|
31 | #define QSCATTERSERIES_P_H | |
32 |
|
32 | |||
33 |
#include |
|
33 | #include <private/qxyseries_p.h> | |
34 |
|
34 | |||
35 | QT_CHARTS_BEGIN_NAMESPACE |
|
35 | QT_CHARTS_BEGIN_NAMESPACE | |
36 |
|
36 |
@@ -18,16 +18,16 | |||||
18 | ** |
|
18 | ** | |
19 | ****************************************************************************/ |
|
19 | ****************************************************************************/ | |
20 |
|
20 | |||
21 |
#include |
|
21 | #include <private/scatterchartitem_p.h> | |
22 |
#include |
|
22 | #include <QtCharts/QScatterSeries> | |
23 |
#include |
|
23 | #include <private/qscatterseries_p.h> | |
24 |
#include |
|
24 | #include <private/chartpresenter_p.h> | |
25 |
#include |
|
25 | #include <private/abstractdomain_p.h> | |
26 |
#include |
|
26 | #include <QtCharts/QChart> | |
27 | #include <QPainter> |
|
27 | #include <QtGui/QPainter> | |
28 | #include <QGraphicsScene> |
|
28 | #include <QtWidgets/QGraphicsScene> | |
29 | #include <QDebug> |
|
29 | #include <QtCore/QDebug> | |
30 | #include <QGraphicsSceneMouseEvent> |
|
30 | #include <QtWidgets/QGraphicsSceneMouseEvent> | |
31 |
|
31 | |||
32 | QT_CHARTS_BEGIN_NAMESPACE |
|
32 | QT_CHARTS_BEGIN_NAMESPACE | |
33 |
|
33 |
@@ -30,10 +30,10 | |||||
30 | #ifndef SCATTERCHARTITEM_H |
|
30 | #ifndef SCATTERCHARTITEM_H | |
31 | #define SCATTERCHARTITEM_H |
|
31 | #define SCATTERCHARTITEM_H | |
32 |
|
32 | |||
33 |
#include |
|
33 | #include <QtCharts/QChartGlobal> | |
34 |
#include |
|
34 | #include <private/xychart_p.h> | |
35 | #include <QGraphicsEllipseItem> |
|
35 | #include <QtWidgets/QGraphicsEllipseItem> | |
36 | #include <QPen> |
|
36 | #include <QtGui/QPen> | |
37 |
|
37 | |||
38 | QT_CHARTS_BEGIN_NAMESPACE |
|
38 | QT_CHARTS_BEGIN_NAMESPACE | |
39 |
|
39 |
@@ -18,10 +18,10 | |||||
18 | ** |
|
18 | ** | |
19 | ****************************************************************************/ |
|
19 | ****************************************************************************/ | |
20 |
|
20 | |||
21 |
#include |
|
21 | #include <private/scroller_p.h> | |
22 | #include "qlegend.h" |
|
22 | #include <QtCharts/QLegend> | |
23 | #include <QGraphicsSceneMouseEvent> |
|
23 | #include <QtWidgets/QGraphicsSceneMouseEvent> | |
24 | #include <QDebug> |
|
24 | #include <QtCore/QDebug> | |
25 |
|
25 | |||
26 | QT_CHARTS_BEGIN_NAMESPACE |
|
26 | QT_CHARTS_BEGIN_NAMESPACE | |
27 |
|
27 |
@@ -30,10 +30,10 | |||||
30 | #ifndef SCROLLER_P_H |
|
30 | #ifndef SCROLLER_P_H | |
31 | #define SCROLLER_P_H |
|
31 | #define SCROLLER_P_H | |
32 |
|
32 | |||
33 |
#include |
|
33 | #include <QtCharts/QChartGlobal> | |
34 | #include <QBasicTimer> |
|
34 | #include <QtCore/QBasicTimer> | |
35 | #include <QTime> |
|
35 | #include <QtCore/QTime> | |
36 | #include <QPointF> |
|
36 | #include <QtCore/QPointF> | |
37 |
|
37 | |||
38 | class QGraphicsSceneMouseEvent; |
|
38 | class QGraphicsSceneMouseEvent; | |
39 |
|
39 |
@@ -18,13 +18,13 | |||||
18 | ** |
|
18 | ** | |
19 | ****************************************************************************/ |
|
19 | ****************************************************************************/ | |
20 |
|
20 | |||
21 |
#include |
|
21 | #include <QtCharts/QSplineSeries> | |
22 |
#include |
|
22 | #include <private/qsplineseries_p.h> | |
23 |
#include |
|
23 | #include <private/splinechartitem_p.h> | |
24 |
#include |
|
24 | #include <private/chartdataset_p.h> | |
25 |
#include |
|
25 | #include <private/charttheme_p.h> | |
26 |
#include |
|
26 | #include <private/splineanimation_p.h> | |
27 |
#include |
|
27 | #include <private/qchart_p.h> | |
28 |
|
28 | |||
29 | /*! |
|
29 | /*! | |
30 | \class QSplineSeries |
|
30 | \class QSplineSeries |
@@ -21,11 +21,11 | |||||
21 | #ifndef QSPLINESERIES_H |
|
21 | #ifndef QSPLINESERIES_H | |
22 | #define QSPLINESERIES_H |
|
22 | #define QSPLINESERIES_H | |
23 |
|
23 | |||
24 |
#include <QtCharts/ |
|
24 | #include <QtCharts/QChartGlobal> | |
25 | #include <QtCharts/qlineseries.h> |
|
25 | #include <QtCharts/qlineseries.h> | |
26 | #include <QList> |
|
26 | #include <QtCore/QList> | |
27 | #include <QPointF> |
|
27 | #include <QtCore/QPointF> | |
28 | #include <QtGlobal> |
|
28 | #include <QtCore/QtGlobal> | |
29 |
|
29 | |||
30 | QT_CHARTS_BEGIN_NAMESPACE |
|
30 | QT_CHARTS_BEGIN_NAMESPACE | |
31 |
|
31 |
@@ -30,7 +30,7 | |||||
30 | #ifndef QSPLINESERIES_P_H |
|
30 | #ifndef QSPLINESERIES_P_H | |
31 | #define QSPLINESERIES_P_H |
|
31 | #define QSPLINESERIES_P_H | |
32 |
|
32 | |||
33 |
#include |
|
33 | #include <private/qlineseries_p.h> | |
34 |
|
34 | |||
35 | QT_CHARTS_BEGIN_NAMESPACE |
|
35 | QT_CHARTS_BEGIN_NAMESPACE | |
36 |
|
36 |
@@ -18,13 +18,13 | |||||
18 | ** |
|
18 | ** | |
19 | ****************************************************************************/ |
|
19 | ****************************************************************************/ | |
20 |
|
20 | |||
21 |
#include |
|
21 | #include <private/splinechartitem_p.h> | |
22 |
#include |
|
22 | #include <private/qsplineseries_p.h> | |
23 |
#include |
|
23 | #include <private/chartpresenter_p.h> | |
24 |
#include |
|
24 | #include <private/splineanimation_p.h> | |
25 |
#include |
|
25 | #include <private/polardomain_p.h> | |
26 | #include <QPainter> |
|
26 | #include <QtGui/QPainter> | |
27 | #include <QGraphicsSceneMouseEvent> |
|
27 | #include <QtWidgets/QGraphicsSceneMouseEvent> | |
28 |
|
28 | |||
29 | QT_CHARTS_BEGIN_NAMESPACE |
|
29 | QT_CHARTS_BEGIN_NAMESPACE | |
30 |
|
30 |
@@ -30,8 +30,8 | |||||
30 | #ifndef SPLINECHARTITEM_P_H |
|
30 | #ifndef SPLINECHARTITEM_P_H | |
31 | #define SPLINECHARTITEM_P_H |
|
31 | #define SPLINECHARTITEM_P_H | |
32 |
|
32 | |||
33 |
#include |
|
33 | #include <QtCharts/QSplineSeries> | |
34 |
#include |
|
34 | #include <private/xychart_p.h> | |
35 |
|
35 | |||
36 | QT_CHARTS_BEGIN_NAMESPACE |
|
36 | QT_CHARTS_BEGIN_NAMESPACE | |
37 |
|
37 |
@@ -30,9 +30,9 | |||||
30 | #ifndef CHARTTHEME_H |
|
30 | #ifndef CHARTTHEME_H | |
31 | #define CHARTTHEME_H |
|
31 | #define CHARTTHEME_H | |
32 |
|
32 | |||
33 |
#include |
|
33 | #include <private/chartthememanager_p.h> | |
34 | #include <QColor> |
|
34 | #include <QtGui/QColor> | |
35 | #include <QGradientStops> |
|
35 | #include <QtGui/QGradientStops> | |
36 |
|
36 | |||
37 | QT_CHARTS_BEGIN_NAMESPACE |
|
37 | QT_CHARTS_BEGIN_NAMESPACE | |
38 |
|
38 |
@@ -30,7 +30,7 | |||||
30 | #ifndef CHARTTHEMEBLUECERULEAN_P_H |
|
30 | #ifndef CHARTTHEMEBLUECERULEAN_P_H | |
31 | #define CHARTTHEMEBLUECERULEAN_P_H |
|
31 | #define CHARTTHEMEBLUECERULEAN_P_H | |
32 |
|
32 | |||
33 |
#include |
|
33 | #include <private/charttheme_p.h> | |
34 |
|
34 | |||
35 | QT_CHARTS_BEGIN_NAMESPACE |
|
35 | QT_CHARTS_BEGIN_NAMESPACE | |
36 |
|
36 |
@@ -30,7 +30,7 | |||||
30 | #ifndef CHARTTHEMEBLUEICY_P_H |
|
30 | #ifndef CHARTTHEMEBLUEICY_P_H | |
31 | #define CHARTTHEMEBLUEICY_P_H |
|
31 | #define CHARTTHEMEBLUEICY_P_H | |
32 |
|
32 | |||
33 |
#include |
|
33 | #include <private/charttheme_p.h> | |
34 |
|
34 | |||
35 | QT_CHARTS_BEGIN_NAMESPACE |
|
35 | QT_CHARTS_BEGIN_NAMESPACE | |
36 |
|
36 |
@@ -30,7 +30,7 | |||||
30 | #ifndef CHARTTHEMEBLUENCS_P_H |
|
30 | #ifndef CHARTTHEMEBLUENCS_P_H | |
31 | #define CHARTTHEMEBLUENCS_P_H |
|
31 | #define CHARTTHEMEBLUENCS_P_H | |
32 |
|
32 | |||
33 |
#include |
|
33 | #include <private/charttheme_p.h> | |
34 |
|
34 | |||
35 | QT_CHARTS_BEGIN_NAMESPACE |
|
35 | QT_CHARTS_BEGIN_NAMESPACE | |
36 |
|
36 |
@@ -30,7 +30,7 | |||||
30 | #ifndef CHARTTHEMEBROWNSAND_P_H |
|
30 | #ifndef CHARTTHEMEBROWNSAND_P_H | |
31 | #define CHARTTHEMEBROWNSAND_P_H |
|
31 | #define CHARTTHEMEBROWNSAND_P_H | |
32 |
|
32 | |||
33 |
#include |
|
33 | #include <private/charttheme_p.h> | |
34 |
|
34 | |||
35 | QT_CHARTS_BEGIN_NAMESPACE |
|
35 | QT_CHARTS_BEGIN_NAMESPACE | |
36 |
|
36 |
@@ -30,7 +30,7 | |||||
30 | #ifndef CHARTTHEMEDARK_P_H |
|
30 | #ifndef CHARTTHEMEDARK_P_H | |
31 | #define CHARTTHEMEDARK_P_H |
|
31 | #define CHARTTHEMEDARK_P_H | |
32 |
|
32 | |||
33 |
#include |
|
33 | #include <private/charttheme_p.h> | |
34 |
|
34 | |||
35 | QT_CHARTS_BEGIN_NAMESPACE |
|
35 | QT_CHARTS_BEGIN_NAMESPACE | |
36 |
|
36 |
@@ -30,7 +30,7 | |||||
30 | #ifndef CHARTTHEMEHIGHCONTRAST_P_H |
|
30 | #ifndef CHARTTHEMEHIGHCONTRAST_P_H | |
31 | #define CHARTTHEMEHIGHCONTRAST_P_H |
|
31 | #define CHARTTHEMEHIGHCONTRAST_P_H | |
32 |
|
32 | |||
33 |
#include |
|
33 | #include <private/charttheme_p.h> | |
34 |
|
34 | |||
35 | QT_CHARTS_BEGIN_NAMESPACE |
|
35 | QT_CHARTS_BEGIN_NAMESPACE | |
36 |
|
36 |
@@ -30,7 +30,7 | |||||
30 | #ifndef CHARTTHEMELIGHT_P_H |
|
30 | #ifndef CHARTTHEMELIGHT_P_H | |
31 | #define CHARTTHEMELIGHT_P_H |
|
31 | #define CHARTTHEMELIGHT_P_H | |
32 |
|
32 | |||
33 |
#include |
|
33 | #include <private/charttheme_p.h> | |
34 |
|
34 | |||
35 | QT_CHARTS_BEGIN_NAMESPACE |
|
35 | QT_CHARTS_BEGIN_NAMESPACE | |
36 |
|
36 |
@@ -30,7 +30,7 | |||||
30 | #ifndef CHARTTHEMEQT_P_H |
|
30 | #ifndef CHARTTHEMEQT_P_H | |
31 | #define CHARTTHEMEQT_P_H |
|
31 | #define CHARTTHEMEQT_P_H | |
32 |
|
32 | |||
33 |
#include |
|
33 | #include <private/charttheme_p.h> | |
34 |
|
34 | |||
35 | QT_CHARTS_BEGIN_NAMESPACE |
|
35 | QT_CHARTS_BEGIN_NAMESPACE | |
36 |
|
36 |
@@ -30,7 +30,7 | |||||
30 | #ifndef CHARTTHEMESYSTEM_P_H |
|
30 | #ifndef CHARTTHEMESYSTEM_P_H | |
31 | #define CHARTTHEMESYSTEM_P_H |
|
31 | #define CHARTTHEMESYSTEM_P_H | |
32 |
|
32 | |||
33 |
#include |
|
33 | #include <private/charttheme_p.h> | |
34 | #ifdef Q_OS_WIN |
|
34 | #ifdef Q_OS_WIN | |
35 | #include <windows.h> |
|
35 | #include <windows.h> | |
36 | #include <stdio.h> |
|
36 | #include <stdio.h> |
@@ -18,7 +18,7 | |||||
18 | ** |
|
18 | ** | |
19 | ****************************************************************************/ |
|
19 | ****************************************************************************/ | |
20 |
|
20 | |||
21 |
#include |
|
21 | #include <QtCharts/QHXYModelMapper> | |
22 |
|
22 | |||
23 | QT_CHARTS_BEGIN_NAMESPACE |
|
23 | QT_CHARTS_BEGIN_NAMESPACE | |
24 |
|
24 |
@@ -18,7 +18,7 | |||||
18 | ** |
|
18 | ** | |
19 | ****************************************************************************/ |
|
19 | ****************************************************************************/ | |
20 |
|
20 | |||
21 | #include "qvxymodelmapper.h" |
|
21 | #include <QtCharts/QVXYModelMapper> | |
22 |
|
22 | |||
23 | QT_CHARTS_BEGIN_NAMESPACE |
|
23 | QT_CHARTS_BEGIN_NAMESPACE | |
24 |
|
24 |
@@ -18,11 +18,11 | |||||
18 | ** |
|
18 | ** | |
19 | ****************************************************************************/ |
|
19 | ****************************************************************************/ | |
20 |
|
20 | |||
21 | #include "qxymodelmapper.h" |
|
21 | #include <QtCharts/QXYModelMapper> | |
22 |
#include |
|
22 | #include <private/qxymodelmapper_p.h> | |
23 | #include "qxyseries.h" |
|
23 | #include <QtCharts/QXYSeries> | |
24 | #include <QAbstractItemModel> |
|
24 | #include <QtCore/QAbstractItemModel> | |
25 | #include <QDateTime> |
|
25 | #include <QtCore/QDateTime> | |
26 |
|
26 | |||
27 | QT_CHARTS_BEGIN_NAMESPACE |
|
27 | QT_CHARTS_BEGIN_NAMESPACE | |
28 |
|
28 |
@@ -21,8 +21,8 | |||||
21 | #ifndef QXYMODELMAPPER_H |
|
21 | #ifndef QXYMODELMAPPER_H | |
22 | #define QXYMODELMAPPER_H |
|
22 | #define QXYMODELMAPPER_H | |
23 |
|
23 | |||
24 |
#include <QtCharts/ |
|
24 | #include <QtCharts/QChartGlobal> | |
25 | #include <QObject> |
|
25 | #include <QtCore/QObject> | |
26 |
|
26 | |||
27 | class QAbstractItemModel; |
|
27 | class QAbstractItemModel; | |
28 |
|
28 |
@@ -30,8 +30,8 | |||||
30 | #ifndef QXYMODELMAPPER_P_H |
|
30 | #ifndef QXYMODELMAPPER_P_H | |
31 | #define QXYMODELMAPPER_P_H |
|
31 | #define QXYMODELMAPPER_P_H | |
32 |
|
32 | |||
33 | #include "qxymodelmapper.h" |
|
33 | #include <QtCharts/QXYModelMapper> | |
34 | #include <QObject> |
|
34 | #include <QtCore/QObject> | |
35 |
|
35 | |||
36 | class QModelIndex; |
|
36 | class QModelIndex; | |
37 | class QAbstractItemModel; |
|
37 | class QAbstractItemModel; |
@@ -18,15 +18,15 | |||||
18 | ** |
|
18 | ** | |
19 | ****************************************************************************/ |
|
19 | ****************************************************************************/ | |
20 |
|
20 | |||
21 | #include "qxyseries.h" |
|
21 | #include <QtCharts/QXYSeries> | |
22 |
#include |
|
22 | #include <private/qxyseries_p.h> | |
23 |
#include |
|
23 | #include <private/abstractdomain_p.h> | |
24 |
#include |
|
24 | #include <QtCharts/QValueAxis> | |
25 |
#include |
|
25 | #include <private/xychart_p.h> | |
26 |
#include |
|
26 | #include <QtCharts/QXYLegendMarker> | |
27 |
#include |
|
27 | #include <private/charthelpers_p.h> | |
28 |
#include |
|
28 | #include <private/qchart_p.h> | |
29 | #include <QPainter> |
|
29 | #include <QtGui/QPainter> | |
30 |
|
30 | |||
31 | QT_CHARTS_BEGIN_NAMESPACE |
|
31 | QT_CHARTS_BEGIN_NAMESPACE | |
32 |
|
32 |
@@ -21,10 +21,10 | |||||
21 | #ifndef QXYSERIES_H |
|
21 | #ifndef QXYSERIES_H | |
22 | #define QXYSERIES_H |
|
22 | #define QXYSERIES_H | |
23 |
|
23 | |||
24 |
#include <QtCharts/ |
|
24 | #include <QtCharts/QChartGlobal> | |
25 |
#include <QtCharts/ |
|
25 | #include <QtCharts/QAbstractSeries> | |
26 | #include <QPen> |
|
26 | #include <QtGui/QPen> | |
27 | #include <QBrush> |
|
27 | #include <QtGui/QBrush> | |
28 |
|
28 | |||
29 | class QModelIndex; |
|
29 | class QModelIndex; | |
30 |
|
30 |
@@ -30,7 +30,7 | |||||
30 | #ifndef QXYSERIES_P_H |
|
30 | #ifndef QXYSERIES_P_H | |
31 | #define QXYSERIES_P_H |
|
31 | #define QXYSERIES_P_H | |
32 |
|
32 | |||
33 |
#include |
|
33 | #include <private/qabstractseries_p.h> | |
34 |
|
34 | |||
35 | QT_CHARTS_BEGIN_NAMESPACE |
|
35 | QT_CHARTS_BEGIN_NAMESPACE | |
36 |
|
36 |
@@ -18,15 +18,15 | |||||
18 | ** |
|
18 | ** | |
19 | ****************************************************************************/ |
|
19 | ****************************************************************************/ | |
20 |
|
20 | |||
21 |
#include |
|
21 | #include <private/xychart_p.h> | |
22 | #include "qxyseries.h" |
|
22 | #include <QtCharts/QXYSeries> | |
23 |
#include |
|
23 | #include <private/qxyseries_p.h> | |
24 |
#include |
|
24 | #include <private/chartpresenter_p.h> | |
25 |
#include |
|
25 | #include <private/abstractdomain_p.h> | |
26 | #include "qxymodelmapper.h" |
|
26 | #include <QtCharts/QXYModelMapper> | |
27 |
#include |
|
27 | #include <private/qabstractaxis_p.h> | |
28 | #include <QPainter> |
|
28 | #include <QtGui/QPainter> | |
29 | #include <QAbstractItemModel> |
|
29 | #include <QtCore/QAbstractItemModel> | |
30 |
|
30 | |||
31 |
|
31 | |||
32 | QT_CHARTS_BEGIN_NAMESPACE |
|
32 | QT_CHARTS_BEGIN_NAMESPACE |
@@ -30,11 +30,11 | |||||
30 | #ifndef XYCHART_H |
|
30 | #ifndef XYCHART_H | |
31 | #define XYCHART_H |
|
31 | #define XYCHART_H | |
32 |
|
32 | |||
33 |
#include < |
|
33 | #include <QtCharts/QChartGlobal> | |
34 |
#include |
|
34 | #include <private/chartitem_p.h> | |
35 |
#include |
|
35 | #include <private/xyanimation_p.h> | |
36 |
#include |
|
36 | #include <QtCharts/QValueAxis> | |
37 | #include <QPen> |
|
37 | #include <QtGui/QPen> | |
38 |
|
38 | |||
39 | QT_CHARTS_BEGIN_NAMESPACE |
|
39 | QT_CHARTS_BEGIN_NAMESPACE | |
40 |
|
40 |
@@ -1,7 +1,7 | |||||
1 |
|
1 | |||
2 | TARGET = qtchartsqml2 |
|
2 | TARGET = qtchartsqml2 | |
3 | QT += qml quick |
|
3 | QT += qml quick | |
4 | QT += charts |
|
4 | QT += charts charts-private | |
5 | TARGETPATH = QtCharts |
|
5 | TARGETPATH = QtCharts | |
6 |
|
6 | |||
7 | IMPORT_VERSION = $$MODULE_VERSION |
|
7 | IMPORT_VERSION = $$MODULE_VERSION |
@@ -18,12 +18,12 | |||||
18 | ** |
|
18 | ** | |
19 | ****************************************************************************/ |
|
19 | ****************************************************************************/ | |
20 |
|
20 | |||
21 |
#include |
|
21 | #include <QtCharts/QChart> | |
22 |
#include |
|
22 | #include <QtCharts/QAbstractAxis> | |
23 |
#include |
|
23 | #include <QtCharts/QValueAxis> | |
24 |
#include |
|
24 | #include <QtCharts/QLogValueAxis> | |
25 | #include "declarativecategoryaxis.h" |
|
25 | #include "declarativecategoryaxis.h" | |
26 |
#include |
|
26 | #include <QtCharts/QBarCategoryAxis> | |
27 | #include "declarativechart.h" |
|
27 | #include "declarativechart.h" | |
28 | #include "declarativepolarchart.h" |
|
28 | #include "declarativepolarchart.h" | |
29 | #include "declarativexypoint.h" |
|
29 | #include "declarativexypoint.h" | |
@@ -35,23 +35,23 | |||||
35 | #include "declarativeboxplotseries.h" |
|
35 | #include "declarativeboxplotseries.h" | |
36 | #include "declarativepieseries.h" |
|
36 | #include "declarativepieseries.h" | |
37 | #include "declarativeaxes.h" |
|
37 | #include "declarativeaxes.h" | |
38 | #include "qvxymodelmapper.h" |
|
38 | #include <QtCharts/QVXYModelMapper> | |
39 |
#include |
|
39 | #include <QtCharts/QHXYModelMapper> | |
40 |
#include |
|
40 | #include <QtCharts/QHPieModelMapper> | |
41 |
#include |
|
41 | #include <QtCharts/QVPieModelMapper> | |
42 |
#include |
|
42 | #include <QtCharts/QHBarModelMapper> | |
43 |
#include |
|
43 | #include <QtCharts/QVBarModelMapper> | |
44 | #include "declarativemargins.h" |
|
44 | #include "declarativemargins.h" | |
45 |
#include |
|
45 | #include <QtCharts/QAreaLegendMarker> | |
46 |
#include |
|
46 | #include <QtCharts/QBarLegendMarker> | |
47 |
#include |
|
47 | #include <QtCharts/QPieLegendMarker> | |
48 |
#include |
|
48 | #include <QtCharts/QXYLegendMarker> | |
49 |
#include |
|
49 | #include <QtCharts/QBoxPlotModelMapper> | |
50 |
#include |
|
50 | #include <QtCharts/QVBoxPlotModelMapper> | |
51 | #ifndef QT_ON_ARM |
|
51 | #ifndef QT_ON_ARM | |
52 |
#include |
|
52 | #include <QtCharts/QDateTimeAxis> | |
53 | #endif |
|
53 | #endif | |
54 | #include <QAbstractItemModel> |
|
54 | #include <QtCore/QAbstractItemModel> | |
55 | #include <QtQml> |
|
55 | #include <QtQml> | |
56 |
|
56 | |||
57 | QT_CHARTS_USE_NAMESPACE |
|
57 | QT_CHARTS_USE_NAMESPACE |
@@ -21,7 +21,7 | |||||
21 | #ifndef DECLARATIVEAREASERIES_H |
|
21 | #ifndef DECLARATIVEAREASERIES_H | |
22 | #define DECLARATIVEAREASERIES_H |
|
22 | #define DECLARATIVEAREASERIES_H | |
23 |
|
23 | |||
24 |
#include |
|
24 | #include <QtCharts/QAreaSeries> | |
25 | #include "declarativeaxes.h" |
|
25 | #include "declarativeaxes.h" | |
26 |
|
26 | |||
27 | QT_CHARTS_BEGIN_NAMESPACE |
|
27 | QT_CHARTS_BEGIN_NAMESPACE |
@@ -19,7 +19,7 | |||||
19 | ****************************************************************************/ |
|
19 | ****************************************************************************/ | |
20 |
|
20 | |||
21 | #include "declarativeaxes.h" |
|
21 | #include "declarativeaxes.h" | |
22 |
#include |
|
22 | #include <QtCharts/QAbstractAxis> | |
23 |
|
23 | |||
24 | QT_CHARTS_BEGIN_NAMESPACE |
|
24 | QT_CHARTS_BEGIN_NAMESPACE | |
25 |
|
25 |
@@ -21,8 +21,8 | |||||
21 | #ifndef DECLARATIVEAXES_H |
|
21 | #ifndef DECLARATIVEAXES_H | |
22 | #define DECLARATIVEAXES_H |
|
22 | #define DECLARATIVEAXES_H | |
23 |
|
23 | |||
24 |
#include |
|
24 | #include <QtCharts/QChartGlobal> | |
25 | #include <QObject> |
|
25 | #include <QtCore/QObject> | |
26 |
|
26 | |||
27 | QT_CHARTS_BEGIN_NAMESPACE |
|
27 | QT_CHARTS_BEGIN_NAMESPACE | |
28 |
|
28 |
@@ -19,9 +19,9 | |||||
19 | ****************************************************************************/ |
|
19 | ****************************************************************************/ | |
20 |
|
20 | |||
21 | #include "declarativebarseries.h" |
|
21 | #include "declarativebarseries.h" | |
22 | #include "qbarset.h" |
|
22 | #include <QtCharts/QBarSet> | |
23 |
#include |
|
23 | #include <QtCharts/QVBarModelMapper> | |
24 |
#include |
|
24 | #include <QtCharts/QHBarModelMapper> | |
25 |
|
25 | |||
26 | QT_CHARTS_BEGIN_NAMESPACE |
|
26 | QT_CHARTS_BEGIN_NAMESPACE | |
27 |
|
27 |
@@ -21,13 +21,13 | |||||
21 | #ifndef DECLARATIVEBARSERIES_H |
|
21 | #ifndef DECLARATIVEBARSERIES_H | |
22 | #define DECLARATIVEBARSERIES_H |
|
22 | #define DECLARATIVEBARSERIES_H | |
23 |
|
23 | |||
24 |
#include |
|
24 | #include <QtCharts/QBarSeries> | |
25 |
#include |
|
25 | #include <QtCharts/QStackedBarSeries> | |
26 |
#include |
|
26 | #include <QtCharts/QPercentBarSeries> | |
27 |
#include |
|
27 | #include <QtCharts/QHorizontalBarSeries> | |
28 |
#include |
|
28 | #include <QtCharts/QHorizontalStackedBarSeries> | |
29 |
#include |
|
29 | #include <QtCharts/QHorizontalPercentBarSeries> | |
30 | #include "qbarset.h" |
|
30 | #include <QtCharts/QBarSet> | |
31 | #include "declarativeaxes.h" |
|
31 | #include "declarativeaxes.h" | |
32 |
|
32 | |||
33 | #include <QtQuick/QQuickItem> |
|
33 | #include <QtQuick/QQuickItem> |
@@ -20,8 +20,8 | |||||
20 |
|
20 | |||
21 | #include "declarativebarseries.h" |
|
21 | #include "declarativebarseries.h" | |
22 | #include "declarativeboxplotseries.h" |
|
22 | #include "declarativeboxplotseries.h" | |
23 | #include "qboxset.h" |
|
23 | #include <QtCharts/QBoxSet> | |
24 |
#include |
|
24 | #include <QtCharts/QVBoxPlotModelMapper> | |
25 |
|
25 | |||
26 | QT_CHARTS_BEGIN_NAMESPACE |
|
26 | QT_CHARTS_BEGIN_NAMESPACE | |
27 |
|
27 |
@@ -21,9 +21,9 | |||||
21 | #ifndef DECLARATIVEBOXPLOT_H |
|
21 | #ifndef DECLARATIVEBOXPLOT_H | |
22 | #define DECLARATIVEBOXPLOT_H |
|
22 | #define DECLARATIVEBOXPLOT_H | |
23 |
|
23 | |||
24 | #include "qboxset.h" |
|
24 | #include <QtCharts/QBoxSet> | |
25 | #include "declarativeaxes.h" |
|
25 | #include "declarativeaxes.h" | |
26 |
#include |
|
26 | #include <QtCharts/QBoxPlotSeries> | |
27 |
|
27 | |||
28 | #include <QtQuick/QQuickItem> |
|
28 | #include <QtQuick/QQuickItem> | |
29 | #include <QtQml/QQmlParserStatus> |
|
29 | #include <QtQml/QQmlParserStatus> |
@@ -19,7 +19,7 | |||||
19 | ****************************************************************************/ |
|
19 | ****************************************************************************/ | |
20 |
|
20 | |||
21 | #include "declarativecategoryaxis.h" |
|
21 | #include "declarativecategoryaxis.h" | |
22 | #include <QDebug> |
|
22 | #include <QtCore/QDebug> | |
23 |
|
23 | |||
24 | QT_CHARTS_BEGIN_NAMESPACE |
|
24 | QT_CHARTS_BEGIN_NAMESPACE | |
25 |
|
25 |
@@ -21,7 +21,7 | |||||
21 | #ifndef DECLARATIVECATEGORYAXIS_H |
|
21 | #ifndef DECLARATIVECATEGORYAXIS_H | |
22 | #define DECLARATIVECATEGORYAXIS_H |
|
22 | #define DECLARATIVECATEGORYAXIS_H | |
23 |
|
23 | |||
24 |
#include |
|
24 | #include <QtCharts/QCategoryAxis> | |
25 |
|
25 | |||
26 | #include <QtQml/QQmlListProperty> |
|
26 | #include <QtQml/QQmlListProperty> | |
27 | #include <QtQml/QQmlParserStatus> |
|
27 | #include <QtQml/QQmlParserStatus> |
@@ -19,7 +19,7 | |||||
19 | ****************************************************************************/ |
|
19 | ****************************************************************************/ | |
20 |
|
20 | |||
21 | #include "declarativechart.h" |
|
21 | #include "declarativechart.h" | |
22 | #include <QPainter> |
|
22 | #include <QtGui/QPainter> | |
23 | #include "declarativelineseries.h" |
|
23 | #include "declarativelineseries.h" | |
24 | #include "declarativeareaseries.h" |
|
24 | #include "declarativeareaseries.h" | |
25 | #include "declarativebarseries.h" |
|
25 | #include "declarativebarseries.h" | |
@@ -27,26 +27,26 | |||||
27 | #include "declarativesplineseries.h" |
|
27 | #include "declarativesplineseries.h" | |
28 | #include "declarativeboxplotseries.h" |
|
28 | #include "declarativeboxplotseries.h" | |
29 | #include "declarativescatterseries.h" |
|
29 | #include "declarativescatterseries.h" | |
30 |
#include |
|
30 | #include <QtCharts/QBarCategoryAxis> | |
31 |
#include |
|
31 | #include <QtCharts/QValueAxis> | |
32 |
#include |
|
32 | #include <QtCharts/QLogValueAxis> | |
33 |
#include |
|
33 | #include <QtCharts/QCategoryAxis> | |
34 |
#include |
|
34 | #include <private/qabstractseries_p.h> | |
35 | #include "declarativemargins.h" |
|
35 | #include "declarativemargins.h" | |
36 |
#include |
|
36 | #include <private/chartdataset_p.h> | |
37 | #include "declarativeaxes.h" |
|
37 | #include "declarativeaxes.h" | |
38 |
#include |
|
38 | #include <private/qchart_p.h> | |
39 |
#include |
|
39 | #include <QtCharts/QPolarChart> | |
40 |
|
40 | |||
41 | #ifndef QT_ON_ARM |
|
41 | #ifndef QT_ON_ARM | |
42 |
#include |
|
42 | #include <QtCharts/QDateTimeAxis> | |
43 | #endif |
|
43 | #endif | |
44 |
|
44 | |||
45 | #include <QGraphicsSceneMouseEvent> |
|
45 | #include <QtWidgets/QGraphicsSceneMouseEvent> | |
46 | #include <QGraphicsSceneHoverEvent> |
|
46 | #include <QtWidgets/QGraphicsSceneHoverEvent> | |
47 | #include <QApplication> |
|
47 | #include <QtWidgets/QApplication> | |
48 | #include <QTimer> |
|
48 | #include <QtCore/QTimer> | |
49 | #include <QThread> |
|
49 | #include <QtCore/QThread> | |
50 |
|
50 | |||
51 | QT_CHARTS_BEGIN_NAMESPACE |
|
51 | QT_CHARTS_BEGIN_NAMESPACE | |
52 |
|
52 |
@@ -27,7 +27,7 | |||||
27 | #include <QtWidgets/QGraphicsScene> |
|
27 | #include <QtWidgets/QGraphicsScene> | |
28 | #include <QtCore/QMutex> |
|
28 | #include <QtCore/QMutex> | |
29 |
|
29 | |||
30 |
#include |
|
30 | #include <QtCharts/QChart> | |
31 | #include <QtCore/QLocale> |
|
31 | #include <QtCore/QLocale> | |
32 |
|
32 | |||
33 | QT_CHARTS_BEGIN_NAMESPACE |
|
33 | QT_CHARTS_BEGIN_NAMESPACE |
@@ -21,7 +21,7 | |||||
21 | #ifndef DECLARATIVELINESERIES_H |
|
21 | #ifndef DECLARATIVELINESERIES_H | |
22 | #define DECLARATIVELINESERIES_H |
|
22 | #define DECLARATIVELINESERIES_H | |
23 |
|
23 | |||
24 |
#include |
|
24 | #include <QtCharts/QLineSeries> | |
25 | #include "declarativexyseries.h" |
|
25 | #include "declarativexyseries.h" | |
26 | #include "declarativeaxes.h" |
|
26 | #include "declarativeaxes.h" | |
27 |
|
27 |
@@ -19,8 +19,8 | |||||
19 | ****************************************************************************/ |
|
19 | ****************************************************************************/ | |
20 |
|
20 | |||
21 | #include "declarativemargins.h" |
|
21 | #include "declarativemargins.h" | |
22 | #include <QDataStream> |
|
22 | #include <QtCore/QDataStream> | |
23 | #include <QDebug> |
|
23 | #include <QtCore/QDebug> | |
24 |
|
24 | |||
25 | QT_CHARTS_BEGIN_NAMESPACE |
|
25 | QT_CHARTS_BEGIN_NAMESPACE | |
26 |
|
26 |
@@ -21,9 +21,9 | |||||
21 | #ifndef DECLARATIVE_MARGINS_H |
|
21 | #ifndef DECLARATIVE_MARGINS_H | |
22 | #define DECLARATIVE_MARGINS_H |
|
22 | #define DECLARATIVE_MARGINS_H | |
23 |
|
23 | |||
24 |
#include |
|
24 | #include <QtCharts/QChartGlobal> | |
25 | #include <QObject> |
|
25 | #include <QtCore/QObject> | |
26 | #include <QMargins> |
|
26 | #include <QtCore/QMargins> | |
27 |
|
27 | |||
28 | QT_CHARTS_BEGIN_NAMESPACE |
|
28 | QT_CHARTS_BEGIN_NAMESPACE | |
29 |
|
29 |
@@ -19,9 +19,9 | |||||
19 | ****************************************************************************/ |
|
19 | ****************************************************************************/ | |
20 |
|
20 | |||
21 | #include "declarativepieseries.h" |
|
21 | #include "declarativepieseries.h" | |
22 | #include "qpieslice.h" |
|
22 | #include <QtCharts/QPieSlice> | |
23 |
#include |
|
23 | #include <QtCharts/QVPieModelMapper> | |
24 |
#include |
|
24 | #include <QtCharts/QHPieModelMapper> | |
25 |
|
25 | |||
26 | QT_CHARTS_BEGIN_NAMESPACE |
|
26 | QT_CHARTS_BEGIN_NAMESPACE | |
27 |
|
27 |
@@ -21,8 +21,8 | |||||
21 | #ifndef DECLARATIVEPIESERIES_H |
|
21 | #ifndef DECLARATIVEPIESERIES_H | |
22 | #define DECLARATIVEPIESERIES_H |
|
22 | #define DECLARATIVEPIESERIES_H | |
23 |
|
23 | |||
24 |
#include |
|
24 | #include <QtCharts/QPieSeries> | |
25 | #include "qpieslice.h" |
|
25 | #include <QtCharts/QPieSlice> | |
26 |
|
26 | |||
27 | #include <QtQuick/QQuickItem> |
|
27 | #include <QtQuick/QQuickItem> | |
28 | #include <QtQml/QQmlParserStatus> |
|
28 | #include <QtQml/QQmlParserStatus> |
@@ -19,7 +19,7 | |||||
19 | ****************************************************************************/ |
|
19 | ****************************************************************************/ | |
20 |
|
20 | |||
21 | #include "declarativepolarchart.h" |
|
21 | #include "declarativepolarchart.h" | |
22 |
#include |
|
22 | #include <QtCharts/QChart> | |
23 |
|
23 | |||
24 | QT_CHARTS_BEGIN_NAMESPACE |
|
24 | QT_CHARTS_BEGIN_NAMESPACE | |
25 |
|
25 |
@@ -21,7 +21,7 | |||||
21 | #ifndef DECLARATIVESCATTERSERIES_H |
|
21 | #ifndef DECLARATIVESCATTERSERIES_H | |
22 | #define DECLARATIVESCATTERSERIES_H |
|
22 | #define DECLARATIVESCATTERSERIES_H | |
23 |
|
23 | |||
24 |
#include |
|
24 | #include <QtCharts/QScatterSeries> | |
25 | #include "declarativexyseries.h" |
|
25 | #include "declarativexyseries.h" | |
26 | #include "declarativeaxes.h" |
|
26 | #include "declarativeaxes.h" | |
27 |
|
27 |
@@ -21,7 +21,7 | |||||
21 | #ifndef DECLARATIVESPLINESERIES_H |
|
21 | #ifndef DECLARATIVESPLINESERIES_H | |
22 | #define DECLARATIVESPLINESERIES_H |
|
22 | #define DECLARATIVESPLINESERIES_H | |
23 |
|
23 | |||
24 |
#include |
|
24 | #include <QtCharts/QSplineSeries> | |
25 | #include "declarativexyseries.h" |
|
25 | #include "declarativexyseries.h" | |
26 | #include "declarativeaxes.h" |
|
26 | #include "declarativeaxes.h" | |
27 |
|
27 |
@@ -19,7 +19,7 | |||||
19 | ****************************************************************************/ |
|
19 | ****************************************************************************/ | |
20 |
|
20 | |||
21 | #include "declarativexypoint.h" |
|
21 | #include "declarativexypoint.h" | |
22 | #include <QDataStream> |
|
22 | #include <QtCore/QDataStream> | |
23 |
|
23 | |||
24 | QT_CHARTS_BEGIN_NAMESPACE |
|
24 | QT_CHARTS_BEGIN_NAMESPACE | |
25 |
|
25 |
@@ -21,9 +21,9 | |||||
21 | #ifndef DECLARATIVE_XY_POINT_H |
|
21 | #ifndef DECLARATIVE_XY_POINT_H | |
22 | #define DECLARATIVE_XY_POINT_H |
|
22 | #define DECLARATIVE_XY_POINT_H | |
23 |
|
23 | |||
24 |
#include |
|
24 | #include <QtCharts/QChartGlobal> | |
25 | #include <QObject> |
|
25 | #include <QtCore/QObject> | |
26 | #include <QPointF> |
|
26 | #include <QtCore/QPointF> | |
27 |
|
27 | |||
28 | QT_CHARTS_BEGIN_NAMESPACE |
|
28 | QT_CHARTS_BEGIN_NAMESPACE | |
29 |
|
29 |
@@ -21,8 +21,8 | |||||
21 |
|
21 | |||
22 | #include "declarativexyseries.h" |
|
22 | #include "declarativexyseries.h" | |
23 | #include "declarativexypoint.h" |
|
23 | #include "declarativexypoint.h" | |
24 | #include "qvxymodelmapper.h" |
|
24 | #include <QtCharts/QVXYModelMapper> | |
25 |
#include |
|
25 | #include <QtCharts/QHXYModelMapper> | |
26 |
|
26 | |||
27 | QT_CHARTS_BEGIN_NAMESPACE |
|
27 | QT_CHARTS_BEGIN_NAMESPACE | |
28 |
|
28 |
@@ -21,7 +21,7 | |||||
21 | #ifndef DECLARATIVE_XY_SERIES_H |
|
21 | #ifndef DECLARATIVE_XY_SERIES_H | |
22 | #define DECLARATIVE_XY_SERIES_H |
|
22 | #define DECLARATIVE_XY_SERIES_H | |
23 |
|
23 | |||
24 | #include <QXYSeries> |
|
24 | #include <QtCharts/QXYSeries> | |
25 |
|
25 | |||
26 | QT_CHARTS_BEGIN_NAMESPACE |
|
26 | QT_CHARTS_BEGIN_NAMESPACE | |
27 |
|
27 |
@@ -2,7 +2,7 | |||||
2 | error( "Couldn't find the tests.pri file!" ) |
|
2 | error( "Couldn't find the tests.pri file!" ) | |
3 | } |
|
3 | } | |
4 |
|
4 | |||
5 |
|
|
5 | QT += testlib widgets | |
6 |
|
6 | |||
7 | !contains(TARGET, ^tst_.*):TARGET = $$join(TARGET,,"tst_") |
|
7 | !contains(TARGET, ^tst_.*):TARGET = $$join(TARGET,,"tst_") | |
8 |
|
8 |
@@ -40,21 +40,21 QTEST_MAIN(tst_ChartDataSet) | |||||
40 | #else |
|
40 | #else | |
41 |
|
41 | |||
42 | #include <QtTest/QtTest> |
|
42 | #include <QtTest/QtTest> | |
43 |
#include < |
|
43 | #include <QtCharts/QAbstractAxis> | |
44 |
#include < |
|
44 | #include <QtCharts/QValueAxis> | |
45 |
#include < |
|
45 | #include <QtCharts/QBarCategoryAxis> | |
46 |
#include < |
|
46 | #include <QtCharts/QCategoryAxis> | |
47 | #ifndef QT_ON_ARM |
|
47 | #ifndef QT_ON_ARM | |
48 |
#include |
|
48 | #include <QtCharts/QDateTimeAxis> | |
49 | #endif |
|
49 | #endif | |
50 |
#include < |
|
50 | #include <QtCharts/QLineSeries> | |
51 |
#include < |
|
51 | #include <QtCharts/QAreaSeries> | |
52 |
#include < |
|
52 | #include <QtCharts/QScatterSeries> | |
53 |
#include < |
|
53 | #include <QtCharts/QSplineSeries> | |
54 |
#include < |
|
54 | #include <QtCharts/QPieSeries> | |
55 |
#include < |
|
55 | #include <QtCharts/QBarSeries> | |
56 |
#include < |
|
56 | #include <QtCharts/QPercentBarSeries> | |
57 |
#include < |
|
57 | #include <QtCharts/QStackedBarSeries> | |
58 | #include <private/chartdataset_p.h> |
|
58 | #include <private/chartdataset_p.h> | |
59 | #include <private/abstractdomain_p.h> |
|
59 | #include <private/abstractdomain_p.h> | |
60 | #include <tst_definitions.h> |
|
60 | #include <tst_definitions.h> |
@@ -23,7 +23,7 | |||||
23 |
|
23 | |||
24 | #include <QtCharts/qpolarchart.h> |
|
24 | #include <QtCharts/qpolarchart.h> | |
25 | #include <QtTest/QtTest> |
|
25 | #include <QtTest/QtTest> | |
26 | #include <QPushButton> |
|
26 | #include <QtWidgets/QPushButton> | |
27 |
|
27 | |||
28 | namespace QTest |
|
28 | namespace QTest | |
29 | { |
|
29 | { |
@@ -23,8 +23,8 | |||||
23 |
|
23 | |||
24 | #include <QtTest/QtTest> |
|
24 | #include <QtTest/QtTest> | |
25 | #include <tst_definitions.h> |
|
25 | #include <tst_definitions.h> | |
26 |
#include < |
|
26 | #include <QtCharts/QAbstractAxis> | |
27 |
#include < |
|
27 | #include <QtCharts/QChartView> | |
28 |
|
28 | |||
29 | QT_CHARTS_USE_NAMESPACE |
|
29 | QT_CHARTS_USE_NAMESPACE | |
30 |
|
30 |
@@ -19,9 +19,9 | |||||
19 | ****************************************************************************/ |
|
19 | ****************************************************************************/ | |
20 |
|
20 | |||
21 | #include "../qabstractaxis/tst_qabstractaxis.h" |
|
21 | #include "../qabstractaxis/tst_qabstractaxis.h" | |
22 |
#include < |
|
22 | #include <QtCharts/QBarSeries> | |
23 |
#include < |
|
23 | #include <QtCharts/QBarSet> | |
24 |
#include < |
|
24 | #include <QtCharts/QBarCategoryAxis> | |
25 |
|
25 | |||
26 | class tst_QBarCategoriesAxis: public tst_QAbstractAxis |
|
26 | class tst_QBarCategoriesAxis: public tst_QAbstractAxis | |
27 | { |
|
27 | { |
@@ -21,13 +21,13 | |||||
21 | #include <QtCore/QString> |
|
21 | #include <QtCore/QString> | |
22 | #include <QtTest/QtTest> |
|
22 | #include <QtTest/QtTest> | |
23 |
|
23 | |||
24 |
#include < |
|
24 | #include <QtCharts/QChart> | |
25 |
#include < |
|
25 | #include <QtCharts/QChartView> | |
26 |
#include < |
|
26 | #include <QtCharts/QBarSeries> | |
27 |
#include < |
|
27 | #include <QtCharts/QBarSet> | |
28 |
#include < |
|
28 | #include <QtCharts/QVBarModelMapper> | |
29 |
#include < |
|
29 | #include <QtCharts/QHBarModelMapper> | |
30 | #include <QStandardItemModel> |
|
30 | #include <QtGui/QStandardItemModel> | |
31 |
|
31 | |||
32 | QT_CHARTS_USE_NAMESPACE |
|
32 | QT_CHARTS_USE_NAMESPACE | |
33 |
|
33 |
@@ -19,10 +19,10 | |||||
19 | ****************************************************************************/ |
|
19 | ****************************************************************************/ | |
20 |
|
20 | |||
21 | #include <QtTest/QtTest> |
|
21 | #include <QtTest/QtTest> | |
22 |
#include < |
|
22 | #include <QtCharts/QBarSeries> | |
23 |
#include < |
|
23 | #include <QtCharts/QBarSet> | |
24 |
#include < |
|
24 | #include <QtCharts/QChartView> | |
25 |
#include < |
|
25 | #include <QtCharts/QChart> | |
26 | #include "tst_definitions.h" |
|
26 | #include "tst_definitions.h" | |
27 |
|
27 | |||
28 | QT_CHARTS_USE_NAMESPACE |
|
28 | QT_CHARTS_USE_NAMESPACE |
@@ -19,9 +19,9 | |||||
19 | ****************************************************************************/ |
|
19 | ****************************************************************************/ | |
20 |
|
20 | |||
21 | #include <QtTest/QtTest> |
|
21 | #include <QtTest/QtTest> | |
22 |
#include < |
|
22 | #include <QtCharts/QBarSet> | |
23 |
#include < |
|
23 | #include <QtCharts/QBarSeries> | |
24 |
#include < |
|
24 | #include <QtCharts/QChartView> | |
25 | #include "tst_definitions.h" |
|
25 | #include "tst_definitions.h" | |
26 |
|
26 | |||
27 | QT_CHARTS_USE_NAMESPACE |
|
27 | QT_CHARTS_USE_NAMESPACE |
@@ -19,8 +19,8 | |||||
19 | ****************************************************************************/ |
|
19 | ****************************************************************************/ | |
20 |
|
20 | |||
21 | #include "../qabstractaxis/tst_qabstractaxis.h" |
|
21 | #include "../qabstractaxis/tst_qabstractaxis.h" | |
22 |
#include |
|
22 | #include <QtCharts/QCategoryAxis> | |
23 |
#include < |
|
23 | #include <QtCharts/QLineSeries> | |
24 |
|
24 | |||
25 | class tst_QCategoryAxis: public tst_QAbstractAxis |
|
25 | class tst_QCategoryAxis: public tst_QAbstractAxis | |
26 | { |
|
26 | { |
@@ -19,18 +19,18 | |||||
19 | ****************************************************************************/ |
|
19 | ****************************************************************************/ | |
20 |
|
20 | |||
21 | #include <QtTest/QtTest> |
|
21 | #include <QtTest/QtTest> | |
22 |
#include < |
|
22 | #include <QtCharts/QChartView> | |
23 |
#include < |
|
23 | #include <QtCharts/QLineSeries> | |
24 |
#include < |
|
24 | #include <QtCharts/QAreaSeries> | |
25 |
#include < |
|
25 | #include <QtCharts/QScatterSeries> | |
26 |
#include < |
|
26 | #include <QtCharts/QSplineSeries> | |
27 |
#include < |
|
27 | #include <QtCharts/QPieSeries> | |
28 |
#include < |
|
28 | #include <QtCharts/QAbstractBarSeries> | |
29 |
#include < |
|
29 | #include <QtCharts/QBarSeries> | |
30 |
#include < |
|
30 | #include <QtCharts/QPercentBarSeries> | |
31 |
#include < |
|
31 | #include <QtCharts/QStackedBarSeries> | |
32 |
#include < |
|
32 | #include <QtCharts/QValueAxis> | |
33 |
#include < |
|
33 | #include <QtCharts/QBarCategoryAxis> | |
34 | #include "tst_definitions.h" |
|
34 | #include "tst_definitions.h" | |
35 |
|
35 | |||
36 | QT_CHARTS_USE_NAMESPACE |
|
36 | QT_CHARTS_USE_NAMESPACE |
@@ -23,7 +23,7 | |||||
23 | #include <QtCharts/qlineseries.h> |
|
23 | #include <QtCharts/qlineseries.h> | |
24 | #include <cmath> |
|
24 | #include <cmath> | |
25 | #include <tst_definitions.h> |
|
25 | #include <tst_definitions.h> | |
26 |
#include <QtCharts/ |
|
26 | #include <QtCharts/QValueAxis> | |
27 |
|
27 | |||
28 | QT_CHARTS_USE_NAMESPACE |
|
28 | QT_CHARTS_USE_NAMESPACE | |
29 |
|
29 |
@@ -19,8 +19,8 | |||||
19 | ****************************************************************************/ |
|
19 | ****************************************************************************/ | |
20 |
|
20 | |||
21 | #include "../qabstractaxis/tst_qabstractaxis.h" |
|
21 | #include "../qabstractaxis/tst_qabstractaxis.h" | |
22 |
#include < |
|
22 | #include <QtCharts/QDateTimeAxis> | |
23 |
#include < |
|
23 | #include <QtCharts/QLineSeries> | |
24 |
|
24 | |||
25 | class tst_QDateTimeAxis : public QObject//: public tst_QAbstractAxis |
|
25 | class tst_QDateTimeAxis : public QObject//: public tst_QAbstractAxis | |
26 | { |
|
26 | { |
@@ -19,10 +19,10 | |||||
19 | ****************************************************************************/ |
|
19 | ****************************************************************************/ | |
20 |
|
20 | |||
21 | #include <QtTest/QtTest> |
|
21 | #include <QtTest/QtTest> | |
22 |
#include < |
|
22 | #include <QtCharts/QHorizontalBarSeries> | |
23 |
#include < |
|
23 | #include <QtCharts/QBarSet> | |
24 |
#include < |
|
24 | #include <QtCharts/QChartView> | |
25 |
#include < |
|
25 | #include <QtCharts/QChart> | |
26 | #include "tst_definitions.h" |
|
26 | #include "tst_definitions.h" | |
27 |
|
27 | |||
28 | QT_CHARTS_USE_NAMESPACE |
|
28 | QT_CHARTS_USE_NAMESPACE |
@@ -19,10 +19,10 | |||||
19 | ****************************************************************************/ |
|
19 | ****************************************************************************/ | |
20 |
|
20 | |||
21 | #include <QtTest/QtTest> |
|
21 | #include <QtTest/QtTest> | |
22 |
#include < |
|
22 | #include <QtCharts/QHorizontalPercentBarSeries> | |
23 |
#include < |
|
23 | #include <QtCharts/QBarSet> | |
24 |
#include < |
|
24 | #include <QtCharts/QChartView> | |
25 |
#include < |
|
25 | #include <QtCharts/QChart> | |
26 | #include "tst_definitions.h" |
|
26 | #include "tst_definitions.h" | |
27 |
|
27 | |||
28 | QT_CHARTS_USE_NAMESPACE |
|
28 | QT_CHARTS_USE_NAMESPACE |
@@ -19,10 +19,10 | |||||
19 | ****************************************************************************/ |
|
19 | ****************************************************************************/ | |
20 |
|
20 | |||
21 | #include <QtTest/QtTest> |
|
21 | #include <QtTest/QtTest> | |
22 |
#include < |
|
22 | #include <QtCharts/QHorizontalStackedBarSeries> | |
23 |
#include < |
|
23 | #include <QtCharts/QBarSet> | |
24 |
#include < |
|
24 | #include <QtCharts/QChartView> | |
25 |
#include < |
|
25 | #include <QtCharts/QChart> | |
26 | #include "tst_definitions.h" |
|
26 | #include "tst_definitions.h" | |
27 |
|
27 | |||
28 | QT_CHARTS_USE_NAMESPACE |
|
28 | QT_CHARTS_USE_NAMESPACE |
@@ -19,18 +19,18 | |||||
19 | ****************************************************************************/ |
|
19 | ****************************************************************************/ | |
20 |
|
20 | |||
21 | #include <QtTest/QtTest> |
|
21 | #include <QtTest/QtTest> | |
22 |
#include < |
|
22 | #include <QtCharts/QChartView> | |
23 |
#include < |
|
23 | #include <QtCharts/QLegend> | |
24 |
#include < |
|
24 | #include <QtCharts/QPieSeries> | |
25 |
#include < |
|
25 | #include <QtCharts/QPieLegendMarker> | |
26 |
#include < |
|
26 | #include <QtCharts/QAreaSeries> | |
27 |
#include < |
|
27 | #include <QtCharts/QAreaLegendMarker> | |
28 |
#include < |
|
28 | #include <QtCharts/QLineSeries> | |
29 |
#include < |
|
29 | #include <QtCharts/QXYLegendMarker> | |
30 |
#include < |
|
30 | #include <QtCharts/QScatterSeries> | |
31 |
#include < |
|
31 | #include <QtCharts/QBarSeries> | |
32 |
#include < |
|
32 | #include <QtCharts/QBarSet> | |
33 |
#include < |
|
33 | #include <QtCharts/QBarLegendMarker> | |
34 | #include "tst_definitions.h" |
|
34 | #include "tst_definitions.h" | |
35 |
|
35 | |||
36 | QT_CHARTS_USE_NAMESPACE |
|
36 | QT_CHARTS_USE_NAMESPACE |
@@ -19,7 +19,7 | |||||
19 | ****************************************************************************/ |
|
19 | ****************************************************************************/ | |
20 |
|
20 | |||
21 | #include "../qxyseries/tst_qxyseries.h" |
|
21 | #include "../qxyseries/tst_qxyseries.h" | |
22 |
#include < |
|
22 | #include <QtCharts/QLineSeries> | |
23 |
|
23 | |||
24 |
|
24 | |||
25 | Q_DECLARE_METATYPE(QList<QPointF>) |
|
25 | Q_DECLARE_METATYPE(QList<QPointF>) |
@@ -19,9 +19,9 | |||||
19 | ****************************************************************************/ |
|
19 | ****************************************************************************/ | |
20 |
|
20 | |||
21 | #include "../qabstractaxis/tst_qabstractaxis.h" |
|
21 | #include "../qabstractaxis/tst_qabstractaxis.h" | |
22 |
#include |
|
22 | #include <QtCharts/QLogValueAxis> | |
23 |
#include < |
|
23 | #include <QtCharts/QLineSeries> | |
24 | #include <QDebug> |
|
24 | #include <QtCore/QDebug> | |
25 |
|
25 | |||
26 | class tst_QLogValueAxis: public tst_QAbstractAxis |
|
26 | class tst_QLogValueAxis: public tst_QAbstractAxis | |
27 | { |
|
27 | { |
@@ -19,10 +19,10 | |||||
19 | ****************************************************************************/ |
|
19 | ****************************************************************************/ | |
20 |
|
20 | |||
21 | #include <QtTest/QtTest> |
|
21 | #include <QtTest/QtTest> | |
22 |
#include < |
|
22 | #include <QtCharts/QPercentBarSeries> | |
23 |
#include < |
|
23 | #include <QtCharts/QBarSet> | |
24 |
#include < |
|
24 | #include <QtCharts/QChartView> | |
25 |
#include < |
|
25 | #include <QtCharts/QChart> | |
26 | #include "tst_definitions.h" |
|
26 | #include "tst_definitions.h" | |
27 |
|
27 | |||
28 | QT_CHARTS_USE_NAMESPACE |
|
28 | QT_CHARTS_USE_NAMESPACE |
@@ -21,13 +21,13 | |||||
21 | #include <QtCore/QString> |
|
21 | #include <QtCore/QString> | |
22 | #include <QtTest/QtTest> |
|
22 | #include <QtTest/QtTest> | |
23 |
|
23 | |||
24 |
#include < |
|
24 | #include <QtCharts/QChart> | |
25 |
#include < |
|
25 | #include <QtCharts/QChartView> | |
26 |
#include < |
|
26 | #include <QtCharts/QPieSeries> | |
27 |
#include < |
|
27 | #include <QtCharts/QPieSlice> | |
28 |
#include < |
|
28 | #include <QtCharts/QVPieModelMapper> | |
29 |
#include < |
|
29 | #include <QtCharts/QHPieModelMapper> | |
30 | #include <QStandardItemModel> |
|
30 | #include <QtGui/QStandardItemModel> | |
31 |
|
31 | |||
32 | QT_CHARTS_USE_NAMESPACE |
|
32 | QT_CHARTS_USE_NAMESPACE | |
33 |
|
33 |
@@ -19,12 +19,12 | |||||
19 | ****************************************************************************/ |
|
19 | ****************************************************************************/ | |
20 |
|
20 | |||
21 | #include <QtTest/QtTest> |
|
21 | #include <QtTest/QtTest> | |
22 |
#include < |
|
22 | #include <QtCharts/QChartView> | |
23 |
#include < |
|
23 | #include <QtCharts/QChart> | |
24 |
#include < |
|
24 | #include <QtCharts/QPieSeries> | |
25 |
#include < |
|
25 | #include <QtCharts/QPieSlice> | |
26 |
#include < |
|
26 | #include <QtCharts/QPieModelMapper> | |
27 | #include <QStandardItemModel> |
|
27 | #include <QtGui/QStandardItemModel> | |
28 | #include <tst_definitions.h> |
|
28 | #include <tst_definitions.h> | |
29 |
|
29 | |||
30 | QT_CHARTS_USE_NAMESPACE |
|
30 | QT_CHARTS_USE_NAMESPACE |
@@ -20,10 +20,10 | |||||
20 |
|
20 | |||
21 | #include <QtTest/QtTest> |
|
21 | #include <QtTest/QtTest> | |
22 | #include <tst_definitions.h> |
|
22 | #include <tst_definitions.h> | |
23 |
#include < |
|
23 | #include <QtCharts/QChartView> | |
24 |
#include < |
|
24 | #include <QtCharts/QChart> | |
25 |
#include < |
|
25 | #include <QtCharts/QPieSlice> | |
26 |
#include < |
|
26 | #include <QtCharts/QPieSeries> | |
27 |
|
27 | |||
28 | QT_CHARTS_USE_NAMESPACE |
|
28 | QT_CHARTS_USE_NAMESPACE | |
29 |
|
29 |
@@ -19,7 +19,7 | |||||
19 | ****************************************************************************/ |
|
19 | ****************************************************************************/ | |
20 |
|
20 | |||
21 | #include "../qxyseries/tst_qxyseries.h" |
|
21 | #include "../qxyseries/tst_qxyseries.h" | |
22 |
#include < |
|
22 | #include <QtCharts/QScatterSeries> | |
23 |
|
23 | |||
24 | Q_DECLARE_METATYPE(QList<QPointF>) |
|
24 | Q_DECLARE_METATYPE(QList<QPointF>) | |
25 |
|
25 |
@@ -19,7 +19,7 | |||||
19 | ****************************************************************************/ |
|
19 | ****************************************************************************/ | |
20 |
|
20 | |||
21 | #include "../qxyseries/tst_qxyseries.h" |
|
21 | #include "../qxyseries/tst_qxyseries.h" | |
22 |
#include < |
|
22 | #include <QtCharts/QSplineSeries> | |
23 |
|
23 | |||
24 | Q_DECLARE_METATYPE(QList<QPointF>) |
|
24 | Q_DECLARE_METATYPE(QList<QPointF>) | |
25 |
|
25 |
@@ -19,10 +19,10 | |||||
19 | ****************************************************************************/ |
|
19 | ****************************************************************************/ | |
20 |
|
20 | |||
21 | #include <QtTest/QtTest> |
|
21 | #include <QtTest/QtTest> | |
22 |
#include < |
|
22 | #include <QtCharts/QStackedBarSeries> | |
23 |
#include < |
|
23 | #include <QtCharts/QBarSet> | |
24 |
#include < |
|
24 | #include <QtCharts/QChartView> | |
25 |
#include < |
|
25 | #include <QtCharts/QChart> | |
26 | #include "tst_definitions.h" |
|
26 | #include "tst_definitions.h" | |
27 |
|
27 | |||
28 | QT_CHARTS_USE_NAMESPACE |
|
28 | QT_CHARTS_USE_NAMESPACE |
@@ -19,8 +19,8 | |||||
19 | ****************************************************************************/ |
|
19 | ****************************************************************************/ | |
20 |
|
20 | |||
21 | #include "../qabstractaxis/tst_qabstractaxis.h" |
|
21 | #include "../qabstractaxis/tst_qabstractaxis.h" | |
22 |
#include |
|
22 | #include <QtCharts/QValueAxis> | |
23 |
#include < |
|
23 | #include <QtCharts/QLineSeries> | |
24 |
|
24 | |||
25 | class tst_QValueAxis: public tst_QAbstractAxis |
|
25 | class tst_QValueAxis: public tst_QAbstractAxis | |
26 | { |
|
26 | { |
@@ -21,13 +21,13 | |||||
21 | #include <QtCore/QString> |
|
21 | #include <QtCore/QString> | |
22 | #include <QtTest/QtTest> |
|
22 | #include <QtTest/QtTest> | |
23 |
|
23 | |||
24 |
#include < |
|
24 | #include <QtCharts/QChart> | |
25 |
#include < |
|
25 | #include <QtCharts/QChartView> | |
26 |
#include < |
|
26 | #include <QtCharts/QXYSeries> | |
27 |
#include < |
|
27 | #include <QtCharts/QLineSeries> | |
28 |
#include < |
|
28 | #include <QtCharts/QVXYModelMapper> | |
29 |
#include < |
|
29 | #include <QtCharts/QHXYModelMapper> | |
30 | #include <QStandardItemModel> |
|
30 | #include <QtGui/QStandardItemModel> | |
31 | #include "tst_definitions.h" |
|
31 | #include "tst_definitions.h" | |
32 |
|
32 | |||
33 | QT_CHARTS_USE_NAMESPACE |
|
33 | QT_CHARTS_USE_NAMESPACE |
@@ -22,9 +22,9 | |||||
22 | #define TST_QXYSERIES_H |
|
22 | #define TST_QXYSERIES_H | |
23 |
|
23 | |||
24 | #include <QtTest/QtTest> |
|
24 | #include <QtTest/QtTest> | |
25 |
#include < |
|
25 | #include <QtCharts/QXYSeries> | |
26 |
#include < |
|
26 | #include <QtCharts/QChartView> | |
27 | #include <QStandardItemModel> |
|
27 | #include <QtGui/QStandardItemModel> | |
28 | #include <tst_definitions.h> |
|
28 | #include <tst_definitions.h> | |
29 |
|
29 | |||
30 | QT_CHARTS_USE_NAMESPACE |
|
30 | QT_CHARTS_USE_NAMESPACE |
@@ -4,6 +4,7 | |||||
4 |
|
4 | |||
5 | TEMPLATE = app |
|
5 | TEMPLATE = app | |
6 |
|
6 | |||
|
7 | QT += charts | |||
7 | QT += core gui |
|
8 | QT += core gui | |
8 | contains(QT_MAJOR_VERSION, 5) { |
|
9 | contains(QT_MAJOR_VERSION, 5) { | |
9 | QT += widgets |
|
10 | QT += widgets |
@@ -19,10 +19,10 | |||||
19 | ****************************************************************************/ |
|
19 | ****************************************************************************/ | |
20 |
|
20 | |||
21 | #include "customtablemodel.h" |
|
21 | #include "customtablemodel.h" | |
22 | #include <QVector> |
|
22 | #include <QtCore/QVector> | |
23 | #include <QTime> |
|
23 | #include <QtCore/QTime> | |
24 | #include <QRect> |
|
24 | #include <QtCore/QRect> | |
25 | #include <QColor> |
|
25 | #include <QtGui/QColor> | |
26 |
|
26 | |||
27 | const QString categories[] = {"Jan", "Feb", "Mar", "Apr", "May", "Jun", "Jul", "Aug", "Sep", "Nov", "Dec"}; |
|
27 | const QString categories[] = {"Jan", "Feb", "Mar", "Apr", "May", "Jun", "Jul", "Aug", "Sep", "Nov", "Dec"}; | |
28 |
|
28 |
@@ -21,9 +21,9 | |||||
21 | #ifndef CUSTOMTABLEMODEL_H |
|
21 | #ifndef CUSTOMTABLEMODEL_H | |
22 | #define CUSTOMTABLEMODEL_H |
|
22 | #define CUSTOMTABLEMODEL_H | |
23 |
|
23 | |||
24 | #include <QAbstractTableModel> |
|
24 | #include <QtCore/QAbstractTableModel> | |
25 | #include <QHash> |
|
25 | #include <QtCore/QHash> | |
26 | #include <QRect> |
|
26 | #include <QtCore/QRect> | |
27 |
|
27 | |||
28 | class CustomTableModel : public QAbstractTableModel |
|
28 | class CustomTableModel : public QAbstractTableModel | |
29 | { |
|
29 | { |
@@ -21,30 +21,30 | |||||
21 | #include "mainwidget.h" |
|
21 | #include "mainwidget.h" | |
22 | #include "customtablemodel.h" |
|
22 | #include "customtablemodel.h" | |
23 | #include "pentool.h" |
|
23 | #include "pentool.h" | |
24 | #include <QVBoxPlotModelMapper> |
|
24 | #include <QtCharts/QVBoxPlotModelMapper> | |
25 | #include <QTableView> |
|
25 | #include <QtWidgets/QTableView> | |
26 | #include <QHeaderView> |
|
26 | #include <QtWidgets/QHeaderView> | |
27 | #include <QChartView> |
|
27 | #include <QtCharts/QChartView> | |
28 | #include <QBoxPlotSeries> |
|
28 | #include <QtCharts/QBoxPlotSeries> | |
29 | #include <QBoxSet> |
|
29 | #include <QtCharts/QBoxSet> | |
30 | #include <QLegend> |
|
30 | #include <QtCharts/QLegend> | |
31 | #include <QBarCategoryAxis> |
|
31 | #include <QtCharts/QBarCategoryAxis> | |
32 | #include <QBrush> |
|
32 | #include <QtGui/QBrush> | |
33 | #include <QColor> |
|
33 | #include <QtGui/QColor> | |
34 | #include <QPushButton> |
|
34 | #include <QtWidgets/QPushButton> | |
35 | #include <QComboBox> |
|
35 | #include <QtWidgets/QComboBox> | |
36 | #include <QSpinBox> |
|
36 | #include <QtWidgets/QSpinBox> | |
37 | #include <QCheckBox> |
|
37 | #include <QtWidgets/QCheckBox> | |
38 | #include <QGridLayout> |
|
38 | #include <QtWidgets/QGridLayout> | |
39 | #include <QHBoxLayout> |
|
39 | #include <QtWidgets/QHBoxLayout> | |
40 | #include <QLabel> |
|
40 | #include <QtWidgets/QLabel> | |
41 | #include <QSpacerItem> |
|
41 | #include <QtWidgets/QSpacerItem> | |
42 | #include <QMessageBox> |
|
42 | #include <QtWidgets/QMessageBox> | |
43 | #include <cmath> |
|
43 | #include <cmath> | |
44 | #include <QDebug> |
|
44 | #include <QtCore/QDebug> | |
45 | #include <QStandardItemModel> |
|
45 | #include <QtGui/QStandardItemModel> | |
46 | #include <QBarCategoryAxis> |
|
46 | #include <QtCharts/QBarCategoryAxis> | |
47 | #include <QLogValueAxis> |
|
47 | #include <QtCharts/QLogValueAxis> | |
48 |
|
48 | |||
49 | QT_CHARTS_USE_NAMESPACE |
|
49 | QT_CHARTS_USE_NAMESPACE | |
50 |
|
50 |
@@ -21,19 +21,19 | |||||
21 | #ifndef MAINWIDGET_H |
|
21 | #ifndef MAINWIDGET_H | |
22 | #define MAINWIDGET_H |
|
22 | #define MAINWIDGET_H | |
23 |
|
23 | |||
24 |
#include |
|
24 | #include <QtCharts/QChartGlobal> | |
25 |
#include |
|
25 | #include <QtCharts/QChart> | |
26 |
#include |
|
26 | #include <QtCharts/QChartView> | |
27 | #include "customtablemodel.h" |
|
27 | #include <QtWidgets/QWidget> | |
28 | #include "pentool.h" |
|
28 | #include <QtCharts/QBoxPlotSeries> | |
29 | #include <QWidget> |
|
29 | #include <QtCharts/QBarCategoryAxis> | |
30 |
#include <Q |
|
30 | #include <QtCharts/QBoxSet> | |
31 | #include <QBarCategoryAxis> |
|
31 | #include <QtWidgets/QCheckBox> | |
32 | #include <QBoxSet> |
|
32 | #include <QtWidgets/QDoubleSpinBox> | |
33 | #include <QCheckBox> |
|
|||
34 | #include <QDoubleSpinBox> |
|
|||
35 |
|
33 | |||
36 | class QGridLayout; |
|
34 | class QGridLayout; | |
|
35 | class CustomTableModel; | |||
|
36 | class PenTool; | |||
37 |
|
37 | |||
38 | QT_CHARTS_USE_NAMESPACE |
|
38 | QT_CHARTS_USE_NAMESPACE | |
39 |
|
39 |
@@ -19,11 +19,11 | |||||
19 | ****************************************************************************/ |
|
19 | ****************************************************************************/ | |
20 |
|
20 | |||
21 | #include "pentool.h" |
|
21 | #include "pentool.h" | |
22 | #include <QPushButton> |
|
22 | #include <QtWidgets/QPushButton> | |
23 | #include <QDoubleSpinBox> |
|
23 | #include <QtWidgets/QDoubleSpinBox> | |
24 | #include <QComboBox> |
|
24 | #include <QtWidgets/QComboBox> | |
25 | #include <QFormLayout> |
|
25 | #include <QtWidgets/QFormLayout> | |
26 | #include <QColorDialog> |
|
26 | #include <QtWidgets/QColorDialog> | |
27 |
|
27 | |||
28 | PenTool::PenTool(QString title, QWidget *parent) |
|
28 | PenTool::PenTool(QString title, QWidget *parent) | |
29 | : QWidget(parent) |
|
29 | : QWidget(parent) |
@@ -20,8 +20,8 | |||||
20 | #ifndef PENTOOL_H |
|
20 | #ifndef PENTOOL_H | |
21 | #define PENTOOL_H |
|
21 | #define PENTOOL_H | |
22 |
|
22 | |||
23 | #include <QWidget> |
|
23 | #include <QtWidgets/QWidget> | |
24 | #include <QPen> |
|
24 | #include <QtGui/QPen> | |
25 |
|
25 | |||
26 | class QPushButton; |
|
26 | class QPushButton; | |
27 | class QDoubleSpinBox; |
|
27 | class QDoubleSpinBox; |
@@ -21,7 +21,7 | |||||
21 | #ifndef BRUSHWIDGET_H |
|
21 | #ifndef BRUSHWIDGET_H | |
22 | #define BRUSHWIDGET_H |
|
22 | #define BRUSHWIDGET_H | |
23 |
|
23 | |||
24 | #include <QWidget> |
|
24 | #include <QtWidgets/QWidget> | |
25 |
|
25 | |||
26 | class BrushWidget: public QWidget |
|
26 | class BrushWidget: public QWidget | |
27 | { |
|
27 | { |
@@ -19,21 +19,21 | |||||
19 | ****************************************************************************/ |
|
19 | ****************************************************************************/ | |
20 |
|
20 | |||
21 | #include "engine.h" |
|
21 | #include "engine.h" | |
22 | #include <QItemSelectionModel> |
|
22 | #include <QtCore/QItemSelectionModel> | |
23 | #include <QStandardItemModel> |
|
23 | #include <QtGui/QStandardItemModel> | |
24 | #include <QVXYModelMapper> |
|
24 | #include <QtCharts/QVXYModelMapper> | |
25 | #include <QHBarModelMapper> |
|
25 | #include <QtCharts/QHBarModelMapper> | |
26 | #include <QVPieModelMapper> |
|
26 | #include <QtCharts/QVPieModelMapper> | |
27 | #include <QLineSeries> |
|
27 | #include <QtCharts/QLineSeries> | |
28 | #include <QSplineSeries> |
|
28 | #include <QtCharts/QSplineSeries> | |
29 | #include <QScatterSeries> |
|
29 | #include <QtCharts/QScatterSeries> | |
30 | #include <QBarSeries> |
|
30 | #include <QtCharts/QBarSeries> | |
31 | #include <QPercentBarSeries> |
|
31 | #include <QtCharts/QPercentBarSeries> | |
32 | #include <QStackedBarSeries> |
|
32 | #include <QtCharts/QStackedBarSeries> | |
33 | #include <QAreaSeries> |
|
33 | #include <QtCharts/QAreaSeries> | |
34 | #include <QPieSeries> |
|
34 | #include <QtCharts/QPieSeries> | |
35 | #include <QChart> |
|
35 | #include <QtCharts/QChart> | |
36 | #include <QBarSet> |
|
36 | #include <QtCharts/QBarSet> | |
37 |
|
37 | |||
38 |
|
38 | |||
39 | const qint32 MAGIC_NUMBER = 0x66666666; |
|
39 | const qint32 MAGIC_NUMBER = 0x66666666; |
@@ -21,9 +21,9 | |||||
21 | #ifndef ENGINE_H |
|
21 | #ifndef ENGINE_H | |
22 | #define ENGINE_H |
|
22 | #define ENGINE_H | |
23 |
|
23 | |||
24 | #include <QObject> |
|
24 | #include <QtCore/QObject> | |
25 | #include <QAbstractSeries> |
|
25 | #include <QtCharts/QAbstractSeries> | |
26 | #include <QModelIndex> |
|
26 | #include <QtCore/QModelIndex> | |
27 |
|
27 | |||
28 | class QStandardItemModel; |
|
28 | class QStandardItemModel; | |
29 | class QItemSelectionModel; |
|
29 | class QItemSelectionModel; |
@@ -19,7 +19,7 | |||||
19 | ****************************************************************************/ |
|
19 | ****************************************************************************/ | |
20 |
|
20 | |||
21 | #include "mainwindow.h" |
|
21 | #include "mainwindow.h" | |
22 | #include <QApplication> |
|
22 | #include <QtWidgets/QApplication> | |
23 |
|
23 | |||
24 | int main(int argc, char *argv[]) |
|
24 | int main(int argc, char *argv[]) | |
25 | { |
|
25 | { |
@@ -23,17 +23,17 | |||||
23 | #include "penwidget.h" |
|
23 | #include "penwidget.h" | |
24 | #include "brushwidget.h" |
|
24 | #include "brushwidget.h" | |
25 | #include "engine.h" |
|
25 | #include "engine.h" | |
26 | #include <QSettings> |
|
26 | #include <QtCore/QSettings> | |
27 | #include <QChartView> |
|
27 | #include <QtCharts/QChartView> | |
28 | #include <QDockWidget> |
|
28 | #include <QtWidgets/QDockWidget> | |
29 | #include <QMenuBar> |
|
29 | #include <QtWidgets/QMenuBar> | |
30 | #include <QTableWidget> |
|
30 | #include <QtWidgets/QTableWidget> | |
31 | #include <QSplitter> |
|
31 | #include <QtWidgets/QSplitter> | |
32 | #include <QMetaEnum> |
|
32 | #include <QtCore/QMetaEnum> | |
33 | #include <QStandardItemModel> |
|
33 | #include <QtGui/QStandardItemModel> | |
34 | #include <QHeaderView> |
|
34 | #include <QtWidgets/QHeaderView> | |
35 | #include <QDebug> |
|
35 | #include <QtCore/QDebug> | |
36 | #include <QMessageBox> |
|
36 | #include <QtWidgets/QMessageBox> | |
37 |
|
37 | |||
38 | static const QString FILENAME_SETTING("filename"); |
|
38 | static const QString FILENAME_SETTING("filename"); | |
39 | static const QString GEOMETRY_SETTING("geometry"); |
|
39 | static const QString GEOMETRY_SETTING("geometry"); |
@@ -21,9 +21,9 | |||||
21 | #ifndef MAINWINDOW_H |
|
21 | #ifndef MAINWINDOW_H | |
22 | #define MAINWINDOW_H |
|
22 | #define MAINWINDOW_H | |
23 |
|
23 | |||
24 | #include <QMainWindow> |
|
24 | #include <QtWidgets/QMainWindow> | |
25 | #include <QChartGlobal> |
|
25 | #include <QtCharts/QChartGlobal> | |
26 | #include <QMap> |
|
26 | #include <QtCore/QMap> | |
27 |
|
27 | |||
28 |
|
28 | |||
29 | QT_CHARTS_BEGIN_NAMESPACE |
|
29 | QT_CHARTS_BEGIN_NAMESPACE |
@@ -19,9 +19,9 | |||||
19 | ****************************************************************************/ |
|
19 | ****************************************************************************/ | |
20 |
|
20 | |||
21 | #include "objectinspectorwidget.h" |
|
21 | #include "objectinspectorwidget.h" | |
22 | #include <QIcon> |
|
22 | #include <QtGui/QIcon> | |
23 | #include <QPainter> |
|
23 | #include <QtGui/QPainter> | |
24 | #include <QPixmapCache> |
|
24 | #include <QtGui/QPixmapCache> | |
25 |
|
25 | |||
26 | InspectorWidget::InspectorWidget() |
|
26 | InspectorWidget::InspectorWidget() | |
27 | { |
|
27 | { |
@@ -21,7 +21,7 | |||||
21 | #ifndef INSPECTORWIDGET_H |
|
21 | #ifndef INSPECTORWIDGET_H | |
22 | #define INSPECTORWIDGET_H |
|
22 | #define INSPECTORWIDGET_H | |
23 |
|
23 | |||
24 | #include <QWidget> |
|
24 | #include <QtWidgets/QWidget> | |
25 |
|
25 | |||
26 | class InspectorWidget : public QWidget |
|
26 | class InspectorWidget : public QWidget | |
27 | { |
|
27 | { |
@@ -19,9 +19,9 | |||||
19 | ****************************************************************************/ |
|
19 | ****************************************************************************/ | |
20 |
|
20 | |||
21 | #include "penwidget.h" |
|
21 | #include "penwidget.h" | |
22 | #include <QFormLayout> |
|
22 | #include <QtWidgets/QFormLayout> | |
23 | #include <QComboBox> |
|
23 | #include <QtWidgets/QComboBox> | |
24 | #include <QSpinBox> |
|
24 | #include <QtWidgets/QSpinBox> | |
25 |
|
25 | |||
26 | PenWidget::PenWidget(QWidget *parent):QWidget(parent), |
|
26 | PenWidget::PenWidget(QWidget *parent):QWidget(parent), | |
27 | m_colorComboBox(0), |
|
27 | m_colorComboBox(0), |
@@ -21,8 +21,8 | |||||
21 | #ifndef PENWIDGET_H |
|
21 | #ifndef PENWIDGET_H | |
22 | #define PENWIDGET_H |
|
22 | #define PENWIDGET_H | |
23 |
|
23 | |||
24 | #include <QWidget> |
|
24 | #include <QtWidgets/QWidget> | |
25 | #include <QPen> |
|
25 | #include <QtWidgets/QPen> | |
26 |
|
26 | |||
27 | class QComboBox; |
|
27 | class QComboBox; | |
28 | class QSpinBox; |
|
28 | class QSpinBox; |
@@ -22,9 +22,9 | |||||
22 | #ifndef CHARTS_H |
|
22 | #ifndef CHARTS_H | |
23 | #define CHARTS_H |
|
23 | #define CHARTS_H | |
24 | #include "model.h" |
|
24 | #include "model.h" | |
25 | #include <QList> |
|
25 | #include <QtCore/QList> | |
26 | #include <QString> |
|
26 | #include <QtCore/QString> | |
27 |
#include < |
|
27 | #include <QtCharts/QChartGlobal> | |
28 |
|
28 | |||
29 | QT_CHARTS_BEGIN_NAMESPACE |
|
29 | QT_CHARTS_BEGIN_NAMESPACE | |
30 | class QChart; |
|
30 | class QChart; |
@@ -19,11 +19,11 | |||||
19 | ****************************************************************************/ |
|
19 | ****************************************************************************/ | |
20 |
|
20 | |||
21 | #include "charts.h" |
|
21 | #include "charts.h" | |
22 |
#include |
|
22 | #include <QtCharts/QChart> | |
23 |
#include |
|
23 | #include <QtCharts/QBarSeries> | |
24 | #include "qbarset.h" |
|
24 | #include <QtCharts/QBarSet> | |
25 |
#include |
|
25 | #include <QtCharts/QValueAxis> | |
26 |
#include |
|
26 | #include <QtCharts/QBarCategoryAxis> | |
27 |
|
27 | |||
28 | class BarCategoryAxisX: public Chart |
|
28 | class BarCategoryAxisX: public Chart | |
29 | { |
|
29 | { |
@@ -19,11 +19,11 | |||||
19 | ****************************************************************************/ |
|
19 | ****************************************************************************/ | |
20 |
|
20 | |||
21 | #include "charts.h" |
|
21 | #include "charts.h" | |
22 |
#include |
|
22 | #include <QtCharts/QChart> | |
23 |
#include |
|
23 | #include <QtCharts/QBarSeries> | |
24 | #include "qbarset.h" |
|
24 | #include <QtCharts/QBarSet> | |
25 |
#include |
|
25 | #include <QtCharts/QLogValueAxis> | |
26 |
#include |
|
26 | #include <QtCharts/QBarCategoryAxis> | |
27 |
|
27 | |||
28 | class BarCategoryAxisXLogY: public Chart |
|
28 | class BarCategoryAxisXLogY: public Chart | |
29 | { |
|
29 | { |
@@ -19,11 +19,11 | |||||
19 | ****************************************************************************/ |
|
19 | ****************************************************************************/ | |
20 |
|
20 | |||
21 | #include "charts.h" |
|
21 | #include "charts.h" | |
22 |
#include |
|
22 | #include <QtCharts/QChart> | |
23 |
#include |
|
23 | #include <QtCharts/QHorizontalBarSeries> | |
24 | #include "qbarset.h" |
|
24 | #include <QtCharts/QBarSet> | |
25 |
#include |
|
25 | #include <QtCharts/QValueAxis> | |
26 |
#include |
|
26 | #include <QtCharts/QBarCategoryAxis> | |
27 |
|
27 | |||
28 | class BarCategoryAxisY: public Chart |
|
28 | class BarCategoryAxisY: public Chart | |
29 | { |
|
29 | { |
@@ -19,11 +19,11 | |||||
19 | ****************************************************************************/ |
|
19 | ****************************************************************************/ | |
20 |
|
20 | |||
21 | #include "charts.h" |
|
21 | #include "charts.h" | |
22 |
#include |
|
22 | #include <QtCharts/QChart> | |
23 |
#include |
|
23 | #include <QtCharts/QHorizontalBarSeries> | |
24 | #include "qbarset.h" |
|
24 | #include <QtCharts/QBarSet> | |
25 |
#include |
|
25 | #include <QtCharts/QLogValueAxis> | |
26 |
#include |
|
26 | #include <QtCharts/QBarCategoryAxis> | |
27 |
|
27 | |||
28 | class BarCategoryAxisYLogX: public Chart |
|
28 | class BarCategoryAxisYLogX: public Chart | |
29 | { |
|
29 | { |
@@ -19,9 +19,9 | |||||
19 | ****************************************************************************/ |
|
19 | ****************************************************************************/ | |
20 |
|
20 | |||
21 | #include "charts.h" |
|
21 | #include "charts.h" | |
22 |
#include |
|
22 | #include <QtCharts/QChart> | |
23 |
#include |
|
23 | #include <QtCharts/QLineSeries> | |
24 | #include <QCategoryAxis> |
|
24 | #include <QtCharts/QCategoryAxis> | |
25 |
|
25 | |||
26 | class CategoryLineChart: public Chart |
|
26 | class CategoryLineChart: public Chart | |
27 | { |
|
27 | { |
@@ -19,10 +19,10 | |||||
19 | ****************************************************************************/ |
|
19 | ****************************************************************************/ | |
20 |
|
20 | |||
21 | #include "charts.h" |
|
21 | #include "charts.h" | |
22 |
#include |
|
22 | #include <QtCharts/QChart> | |
23 |
#include |
|
23 | #include <QtCharts/QLineSeries> | |
24 |
#include |
|
24 | #include <QtCharts/QValueAxis> | |
25 |
#include |
|
25 | #include <QtCharts/QDateTimeAxis> | |
26 |
|
26 | |||
27 | class DateTimeAxisX: public Chart |
|
27 | class DateTimeAxisX: public Chart | |
28 | { |
|
28 | { |
@@ -19,10 +19,10 | |||||
19 | ****************************************************************************/ |
|
19 | ****************************************************************************/ | |
20 |
|
20 | |||
21 | #include "charts.h" |
|
21 | #include "charts.h" | |
22 |
#include |
|
22 | #include <QtCharts/QChart> | |
23 |
#include |
|
23 | #include <QtCharts/QLineSeries> | |
24 |
#include |
|
24 | #include <QtCharts/QValueAxis> | |
25 |
#include |
|
25 | #include <QtCharts/QDateTimeAxis> | |
26 |
|
26 | |||
27 | class DateTimeAxisY: public Chart |
|
27 | class DateTimeAxisY: public Chart | |
28 | { |
|
28 | { |
@@ -19,10 +19,10 | |||||
19 | ****************************************************************************/ |
|
19 | ****************************************************************************/ | |
20 |
|
20 | |||
21 | #include "charts.h" |
|
21 | #include "charts.h" | |
22 |
#include |
|
22 | #include <QtCharts/QChart> | |
23 |
#include |
|
23 | #include <QtCharts/QLineSeries> | |
24 |
#include |
|
24 | #include <QtCharts/QLogValueAxis> | |
25 |
#include |
|
25 | #include <QtCharts/QCategoryAxis> | |
26 |
|
26 | |||
27 | class LogValueAxisX: public Chart |
|
27 | class LogValueAxisX: public Chart | |
28 | { |
|
28 | { |
@@ -19,10 +19,10 | |||||
19 | ****************************************************************************/ |
|
19 | ****************************************************************************/ | |
20 |
|
20 | |||
21 | #include "charts.h" |
|
21 | #include "charts.h" | |
22 |
#include |
|
22 | #include <QtCharts/QChart> | |
23 |
#include |
|
23 | #include <QtCharts/QLineSeries> | |
24 |
#include |
|
24 | #include <QtCharts/QLogValueAxis> | |
25 |
#include |
|
25 | #include <QtCharts/QCategoryAxis> | |
26 |
|
26 | |||
27 | class LogValueAxisY: public Chart |
|
27 | class LogValueAxisY: public Chart | |
28 | { |
|
28 | { |
@@ -19,10 +19,10 | |||||
19 | ****************************************************************************/ |
|
19 | ****************************************************************************/ | |
20 |
|
20 | |||
21 | #include "charts.h" |
|
21 | #include "charts.h" | |
22 |
#include |
|
22 | #include <QtCharts/QChart> | |
23 |
#include |
|
23 | #include <QtCharts/QLineSeries> | |
24 |
#include |
|
24 | #include <QtCharts/QValueAxis> | |
25 |
#include |
|
25 | #include <QtCharts/QCategoryAxis> | |
26 |
|
26 | |||
27 | class ValueAxis: public Chart |
|
27 | class ValueAxis: public Chart | |
28 | { |
|
28 | { |
@@ -19,9 +19,9 | |||||
19 | ****************************************************************************/ |
|
19 | ****************************************************************************/ | |
20 |
|
20 | |||
21 | #include "charts.h" |
|
21 | #include "charts.h" | |
22 |
#include |
|
22 | #include <QtCharts/QChart> | |
23 |
#include |
|
23 | #include <QtCharts/QHorizontalBarSeries> | |
24 | #include "qbarset.h" |
|
24 | #include <QtCharts/QBarSet> | |
25 |
|
25 | |||
26 | class HorizontalBarChart: public Chart |
|
26 | class HorizontalBarChart: public Chart | |
27 | { |
|
27 | { |
@@ -19,9 +19,9 | |||||
19 | ****************************************************************************/ |
|
19 | ****************************************************************************/ | |
20 |
|
20 | |||
21 | #include "charts.h" |
|
21 | #include "charts.h" | |
22 |
#include |
|
22 | #include <QtCharts/QChart> | |
23 |
#include |
|
23 | #include <QtCharts/QHorizontalPercentBarSeries> | |
24 | #include "qbarset.h" |
|
24 | #include <QtCharts/QBarSet> | |
25 |
|
25 | |||
26 | class HorizontalPercentBarChart: public Chart |
|
26 | class HorizontalPercentBarChart: public Chart | |
27 | { |
|
27 | { |
@@ -19,9 +19,9 | |||||
19 | ****************************************************************************/ |
|
19 | ****************************************************************************/ | |
20 |
|
20 | |||
21 | #include "charts.h" |
|
21 | #include "charts.h" | |
22 |
#include |
|
22 | #include <QtCharts/QChart> | |
23 |
#include |
|
23 | #include <QtCharts/QHorizontalStackedBarSeries> | |
24 | #include "qbarset.h" |
|
24 | #include <QtCharts/QBarSet> | |
25 |
|
25 | |||
26 | class HorizontalStackedBarChart: public Chart |
|
26 | class HorizontalStackedBarChart: public Chart | |
27 | { |
|
27 | { |
@@ -19,9 +19,9 | |||||
19 | ****************************************************************************/ |
|
19 | ****************************************************************************/ | |
20 |
|
20 | |||
21 | #include "charts.h" |
|
21 | #include "charts.h" | |
22 |
#include |
|
22 | #include <QtCharts/QChart> | |
23 |
#include |
|
23 | #include <QtCharts/QBarSeries> | |
24 | #include "qbarset.h" |
|
24 | #include <QtCharts/QBarSet> | |
25 |
|
25 | |||
26 | class VerticalBarChart: public Chart |
|
26 | class VerticalBarChart: public Chart | |
27 | { |
|
27 | { |
@@ -19,9 +19,9 | |||||
19 | ****************************************************************************/ |
|
19 | ****************************************************************************/ | |
20 |
|
20 | |||
21 | #include "charts.h" |
|
21 | #include "charts.h" | |
22 |
#include |
|
22 | #include <QtCharts/QChart> | |
23 |
#include |
|
23 | #include <QtCharts/QPercentBarSeries> | |
24 | #include "qbarset.h" |
|
24 | #include <QtCharts/QBarSet> | |
25 |
|
25 | |||
26 | class VerticalPercentBarChart: public Chart |
|
26 | class VerticalPercentBarChart: public Chart | |
27 | { |
|
27 | { |
@@ -19,9 +19,9 | |||||
19 | ****************************************************************************/ |
|
19 | ****************************************************************************/ | |
20 |
|
20 | |||
21 | #include "charts.h" |
|
21 | #include "charts.h" | |
22 |
#include |
|
22 | #include <QtCharts/QChart> | |
23 |
#include |
|
23 | #include <QtCharts/QStackedBarSeries> | |
24 | #include "qbarset.h" |
|
24 | #include <QtCharts/QBarSet> | |
25 |
|
25 | |||
26 | class VerticalStackedBarChart: public Chart |
|
26 | class VerticalStackedBarChart: public Chart | |
27 | { |
|
27 | { |
@@ -19,11 +19,11 | |||||
19 | ****************************************************************************/ |
|
19 | ****************************************************************************/ | |
20 |
|
20 | |||
21 | #include "charts.h" |
|
21 | #include "charts.h" | |
22 |
#include |
|
22 | #include <QtCharts/QChart> | |
23 |
#include |
|
23 | #include <QtCharts/QHorizontalBarSeries> | |
24 | #include "qbarset.h" |
|
24 | #include <QtCharts/QBarSet> | |
25 |
#include |
|
25 | #include <QtCharts/QLogValueAxis> | |
26 |
#include |
|
26 | #include <QtCharts/QBarCategoryAxis> | |
27 |
|
27 | |||
28 | class BarLogX: public Chart |
|
28 | class BarLogX: public Chart | |
29 | { |
|
29 | { |
@@ -19,11 +19,11 | |||||
19 | ****************************************************************************/ |
|
19 | ****************************************************************************/ | |
20 |
|
20 | |||
21 | #include "charts.h" |
|
21 | #include "charts.h" | |
22 |
#include |
|
22 | #include <QtCharts/QChart> | |
23 |
#include |
|
23 | #include <QtCharts/QBarSeries> | |
24 | #include "qbarset.h" |
|
24 | #include <QtCharts/QBarSet> | |
25 |
#include |
|
25 | #include <QtCharts/QLogValueAxis> | |
26 |
#include |
|
26 | #include <QtCharts/QBarCategoryAxis> | |
27 |
|
27 | |||
28 | class BarLogY: public Chart |
|
28 | class BarLogY: public Chart | |
29 | { |
|
29 | { |
@@ -19,11 +19,11 | |||||
19 | ****************************************************************************/ |
|
19 | ****************************************************************************/ | |
20 |
|
20 | |||
21 | #include "charts.h" |
|
21 | #include "charts.h" | |
22 |
#include |
|
22 | #include <QtCharts/QChart> | |
23 |
#include |
|
23 | #include <QtCharts/QHorizontalPercentBarSeries> | |
24 | #include "qbarset.h" |
|
24 | #include <QtCharts/QBarSet> | |
25 |
#include |
|
25 | #include <QtCharts/QLogValueAxis> | |
26 |
#include |
|
26 | #include <QtCharts/QBarCategoryAxis> | |
27 |
|
27 | |||
28 | class BarPercentLogX: public Chart |
|
28 | class BarPercentLogX: public Chart | |
29 | { |
|
29 | { |
@@ -19,11 +19,11 | |||||
19 | ****************************************************************************/ |
|
19 | ****************************************************************************/ | |
20 |
|
20 | |||
21 | #include "charts.h" |
|
21 | #include "charts.h" | |
22 |
#include |
|
22 | #include <QtCharts/QChart> | |
23 |
#include |
|
23 | #include <QtCharts/QPercentBarSeries> | |
24 | #include "qbarset.h" |
|
24 | #include <QtCharts/QBarSet> | |
25 |
#include |
|
25 | #include <QtCharts/QLogValueAxis> | |
26 |
#include |
|
26 | #include <QtCharts/QBarCategoryAxis> | |
27 |
|
27 | |||
28 | class BarPercentLogY: public Chart |
|
28 | class BarPercentLogY: public Chart | |
29 | { |
|
29 | { |
@@ -19,11 +19,11 | |||||
19 | ****************************************************************************/ |
|
19 | ****************************************************************************/ | |
20 |
|
20 | |||
21 | #include "charts.h" |
|
21 | #include "charts.h" | |
22 |
#include |
|
22 | #include <QtCharts/QChart> | |
23 |
#include |
|
23 | #include <QtCharts/QHorizontalStackedBarSeries> | |
24 | #include "qbarset.h" |
|
24 | #include <QtCharts/QBarSet> | |
25 |
#include |
|
25 | #include <QtCharts/QLogValueAxis> | |
26 |
#include |
|
26 | #include <QtCharts/QBarCategoryAxis> | |
27 |
|
27 | |||
28 | class BarStackedLogX: public Chart |
|
28 | class BarStackedLogX: public Chart | |
29 | { |
|
29 | { |
@@ -19,11 +19,11 | |||||
19 | ****************************************************************************/ |
|
19 | ****************************************************************************/ | |
20 |
|
20 | |||
21 | #include "charts.h" |
|
21 | #include "charts.h" | |
22 |
#include |
|
22 | #include <QtCharts/QChart> | |
23 |
#include |
|
23 | #include <QtCharts/QStackedBarSeries> | |
24 | #include "qbarset.h" |
|
24 | #include <QtCharts/QBarSet> | |
25 |
#include |
|
25 | #include <QtCharts/QLogValueAxis> | |
26 |
#include |
|
26 | #include <QtCharts/QBarCategoryAxis> | |
27 |
|
27 | |||
28 | class BarStackedLogY: public Chart |
|
28 | class BarStackedLogY: public Chart | |
29 | { |
|
29 | { |
@@ -19,9 +19,9 | |||||
19 | ****************************************************************************/ |
|
19 | ****************************************************************************/ | |
20 |
|
20 | |||
21 | #include "charts.h" |
|
21 | #include "charts.h" | |
22 |
#include |
|
22 | #include <QtCharts/QChart> | |
23 |
#include |
|
23 | #include <QtCharts/QLineSeries> | |
24 |
#include |
|
24 | #include <QtCharts/QLogValueAxis> | |
25 |
|
25 | |||
26 | class LineLogXLogY: public Chart |
|
26 | class LineLogXLogY: public Chart | |
27 | { |
|
27 | { |
@@ -19,10 +19,10 | |||||
19 | ****************************************************************************/ |
|
19 | ****************************************************************************/ | |
20 |
|
20 | |||
21 | #include "charts.h" |
|
21 | #include "charts.h" | |
22 |
#include |
|
22 | #include <QtCharts/QChart> | |
23 |
#include |
|
23 | #include <QtCharts/QLineSeries> | |
24 |
#include |
|
24 | #include <QtCharts/QLogValueAxis> | |
25 |
#include |
|
25 | #include <QtCharts/QValueAxis> | |
26 |
|
26 | |||
27 | class LineLogXY: public Chart |
|
27 | class LineLogXY: public Chart | |
28 | { |
|
28 | { |
@@ -19,10 +19,10 | |||||
19 | ****************************************************************************/ |
|
19 | ****************************************************************************/ | |
20 |
|
20 | |||
21 | #include "charts.h" |
|
21 | #include "charts.h" | |
22 |
#include |
|
22 | #include <QtCharts/QChart> | |
23 |
#include |
|
23 | #include <QtCharts/QLineSeries> | |
24 |
#include |
|
24 | #include <QtCharts/QLogValueAxis> | |
25 |
#include |
|
25 | #include <QtCharts/QValueAxis> | |
26 |
|
26 | |||
27 | class LineXLogY: public Chart |
|
27 | class LineXLogY: public Chart | |
28 | { |
|
28 | { |
@@ -19,9 +19,9 | |||||
19 | ****************************************************************************/ |
|
19 | ****************************************************************************/ | |
20 |
|
20 | |||
21 | #include "charts.h" |
|
21 | #include "charts.h" | |
22 |
#include |
|
22 | #include <QtCharts/QChart> | |
23 |
#include |
|
23 | #include <QtCharts/QScatterSeries> | |
24 |
#include |
|
24 | #include <QtCharts/QLogValueAxis> | |
25 |
|
25 | |||
26 | class ScatterLogXLogY: public Chart |
|
26 | class ScatterLogXLogY: public Chart | |
27 | { |
|
27 | { |
@@ -19,10 +19,10 | |||||
19 | ****************************************************************************/ |
|
19 | ****************************************************************************/ | |
20 |
|
20 | |||
21 | #include "charts.h" |
|
21 | #include "charts.h" | |
22 |
#include |
|
22 | #include <QtCharts/QChart> | |
23 |
#include |
|
23 | #include <QtCharts/QScatterSeries> | |
24 |
#include |
|
24 | #include <QtCharts/QLogValueAxis> | |
25 |
#include |
|
25 | #include <QtCharts/QValueAxis> | |
26 |
|
26 | |||
27 | class ScatterLogXY: public Chart |
|
27 | class ScatterLogXY: public Chart | |
28 | { |
|
28 | { |
@@ -19,10 +19,10 | |||||
19 | ****************************************************************************/ |
|
19 | ****************************************************************************/ | |
20 |
|
20 | |||
21 | #include "charts.h" |
|
21 | #include "charts.h" | |
22 |
#include |
|
22 | #include <QtCharts/QChart> | |
23 |
#include |
|
23 | #include <QtCharts/QScatterSeries> | |
24 |
#include |
|
24 | #include <QtCharts/QLogValueAxis> | |
25 |
#include |
|
25 | #include <QtCharts/QValueAxis> | |
26 |
|
26 | |||
27 | class ScatterXLogY: public Chart |
|
27 | class ScatterXLogY: public Chart | |
28 | { |
|
28 | { |
@@ -19,9 +19,9 | |||||
19 | ****************************************************************************/ |
|
19 | ****************************************************************************/ | |
20 |
|
20 | |||
21 | #include "charts.h" |
|
21 | #include "charts.h" | |
22 |
#include |
|
22 | #include <QtCharts/QChart> | |
23 |
#include |
|
23 | #include <QtCharts/QSplineSeries> | |
24 |
#include |
|
24 | #include <QtCharts/QLogValueAxis> | |
25 |
|
25 | |||
26 | class SplineLogXLogY: public Chart |
|
26 | class SplineLogXLogY: public Chart | |
27 | { |
|
27 | { |
@@ -19,10 +19,10 | |||||
19 | ****************************************************************************/ |
|
19 | ****************************************************************************/ | |
20 |
|
20 | |||
21 | #include "charts.h" |
|
21 | #include "charts.h" | |
22 |
#include |
|
22 | #include <QtCharts/QChart> | |
23 |
#include |
|
23 | #include <QtCharts/QSplineSeries> | |
24 |
#include |
|
24 | #include <QtCharts/QLogValueAxis> | |
25 |
#include |
|
25 | #include <QtCharts/QValueAxis> | |
26 |
|
26 | |||
27 | class SplineLogXY: public Chart |
|
27 | class SplineLogXY: public Chart | |
28 | { |
|
28 | { |
@@ -19,10 +19,10 | |||||
19 | ****************************************************************************/ |
|
19 | ****************************************************************************/ | |
20 |
|
20 | |||
21 | #include "charts.h" |
|
21 | #include "charts.h" | |
22 |
#include |
|
22 | #include <QtCharts/QChart> | |
23 |
#include |
|
23 | #include <QtCharts/QSplineSeries> | |
24 |
#include |
|
24 | #include <QtCharts/QLogValueAxis> | |
25 |
#include |
|
25 | #include <QtCharts/QValueAxis> | |
26 |
|
26 | |||
27 | class SplineXLogY: public Chart |
|
27 | class SplineXLogY: public Chart | |
28 | { |
|
28 | { |
@@ -19,8 +19,8 | |||||
19 | ****************************************************************************/ |
|
19 | ****************************************************************************/ | |
20 |
|
20 | |||
21 | #include "charts.h" |
|
21 | #include "charts.h" | |
22 |
#include |
|
22 | #include <QtCharts/QChart> | |
23 |
#include |
|
23 | #include <QtCharts/QLineSeries> | |
24 |
|
24 | |||
25 | class FontChart: public Chart |
|
25 | class FontChart: public Chart | |
26 | { |
|
26 | { |
@@ -19,10 +19,10 | |||||
19 | ****************************************************************************/ |
|
19 | ****************************************************************************/ | |
20 |
|
20 | |||
21 | #include "charts.h" |
|
21 | #include "charts.h" | |
22 |
#include |
|
22 | #include <QtCharts/QChart> | |
23 |
#include |
|
23 | #include <QtCharts/QLineSeries> | |
24 |
#include |
|
24 | #include <QtCharts/QValueAxis> | |
25 |
#include |
|
25 | #include <QtCharts/QCategoryAxis> | |
26 |
|
26 | |||
27 | class MultiValueAxis: public Chart |
|
27 | class MultiValueAxis: public Chart | |
28 | { |
|
28 | { |
@@ -19,10 +19,10 | |||||
19 | ****************************************************************************/ |
|
19 | ****************************************************************************/ | |
20 |
|
20 | |||
21 | #include "charts.h" |
|
21 | #include "charts.h" | |
22 |
#include |
|
22 | #include <QtCharts/QChart> | |
23 |
#include |
|
23 | #include <QtCharts/QLineSeries> | |
24 |
#include |
|
24 | #include <QtCharts/QValueAxis> | |
25 |
#include |
|
25 | #include <QtCharts/QCategoryAxis> | |
26 |
|
26 | |||
27 | class MultiValueAxis2: public Chart |
|
27 | class MultiValueAxis2: public Chart | |
28 | { |
|
28 | { |
@@ -19,10 +19,10 | |||||
19 | ****************************************************************************/ |
|
19 | ****************************************************************************/ | |
20 |
|
20 | |||
21 | #include "charts.h" |
|
21 | #include "charts.h" | |
22 |
#include |
|
22 | #include <QtCharts/QChart> | |
23 |
#include |
|
23 | #include <QtCharts/QLineSeries> | |
24 |
#include |
|
24 | #include <QtCharts/QValueAxis> | |
25 |
#include |
|
25 | #include <QtCharts/QCategoryAxis> | |
26 |
|
26 | |||
27 | class MultiValueAxis3: public Chart |
|
27 | class MultiValueAxis3: public Chart | |
28 | { |
|
28 | { |
@@ -19,10 +19,10 | |||||
19 | ****************************************************************************/ |
|
19 | ****************************************************************************/ | |
20 |
|
20 | |||
21 | #include "charts.h" |
|
21 | #include "charts.h" | |
22 |
#include |
|
22 | #include <QtCharts/QChart> | |
23 |
#include |
|
23 | #include <QtCharts/QLineSeries> | |
24 |
#include |
|
24 | #include <QtCharts/QValueAxis> | |
25 |
#include |
|
25 | #include <QtCharts/QCategoryAxis> | |
26 |
|
26 | |||
27 | class MultiValueAxis4: public Chart |
|
27 | class MultiValueAxis4: public Chart | |
28 | { |
|
28 | { |
@@ -19,13 +19,13 | |||||
19 | ****************************************************************************/ |
|
19 | ****************************************************************************/ | |
20 |
|
20 | |||
21 | #include "charts.h" |
|
21 | #include "charts.h" | |
22 |
#include |
|
22 | #include <QtCharts/QChart> | |
23 |
#include |
|
23 | #include <QtCharts/QLineSeries> | |
24 |
#include |
|
24 | #include <QtCharts/QValueAxis> | |
25 |
#include |
|
25 | #include <QtCharts/QCategoryAxis> | |
26 |
#include |
|
26 | #include <QtCharts/QBarSeries> | |
27 | #include "qbarset.h" |
|
27 | #include <QtCharts/QBarSet> | |
28 |
#include |
|
28 | #include <QtCharts/QBarCategoryAxis> | |
29 |
|
29 | |||
30 | class MultiValueBarAxis: public Chart |
|
30 | class MultiValueBarAxis: public Chart | |
31 | { |
|
31 | { |
@@ -19,8 +19,8 | |||||
19 | ****************************************************************************/ |
|
19 | ****************************************************************************/ | |
20 |
|
20 | |||
21 | #include "charts.h" |
|
21 | #include "charts.h" | |
22 |
#include |
|
22 | #include <QtCharts/QChart> | |
23 |
#include |
|
23 | #include <QtCharts/QPieSeries> | |
24 |
|
24 | |||
25 | class DonutChart: public Chart |
|
25 | class DonutChart: public Chart | |
26 | { |
|
26 | { |
@@ -19,8 +19,8 | |||||
19 | ****************************************************************************/ |
|
19 | ****************************************************************************/ | |
20 |
|
20 | |||
21 | #include "charts.h" |
|
21 | #include "charts.h" | |
22 |
#include |
|
22 | #include <QtCharts/QChart> | |
23 |
#include |
|
23 | #include <QtCharts/QPieSeries> | |
24 |
|
24 | |||
25 | class PieChart: public Chart |
|
25 | class PieChart: public Chart | |
26 | { |
|
26 | { |
@@ -19,9 +19,9 | |||||
19 | ****************************************************************************/ |
|
19 | ****************************************************************************/ | |
20 |
|
20 | |||
21 | #include "charts.h" |
|
21 | #include "charts.h" | |
22 |
#include |
|
22 | #include <QtCharts/QChart> | |
23 |
#include |
|
23 | #include <QtCharts/QLineSeries> | |
24 |
#include |
|
24 | #include <QtCharts/QValueAxis> | |
25 |
|
25 | |||
26 | class SizeChart: public Chart |
|
26 | class SizeChart: public Chart | |
27 | { |
|
27 | { |
@@ -19,9 +19,9 | |||||
19 | ****************************************************************************/ |
|
19 | ****************************************************************************/ | |
20 |
|
20 | |||
21 | #include "charts.h" |
|
21 | #include "charts.h" | |
22 |
#include |
|
22 | #include <QtCharts/QChart> | |
23 |
#include |
|
23 | #include <QtCharts/QAreaSeries> | |
24 |
#include |
|
24 | #include <QtCharts/QLineSeries> | |
25 |
|
25 | |||
26 | class AreaChart: public Chart |
|
26 | class AreaChart: public Chart | |
27 | { |
|
27 | { |
@@ -19,8 +19,8 | |||||
19 | ****************************************************************************/ |
|
19 | ****************************************************************************/ | |
20 |
|
20 | |||
21 | #include "charts.h" |
|
21 | #include "charts.h" | |
22 |
#include |
|
22 | #include <QtCharts/QChart> | |
23 |
#include |
|
23 | #include <QtCharts/QLineSeries> | |
24 |
|
24 | |||
25 | class LineChart: public Chart |
|
25 | class LineChart: public Chart | |
26 | { |
|
26 | { |
@@ -19,8 +19,8 | |||||
19 | ****************************************************************************/ |
|
19 | ****************************************************************************/ | |
20 |
|
20 | |||
21 | #include "charts.h" |
|
21 | #include "charts.h" | |
22 |
#include |
|
22 | #include <QtCharts/QChart> | |
23 |
#include |
|
23 | #include <QtCharts/QScatterSeries> | |
24 |
|
24 | |||
25 | class ScatterChart: public Chart |
|
25 | class ScatterChart: public Chart | |
26 | { |
|
26 | { |
@@ -19,8 +19,8 | |||||
19 | ****************************************************************************/ |
|
19 | ****************************************************************************/ | |
20 |
|
20 | |||
21 | #include "charts.h" |
|
21 | #include "charts.h" | |
22 |
#include |
|
22 | #include <QtCharts/QChart> | |
23 |
#include |
|
23 | #include <QtCharts/QSplineSeries> | |
24 |
|
24 | |||
25 | class SplineChart: public Chart |
|
25 | class SplineChart: public Chart | |
26 | { |
|
26 | { |
@@ -20,10 +20,10 | |||||
20 |
|
20 | |||
21 | #include "grid.h" |
|
21 | #include "grid.h" | |
22 | #include "charts.h" |
|
22 | #include "charts.h" | |
23 |
#include < |
|
23 | #include <QtCharts/QChart> | |
24 | #include <QGraphicsGridLayout> |
|
24 | #include <QtWidgets/QGraphicsGridLayout> | |
25 | #include <QGraphicsSceneMouseEvent> |
|
25 | #include <QtWidgets/QGraphicsSceneMouseEvent> | |
26 | #include <QDebug> |
|
26 | #include <QtCore/QDebug> | |
27 |
|
27 | |||
28 | Grid::Grid(int size, QGraphicsItem *parent) |
|
28 | Grid::Grid(int size, QGraphicsItem *parent) | |
29 | : QGraphicsWidget(parent), |
|
29 | : QGraphicsWidget(parent), |
@@ -22,8 +22,8 | |||||
22 | #define GRID_H_ |
|
22 | #define GRID_H_ | |
23 |
|
23 | |||
24 | #include "model.h" |
|
24 | #include "model.h" | |
25 | #include <QGraphicsWidget> |
|
25 | #include <QtWidgets/QGraphicsWidget> | |
26 | #include <QChartGlobal> |
|
26 | #include <QtCharts/QChartGlobal> | |
27 |
|
27 | |||
28 | class QGraphicsGridLayout; |
|
28 | class QGraphicsGridLayout; | |
29 | class Chart; |
|
29 | class Chart; |
@@ -19,8 +19,8 | |||||
19 | ****************************************************************************/ |
|
19 | ****************************************************************************/ | |
20 |
|
20 | |||
21 | #include "window.h" |
|
21 | #include "window.h" | |
22 | #include <QApplication> |
|
22 | #include <QtWidgets/QApplication> | |
23 | #include <QMainWindow> |
|
23 | #include <QtWidgets/QMainWindow> | |
24 | #include <iostream> |
|
24 | #include <iostream> | |
25 |
|
25 | |||
26 | QVariantHash parseArgs(QStringList args) |
|
26 | QVariantHash parseArgs(QStringList args) |
@@ -21,10 +21,10 | |||||
21 | #ifndef MODEL_H |
|
21 | #ifndef MODEL_H | |
22 | #define MODEL_H |
|
22 | #define MODEL_H | |
23 |
|
23 | |||
24 | #include <QList> |
|
24 | #include <QtCore/QList> | |
25 | #include <QPair> |
|
25 | #include <QtCore/QPair> | |
26 | #include <QPointF> |
|
26 | #include <QtCore/QPointF> | |
27 | #include <QTime> |
|
27 | #include <QtCore/QTime> | |
28 | #include <stdlib.h> |
|
28 | #include <stdlib.h> | |
29 |
|
29 | |||
30 | typedef QPair<QPointF, QString> Data; |
|
30 | typedef QPair<QPointF, QString> Data; |
@@ -19,9 +19,9 | |||||
19 | ****************************************************************************/ |
|
19 | ****************************************************************************/ | |
20 |
|
20 | |||
21 | #include "view.h" |
|
21 | #include "view.h" | |
22 | #include <QGraphicsWidget> |
|
22 | #include <QtWidgets/QGraphicsWidget> | |
23 | #include <QResizeEvent> |
|
23 | #include <QtGui/QResizeEvent> | |
24 | #include <QDebug> |
|
24 | #include <QtCore/QDebug> | |
25 |
|
25 | |||
26 | View::View(QGraphicsScene *scene, QGraphicsWidget *form , QWidget *parent) |
|
26 | View::View(QGraphicsScene *scene, QGraphicsWidget *form , QWidget *parent) | |
27 | : QGraphicsView(scene, parent), |
|
27 | : QGraphicsView(scene, parent), |
@@ -20,7 +20,7 | |||||
20 |
|
20 | |||
21 | #ifndef VIEW_H |
|
21 | #ifndef VIEW_H | |
22 | #define VIEW_H |
|
22 | #define VIEW_H | |
23 | #include <QGraphicsView> |
|
23 | #include <QtWidgets/QGraphicsView> | |
24 |
|
24 | |||
25 | class QGraphicsScene; |
|
25 | class QGraphicsScene; | |
26 | class QResizeEvent; |
|
26 | class QResizeEvent; |
@@ -22,24 +22,24 | |||||
22 | #include "view.h" |
|
22 | #include "view.h" | |
23 | #include "grid.h" |
|
23 | #include "grid.h" | |
24 | #include "charts.h" |
|
24 | #include "charts.h" | |
25 | #include <QChartView> |
|
25 | #include <QtCharts/QChartView> | |
26 | #include <QAreaSeries> |
|
26 | #include <QtCharts/QAreaSeries> | |
27 | #include <QLegend> |
|
27 | #include <QtCharts/QLegend> | |
28 | #include <QGridLayout> |
|
28 | #include <QtWidgets/QGridLayout> | |
29 | #include <QFormLayout> |
|
29 | #include <QtWidgets/QFormLayout> | |
30 | #include <QComboBox> |
|
30 | #include <QtWidgets/QComboBox> | |
31 | #include <QSpinBox> |
|
31 | #include <QtWidgets/QSpinBox> | |
32 | #include <QCheckBox> |
|
32 | #include <QtWidgets/QCheckBox> | |
33 | #include <QGroupBox> |
|
33 | #include <QtWidgets/QGroupBox> | |
34 | #include <QLabel> |
|
34 | #include <QtWidgets/QLabel> | |
35 | #include <QGraphicsScene> |
|
35 | #include <QtWidgets/QGraphicsScene> | |
36 | #include <QGraphicsLinearLayout> |
|
36 | #include <QtWidgets/QGraphicsLinearLayout> | |
37 | #include <QGraphicsProxyWidget> |
|
37 | #include <QtWidgets/QGraphicsProxyWidget> | |
38 | #include <QGLWidget> |
|
38 | #include <QtOpenGL/QGLWidget> | |
39 | #include <QApplication> |
|
39 | #include <QtWidgets/QApplication> | |
40 | #include <QDebug> |
|
40 | #include <QtCore/QDebug> | |
41 | #include <QMenu> |
|
41 | #include <QtWidgets/QMenu> | |
42 | #include <QPushButton> |
|
42 | #include <QtWidgets/QPushButton> | |
43 |
|
43 | |||
44 | Window::Window(const QVariantHash ¶meters, QWidget *parent) |
|
44 | Window::Window(const QVariantHash ¶meters, QWidget *parent) | |
45 | : QMainWindow(parent), |
|
45 | : QMainWindow(parent), |
@@ -20,10 +20,10 | |||||
20 |
|
20 | |||
21 | #ifndef WINDOW_H |
|
21 | #ifndef WINDOW_H | |
22 | #define WINDOW_H |
|
22 | #define WINDOW_H | |
23 | #include <QMainWindow> |
|
23 | #include <QtWidgets/QMainWindow> | |
24 | #include <QChartGlobal> |
|
24 | #include <QtCharts/QChartGlobal> | |
25 | #include <QHash> |
|
25 | #include <QtCore/QHash> | |
26 | #include <QComboBox> |
|
26 | #include <QtWidgets/QComboBox> | |
27 |
|
27 | |||
28 | class QCheckBox; |
|
28 | class QCheckBox; | |
29 | class QGraphicsRectItem; |
|
29 | class QGraphicsRectItem; |
@@ -19,14 +19,14 | |||||
19 | ****************************************************************************/ |
|
19 | ****************************************************************************/ | |
20 |
|
20 | |||
21 | #include "dataseriedialog.h" |
|
21 | #include "dataseriedialog.h" | |
22 | #include <QDialogButtonBox> |
|
22 | #include <QtWidgets/QDialogButtonBox> | |
23 | #include <QGridLayout> |
|
23 | #include <QtWidgets/QGridLayout> | |
24 | #include <QCheckBox> |
|
24 | #include <QtWidgets/QCheckBox> | |
25 | #include <QPushButton> |
|
25 | #include <QtWidgets/QPushButton> | |
26 | #include <QGroupBox> |
|
26 | #include <QtWidgets/QGroupBox> | |
27 | #include <QRadioButton> |
|
27 | #include <QtWidgets/QRadioButton> | |
28 | #include <QLabel> |
|
28 | #include <QtWidgets/QLabel> | |
29 | #include <QDebug> |
|
29 | #include <QtCore/QDebug> | |
30 |
|
30 | |||
31 | DataSerieDialog::DataSerieDialog(QWidget *parent) : |
|
31 | DataSerieDialog::DataSerieDialog(QWidget *parent) : | |
32 | QDialog(parent) |
|
32 | QDialog(parent) |
@@ -21,7 +21,7 | |||||
21 | #ifndef DATASERIEDIALOG_H |
|
21 | #ifndef DATASERIEDIALOG_H | |
22 | #define DATASERIEDIALOG_H |
|
22 | #define DATASERIEDIALOG_H | |
23 |
|
23 | |||
24 | #include <QDialog> |
|
24 | #include <QtWidgets/QDialog> | |
25 |
|
25 | |||
26 | class QGroupBox; |
|
26 | class QGroupBox; | |
27 | class QCheckBox; |
|
27 | class QCheckBox; |
@@ -20,30 +20,30 | |||||
20 |
|
20 | |||
21 | #include "mainwidget.h" |
|
21 | #include "mainwidget.h" | |
22 | #include "dataseriedialog.h" |
|
22 | #include "dataseriedialog.h" | |
23 |
#include |
|
23 | #include <QtCharts/QChartView> | |
24 |
#include |
|
24 | #include <QtCharts/QPieSeries> | |
25 |
#include |
|
25 | #include <QtCharts/QScatterSeries> | |
26 |
#include |
|
26 | #include <QtCharts/QLineSeries> | |
27 |
#include < |
|
27 | #include <QtCharts/QAreaSeries> | |
28 |
#include < |
|
28 | #include <QtCharts/QSplineSeries> | |
29 |
#include < |
|
29 | #include <QtCharts/QBarSet> | |
30 |
#include < |
|
30 | #include <QtCharts/QBarSeries> | |
31 |
#include < |
|
31 | #include <QtCharts/QStackedBarSeries> | |
32 |
#include < |
|
32 | #include <QtCharts/QPercentBarSeries> | |
33 | #include <QPushButton> |
|
33 | #include <QtWidgets/QPushButton> | |
34 | #include <QComboBox> |
|
34 | #include <QtWidgets/QComboBox> | |
35 | #include <QSpinBox> |
|
35 | #include <QtWidgets/QSpinBox> | |
36 | #include <QCheckBox> |
|
36 | #include <QtWidgets/QCheckBox> | |
37 | #include <QGridLayout> |
|
37 | #include <QtWidgets/QGridLayout> | |
38 | #include <QHBoxLayout> |
|
38 | #include <QtWidgets/QHBoxLayout> | |
39 | #include <QLabel> |
|
39 | #include <QtWidgets/QLabel> | |
40 | #include <QSpacerItem> |
|
40 | #include <QtWidgets/QSpacerItem> | |
41 | #include <QMessageBox> |
|
41 | #include <QtWidgets/QMessageBox> | |
42 | #include <cmath> |
|
42 | #include <cmath> | |
43 | #include <QDebug> |
|
43 | #include <QtCore/QDebug> | |
44 | #include <QStandardItemModel> |
|
44 | #include <QtGui/QStandardItemModel> | |
45 | #include <QBarCategoryAxis> |
|
45 | #include <QtCharts/QBarCategoryAxis> | |
46 | #include <QGLWidget> |
|
46 | #include <QtOpenGL/QGLWidget> | |
47 |
|
47 | |||
48 | QT_CHARTS_USE_NAMESPACE |
|
48 | QT_CHARTS_USE_NAMESPACE | |
49 |
|
49 |
@@ -21,10 +21,10 | |||||
21 | #ifndef MAINWIDGET_H |
|
21 | #ifndef MAINWIDGET_H | |
22 | #define MAINWIDGET_H |
|
22 | #define MAINWIDGET_H | |
23 |
|
23 | |||
24 |
#include |
|
24 | #include <QtCharts/QChartGlobal> | |
25 |
#include |
|
25 | #include <QtCharts/QChart> | |
26 |
#include |
|
26 | #include <QtCharts/QChartView> | |
27 | #include <QWidget> |
|
27 | #include <QtWidgets/QWidget> | |
28 |
|
28 | |||
29 | class QSpinBox; |
|
29 | class QSpinBox; | |
30 | class QCheckBox; |
|
30 | class QCheckBox; |
@@ -19,9 +19,9 | |||||
19 | ****************************************************************************/ |
|
19 | ****************************************************************************/ | |
20 |
|
20 | |||
21 | #include "chartview.h" |
|
21 | #include "chartview.h" | |
22 | #include <QMouseEvent> |
|
22 | #include <QtGui/QMouseEvent> | |
23 | #include <QDebug> |
|
23 | #include <QtCore/QDebug> | |
24 | #include <QAbstractAxis> |
|
24 | #include <QtCharts/QAbstractAxis> | |
25 |
|
25 | |||
26 | QT_CHARTS_USE_NAMESPACE |
|
26 | QT_CHARTS_USE_NAMESPACE | |
27 |
|
27 |
@@ -21,8 +21,8 | |||||
21 | #ifndef CHARTVIEW_H |
|
21 | #ifndef CHARTVIEW_H | |
22 | #define CHARTVIEW_H |
|
22 | #define CHARTVIEW_H | |
23 |
|
23 | |||
24 | #include <QChartView> |
|
24 | #include <QtCharts/QChartView> | |
25 | #include <QPolarChart> |
|
25 | #include <QtCharts/QPolarChart> | |
26 |
|
26 | |||
27 | QT_CHARTS_USE_NAMESPACE |
|
27 | QT_CHARTS_USE_NAMESPACE | |
28 |
|
28 |
@@ -19,7 +19,7 | |||||
19 | ****************************************************************************/ |
|
19 | ****************************************************************************/ | |
20 |
|
20 | |||
21 | #include "mainwindow.h" |
|
21 | #include "mainwindow.h" | |
22 | #include <QApplication> |
|
22 | #include <QtWidgets/QApplication> | |
23 |
|
23 | |||
24 | int main(int argc, char *argv[]) |
|
24 | int main(int argc, char *argv[]) | |
25 | { |
|
25 | { |
@@ -20,20 +20,20 | |||||
20 |
|
20 | |||
21 | #include "mainwindow.h" |
|
21 | #include "mainwindow.h" | |
22 | #include "chartview.h" |
|
22 | #include "chartview.h" | |
23 | #include <QScatterSeries> |
|
23 | #include <QtCharts/QScatterSeries> | |
24 | #include <QLineSeries> |
|
24 | #include <QtCharts/QLineSeries> | |
25 | #include <QSplineSeries> |
|
25 | #include <QtCharts/QSplineSeries> | |
26 | #include <QAreaSeries> |
|
26 | #include <QtCharts/QAreaSeries> | |
27 | #include <QBarSeries> |
|
27 | #include <QtCharts/QBarSeries> | |
28 | #include <QBarSet> |
|
28 | #include <QtCharts/QBarSet> | |
29 | #include <QValueAxis> |
|
29 | #include <QtCharts/QValueAxis> | |
30 | #include <QLogValueAxis> |
|
30 | #include <QtCharts/QLogValueAxis> | |
31 | #include <QDateTimeAxis> |
|
31 | #include <QtCharts/QDateTimeAxis> | |
32 | #include <QCategoryAxis> |
|
32 | #include <QtCharts/QCategoryAxis> | |
33 | #include <QPolarChart> |
|
33 | #include <QtCharts/QPolarChart> | |
34 | #include <QDebug> |
|
34 | #include <QtCore/QDebug> | |
35 |
#include < |
|
35 | #include <QtCore/QtMath> | |
36 | #include <QDateTime> |
|
36 | #include <QtCore/QDateTime> | |
37 |
|
37 | |||
38 | QT_CHARTS_USE_NAMESPACE |
|
38 | QT_CHARTS_USE_NAMESPACE | |
39 | #include "ui_mainwindow.h" |
|
39 | #include "ui_mainwindow.h" |
@@ -21,14 +21,14 | |||||
21 | #ifndef MAINWINDOW_H |
|
21 | #ifndef MAINWINDOW_H | |
22 | #define MAINWINDOW_H |
|
22 | #define MAINWINDOW_H | |
23 |
|
23 | |||
24 | #include <QPolarChart> |
|
24 | #include <QtCharts/QPolarChart> | |
25 | #include <QMainWindow> |
|
25 | #include <QtWidgets/QMainWindow> | |
26 | #include <QFont> |
|
26 | #include <QtGui/QFont> | |
27 | #include <QChart> |
|
27 | #include <QtCharts/QChart> | |
28 | #include <QScatterSeries> |
|
28 | #include <QtCharts/QScatterSeries> | |
29 | #include <QLineSeries> |
|
29 | #include <QtCharts/QLineSeries> | |
30 | #include <QSplineSeries> |
|
30 | #include <QtCharts/QSplineSeries> | |
31 | #include <QAreaSeries> |
|
31 | #include <QtCharts/QAreaSeries> | |
32 |
|
32 | |||
33 | namespace Ui { |
|
33 | namespace Ui { | |
34 | class MainWindow; |
|
34 | class MainWindow; |
@@ -19,11 +19,11 | |||||
19 | ****************************************************************************/ |
|
19 | ****************************************************************************/ | |
20 |
|
20 | |||
21 | #include "chartview.h" |
|
21 | #include "chartview.h" | |
22 | #include <QLineSeries> |
|
22 | #include <QtCharts/QLineSeries> | |
23 | #include <QScatterSeries> |
|
23 | #include <QtCharts/QScatterSeries> | |
24 | #include <QSplineSeries> |
|
24 | #include <QtCharts/QSplineSeries> | |
25 | #include <QAreaSeries> |
|
25 | #include <QtCharts/QAreaSeries> | |
26 | #include <QTime> |
|
26 | #include <QtCore/QTime> | |
27 |
|
27 | |||
28 | ChartView::ChartView(QChart *chart, QWidget *parent) |
|
28 | ChartView::ChartView(QChart *chart, QWidget *parent) | |
29 | : QChartView(chart, parent), |
|
29 | : QChartView(chart, parent), |
@@ -21,8 +21,8 | |||||
21 | #ifndef CHARTVIEW_H |
|
21 | #ifndef CHARTVIEW_H | |
22 | #define CHARTVIEW_H |
|
22 | #define CHARTVIEW_H | |
23 |
|
23 | |||
24 | #include <QChartView> |
|
24 | #include <QtCharts/QChartView> | |
25 | #include <QTimer> |
|
25 | #include <QtCore/QTimer> | |
26 |
|
26 | |||
27 | QT_CHARTS_USE_NAMESPACE |
|
27 | QT_CHARTS_USE_NAMESPACE | |
28 |
|
28 |
@@ -19,8 +19,8 | |||||
19 | ****************************************************************************/ |
|
19 | ****************************************************************************/ | |
20 |
|
20 | |||
21 | #include "chartview.h" |
|
21 | #include "chartview.h" | |
22 | #include <QApplication> |
|
22 | #include <QtWidgets/QApplication> | |
23 | #include <QMainWindow> |
|
23 | #include <QtWidgets/QMainWindow> | |
24 |
|
24 | |||
25 | int main(int argc, char *argv[]) |
|
25 | int main(int argc, char *argv[]) | |
26 | { |
|
26 | { |
@@ -18,7 +18,7 | |||||
18 | ** |
|
18 | ** | |
19 | ****************************************************************************/ |
|
19 | ****************************************************************************/ | |
20 |
|
20 | |||
21 | #include <QApplication> |
|
21 | #include <QtWidgets/QApplication> | |
22 | #include <QtCore/QDir> |
|
22 | #include <QtCore/QDir> | |
23 | #include <QtQuick/QQuickView> |
|
23 | #include <QtQuick/QQuickView> | |
24 | #include <QtQml/QQmlEngine> |
|
24 | #include <QtQml/QQmlEngine> |
@@ -18,7 +18,7 | |||||
18 | ** |
|
18 | ** | |
19 | ****************************************************************************/ |
|
19 | ****************************************************************************/ | |
20 |
|
20 | |||
21 | #include <QApplication> |
|
21 | #include <QtWidgets/QApplication> | |
22 | #include <QtCore/QDir> |
|
22 | #include <QtCore/QDir> | |
23 | #include <QtQuick/QQuickView> |
|
23 | #include <QtQuick/QQuickView> | |
24 | #include <QtQml/QQmlEngine> |
|
24 | #include <QtQml/QQmlEngine> |
@@ -1,6 +1,3 | |||||
1 | INCLUDEPATH += ../../include |
|
|||
2 |
|
||||
3 | LIBS += -L$$OUT_PWD/../../lib |
|
|||
4 | TEMPLATE = app |
|
1 | TEMPLATE = app | |
5 |
|
2 | |||
6 | QT += charts |
|
3 | QT += charts |
@@ -19,9 +19,9 | |||||
19 | ****************************************************************************/ |
|
19 | ****************************************************************************/ | |
20 |
|
20 | |||
21 | #include "wavechart.h" |
|
21 | #include "wavechart.h" | |
22 | #include <QApplication> |
|
22 | #include <QtWidgets/QApplication> | |
23 | #include <QMainWindow> |
|
23 | #include <QtWidgets/QMainWindow> | |
24 | #include <QGLWidget> |
|
24 | #include <QtOpenGL/QGLWidget> | |
25 |
|
25 | |||
26 | int main(int argc, char *argv[]) |
|
26 | int main(int argc, char *argv[]) | |
27 | { |
|
27 | { |
@@ -21,11 +21,11 | |||||
21 | #ifndef WAVECHART_H |
|
21 | #ifndef WAVECHART_H | |
22 | #define WAVECHART_H |
|
22 | #define WAVECHART_H | |
23 |
|
23 | |||
24 | #include <QTimer> |
|
24 | #include <QtCore/QTimer> | |
25 | #include <QTime> |
|
25 | #include <QtCore/QTime> | |
26 | #include <QObject> |
|
26 | #include <QtCore/QObject> | |
27 | #include <QLineSeries> |
|
27 | #include <QtCharts/QLineSeries> | |
28 | #include <QChartView> |
|
28 | #include <QtCharts/QChartView> | |
29 |
|
29 | |||
30 | QT_CHARTS_USE_NAMESPACE |
|
30 | QT_CHARTS_USE_NAMESPACE | |
31 |
|
31 |
General Comments 0
You need to be logged in to leave comments.
Login now