diff options
299 files changed, 1444 insertions, 664 deletions
diff --git a/.qmake.conf b/.qmake.conf index 7e0ad0e1..dc68d388 100644 --- a/.qmake.conf +++ b/.qmake.conf @@ -1,3 +1,3 @@ load(qt_build_config) -MODULE_VERSION = 5.9.5 +MODULE_VERSION = 5.11.0 diff --git a/dist/changes-5.10.0 b/dist/changes-5.10.0 new file mode 100644 index 00000000..6847eb8d --- /dev/null +++ b/dist/changes-5.10.0 @@ -0,0 +1,22 @@ +Qt 5.10 introduces many new features and improvements as well as bugfixes +over the 5.9.x series. For more details, refer to the online documentation +included in this distribution. The documentation is also available online: + +http://doc.qt.io/qt-5/index.html + +The Qt version 5.10 series is binary compatible with the 5.10.x series. +Applications compiled for 5.9 will continue to run with 5.10. + +Some of the changes listed in this file include issue tracking numbers +corresponding to tasks in the Qt Bug Tracker: + +https://bugreports.qt.io/ + +Each of these identifiers can be entered in the bug tracker to obtain more +information about a particular change. + +**************************************************************************** +* Qt 5.10.0 Changes * +**************************************************************************** + + - This release contains only minor code improvements. diff --git a/dist/changes-5.10.1 b/dist/changes-5.10.1 new file mode 100644 index 00000000..695c4e36 --- /dev/null +++ b/dist/changes-5.10.1 @@ -0,0 +1,26 @@ +Qt 5.10.1 is a bug-fix release. It maintains both forward and backward +compatibility (source and binary) with Qt 5.10.0. + +For more details, refer to the online documentation included in this +distribution. The documentation is also available online: + +http://doc.qt.io/qt-5/index.html + +The Qt version 5.10 series is binary compatible with the 5.9.x series. +Applications compiled for 5.9 will continue to run with 5.10. + +Some of the changes listed in this file include issue tracking numbers +corresponding to tasks in the Qt Bug Tracker: + +https://bugreports.qt.io/ + +Each of these identifiers can be entered in the bug tracker to obtain more +information about a particular change. + +This release contains all fixes included in the Qt 5.9.4 release. + +**************************************************************************** +* Qt 5.10.1 Changes * +**************************************************************************** + + - This release contains only minor code improvements. diff --git a/examples/charts/audio/main.cpp b/examples/charts/audio/main.cpp index be287d7b..8c4eca66 100644 --- a/examples/charts/audio/main.cpp +++ b/examples/charts/audio/main.cpp @@ -27,13 +27,24 @@ ** ****************************************************************************/ -#include <QtWidgets/QApplication> #include "widget.h" +#include <QtMultimedia/QAudioDeviceInfo> +#include <QtWidgets/QApplication> +#include <QtWidgets/QMessageBox> + int main(int argc, char *argv[]) { QApplication a(argc, argv); - Widget w; + + const QAudioDeviceInfo inputDevice = QAudioDeviceInfo::defaultInputDevice(); + if (inputDevice.isNull()) { + QMessageBox::warning(nullptr, "audio", + "There is no audio input device available."); + return -1; + } + + Widget w(inputDevice); w.show(); return a.exec(); diff --git a/examples/charts/audio/widget.cpp b/examples/charts/audio/widget.cpp index b285a6ca..86dd6206 100644 --- a/examples/charts/audio/widget.cpp +++ b/examples/charts/audio/widget.cpp @@ -28,31 +28,30 @@ ****************************************************************************/ #include "widget.h" +#include "xyseriesiodevice.h" + #include <QtMultimedia/QAudioDeviceInfo> #include <QtMultimedia/QAudioInput> + #include <QtCharts/QChartView> #include <QtCharts/QLineSeries> #include <QtCharts/QChart> -#include <QtWidgets/QVBoxLayout> #include <QtCharts/QValueAxis> -#include "xyseriesiodevice.h" + +#include <QtWidgets/QVBoxLayout> QT_CHARTS_USE_NAMESPACE -Widget::Widget(QWidget *parent) - : QWidget(parent), - m_device(0), - m_chart(0), - m_series(0), - m_audioInput(0) +Widget::Widget(const QAudioDeviceInfo &deviceInfo, QWidget *parent) : + QWidget(parent), + m_chart(new QChart), + m_series(new QLineSeries) { - m_chart = new QChart; QChartView *chartView = new QChartView(m_chart); chartView->setMinimumSize(800, 600); - m_series = new QLineSeries; m_chart->addSeries(m_series); QValueAxis *axisX = new QValueAxis; - axisX->setRange(0, 2000); + axisX->setRange(0, XYSeriesIODevice::sampleCount); axisX->setLabelFormat("%g"); axisX->setTitleText("Samples"); QValueAxis *axisY = new QValueAxis; @@ -61,11 +60,10 @@ Widget::Widget(QWidget *parent) m_chart->setAxisX(axisX, m_series); m_chart->setAxisY(axisY, m_series); m_chart->legend()->hide(); - m_chart->setTitle("Data from the microphone"); + m_chart->setTitle("Data from the microphone (" + deviceInfo.deviceName() + ')'); - QVBoxLayout *mainLayout = new QVBoxLayout; + QVBoxLayout *mainLayout = new QVBoxLayout(this); mainLayout->addWidget(chartView); - setLayout(mainLayout); QAudioFormat formatAudio; formatAudio.setSampleRate(8000); @@ -75,8 +73,7 @@ Widget::Widget(QWidget *parent) formatAudio.setByteOrder(QAudioFormat::LittleEndian); formatAudio.setSampleType(QAudioFormat::UnSignedInt); - QAudioDeviceInfo inputDevices = QAudioDeviceInfo::defaultInputDevice(); - m_audioInput = new QAudioInput(inputDevices,formatAudio, this); + m_audioInput = new QAudioInput(deviceInfo, formatAudio, this); m_device = new XYSeriesIODevice(m_series, this); m_device->open(QIODevice::WriteOnly); diff --git a/examples/charts/audio/widget.h b/examples/charts/audio/widget.h index 70cc3862..82072b92 100644 --- a/examples/charts/audio/widget.h +++ b/examples/charts/audio/widget.h @@ -44,6 +44,7 @@ class XYSeriesIODevice; QT_BEGIN_NAMESPACE class QAudioInput; +class QAudioDeviceInfo; QT_END_NAMESPACE class Widget : public QWidget @@ -51,14 +52,14 @@ class Widget : public QWidget Q_OBJECT public: - Widget(QWidget *parent = 0); + explicit Widget(const QAudioDeviceInfo &deviceInfo, QWidget *parent = nullptr); ~Widget(); private: - XYSeriesIODevice *m_device; + XYSeriesIODevice *m_device = nullptr; QChart *m_chart; - QLineSeries *m_series; - QAudioInput *m_audioInput; + QLineSeries *m_series ; + QAudioInput *m_audioInput = nullptr; }; #endif // WIDGET_H diff --git a/examples/charts/audio/xyseriesiodevice.cpp b/examples/charts/audio/xyseriesiodevice.cpp index 19669ff9..d129725d 100644 --- a/examples/charts/audio/xyseriesiodevice.cpp +++ b/examples/charts/audio/xyseriesiodevice.cpp @@ -28,39 +28,43 @@ ****************************************************************************/ #include "xyseriesiodevice.h" + #include <QtCharts/QXYSeries> -XYSeriesIODevice::XYSeriesIODevice(QXYSeries * series, QObject *parent) : +XYSeriesIODevice::XYSeriesIODevice(QXYSeries *series, QObject *parent) : QIODevice(parent), m_series(series) { } -qint64 XYSeriesIODevice::readData(char * data, qint64 maxSize) +qint64 XYSeriesIODevice::readData(char *data, qint64 maxSize) { Q_UNUSED(data) Q_UNUSED(maxSize) return -1; } -qint64 XYSeriesIODevice::writeData(const char * data, qint64 maxSize) +qint64 XYSeriesIODevice::writeData(const char *data, qint64 maxSize) { - qint64 range = 2000; - QVector<QPointF> oldPoints = m_series->pointsVector(); - QVector<QPointF> points; - int resolution = 4; + static const int resolution = 4; + + if (m_buffer.isEmpty()) { + m_buffer.reserve(sampleCount); + for (int i = 0; i < sampleCount; ++i) + m_buffer.append(QPointF(i, 0)); + } - if (oldPoints.count() < range) { - points = m_series->pointsVector(); - } else { - for (int i = maxSize/resolution; i < oldPoints.count(); i++) - points.append(QPointF(i - maxSize/resolution, oldPoints.at(i).y())); + int start = 0; + const int availableSamples = int(maxSize) / resolution; + if (availableSamples < sampleCount) { + start = sampleCount - availableSamples; + for (int s = 0; s < start; ++s) + m_buffer[s].setY(m_buffer.at(s + availableSamples).y()); } - qint64 size = points.count(); - for (int k = 0; k < maxSize/resolution; k++) - points.append(QPointF(k + size, ((quint8)data[resolution * k] - 128)/128.0)); + for (int s = start; s < sampleCount; ++s, data += resolution) + m_buffer[s].setY(qreal(uchar(*data) -128) / qreal(128)); - m_series->replace(points); - return maxSize; + m_series->replace(m_buffer); + return (sampleCount - start) * resolution; } diff --git a/examples/charts/audio/xyseriesiodevice.h b/examples/charts/audio/xyseriesiodevice.h index 05daf974..cbbf2271 100644 --- a/examples/charts/audio/xyseriesiodevice.h +++ b/examples/charts/audio/xyseriesiodevice.h @@ -31,6 +31,8 @@ #define XYSERIESIODEVICE_H #include <QtCore/QIODevice> +#include <QtCore/QPointF> +#include <QtCore/QVector> #include <QtCharts/QChartGlobal> QT_CHARTS_BEGIN_NAMESPACE @@ -43,14 +45,17 @@ class XYSeriesIODevice : public QIODevice { Q_OBJECT public: - explicit XYSeriesIODevice(QXYSeries * series, QObject *parent = 0); + explicit XYSeriesIODevice(QXYSeries *series, QObject *parent = nullptr); + + static const int sampleCount = 2000; protected: - qint64 readData(char * data, qint64 maxSize); - qint64 writeData(const char * data, qint64 maxSize); + qint64 readData(char *data, qint64 maxSize) override; + qint64 writeData(const char *data, qint64 maxSize) override; private: QXYSeries *m_series; + QVector<QPointF> m_buffer; }; #endif // XYSERIESIODEVICE_H diff --git a/examples/charts/barmodelmapper/barmodelmapper.pro b/examples/charts/barmodelmapper/barmodelmapper.pro index 45a5e224..0ff60561 100644 --- a/examples/charts/barmodelmapper/barmodelmapper.pro +++ b/examples/charts/barmodelmapper/barmodelmapper.pro @@ -1,4 +1,5 @@ QT += charts +requires(qtConfig(tableview)) HEADERS += \ customtablemodel.h \ diff --git a/examples/charts/barmodelmapper/customtablemodel.cpp b/examples/charts/barmodelmapper/customtablemodel.cpp index a1446386..4bbf4191 100644 --- a/examples/charts/barmodelmapper/customtablemodel.cpp +++ b/examples/charts/barmodelmapper/customtablemodel.cpp @@ -31,13 +31,12 @@ #include <QtCore/QVector> #include <QtCore/QTime> #include <QtCore/QRect> +#include <QtCore/QRandomGenerator> #include <QtGui/QColor> CustomTableModel::CustomTableModel(QObject *parent) : QAbstractTableModel(parent) { - qsrand(QTime(0, 0, 0).secsTo(QTime::currentTime())); - m_columnCount = 6; m_rowCount = 12; @@ -46,9 +45,9 @@ CustomTableModel::CustomTableModel(QObject *parent) : QVector<qreal>* dataVec = new QVector<qreal>(m_columnCount); for (int k = 0; k < dataVec->size(); k++) { if (k % 2 == 0) - dataVec->replace(k, i * 50 + qrand() % 20); + dataVec->replace(k, i * 50 + QRandomGenerator::global()->bounded(20)); else - dataVec->replace(k, qrand() % 100); + dataVec->replace(k, QRandomGenerator::global()->bounded(100)); } m_data.append(dataVec); } diff --git a/examples/charts/chartthemes/chartthemes.pro b/examples/charts/chartthemes/chartthemes.pro index 5985f55c..5def152f 100644 --- a/examples/charts/chartthemes/chartthemes.pro +++ b/examples/charts/chartthemes/chartthemes.pro @@ -1,4 +1,5 @@ QT += charts +requires(qtConfig(combobox)) HEADERS += \ themewidget.h @@ -9,3 +10,6 @@ SOURCES += \ target.path = $$[QT_INSTALL_EXAMPLES]/charts/chartthemes INSTALLS += target + +FORMS += \ + themewidget.ui diff --git a/examples/charts/chartthemes/themewidget.cpp b/examples/charts/chartthemes/themewidget.cpp index 982c50e0..84ea8231 100644 --- a/examples/charts/chartthemes/themewidget.cpp +++ b/examples/charts/chartthemes/themewidget.cpp @@ -28,6 +28,7 @@ ****************************************************************************/ #include "themewidget.h" +#include "ui_themewidget.h" #include <QtCharts/QChartView> #include <QtCharts/QPieSeries> @@ -49,8 +50,10 @@ #include <QtWidgets/QCheckBox> #include <QtWidgets/QGroupBox> #include <QtWidgets/QLabel> -#include <QtCore/QTime> +#include <QtCore/QRandomGenerator> #include <QtCharts/QBarCategoryAxis> +#include <QtWidgets/QApplication> +#include <QtCharts/QValueAxis> ThemeWidget::ThemeWidget(QWidget *parent) : QWidget(parent), @@ -58,94 +61,73 @@ ThemeWidget::ThemeWidget(QWidget *parent) : m_valueMax(10), m_valueCount(7), m_dataTable(generateRandomData(m_listCount, m_valueMax, m_valueCount)), - m_themeComboBox(createThemeBox()), - m_antialiasCheckBox(new QCheckBox("Anti-aliasing")), - m_animatedComboBox(createAnimationBox()), - m_legendComboBox(createLegendBox()) + m_ui(new Ui_ThemeWidgetForm) { - connectSignals(); - // create layout - QGridLayout *baseLayout = new QGridLayout(); - QHBoxLayout *settingsLayout = new QHBoxLayout(); - settingsLayout->addWidget(new QLabel("Theme:")); - settingsLayout->addWidget(m_themeComboBox); - settingsLayout->addWidget(new QLabel("Animation:")); - settingsLayout->addWidget(m_animatedComboBox); - settingsLayout->addWidget(new QLabel("Legend:")); - settingsLayout->addWidget(m_legendComboBox); - settingsLayout->addWidget(m_antialiasCheckBox); - settingsLayout->addStretch(); - baseLayout->addLayout(settingsLayout, 0, 0, 1, 3); + m_ui->setupUi(this); + populateThemeBox(); + populateAnimationBox(); + populateLegendBox(); //create charts QChartView *chartView; chartView = new QChartView(createAreaChart()); - baseLayout->addWidget(chartView, 1, 0); + m_ui->gridLayout->addWidget(chartView, 1, 0); m_charts << chartView; - chartView = new QChartView(createBarChart(m_valueCount)); - baseLayout->addWidget(chartView, 1, 1); + chartView = new QChartView(createPieChart()); + // Funny things happen if the pie slice labels do not fit the screen, so we ignore size policy + chartView->setSizePolicy(QSizePolicy::Ignored, QSizePolicy::Ignored); + m_ui->gridLayout->addWidget(chartView, 1, 1); m_charts << chartView; + //![5] chartView = new QChartView(createLineChart()); - baseLayout->addWidget(chartView, 1, 2); + m_ui->gridLayout->addWidget(chartView, 1, 2); + //![5] m_charts << chartView; - chartView = new QChartView(createPieChart()); - // Funny things happen if the pie slice labels do not fit the screen, so we ignore size policy - chartView->setSizePolicy(QSizePolicy::Ignored, QSizePolicy::Ignored); - baseLayout->addWidget(chartView, 2, 0); + chartView = new QChartView(createBarChart(m_valueCount)); + m_ui->gridLayout->addWidget(chartView, 2, 0); m_charts << chartView; chartView = new QChartView(createSplineChart()); - baseLayout->addWidget(chartView, 2, 1); + m_ui->gridLayout->addWidget(chartView, 2, 1); m_charts << chartView; chartView = new QChartView(createScatterChart()); - baseLayout->addWidget(chartView, 2, 2); + m_ui->gridLayout->addWidget(chartView, 2, 2); m_charts << chartView; - setLayout(baseLayout); - // Set defaults - m_antialiasCheckBox->setChecked(true); + m_ui->antialiasCheckBox->setChecked(true); + + // Set the colors from the light theme as default ones + QPalette pal = qApp->palette(); + pal.setColor(QPalette::Window, QRgb(0xf0f0f0)); + pal.setColor(QPalette::WindowText, QRgb(0x404044)); + qApp->setPalette(pal); + updateUI(); } ThemeWidget::~ThemeWidget() { -} - -void ThemeWidget::connectSignals() -{ - connect(m_themeComboBox, - static_cast<void (QComboBox::*)(int)>(&QComboBox::currentIndexChanged), - this, &ThemeWidget::updateUI); - connect(m_antialiasCheckBox, &QCheckBox::toggled, this, &ThemeWidget::updateUI); - connect(m_animatedComboBox, - static_cast<void (QComboBox::*)(int)>(&QComboBox::currentIndexChanged), - this, &ThemeWidget::updateUI); - connect(m_legendComboBox, - static_cast<void (QComboBox::*)(int)>(&QComboBox::currentIndexChanged), - this, &ThemeWidget::updateUI); + delete m_ui; } DataTable ThemeWidget::generateRandomData(int listCount, int valueMax, int valueCount) const { DataTable dataTable; - // set seed for random stuff - qsrand(QTime(0, 0, 0).secsTo(QTime::currentTime())); - // generate random data for (int i(0); i < listCount; i++) { DataList dataList; qreal yValue(0); for (int j(0); j < valueCount; j++) { - yValue = yValue + (qreal)(qrand() % valueMax) / (qreal) valueCount; - QPointF value((j + (qreal) rand() / (qreal) RAND_MAX) * ((qreal) m_valueMax / (qreal) valueCount), + yValue = yValue + QRandomGenerator::global()->bounded(valueMax / (qreal) valueCount); + QPointF value((j + QRandomGenerator::global()->generateDouble()) * ((qreal) m_valueMax / (qreal) valueCount), yValue); QString label = "Slice " + QString::number(i) + ":" + QString::number(j); dataList << Data(value, label); @@ -156,41 +138,36 @@ DataTable ThemeWidget::generateRandomData(int listCount, int valueMax, int value return dataTable; } -QComboBox *ThemeWidget::createThemeBox() const +void ThemeWidget::populateThemeBox() { - // settings layout - QComboBox *themeComboBox = new QComboBox(); - themeComboBox->addItem("Light", QChart::ChartThemeLight); - themeComboBox->addItem("Blue Cerulean", QChart::ChartThemeBlueCerulean); - themeComboBox->addItem("Dark", QChart::ChartThemeDark); - themeComboBox->addItem("Brown Sand", QChart::ChartThemeBrownSand); - themeComboBox->addItem("Blue NCS", QChart::ChartThemeBlueNcs); - themeComboBox->addItem("High Contrast", QChart::ChartThemeHighContrast); - themeComboBox->addItem("Blue Icy", QChart::ChartThemeBlueIcy); - themeComboBox->addItem("Qt", QChart::ChartThemeQt); - return themeComboBox; + // add items to theme combobox + m_ui->themeComboBox->addItem("Light", QChart::ChartThemeLight); + m_ui->themeComboBox->addItem("Blue Cerulean", QChart::ChartThemeBlueCerulean); + m_ui->themeComboBox->addItem("Dark", QChart::ChartThemeDark); + m_ui->themeComboBox->addItem("Brown Sand", QChart::ChartThemeBrownSand); + m_ui->themeComboBox->addItem("Blue NCS", QChart::ChartThemeBlueNcs); + m_ui->themeComboBox->addItem("High Contrast", QChart::ChartThemeHighContrast); + m_ui->themeComboBox->addItem("Blue Icy", QChart::ChartThemeBlueIcy); + m_ui->themeComboBox->addItem("Qt", QChart::ChartThemeQt); } -QComboBox *ThemeWidget::createAnimationBox() const +void ThemeWidget::populateAnimationBox() { - // settings layout - QComboBox *animationComboBox = new QComboBox(); - animationComboBox->addItem("No Animations", QChart::NoAnimation); - animationComboBox->addItem("GridAxis Animations", QChart::GridAxisAnimations); - animationComboBox->addItem("Series Animations", QChart::SeriesAnimations); - animationComboBox->addItem("All Animations", QChart::AllAnimations); - return animationComboBox; + // add items to animation combobox + m_ui->animatedComboBox->addItem("No Animations", QChart::NoAnimation); + m_ui->animatedComboBox->addItem("GridAxis Animations", QChart::GridAxisAnimations); + m_ui->animatedComboBox->addItem("Series Animations", QChart::SeriesAnimations); + m_ui->animatedComboBox->addItem("All Animations", QChart::AllAnimations); } -QComboBox *ThemeWidget::createLegendBox() const +void ThemeWidget::populateLegendBox() { - QComboBox *legendComboBox = new QComboBox(); - legendComboBox->addItem("No Legend ", 0); - legendComboBox->addItem("Legend Top", Qt::AlignTop); - legendComboBox->addItem("Legend Bottom", Qt::AlignBottom); - legendComboBox->addItem("Legend Left", Qt::AlignLeft); - legendComboBox->addItem("Legend Right", Qt::AlignRight); - return legendComboBox; + // add items to legend combobox + m_ui->legendComboBox->addItem("No Legend ", 0); + m_ui->legendComboBox->addItem("Legend Top", Qt::AlignTop); + m_ui->legendComboBox->addItem("Legend Bottom", Qt::AlignBottom); + m_ui->legendComboBox->addItem("Legend Left", Qt::AlignLeft); + m_ui->legendComboBox->addItem("Legend Right", Qt::AlignRight); } QChart *ThemeWidget::createAreaChart() const @@ -217,10 +194,15 @@ QChart *ThemeWidget::createAreaChart() const area->setName(name + QString::number(nameIndex)); nameIndex++; chart->addSeries(area); - chart->createDefaultAxes(); lowerSeries = upperSeries; } + chart->createDefaultAxes(); + chart->axisX()->setRange(0, m_valueCount - 1); + chart->axisY()->setRange(0, m_valueMax); + // Add space to label to add space between labels and axis + static_cast<QValueAxis *>(chart->axisY())->setLabelFormat("%.1f "); + return chart; } @@ -238,16 +220,23 @@ QChart *ThemeWidget::createBarChart(int valueCount) const series->append(set); } chart->addSeries(series); + chart->createDefaultAxes(); + chart->axisY()->setRange(0, m_valueMax * 2); + // Add space to label to add space between labels and axis + static_cast<QValueAxis *>(chart->axisY())->setLabelFormat("%.1f "); return chart; } QChart *ThemeWidget::createLineChart() const { + //![1] QChart *chart = new QChart(); chart->setTitle("Line chart"); + //![1] + //![2] QString name("Series "); int nameIndex = 0; for (const DataList &list : m_dataTable) { @@ -258,7 +247,17 @@ QChart *ThemeWidget::createLineChart() const nameIndex++; chart->addSeries(series); } + //![2] + + //![3] chart->createDefaultAxes(); + chart->axisX()->setRange(0, m_valueMax); + chart->axisY()->setRange(0, m_valueCount); + //![3] + //![4] + // Add space to label to add space between labels and axis + static_cast<QValueAxis *>(chart->axisY())->setLabelFormat("%.1f "); + //![4] return chart; } @@ -268,29 +267,24 @@ QChart *ThemeWidget::createPieChart() const QChart *chart = new QChart(); chart->setTitle("Pie chart"); - qreal pieSize = 1.0 / m_dataTable.count(); - for (int i = 0; i < m_dataTable.count(); i++) { - QPieSeries *series = new QPieSeries(chart); - for (const Data &data : m_dataTable[i]) { - QPieSlice *slice = series->append(data.second, data.first.y()); - if (data == m_dataTable[i].first()) { - slice->setLabelVisible(); - slice->setExploded(); - } + QPieSeries *series = new QPieSeries(chart); + for (const Data &data : m_dataTable[0]) { + QPieSlice *slice = series->append(data.second, data.first.y()); + if (data == m_dataTable[0].first()) { + // Show the first slice exploded with label + slice->setLabelVisible(); + slice->setExploded(); + slice->setExplodeDistanceFactor(0.5); } - qreal hPos = (pieSize / 2) + (i / (qreal) m_dataTable.count()); - series->setPieSize(pieSize); - series->setHorizontalPosition(hPos); - series->setVerticalPosition(0.5); - chart->addSeries(series); } + series->setPieSize(0.4); + chart->addSeries(series); return chart; } QChart *ThemeWidget::createSplineChart() const { - // spine chart QChart *chart = new QChart(); chart->setTitle("Spline chart"); QString name("Series "); @@ -303,7 +297,13 @@ QChart *ThemeWidget::createSplineChart() const nameIndex++; chart->addSeries(series); } + chart->createDefaultAxes(); + chart->axisX()->setRange(0, m_valueMax); + chart->axisY()->setRange(0, m_valueCount); + // Add space to label to add space between labels and axis + static_cast<QValueAxis *>(chart->axisY())->setLabelFormat("%.1f "); + return chart; } @@ -322,24 +322,37 @@ QChart *ThemeWidget::createScatterChart() const nameIndex++; chart->addSeries(series); } + chart->createDefaultAxes(); + chart->axisX()->setRange(0, m_valueMax); + chart->axisY()->setRange(0, m_valueCount); + // Add space to label to add space between labels and axis + static_cast<QValueAxis *>(chart->axisY())->setLabelFormat("%.1f "); + return chart; } void ThemeWidget::updateUI() { + //![6] QChart::ChartTheme theme = static_cast<QChart::ChartTheme>( - m_themeComboBox->itemData(m_themeComboBox->currentIndex()).toInt()); - + m_ui->themeComboBox->itemData(m_ui->themeComboBox->currentIndex()).toInt()); + //![6] const auto charts = m_charts; - if (m_charts.at(0)->chart()->theme() != theme) { - for (QChartView *chartView : charts) + if (!m_charts.isEmpty() && m_charts.at(0)->chart()->theme() != theme) { + for (QChartView *chartView : charts) { + //![7] chartView->chart()->setTheme(theme); + //![7] + } + // Set palette colors based on selected theme + //![8] QPalette pal = window()->palette(); if (theme == QChart::ChartThemeLight) { pal.setColor(QPalette::Window, QRgb(0xf0f0f0)); pal.setColor(QPalette::WindowText, QRgb(0x404044)); + //![8] } else if (theme == QChart::ChartThemeDark) { pal.setColor(QPalette::Window, QRgb(0x121218)); pal.setColor(QPalette::WindowText, QRgb(0xd6d6d6)); @@ -365,18 +378,27 @@ void ThemeWidget::updateUI() window()->setPalette(pal); } - bool checked = m_antialiasCheckBox->isChecked(); + // Update antialiasing + //![11] + bool checked = m_ui->antialiasCheckBox->isChecked(); for (QChartView *chart : charts) chart->setRenderHint(QPainter::Antialiasing, checked); + //![11] + // Update animation options + //![9] QChart::AnimationOptions options( - m_animatedComboBox->itemData(m_animatedComboBox->currentIndex()).toInt()); - if (m_charts.at(0)->chart()->animationOptions() != options) { + m_ui->animatedComboBox->itemData(m_ui->animatedComboBox->currentIndex()).toInt()); + if (!m_charts.isEmpty() && m_charts.at(0)->chart()->animationOptions() != options) { for (QChartView *chartView : charts) chartView->chart()->setAnimationOptions(options); } + //![9] - Qt::Alignment alignment(m_legendComboBox->itemData(m_legendComboBox->currentIndex()).toInt()); + // Update legend alignment + //![10] + Qt::Alignment alignment( + m_ui->legendComboBox->itemData(m_ui->legendComboBox->currentIndex()).toInt()); if (!alignment) { for (QChartView *chartView : charts) @@ -387,5 +409,6 @@ void ThemeWidget::updateUI() chartView->chart()->legend()->show(); } } + //![10] } diff --git a/examples/charts/chartthemes/themewidget.h b/examples/charts/chartthemes/themewidget.h index 5b31ab7c..e2e093ab 100644 --- a/examples/charts/chartthemes/themewidget.h +++ b/examples/charts/chartthemes/themewidget.h @@ -36,6 +36,7 @@ QT_BEGIN_NAMESPACE class QComboBox; class QCheckBox; +class Ui_ThemeWidgetForm; QT_END_NAMESPACE QT_CHARTS_BEGIN_NAMESPACE @@ -61,9 +62,9 @@ private Q_SLOTS: private: DataTable generateRandomData(int listCount, int valueMax, int valueCount) const; - QComboBox *createThemeBox() const; - QComboBox *createAnimationBox() const; - QComboBox *createLegendBox() const; + void populateThemeBox(); + void populateAnimationBox(); + void populateLegendBox(); void connectSignals(); QChart *createAreaChart() const; QChart *createBarChart(int valueCount) const; @@ -79,10 +80,7 @@ private: QList<QChartView *> m_charts; DataTable m_dataTable; - QComboBox *m_themeComboBox; - QCheckBox *m_antialiasCheckBox; - QComboBox *m_animatedComboBox; - QComboBox *m_legendComboBox; + Ui_ThemeWidgetForm *m_ui; }; #endif /* THEMEWIDGET_H */ diff --git a/examples/charts/chartthemes/themewidget.ui b/examples/charts/chartthemes/themewidget.ui new file mode 100644 index 00000000..9ea2bb7c --- /dev/null +++ b/examples/charts/chartthemes/themewidget.ui @@ -0,0 +1,103 @@ +<?xml version="1.0" encoding="UTF-8"?> +<ui version="4.0"> + <class>ThemeWidgetForm</class> + <widget class="QWidget" name="ThemeWidgetForm"> + <property name="geometry"> + <rect> + <x>0</x> + <y>0</y> + <width>900</width> + <height>600</height> + </rect> + </property> + <layout class="QGridLayout" name="gridLayout"> + <item row="0" column="0" colspan="3"> + <layout class="QHBoxLayout" name="horizontalLayout"> + <item> + <widget class="QLabel" name="themeLabel"> + <property name="text"> + <string>Theme:</string> + </property> + </widget> + </item> + <item> + <widget class="QComboBox" name="themeComboBox"/> + </item> + <item> + <widget class="QLabel" name="animatedLabel"> + <property name="text"> + <string>Animation:</string> + </property> + </widget> + </item> + <item> + <widget class="QComboBox" name="animatedComboBox"/> + </item> + <item> + <widget class="QLabel" name="legendLabel"> + <property name="text"> + <string>Legend:</string> + </property> + </widget> + </item> + <item> + <widget class="QComboBox" name="legendComboBox"/> + </item> + <item> + <widget class="QCheckBox" name="antialiasCheckBox"> + <property name="text"> + <string>Anti-aliasing</string> + </property> + <property name="checked"> + <bool>false</bool> + </property> + </widget> + </item> + <item> + <spacer name="horizontalSpacer"> + <property name="orientation"> + <enum>Qt::Horizontal</enum> + </property> + <property name="sizeHint" stdset="0"> + <size> + <width>40</width> + <height>20</height> + </size> + </property> + </spacer> + </item> + </layout> + </item> + </layout> + </widget> + <resources/> + <connections> + <connection> + <sender>themeComboBox</sender> + <signal>currentIndexChanged(int)</signal> + <receiver>ThemeWidgetForm</receiver> + <slot>updateUI()</slot> + </connection> + <connection> + <sender>antialiasCheckBox</sender> + <signal>toggled(bool)</signal> + <receiver>ThemeWidgetForm</receiver> + <slot>updateUI()</slot> + </connection> + <connection> + <sender>legendComboBox</sender> + <signal>currentIndexChanged(int)</signal> + <receiver>ThemeWidgetForm</receiver> + <slot>updateUI()</slot> + </connection> + <connection> + <sender>animatedComboBox</sender> + <signal>currentIndexChanged(int)</signal> + <receiver>ThemeWidgetForm</receiver> + <slot>updateUI()</slot> + </connection> + </connections> + <slots> + <slot>updateUI()</slot> + </slots> +</ui> diff --git a/examples/charts/datetimeaxis/main.cpp b/examples/charts/datetimeaxis/main.cpp index 9a24a649..ca3f4320 100644 --- a/examples/charts/datetimeaxis/main.cpp +++ b/examples/charts/datetimeaxis/main.cpp @@ -43,7 +43,6 @@ QT_CHARTS_USE_NAMESPACE int main(int argc, char *argv[]) { QApplication a(argc, argv); - qsrand(QTime(0, 0, 0).secsTo(QTime::currentTime())); //![1] QLineSeries *series = new QLineSeries(); diff --git a/examples/charts/dynamicspline/chart.cpp b/examples/charts/dynamicspline/chart.cpp index 21985998..beba2513 100644 --- a/examples/charts/dynamicspline/chart.cpp +++ b/examples/charts/dynamicspline/chart.cpp @@ -31,7 +31,7 @@ #include <QtCharts/QAbstractAxis> #include <QtCharts/QSplineSeries> #include <QtCharts/QValueAxis> -#include <QtCore/QTime> +#include <QtCore/QRandomGenerator> #include <QtCore/QDebug> Chart::Chart(QGraphicsItem *parent, Qt::WindowFlags wFlags): @@ -42,8 +42,6 @@ Chart::Chart(QGraphicsItem *parent, Qt::WindowFlags wFlags): m_x(5), m_y(1) { - qsrand((uint) QTime::currentTime().msec()); - QObject::connect(&m_timer, &QTimer::timeout, this, &Chart::handleTimeout); m_timer.setInterval(1000); @@ -73,7 +71,7 @@ void Chart::handleTimeout() qreal x = plotArea().width() / m_axis->tickCount(); qreal y = (m_axis->max() - m_axis->min()) / m_axis->tickCount(); m_x += y; - m_y = qrand() % 5 - 2.5; + m_y = QRandomGenerator::global()->bounded(5) - 2.5; m_series->append(m_x, m_y); scroll(x, 0); if (m_x == 100) diff --git a/examples/charts/legendmarkers/mainwidget.cpp b/examples/charts/legendmarkers/mainwidget.cpp index 46b2b275..a48a6384 100644 --- a/examples/charts/legendmarkers/mainwidget.cpp +++ b/examples/charts/legendmarkers/mainwidget.cpp @@ -82,7 +82,7 @@ void MainWidget::addSeries() int offset = m_chart->series().count(); for (int i = 0; i < 360; i++) { qreal x = offset * 20 + i; - data.append(QPointF(i, qSin(2.0 * 3.141592 * x / 360.0))); + data.append(QPointF(i, qSin(qDegreesToRadians(x)))); } series->append(data); diff --git a/examples/charts/modeldata/customtablemodel.cpp b/examples/charts/modeldata/customtablemodel.cpp index f86c7ed7..8ef3c2a9 100644 --- a/examples/charts/modeldata/customtablemodel.cpp +++ b/examples/charts/modeldata/customtablemodel.cpp @@ -29,15 +29,13 @@ #include "customtablemodel.h" #include <QtCore/QVector> -#include <QtCore/QTime> +#include <QtCore/QRandomGenerator> #include <QtCore/QRect> #include <QtGui/QColor> CustomTableModel::CustomTableModel(QObject *parent) : QAbstractTableModel(parent) { - qsrand(QTime(0, 0, 0).secsTo(QTime::currentTime())); - m_columnCount = 4; m_rowCount = 15; @@ -46,9 +44,9 @@ CustomTableModel::CustomTableModel(QObject *parent) : QVector<qreal>* dataVec = new QVector<qreal>(m_columnCount); for (int k = 0; k < dataVec->size(); k++) { if (k % 2 == 0) - dataVec->replace(k, i * 50 + qrand() % 20); + dataVec->replace(k, i * 50 + QRandomGenerator::global()->bounded(20)); else - dataVec->replace(k, qrand() % 100); + dataVec->replace(k, QRandomGenerator::global()->bounded(100)); } m_data.append(dataVec); } diff --git a/examples/charts/modeldata/modeldata.pro b/examples/charts/modeldata/modeldata.pro index 95d3d689..b71a9d66 100644 --- a/examples/charts/modeldata/modeldata.pro +++ b/examples/charts/modeldata/modeldata.pro @@ -1,4 +1,5 @@ QT += charts +requires(qtConfig(tableview)) HEADERS += \ customtablemodel.h \ diff --git a/examples/charts/nesteddonuts/widget.cpp b/examples/charts/nesteddonuts/widget.cpp index 3d2292c8..92c6415c 100644 --- a/examples/charts/nesteddonuts/widget.cpp +++ b/examples/charts/nesteddonuts/widget.cpp @@ -32,7 +32,7 @@ #include <QtCharts/QLegend> #include <QtCharts/QPieSeries> #include <QtCharts/QPieSlice> -#include <QtCore/QTime> +#include <QtCore/QRandomGenerator> #include <QtWidgets/QGridLayout> #include <QtCore/QTimer> @@ -42,7 +42,6 @@ Widget::Widget(QWidget *parent) : QWidget(parent) { setMinimumSize(800, 600); - qsrand(QTime(0, 0, 0).secsTo(QTime::currentTime())); //! [1] QChartView *chartView = new QChartView; @@ -62,9 +61,9 @@ Widget::Widget(QWidget *parent) //! [3] for (int i = 0; i < donutCount; i++) { QPieSeries *donut = new QPieSeries; - int sliceCount = 3 + qrand() % 3; + int sliceCount = 3 + QRandomGenerator::global()->bounded(3); for (int j = 0; j < sliceCount; j++) { - qreal value = 100 + qrand() % 100; + qreal value = 100 + QRandomGenerator::global()->bounded(100); QPieSlice *slice = new QPieSlice(QString("%1").arg(value), value); slice->setLabelVisible(true); slice->setLabelColor(Qt::white); @@ -103,7 +102,7 @@ void Widget::updateRotation() { for (int i = 0; i < m_donuts.count(); i++) { QPieSeries *donut = m_donuts.at(i); - qreal phaseShift = -50 + qrand() % 100; + qreal phaseShift = -50 + QRandomGenerator::global()->bounded(100); donut->setPieStartAngle(donut->pieStartAngle() + phaseShift); donut->setPieEndAngle(donut->pieEndAngle() + phaseShift); } diff --git a/examples/charts/openglseries/datasource.cpp b/examples/charts/openglseries/datasource.cpp index 5f554500..af2dc10e 100644 --- a/examples/charts/openglseries/datasource.cpp +++ b/examples/charts/openglseries/datasource.cpp @@ -29,6 +29,7 @@ #include "datasource.h" #include <QtCore/QtMath> +#include <QtCore/QRandomGenerator> QT_CHARTS_USE_NAMESPACE @@ -111,8 +112,8 @@ void DataSource::generateData(int seriesCount, int rowCount, int colCount) qreal x(0); qreal y(0); // data with sin + random component - y = height + (yMultiplier * qSin(3.14159265358979 / 50 * j) - + (yMultiplier * (qreal) rand() / (qreal) RAND_MAX)); + y = height + (yMultiplier * qSin(M_PI / 50 * j) + + (yMultiplier * QRandomGenerator::global()->generateDouble())); // 0.000001 added to make values logaxis compatible x = 0.000001 + 20.0 * (qreal(j) / qreal(colCount)) + (xAdjustment * qreal(i)); points.append(QPointF(x, y)); diff --git a/examples/charts/piechartcustomization/piechartcustomization.pro b/examples/charts/piechartcustomization/piechartcustomization.pro index 081e9105..8c3bf136 100644 --- a/examples/charts/piechartcustomization/piechartcustomization.pro +++ b/examples/charts/piechartcustomization/piechartcustomization.pro @@ -1,4 +1,5 @@ QT += charts +requires(qtConfig(combobox)) HEADERS += \ brushtool.h \ diff --git a/examples/charts/piechartdrilldown/main.cpp b/examples/charts/piechartdrilldown/main.cpp index 8deeb0c3..e18f07f3 100644 --- a/examples/charts/piechartdrilldown/main.cpp +++ b/examples/charts/piechartdrilldown/main.cpp @@ -31,7 +31,7 @@ #include "drilldownslice.h" #include <QtWidgets/QApplication> #include <QtWidgets/QMainWindow> -#include <QtCore/QTime> +#include <QtCore/QRandomGenerator> #include <QtCharts/QChartView> #include <QtCharts/QLegend> #include <QtCharts/QPieSeries> @@ -42,8 +42,6 @@ int main(int argc, char *argv[]) { QApplication a(argc, argv); - qsrand(QTime(0, 0, 0).secsTo(QTime::currentTime())); - QMainWindow window; DrilldownChart *chart = new DrilldownChart(); @@ -67,7 +65,7 @@ int main(int argc, char *argv[]) series->setName("Sales by month - " + name); for (const QString &month : months) - *series << new DrilldownSlice(qrand() % 1000, month, yearSeries); + *series << new DrilldownSlice(QRandomGenerator::global()->bounded(1000), month, yearSeries); QObject::connect(series, &QPieSeries::clicked, chart, &DrilldownChart::handleSliceClicked); diff --git a/examples/charts/qmlchart/qml/qmlchart/MainForm.ui.qml b/examples/charts/qmlchart/qml/qmlchart/MainForm.ui.qml new file mode 100644 index 00000000..1adbfd70 --- /dev/null +++ b/examples/charts/qmlchart/qml/qmlchart/MainForm.ui.qml @@ -0,0 +1,87 @@ +/**************************************************************************** +** +** Copyright (C) 2017 The Qt Company Ltd. +** Contact: https://www.qt.io/licensing/ +** +** This file is part of the Qt Charts module of the Qt Toolkit. +** +** $QT_BEGIN_LICENSE:GPL$ +** Commercial License Usage +** Licensees holding valid commercial Qt licenses may use this file in +** accordance with the commercial license agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and The Qt Company. For licensing terms +** and conditions see https://www.qt.io/terms-conditions. For further +** information use the contact form at https://www.qt.io/contact-us. +** +** GNU General Public License Usage +** Alternatively, this file may be used under the terms of the GNU +** General Public License version 3 or (at your option) any later version +** approved by the KDE Free Qt Foundation. The licenses are as published by +** the Free Software Foundation and appearing in the file LICENSE.GPL3 +** included in the packaging of this file. Please review the following +** information to ensure the GNU General Public License requirements will +** be met: https://www.gnu.org/licenses/gpl-3.0.html. +** +** $QT_END_LICENSE$ +** +****************************************************************************/ + +import QtQuick 2.0 + +Item { + width: 600 + height: 400 + property bool sourceLoaded: false + property alias currentIndex: root.currentIndex + property alias info: infoText + + ListView { + id: root + focus: true + anchors.fill: parent + snapMode: ListView.SnapOneItem + highlightRangeMode: ListView.StrictlyEnforceRange + highlightMoveDuration: 250 + orientation: ListView.Horizontal + boundsBehavior: Flickable.StopAtBounds + + model: ListModel { + ListElement {component: "View1.qml"} + ListElement {component: "View2.qml"} + ListElement {component: "View3.qml"} + ListElement {component: "View4.qml"} + ListElement {component: "View5.qml"} + ListElement {component: "View6.qml"} + ListElement {component: "View7.qml"} + ListElement {component: "View8.qml"} + ListElement {component: "View9.qml"} + ListElement {component: "View10.qml"} + ListElement {component: "View11.qml"} + ListElement {component: "View12.qml"} + } + + delegate: Loader { + width: root.width + height: root.height + + source: component + asynchronous: true + + onLoaded: sourceLoaded = true + } + } + + Rectangle { + id: infoText + anchors.centerIn: parent + width: parent.width + height: 40 + color: "black" + Text { + color: "white" + anchors.centerIn: parent + text: "You can navigate between views using swipe or arrow keys" + } + } +} diff --git a/examples/charts/qmlchart/qml/qmlchart/View1.qml b/examples/charts/qmlchart/qml/qmlchart/View1.qml index 5f59989e..6b1de819 100644 --- a/examples/charts/qmlchart/qml/qmlchart/View1.qml +++ b/examples/charts/qmlchart/qml/qmlchart/View1.qml @@ -55,7 +55,7 @@ Item { } Component.onCompleted: { - // You can also manipulate slices dynamically + // You can also manipulate slices dynamically, like append a slice or set a slice exploded othersSlice = pieSeries.append("Others", 52.0); pieSeries.find("Volkswagen").exploded = true; } diff --git a/examples/charts/qmlchart/qml/qmlchart/View12.qml b/examples/charts/qmlchart/qml/qmlchart/View12.qml index e6279efc..6403c3f8 100644 --- a/examples/charts/qmlchart/qml/qmlchart/View12.qml +++ b/examples/charts/qmlchart/qml/qmlchart/View12.qml @@ -45,9 +45,9 @@ Item { id: pieOuter size: 0.96 holeSize: 0.7 - PieSlice { id: slice; label: "Alpha"; value: 19511; color: "#8AB846"; borderColor: "#163430" } - PieSlice { label: "Epsilon"; value: 11105; color: "#C0EEFF"; borderColor: "#3B391C" } - PieSlice { label: "Psi"; value: 9352; color: "#DF8939"; borderColor: "#13060C" } + PieSlice { id: slice; label: "Alpha"; value: 19511; color: "#99CA53" } + PieSlice { label: "Epsilon"; value: 11105; color: "#209FDF" } + PieSlice { label: "Psi"; value: 9352; color: "#F6A625" } } PieSeries { @@ -55,17 +55,17 @@ Item { id: pieInner holeSize: 0.25 - PieSlice { label: "Materials"; value: 10334; color: "#8AB846"; borderColor: "#163430" } - PieSlice { label: "Employee"; value: 3066; color: "#AAE356"; borderColor: "#163430" } - PieSlice { label: "Logistics"; value: 6111; color: "#99CC4E"; borderColor: "#163430" } + PieSlice { label: "Materials"; value: 10334; color: "#B9DB8A" } + PieSlice { label: "Employee"; value: 3066; color: "#DCEDC4" } + PieSlice { label: "Logistics"; value: 6111; color: "#F3F9EB" } - PieSlice { label: "Materials"; value: 7371; color: "#C0EEFF"; borderColor: "#3B391C" } - PieSlice { label: "Employee"; value: 2443; color: "#C9FAFF"; borderColor: "#3B391C" } - PieSlice { label: "Logistics"; value: 1291; color: "#B0FAFF"; borderColor: "#3B391C" } + PieSlice { label: "Materials"; value: 7371; color: "#63BCE9" } + PieSlice { label: "Employee"; value: 2443; color: "#A6D9F2" } + PieSlice { label: "Logistics"; value: 1291; color: "#E9F5FC" } - PieSlice { label: "Materials"; value: 4022; color: "#DF8939"; borderColor: "#13060C" } - PieSlice { label: "Employee"; value: 3998; color: "#FC9D42"; borderColor: "#13060C" } - PieSlice { label: "Logistics"; value: 1332; color: "#F2963F"; borderColor: "#13060C" } + PieSlice { label: "Materials"; value: 4022; color: "#F9C36C" } + PieSlice { label: "Employee"; value: 3998; color: "#FCE1B6" } + PieSlice { label: "Logistics"; value: 1332; color: "#FEF5E7" } } } diff --git a/examples/charts/qmlchart/qml/qmlchart/View4.qml b/examples/charts/qmlchart/qml/qmlchart/View4.qml index dc27a72a..5da50309 100644 --- a/examples/charts/qmlchart/qml/qmlchart/View4.qml +++ b/examples/charts/qmlchart/qml/qmlchart/View4.qml @@ -39,6 +39,7 @@ Item { anchors.fill: parent antialiasing: true + // Define x-axis to be used with the series instead of default one ValueAxis { id: valueAxis min: 2000 @@ -49,9 +50,6 @@ Item { AreaSeries { name: "Russian" - color: "#FFD52B1E" - borderColor: "#FF0039A5" - borderWidth: 3 axisX: valueAxis upperSeries: LineSeries { XYPoint { x: 2000; y: 1 } @@ -72,9 +70,6 @@ Item { AreaSeries { name: "Swedish" - color: "#AF005292" - borderColor: "#AFFDCA00" - borderWidth: 3 axisX: valueAxis upperSeries: LineSeries { XYPoint { x: 2000; y: 1 } @@ -94,9 +89,6 @@ Item { AreaSeries { name: "Finnish" - color: "#00357F" - borderColor: "#FEFEFE" - borderWidth: 3 axisX: valueAxis upperSeries: LineSeries { XYPoint { x: 2000; y: 0 } diff --git a/examples/charts/qmlchart/qml/qmlchart/main.qml b/examples/charts/qmlchart/qml/qmlchart/main.qml index 3d63eac6..e2e683d9 100644 --- a/examples/charts/qmlchart/qml/qmlchart/main.qml +++ b/examples/charts/qmlchart/qml/qmlchart/main.qml @@ -34,66 +34,19 @@ import QtQuick 2.0 Item { width: 600 height: 400 - property bool sourceLoaded: false - - ListView { - id: root - focus: true - anchors.fill: parent - snapMode: ListView.SnapOneItem - highlightRangeMode: ListView.StrictlyEnforceRange - highlightMoveDuration: 250 - orientation: ListView.Horizontal - boundsBehavior: Flickable.StopAtBounds + MainForm { + // Hide the default info text once view changes away from the first view onCurrentIndexChanged: { - if (infoText.opacity > 0.0) { + if (info.opacity > 0.0) { if (sourceLoaded) - infoText.opacity = 0.0; + info.opacity = 0.0; else if (currentIndex != 0) currentIndex = 0; } } - model: ListModel { - ListElement {component: "View1.qml"} - ListElement {component: "View2.qml"} - ListElement {component: "View3.qml"} - ListElement {component: "View4.qml"} - ListElement {component: "View5.qml"} - ListElement {component: "View6.qml"} - ListElement {component: "View7.qml"} - ListElement {component: "View8.qml"} - ListElement {component: "View9.qml"} - ListElement {component: "View10.qml"} - ListElement {component: "View11.qml"} - ListElement {component: "View12.qml"} - } - - delegate: Loader { - width: root.width - height: root.height - - source: component - asynchronous: true - - onLoaded: sourceLoaded = true - } - } - - Rectangle { - id: infoText - anchors.centerIn: parent - width: parent.width - height: 40 - color: "black" - Text { - color: "white" - anchors.centerIn: parent - text: "You can navigate between views using swipe or arrow keys" - } - - Behavior on opacity { + Behavior on info.opacity { NumberAnimation { duration: 400 } } } diff --git a/examples/charts/qmlchart/resources.qrc b/examples/charts/qmlchart/resources.qrc index 7b14dace..28b3a8a4 100644 --- a/examples/charts/qmlchart/resources.qrc +++ b/examples/charts/qmlchart/resources.qrc @@ -13,5 +13,6 @@ <file>qml/qmlchart/View10.qml</file> <file>qml/qmlchart/View11.qml</file> <file>qml/qmlchart/View12.qml</file> + <file>qml/qmlchart/MainForm.ui.qml</file> </qresource> </RCC> diff --git a/examples/charts/qmloscilloscope/datasource.cpp b/examples/charts/qmloscilloscope/datasource.cpp index 1d67c979..b773217b 100644 --- a/examples/charts/qmloscilloscope/datasource.cpp +++ b/examples/charts/qmloscilloscope/datasource.cpp @@ -33,6 +33,7 @@ #include <QtQuick/QQuickView> #include <QtQuick/QQuickItem> #include <QtCore/QDebug> +#include <QtCore/QRandomGenerator> #include <QtCore/QtMath> QT_CHARTS_USE_NAMESPACE @@ -80,7 +81,7 @@ void DataSource::generateData(int type, int rowCount, int colCount) switch (type) { case 0: // data with sin + random component - y = qSin(3.14159265358979 / 50 * j) + 0.5 + (qreal) rand() / (qreal) RAND_MAX; + y = qSin(M_PI / 50 * j) + 0.5 + QRandomGenerator::global()->generateDouble(); x = j; break; case 1: diff --git a/examples/charts/scatterchart/chartview.cpp b/examples/charts/scatterchart/chartview.cpp index c2f099c1..f96497bc 100644 --- a/examples/charts/scatterchart/chartview.cpp +++ b/examples/charts/scatterchart/chartview.cpp @@ -34,8 +34,6 @@ #include <QtGui/QPainter> #include <QtCore/QtMath> -const float Pi = 3.14159f; - ChartView::ChartView(QWidget *parent) : QChartView(new QChart(), parent) { @@ -71,8 +69,8 @@ ChartView::ChartView(QWidget *parent) : QPainterPath starPath; starPath.moveTo(28, 15); for (int i = 1; i < 5; ++i) { - starPath.lineTo(14 + 14 * qCos(0.8 * i * Pi), - 15 + 14 * qSin(0.8 * i * Pi)); + starPath.lineTo(14 + 14 * qCos(0.8 * i * M_PI), + 15 + 14 * qSin(0.8 * i * M_PI)); } starPath.closeSubpath(); diff --git a/examples/charts/stackedbarchartdrilldown/main.cpp b/examples/charts/stackedbarchartdrilldown/main.cpp index c2138f36..87035aea 100644 --- a/examples/charts/stackedbarchartdrilldown/main.cpp +++ b/examples/charts/stackedbarchartdrilldown/main.cpp @@ -29,6 +29,7 @@ #include <QtWidgets/QApplication> #include <QtWidgets/QMainWindow> +#include <QtCore/QRandomGenerator> #include <QtCharts/QChartView> #include <QtCharts/QBarSet> #include <QtCharts/QLegend> @@ -95,7 +96,7 @@ int main(int argc, char *argv[]) for (int month = 0; month < months.count(); month++) { QBarSet *weeklyCrop = new QBarSet(plant); for (int week = 0; week < weeks.count(); week++) - *weeklyCrop << (qrand() % 20); + *weeklyCrop << QRandomGenerator::global()->bounded(20); // Get the drilldown series from season series and add crop to it. seasonSeries->drilldownSeries(month)->append(weeklyCrop); *monthlyCrop << weeklyCrop->sum(); diff --git a/examples/charts/zoomlinechart/main.cpp b/examples/charts/zoomlinechart/main.cpp index 6a80982b..28a3d913 100644 --- a/examples/charts/zoomlinechart/main.cpp +++ b/examples/charts/zoomlinechart/main.cpp @@ -32,6 +32,7 @@ #include <QtWidgets/QApplication> #include <QtWidgets/QMainWindow> #include <QtCore/QtMath> +#include <QtCore/QRandomGenerator> #include <QtCharts/QLineSeries> #include <QtCharts/QValueAxis> @@ -45,7 +46,7 @@ int main(int argc, char *argv[]) QLineSeries *series = new QLineSeries(); for (int i = 0; i < 500; i++) { QPointF p((qreal) i, qSin(M_PI / 50 * i) * 100); - p.ry() += qrand() % 20; + p.ry() += QRandomGenerator::global()->bounded(20); *series << p; } //![1] diff --git a/src/charts/animations/axisanimation_p.h b/src/charts/animations/axisanimation_p.h index c9980d17..42cf8081 100644 --- a/src/charts/animations/axisanimation_p.h +++ b/src/charts/animations/axisanimation_p.h @@ -40,13 +40,14 @@ #define AXISANIMATION_H #include <private/chartanimation_p.h> +#include <QtCharts/private/qchartglobal_p.h> #include <QtCore/QPointF> QT_CHARTS_BEGIN_NAMESPACE class ChartAxisElement; -class AxisAnimation: public ChartAnimation +class QT_CHARTS_PRIVATE_EXPORT AxisAnimation: public ChartAnimation { public: enum Animation { DefaultAnimation, ZoomOutAnimation, ZoomInAnimation, MoveForwardAnimation, MoveBackwordAnimation}; diff --git a/src/charts/animations/baranimation_p.h b/src/charts/animations/baranimation_p.h index 6fc8d224..c27765d0 100644 --- a/src/charts/animations/baranimation_p.h +++ b/src/charts/animations/baranimation_p.h @@ -40,12 +40,13 @@ #define BARANIMATION_P_H #include <private/chartanimation_p.h> +#include <QtCharts/private/qchartglobal_p.h> QT_CHARTS_BEGIN_NAMESPACE class AbstractBarChartItem; -class BarAnimation : public ChartAnimation +class QT_CHARTS_PRIVATE_EXPORT BarAnimation : public ChartAnimation { Q_OBJECT diff --git a/src/charts/animations/boxplotanimation_p.h b/src/charts/animations/boxplotanimation_p.h index 75ebd749..0f3cb388 100644 --- a/src/charts/animations/boxplotanimation_p.h +++ b/src/charts/animations/boxplotanimation_p.h @@ -43,12 +43,13 @@ #include <private/boxwhiskers_p.h> #include <private/boxwhiskersdata_p.h> #include <private/boxwhiskersanimation_p.h> +#include <QtCharts/private/qchartglobal_p.h> QT_CHARTS_BEGIN_NAMESPACE class BoxPlotChartItem; -class BoxPlotAnimation : public QObject +class QT_CHARTS_PRIVATE_EXPORT BoxPlotAnimation : public QObject { Q_OBJECT public: diff --git a/src/charts/animations/boxwhiskersanimation_p.h b/src/charts/animations/boxwhiskersanimation_p.h index e72f68c2..99e26d7b 100644 --- a/src/charts/animations/boxwhiskersanimation_p.h +++ b/src/charts/animations/boxwhiskersanimation_p.h @@ -42,13 +42,14 @@ #include <private/chartanimation_p.h> #include <private/boxwhiskers_p.h> #include <private/boxwhiskersdata_p.h> +#include <QtCharts/private/qchartglobal_p.h> QT_CHARTS_BEGIN_NAMESPACE class BoxPlotChartItem; class BoxPlotAnimation; -class BoxWhiskersAnimation : public ChartAnimation +class QT_CHARTS_PRIVATE_EXPORT BoxWhiskersAnimation : public ChartAnimation { Q_OBJECT diff --git a/src/charts/animations/candlestickanimation_p.h b/src/charts/animations/candlestickanimation_p.h index cb894cd7..c1b82db6 100644 --- a/src/charts/animations/candlestickanimation_p.h +++ b/src/charts/animations/candlestickanimation_p.h @@ -40,6 +40,7 @@ #define CANDLESTICKANIMATION_P_H #include <private/chartanimation_p.h> +#include <QtCharts/private/qchartglobal_p.h> QT_CHARTS_BEGIN_NAMESPACE @@ -47,7 +48,7 @@ class Candlestick; class CandlestickChartItem; class CandlestickBodyWicksAnimation; -class CandlestickAnimation : public QObject +class QT_CHARTS_PRIVATE_EXPORT CandlestickAnimation : public QObject { Q_OBJECT diff --git a/src/charts/animations/candlestickbodywicksanimation_p.h b/src/charts/animations/candlestickbodywicksanimation_p.h index a8d30f04..4a79cd38 100644 --- a/src/charts/animations/candlestickbodywicksanimation_p.h +++ b/src/charts/animations/candlestickbodywicksanimation_p.h @@ -41,13 +41,14 @@ #include <private/candlestickdata_p.h> #include <private/chartanimation_p.h> +#include <QtCharts/private/qchartglobal_p.h> QT_CHARTS_BEGIN_NAMESPACE class Candlestick; class CandlestickAnimation; -class CandlestickBodyWicksAnimation : public ChartAnimation +class QT_CHARTS_PRIVATE_EXPORT CandlestickBodyWicksAnimation : public ChartAnimation { Q_OBJECT diff --git a/src/charts/animations/chartanimation_p.h b/src/charts/animations/chartanimation_p.h index 86564b28..87d552b5 100644 --- a/src/charts/animations/chartanimation_p.h +++ b/src/charts/animations/chartanimation_p.h @@ -41,12 +41,13 @@ #include <QtCharts/QChartGlobal> #include <QtCore/QVariantAnimation> +#include <QtCharts/private/qchartglobal_p.h> QT_CHARTS_BEGIN_NAMESPACE const static int ChartAnimationDuration = 1000; -class ChartAnimation: public QVariantAnimation +class QT_CHARTS_PRIVATE_EXPORT ChartAnimation: public QVariantAnimation { Q_OBJECT public: diff --git a/src/charts/animations/pieanimation_p.h b/src/charts/animations/pieanimation_p.h index 791bac52..de3c5ebc 100644 --- a/src/charts/animations/pieanimation_p.h +++ b/src/charts/animations/pieanimation_p.h @@ -42,12 +42,13 @@ #include <private/chartanimation_p.h> #include <private/piechartitem_p.h> #include <private/piesliceanimation_p.h> +#include <QtCharts/private/qchartglobal_p.h> QT_CHARTS_BEGIN_NAMESPACE class PieChartItem; -class PieAnimation : public ChartAnimation +class QT_CHARTS_PRIVATE_EXPORT PieAnimation : public ChartAnimation { Q_OBJECT diff --git a/src/charts/animations/piesliceanimation_p.h b/src/charts/animations/piesliceanimation_p.h index 2ba03735..de962d51 100644 --- a/src/charts/animations/piesliceanimation_p.h +++ b/src/charts/animations/piesliceanimation_p.h @@ -41,12 +41,13 @@ #include <private/chartanimation_p.h> #include <private/piesliceitem_p.h> +#include <QtCharts/private/qchartglobal_p.h> QT_CHARTS_BEGIN_NAMESPACE class PieChartItem; -class PieSliceAnimation : public ChartAnimation +class QT_CHARTS_PRIVATE_EXPORT PieSliceAnimation : public ChartAnimation { public: PieSliceAnimation(PieSliceItem *sliceItem); diff --git a/src/charts/animations/scatteranimation_p.h b/src/charts/animations/scatteranimation_p.h index 56b9f2e5..6df74417 100644 --- a/src/charts/animations/scatteranimation_p.h +++ b/src/charts/animations/scatteranimation_p.h @@ -38,13 +38,15 @@ #ifndef SCATTERANIMATION_P_H #define SCATTERANIMATION_P_H + #include <private/xyanimation_p.h> +#include <QtCharts/private/qchartglobal_p.h> QT_CHARTS_BEGIN_NAMESPACE class ScatterChartItem; -class ScatterAnimation : public XYAnimation +class QT_CHARTS_PRIVATE_EXPORT ScatterAnimation : public XYAnimation { public: ScatterAnimation(ScatterChartItem *item, int duration, QEasingCurve &curve); diff --git a/src/charts/animations/splineanimation_p.h b/src/charts/animations/splineanimation_p.h index 1744a594..11261aa7 100644 --- a/src/charts/animations/splineanimation_p.h +++ b/src/charts/animations/splineanimation_p.h @@ -38,7 +38,9 @@ #ifndef SPLINEANIMATION_P_H #define SPLINEANIMATION_P_H + #include <private/xyanimation_p.h> +#include <QtCharts/private/qchartglobal_p.h> #include <QtCore/QPointF> typedef QPair<QVector<QPointF >, QVector<QPointF > > SplineVector; @@ -47,7 +49,7 @@ QT_CHARTS_BEGIN_NAMESPACE class SplineChartItem; -class SplineAnimation : public XYAnimation +class QT_CHARTS_PRIVATE_EXPORT SplineAnimation : public XYAnimation { public: SplineAnimation(SplineChartItem *item, int duration, QEasingCurve &curve); diff --git a/src/charts/animations/xyanimation_p.h b/src/charts/animations/xyanimation_p.h index 1a018d3b..e0f7937b 100644 --- a/src/charts/animations/xyanimation_p.h +++ b/src/charts/animations/xyanimation_p.h @@ -40,13 +40,14 @@ #define XYANIMATION_P_H #include <private/chartanimation_p.h> +#include <QtCharts/private/qchartglobal_p.h> #include <QtCore/QPointF> QT_CHARTS_BEGIN_NAMESPACE class XYChart; -class XYAnimation : public ChartAnimation +class QT_CHARTS_PRIVATE_EXPORT XYAnimation : public ChartAnimation { protected: enum Animation { AddPointAnimation, RemovePointAnimation, ReplacePointAnimation, NewAnimation }; diff --git a/src/charts/areachart/areachartitem_p.h b/src/charts/areachart/areachartitem_p.h index be943877..3546d330 100644 --- a/src/charts/areachart/areachartitem_p.h +++ b/src/charts/areachart/areachartitem_p.h @@ -41,6 +41,7 @@ #include <QtCharts/QChartGlobal> #include <private/linechartitem_p.h> +#include <QtCharts/private/qchartglobal_p.h> #include <QtCharts/QAreaSeries> #include <QtGui/QPen> @@ -48,7 +49,7 @@ QT_CHARTS_BEGIN_NAMESPACE class AreaChartItem; -class AreaChartItem : public ChartItem +class QT_CHARTS_PRIVATE_EXPORT AreaChartItem : public ChartItem { Q_OBJECT public: @@ -113,7 +114,7 @@ private: }; -class AreaBoundItem : public LineChartItem +class QT_CHARTS_PRIVATE_EXPORT AreaBoundItem : public LineChartItem { public: AreaBoundItem(AreaChartItem *area, QLineSeries *lineSeries,QGraphicsItem* item = 0) diff --git a/src/charts/areachart/qareaseries.h b/src/charts/areachart/qareaseries.h index 0d05ca5e..cd6e58b4 100644 --- a/src/charts/areachart/qareaseries.h +++ b/src/charts/areachart/qareaseries.h @@ -53,8 +53,8 @@ class QT_CHARTS_EXPORT QAreaSeries : public QAbstractSeries Q_PROPERTY(bool pointLabelsClipping READ pointLabelsClipping WRITE setPointLabelsClipping NOTIFY pointLabelsClippingChanged) public: - explicit QAreaSeries(QObject *parent = Q_NULLPTR); - explicit QAreaSeries(QLineSeries *upperSeries, QLineSeries *lowerSeries = Q_NULLPTR); + explicit QAreaSeries(QObject *parent = nullptr); + explicit QAreaSeries(QLineSeries *upperSeries, QLineSeries *lowerSeries = nullptr); ~QAreaSeries(); public: diff --git a/src/charts/areachart/qareaseries_p.h b/src/charts/areachart/qareaseries_p.h index 0de00597..a4d46169 100644 --- a/src/charts/areachart/qareaseries_p.h +++ b/src/charts/areachart/qareaseries_p.h @@ -40,13 +40,14 @@ #define QAREASERIES_P_H #include <private/qabstractseries_p.h> +#include <QtCharts/private/qchartglobal_p.h> QT_CHARTS_BEGIN_NAMESPACE class QAreaSeries; class QLineSeries; -class QAreaSeriesPrivate: public QAbstractSeriesPrivate +class QT_CHARTS_PRIVATE_EXPORT QAreaSeriesPrivate: public QAbstractSeriesPrivate { Q_OBJECT diff --git a/src/charts/axis/barcategoryaxis/chartbarcategoryaxisx_p.h b/src/charts/axis/barcategoryaxis/chartbarcategoryaxisx_p.h index b0cdbbc4..47a32a09 100644 --- a/src/charts/axis/barcategoryaxis/chartbarcategoryaxisx_p.h +++ b/src/charts/axis/barcategoryaxis/chartbarcategoryaxisx_p.h @@ -40,13 +40,14 @@ #define CHARTBARCATEGORYAXISX_H #include <private/horizontalaxis_p.h> +#include <QtCharts/private/qchartglobal_p.h> QT_CHARTS_BEGIN_NAMESPACE class ChartPresenter; class QBarCategoryAxis; -class ChartBarCategoryAxisX : public HorizontalAxis +class QT_CHARTS_PRIVATE_EXPORT ChartBarCategoryAxisX : public HorizontalAxis { Q_OBJECT public: diff --git a/src/charts/axis/barcategoryaxis/chartbarcategoryaxisy_p.h b/src/charts/axis/barcategoryaxis/chartbarcategoryaxisy_p.h index 26591b0d..14732ab4 100644 --- a/src/charts/axis/barcategoryaxis/chartbarcategoryaxisy_p.h +++ b/src/charts/axis/barcategoryaxis/chartbarcategoryaxisy_p.h @@ -40,13 +40,14 @@ #define CHARTBARCATEGORYAXISY_H #include <private/verticalaxis_p.h> +#include <QtCharts/private/qchartglobal_p.h> QT_CHARTS_BEGIN_NAMESPACE class QBarCategoryAxis; class ChartPresenter; -class ChartBarCategoryAxisY : public VerticalAxis +class QT_CHARTS_PRIVATE_EXPORT ChartBarCategoryAxisY : public VerticalAxis { Q_OBJECT public: diff --git a/src/charts/axis/barcategoryaxis/qbarcategoryaxis.h b/src/charts/axis/barcategoryaxis/qbarcategoryaxis.h index 15ff9ee5..54763e82 100644 --- a/src/charts/axis/barcategoryaxis/qbarcategoryaxis.h +++ b/src/charts/axis/barcategoryaxis/qbarcategoryaxis.h @@ -45,11 +45,11 @@ class QT_CHARTS_EXPORT QBarCategoryAxis : public QAbstractAxis Q_PROPERTY(int count READ count NOTIFY countChanged) public: - explicit QBarCategoryAxis(QObject *parent = Q_NULLPTR); + explicit QBarCategoryAxis(QObject *parent = nullptr); ~QBarCategoryAxis(); protected: - QBarCategoryAxis(QBarCategoryAxisPrivate &d, QObject *parent = Q_NULLPTR); + QBarCategoryAxis(QBarCategoryAxisPrivate &d, QObject *parent = nullptr); public: AxisType type() const; diff --git a/src/charts/axis/barcategoryaxis/qbarcategoryaxis_p.h b/src/charts/axis/barcategoryaxis/qbarcategoryaxis_p.h index 3a1b55f9..3101d041 100644 --- a/src/charts/axis/barcategoryaxis/qbarcategoryaxis_p.h +++ b/src/charts/axis/barcategoryaxis/qbarcategoryaxis_p.h @@ -41,12 +41,13 @@ #include <QtCharts/QBarCategoryAxis> #include <private/qabstractaxis_p.h> +#include <QtCharts/private/qchartglobal_p.h> QT_CHARTS_BEGIN_NAMESPACE class AbstractDomain; -class QBarCategoryAxisPrivate : public QAbstractAxisPrivate +class QT_CHARTS_PRIVATE_EXPORT QBarCategoryAxisPrivate : public QAbstractAxisPrivate { Q_OBJECT diff --git a/src/charts/axis/cartesianchartaxis_p.h b/src/charts/axis/cartesianchartaxis_p.h index 5157da65..60cabd19 100644 --- a/src/charts/axis/cartesianchartaxis_p.h +++ b/src/charts/axis/cartesianchartaxis_p.h @@ -41,12 +41,13 @@ #include <QtCharts/QChartGlobal> #include <private/chartaxiselement_p.h> +#include <QtCharts/private/qchartglobal_p.h> QT_CHARTS_BEGIN_NAMESPACE class QAbstractAxis; -class CartesianChartAxis : public ChartAxisElement +class QT_CHARTS_PRIVATE_EXPORT CartesianChartAxis : public ChartAxisElement { Q_OBJECT Q_INTERFACES(QGraphicsLayoutItem) diff --git a/src/charts/axis/categoryaxis/chartcategoryaxisx_p.h b/src/charts/axis/categoryaxis/chartcategoryaxisx_p.h index e548b38c..ea42aea0 100644 --- a/src/charts/axis/categoryaxis/chartcategoryaxisx_p.h +++ b/src/charts/axis/categoryaxis/chartcategoryaxisx_p.h @@ -40,12 +40,13 @@ #define CHARTCATEGORYAXISX_H #include <private/horizontalaxis_p.h> +#include <QtCharts/private/qchartglobal_p.h> QT_CHARTS_BEGIN_NAMESPACE class QCategoryAxis; -class ChartCategoryAxisX : public HorizontalAxis +class QT_CHARTS_PRIVATE_EXPORT ChartCategoryAxisX : public HorizontalAxis { Q_OBJECT public: diff --git a/src/charts/axis/categoryaxis/chartcategoryaxisy_p.h b/src/charts/axis/categoryaxis/chartcategoryaxisy_p.h index 3efd52bf..9057ed14 100644 --- a/src/charts/axis/categoryaxis/chartcategoryaxisy_p.h +++ b/src/charts/axis/categoryaxis/chartcategoryaxisy_p.h @@ -40,12 +40,13 @@ #define CHARTCATEGORYAXISY_H #include <private/verticalaxis_p.h> +#include <QtCharts/private/qchartglobal_p.h> QT_CHARTS_BEGIN_NAMESPACE class QCategoryAxis; -class ChartCategoryAxisY : public VerticalAxis +class QT_CHARTS_PRIVATE_EXPORT ChartCategoryAxisY : public VerticalAxis { Q_OBJECT public: diff --git a/src/charts/axis/categoryaxis/polarchartcategoryaxisangular_p.h b/src/charts/axis/categoryaxis/polarchartcategoryaxisangular_p.h index 7bbd219b..aef99571 100644 --- a/src/charts/axis/categoryaxis/polarchartcategoryaxisangular_p.h +++ b/src/charts/axis/categoryaxis/polarchartcategoryaxisangular_p.h @@ -40,12 +40,13 @@ #define POLARCHARTCATEGORYAXISANGULAR_P_H #include <private/polarchartaxisangular_p.h> +#include <QtCharts/private/qchartglobal_p.h> QT_CHARTS_BEGIN_NAMESPACE class QCategoryAxis; -class PolarChartCategoryAxisAngular : public PolarChartAxisAngular +class QT_CHARTS_PRIVATE_EXPORT PolarChartCategoryAxisAngular : public PolarChartAxisAngular { Q_OBJECT diff --git a/src/charts/axis/categoryaxis/polarchartcategoryaxisradial_p.h b/src/charts/axis/categoryaxis/polarchartcategoryaxisradial_p.h index 30b0ed15..b5d93e80 100644 --- a/src/charts/axis/categoryaxis/polarchartcategoryaxisradial_p.h +++ b/src/charts/axis/categoryaxis/polarchartcategoryaxisradial_p.h @@ -40,12 +40,13 @@ #define POLARCHARTCATEGORYAXISRADIAL_P_H #include <private/polarchartaxisradial_p.h> +#include <QtCharts/private/qchartglobal_p.h> QT_CHARTS_BEGIN_NAMESPACE class QCategoryAxis; -class PolarChartCategoryAxisRadial : public PolarChartAxisRadial +class QT_CHARTS_PRIVATE_EXPORT PolarChartCategoryAxisRadial : public PolarChartAxisRadial { Q_OBJECT diff --git a/src/charts/axis/categoryaxis/qcategoryaxis.h b/src/charts/axis/categoryaxis/qcategoryaxis.h index eac9b4c1..3400aa18 100644 --- a/src/charts/axis/categoryaxis/qcategoryaxis.h +++ b/src/charts/axis/categoryaxis/qcategoryaxis.h @@ -53,11 +53,11 @@ public: AxisLabelsPositionOnValue = 0x1 }; - explicit QCategoryAxis(QObject *parent = Q_NULLPTR); + explicit QCategoryAxis(QObject *parent = nullptr); ~QCategoryAxis(); protected: - QCategoryAxis(QCategoryAxisPrivate &d, QObject *parent = Q_NULLPTR); + QCategoryAxis(QCategoryAxisPrivate &d, QObject *parent = nullptr); public: AxisType type() const; diff --git a/src/charts/axis/categoryaxis/qcategoryaxis_p.h b/src/charts/axis/categoryaxis/qcategoryaxis_p.h index 7e10e8c0..1938fcb4 100644 --- a/src/charts/axis/categoryaxis/qcategoryaxis_p.h +++ b/src/charts/axis/categoryaxis/qcategoryaxis_p.h @@ -41,12 +41,13 @@ #include <QtCharts/QCategoryAxis> #include <private/qvalueaxis_p.h> +#include <QtCharts/private/qchartglobal_p.h> QT_CHARTS_BEGIN_NAMESPACE typedef QPair<qreal, qreal> Range; -class QCategoryAxisPrivate : public QValueAxisPrivate +class QT_CHARTS_PRIVATE_EXPORT QCategoryAxisPrivate : public QValueAxisPrivate { Q_OBJECT diff --git a/src/charts/axis/chartaxiselement_p.h b/src/charts/axis/chartaxiselement_p.h index f82ba5ce..085a75db 100644 --- a/src/charts/axis/chartaxiselement_p.h +++ b/src/charts/axis/chartaxiselement_p.h @@ -40,6 +40,7 @@ #define CHARTAXISELEMENT_H #include <QtCharts/QChartGlobal> +#include <QtCharts/private/qchartglobal_p.h> #include <private/chartelement_p.h> #include <private/axisanimation_p.h> #include <QtWidgets/QGraphicsItem> @@ -51,7 +52,7 @@ QT_CHARTS_BEGIN_NAMESPACE class ChartPresenter; class QAbstractAxis; -class ChartAxisElement : public ChartElement, public QGraphicsLayoutItem +class QT_CHARTS_PRIVATE_EXPORT ChartAxisElement : public ChartElement, public QGraphicsLayoutItem { Q_OBJECT diff --git a/src/charts/axis/datetimeaxis/chartdatetimeaxisx_p.h b/src/charts/axis/datetimeaxis/chartdatetimeaxisx_p.h index 454e089d..dde0c998 100644 --- a/src/charts/axis/datetimeaxis/chartdatetimeaxisx_p.h +++ b/src/charts/axis/datetimeaxis/chartdatetimeaxisx_p.h @@ -40,12 +40,13 @@ #define CHARTDATETIMEAXISX_H #include <private/horizontalaxis_p.h> +#include <QtCharts/private/qchartglobal_p.h> QT_CHARTS_BEGIN_NAMESPACE class QDateTimeAxis; -class ChartDateTimeAxisX : public HorizontalAxis +class QT_CHARTS_PRIVATE_EXPORT ChartDateTimeAxisX : public HorizontalAxis { Q_OBJECT public: diff --git a/src/charts/axis/datetimeaxis/chartdatetimeaxisy_p.h b/src/charts/axis/datetimeaxis/chartdatetimeaxisy_p.h index b84ca9e6..b7346d52 100644 --- a/src/charts/axis/datetimeaxis/chartdatetimeaxisy_p.h +++ b/src/charts/axis/datetimeaxis/chartdatetimeaxisy_p.h @@ -40,12 +40,13 @@ #define CHARTDATETIMEAXISY_H #include <private/verticalaxis_p.h> +#include <QtCharts/private/qchartglobal_p.h> QT_CHARTS_BEGIN_NAMESPACE class QDateTimeAxis; -class ChartDateTimeAxisY : public VerticalAxis +class QT_CHARTS_PRIVATE_EXPORT ChartDateTimeAxisY : public VerticalAxis { Q_OBJECT public: diff --git a/src/charts/axis/datetimeaxis/polarchartdatetimeaxisangular_p.h b/src/charts/axis/datetimeaxis/polarchartdatetimeaxisangular_p.h index ba47a99b..c15362cd 100644 --- a/src/charts/axis/datetimeaxis/polarchartdatetimeaxisangular_p.h +++ b/src/charts/axis/datetimeaxis/polarchartdatetimeaxisangular_p.h @@ -40,12 +40,13 @@ #define POLARCHARTDATETIMEAXISANGULAR_P_H #include <private/polarchartaxisangular_p.h> +#include <QtCharts/private/qchartglobal_p.h> QT_CHARTS_BEGIN_NAMESPACE class QDateTimeAxis; -class PolarChartDateTimeAxisAngular : public PolarChartAxisAngular +class QT_CHARTS_PRIVATE_EXPORT PolarChartDateTimeAxisAngular : public PolarChartAxisAngular { Q_OBJECT public: diff --git a/src/charts/axis/datetimeaxis/polarchartdatetimeaxisradial_p.h b/src/charts/axis/datetimeaxis/polarchartdatetimeaxisradial_p.h index 8ecb8813..4d22278f 100644 --- a/src/charts/axis/datetimeaxis/polarchartdatetimeaxisradial_p.h +++ b/src/charts/axis/datetimeaxis/polarchartdatetimeaxisradial_p.h @@ -40,12 +40,13 @@ #define POLARCHARTDATETIMEAXISRADIAL_P_H #include <private/polarchartaxisradial_p.h> +#include <QtCharts/private/qchartglobal_p.h> QT_CHARTS_BEGIN_NAMESPACE class QDateTimeAxis; -class PolarChartDateTimeAxisRadial : public PolarChartAxisRadial +class QT_CHARTS_PRIVATE_EXPORT PolarChartDateTimeAxisRadial : public PolarChartAxisRadial { Q_OBJECT public: diff --git a/src/charts/axis/datetimeaxis/qdatetimeaxis.h b/src/charts/axis/datetimeaxis/qdatetimeaxis.h index 142ac7e0..98942949 100644 --- a/src/charts/axis/datetimeaxis/qdatetimeaxis.h +++ b/src/charts/axis/datetimeaxis/qdatetimeaxis.h @@ -49,11 +49,11 @@ class QT_CHARTS_EXPORT QDateTimeAxis : public QAbstractAxis Q_PROPERTY(QString format READ format WRITE setFormat NOTIFY formatChanged) public: - explicit QDateTimeAxis(QObject *parent = Q_NULLPTR); + explicit QDateTimeAxis(QObject *parent = nullptr); ~QDateTimeAxis(); protected: - QDateTimeAxis(QDateTimeAxisPrivate &d, QObject *parent = Q_NULLPTR); + QDateTimeAxis(QDateTimeAxisPrivate &d, QObject *parent = nullptr); public: AxisType type() const; diff --git a/src/charts/axis/datetimeaxis/qdatetimeaxis_p.h b/src/charts/axis/datetimeaxis/qdatetimeaxis_p.h index 468d6999..42483a06 100644 --- a/src/charts/axis/datetimeaxis/qdatetimeaxis_p.h +++ b/src/charts/axis/datetimeaxis/qdatetimeaxis_p.h @@ -40,12 +40,13 @@ #define QDATETIMEAXIS_P_H #include <QtCharts/QDateTimeAxis> +#include <QtCharts/private/qchartglobal_p.h> #include <private/qabstractaxis_p.h> #include <QtCore/QDateTime> QT_CHARTS_BEGIN_NAMESPACE -class QDateTimeAxisPrivate : public QAbstractAxisPrivate +class QT_CHARTS_PRIVATE_EXPORT QDateTimeAxisPrivate : public QAbstractAxisPrivate { Q_OBJECT public: diff --git a/src/charts/axis/horizontalaxis_p.h b/src/charts/axis/horizontalaxis_p.h index 1fe0c405..079783fc 100644 --- a/src/charts/axis/horizontalaxis_p.h +++ b/src/charts/axis/horizontalaxis_p.h @@ -40,19 +40,20 @@ #define HORIZONTALAXIS_P_H #include <private/cartesianchartaxis_p.h> +#include <QtCharts/private/qchartglobal_p.h> QT_CHARTS_BEGIN_NAMESPACE -class HorizontalAxis : public CartesianChartAxis +class QT_CHARTS_PRIVATE_EXPORT HorizontalAxis : public CartesianChartAxis { public: HorizontalAxis(QAbstractAxis *axis, QGraphicsItem *item = nullptr, bool intervalAxis = false); ~HorizontalAxis(); - QSizeF sizeHint(Qt::SizeHint which, const QSizeF &constraint = QSizeF()) const Q_DECL_OVERRIDE; + QSizeF sizeHint(Qt::SizeHint which, const QSizeF &constraint = QSizeF()) const override; protected: - void updateGeometry() Q_DECL_OVERRIDE; + void updateGeometry() override; private: void updateMinorTickGeometry(); diff --git a/src/charts/axis/linearrowitem_p.h b/src/charts/axis/linearrowitem_p.h index 521444aa..58a8d12e 100644 --- a/src/charts/axis/linearrowitem_p.h +++ b/src/charts/axis/linearrowitem_p.h @@ -42,10 +42,11 @@ #include <private/chartaxiselement_p.h> #include <private/qabstractaxis_p.h> #include <QtWidgets/QGraphicsLineItem> +#include <QtCharts/private/qchartglobal_p.h> QT_CHARTS_BEGIN_NAMESPACE -class LineArrowItem: public QGraphicsLineItem +class QT_CHARTS_PRIVATE_EXPORT LineArrowItem: public QGraphicsLineItem { public: explicit LineArrowItem(ChartAxisElement *axis, QGraphicsItem *parent = 0) diff --git a/src/charts/axis/logvalueaxis/chartlogvalueaxisx_p.h b/src/charts/axis/logvalueaxis/chartlogvalueaxisx_p.h index 2b3f71d0..2edcd290 100644 --- a/src/charts/axis/logvalueaxis/chartlogvalueaxisx_p.h +++ b/src/charts/axis/logvalueaxis/chartlogvalueaxisx_p.h @@ -40,12 +40,13 @@ #define CHARTLOGVALUEAXISX_H #include <private/horizontalaxis_p.h> +#include <QtCharts/private/qchartglobal_p.h> QT_CHARTS_BEGIN_NAMESPACE class QLogValueAxis; -class ChartLogValueAxisX : public HorizontalAxis +class QT_CHARTS_PRIVATE_EXPORT ChartLogValueAxisX : public HorizontalAxis { Q_OBJECT diff --git a/src/charts/axis/logvalueaxis/chartlogvalueaxisy_p.h b/src/charts/axis/logvalueaxis/chartlogvalueaxisy_p.h index f62cfd9d..beb5f27e 100644 --- a/src/charts/axis/logvalueaxis/chartlogvalueaxisy_p.h +++ b/src/charts/axis/logvalueaxis/chartlogvalueaxisy_p.h @@ -40,12 +40,13 @@ #define CHARTLOGVALUEAXISY_H #include <private/verticalaxis_p.h> +#include <QtCharts/private/qchartglobal_p.h> QT_CHARTS_BEGIN_NAMESPACE class QLogValueAxis; -class ChartLogValueAxisY : public VerticalAxis +class QT_CHARTS_PRIVATE_EXPORT ChartLogValueAxisY : public VerticalAxis { Q_OBJECT diff --git a/src/charts/axis/logvalueaxis/polarchartlogvalueaxisangular_p.h b/src/charts/axis/logvalueaxis/polarchartlogvalueaxisangular_p.h index eebc4ba6..6c95597a 100644 --- a/src/charts/axis/logvalueaxis/polarchartlogvalueaxisangular_p.h +++ b/src/charts/axis/logvalueaxis/polarchartlogvalueaxisangular_p.h @@ -40,12 +40,13 @@ #define POLARCHARTLOGVALUEAXISANGULAR_P_H #include <private/polarchartaxisangular_p.h> +#include <QtCharts/private/qchartglobal_p.h> QT_CHARTS_BEGIN_NAMESPACE class QLogValueAxis; -class PolarChartLogValueAxisAngular : public PolarChartAxisAngular +class QT_CHARTS_PRIVATE_EXPORT PolarChartLogValueAxisAngular : public PolarChartAxisAngular { Q_OBJECT public: diff --git a/src/charts/axis/logvalueaxis/polarchartlogvalueaxisradial_p.h b/src/charts/axis/logvalueaxis/polarchartlogvalueaxisradial_p.h index 7c6f29c7..17f8a988 100644 --- a/src/charts/axis/logvalueaxis/polarchartlogvalueaxisradial_p.h +++ b/src/charts/axis/logvalueaxis/polarchartlogvalueaxisradial_p.h @@ -40,12 +40,13 @@ #define POLARCHARTLOGVALUEAXISRADIAL_P_H #include <private/polarchartaxisradial_p.h> +#include <QtCharts/private/qchartglobal_p.h> QT_CHARTS_BEGIN_NAMESPACE class QLogValueAxis; -class PolarChartLogValueAxisRadial : public PolarChartAxisRadial +class QT_CHARTS_PRIVATE_EXPORT PolarChartLogValueAxisRadial : public PolarChartAxisRadial { Q_OBJECT public: diff --git a/src/charts/axis/logvalueaxis/qlogvalueaxis.h b/src/charts/axis/logvalueaxis/qlogvalueaxis.h index 2614cff3..1ea9f2b1 100644 --- a/src/charts/axis/logvalueaxis/qlogvalueaxis.h +++ b/src/charts/axis/logvalueaxis/qlogvalueaxis.h @@ -51,11 +51,11 @@ class QT_CHARTS_EXPORT QLogValueAxis : public QAbstractAxis Q_PROPERTY(int minorTickCount READ minorTickCount WRITE setMinorTickCount NOTIFY minorTickCountChanged) public: - explicit QLogValueAxis(QObject *parent = Q_NULLPTR); + explicit QLogValueAxis(QObject *parent = nullptr); ~QLogValueAxis(); protected: - QLogValueAxis(QLogValueAxisPrivate &d, QObject *parent = Q_NULLPTR); + QLogValueAxis(QLogValueAxisPrivate &d, QObject *parent = nullptr); public: AxisType type() const; diff --git a/src/charts/axis/logvalueaxis/qlogvalueaxis_p.h b/src/charts/axis/logvalueaxis/qlogvalueaxis_p.h index 1c00c7eb..5f735650 100644 --- a/src/charts/axis/logvalueaxis/qlogvalueaxis_p.h +++ b/src/charts/axis/logvalueaxis/qlogvalueaxis_p.h @@ -41,10 +41,11 @@ #include <QtCharts/qlogvalueaxis.h> #include <private/qabstractaxis_p.h> +#include <QtCharts/private/qchartglobal_p.h> QT_CHARTS_BEGIN_NAMESPACE -class QLogValueAxisPrivate : public QAbstractAxisPrivate +class QT_CHARTS_PRIVATE_EXPORT QLogValueAxisPrivate : public QAbstractAxisPrivate { Q_OBJECT public: diff --git a/src/charts/axis/polarchartaxis_p.h b/src/charts/axis/polarchartaxis_p.h index 217bf29e..9df07e75 100644 --- a/src/charts/axis/polarchartaxis_p.h +++ b/src/charts/axis/polarchartaxis_p.h @@ -40,10 +40,11 @@ #define POLARCHARTAXIS_P_H #include <private/chartaxiselement_p.h> +#include <QtCharts/private/qchartglobal_p.h> QT_CHARTS_BEGIN_NAMESPACE -class PolarChartAxis : public ChartAxisElement +class QT_CHARTS_PRIVATE_EXPORT PolarChartAxis : public ChartAxisElement { Q_OBJECT Q_INTERFACES(QGraphicsLayoutItem) diff --git a/src/charts/axis/polarchartaxisangular_p.h b/src/charts/axis/polarchartaxisangular_p.h index 1cb43ca6..ac517c4f 100644 --- a/src/charts/axis/polarchartaxisangular_p.h +++ b/src/charts/axis/polarchartaxisangular_p.h @@ -41,10 +41,11 @@ #include <QtCharts/qvalueaxis.h> #include <private/polarchartaxis_p.h> +#include <QtCharts/private/qchartglobal_p.h> QT_CHARTS_BEGIN_NAMESPACE -class PolarChartAxisAngular : public PolarChartAxis +class QT_CHARTS_PRIVATE_EXPORT PolarChartAxisAngular : public PolarChartAxis { Q_OBJECT diff --git a/src/charts/axis/polarchartaxisradial_p.h b/src/charts/axis/polarchartaxisradial_p.h index fd7fe7f2..73fbcea4 100644 --- a/src/charts/axis/polarchartaxisradial_p.h +++ b/src/charts/axis/polarchartaxisradial_p.h @@ -41,10 +41,11 @@ #include <QtCharts/qvalueaxis.h> #include <private/polarchartaxis_p.h> +#include <QtCharts/private/qchartglobal_p.h> QT_CHARTS_BEGIN_NAMESPACE -class PolarChartAxisRadial : public PolarChartAxis +class QT_CHARTS_PRIVATE_EXPORT PolarChartAxisRadial : public PolarChartAxis { Q_OBJECT diff --git a/src/charts/axis/qabstractaxis.h b/src/charts/axis/qabstractaxis.h index 8158f27d..4f902679 100644 --- a/src/charts/axis/qabstractaxis.h +++ b/src/charts/axis/qabstractaxis.h @@ -92,7 +92,7 @@ public: Q_DECLARE_FLAGS(AxisTypes, AxisType) protected: - explicit QAbstractAxis(QAbstractAxisPrivate &d, QObject *parent = Q_NULLPTR); + explicit QAbstractAxis(QAbstractAxisPrivate &d, QObject *parent = nullptr); public: ~QAbstractAxis(); diff --git a/src/charts/axis/qabstractaxis_p.h b/src/charts/axis/qabstractaxis_p.h index 556f3db4..3a635d98 100644 --- a/src/charts/axis/qabstractaxis_p.h +++ b/src/charts/axis/qabstractaxis_p.h @@ -42,6 +42,7 @@ #include <QtCharts/QAbstractAxis> #include <private/chartaxiselement_p.h> #include <QtCharts/QChart> +#include <QtCharts/private/qchartglobal_p.h> #include <QtCore/QDebug> QT_BEGIN_NAMESPACE @@ -57,7 +58,7 @@ class QAbstractSeries; class ChartTheme; class ChartElement; -class Q_AUTOTEST_EXPORT QAbstractAxisPrivate : public QObject +class QT_CHARTS_PRIVATE_EXPORT QAbstractAxisPrivate : public QObject { Q_OBJECT public: diff --git a/src/charts/axis/valueaxis/chartvalueaxisx_p.h b/src/charts/axis/valueaxis/chartvalueaxisx_p.h index 5cb7bdfa..bceb7412 100644 --- a/src/charts/axis/valueaxis/chartvalueaxisx_p.h +++ b/src/charts/axis/valueaxis/chartvalueaxisx_p.h @@ -40,12 +40,13 @@ #define CHARTVALUEAXISX_H #include <private/horizontalaxis_p.h> +#include <QtCharts/private/qchartglobal_p.h> QT_CHARTS_BEGIN_NAMESPACE class QValueAxis; -class ChartValueAxisX : public HorizontalAxis +class QT_CHARTS_PRIVATE_EXPORT ChartValueAxisX : public HorizontalAxis { Q_OBJECT public: diff --git a/src/charts/axis/valueaxis/chartvalueaxisy_p.h b/src/charts/axis/valueaxis/chartvalueaxisy_p.h index 243b49d2..2d0030d7 100644 --- a/src/charts/axis/valueaxis/chartvalueaxisy_p.h +++ b/src/charts/axis/valueaxis/chartvalueaxisy_p.h @@ -40,12 +40,13 @@ #define CHARTVALUEAXISY_H #include <private/verticalaxis_p.h> +#include <QtCharts/private/qchartglobal_p.h> QT_CHARTS_BEGIN_NAMESPACE class QValueAxis; -class ChartValueAxisY : public VerticalAxis +class QT_CHARTS_PRIVATE_EXPORT ChartValueAxisY : public VerticalAxis { Q_OBJECT public: diff --git a/src/charts/axis/valueaxis/polarchartvalueaxisangular_p.h b/src/charts/axis/valueaxis/polarchartvalueaxisangular_p.h index 2897be28..8a39f510 100644 --- a/src/charts/axis/valueaxis/polarchartvalueaxisangular_p.h +++ b/src/charts/axis/valueaxis/polarchartvalueaxisangular_p.h @@ -41,12 +41,13 @@ #include <private/polarchartaxisangular_p.h> #include <QtCharts/QValueAxis> +#include <QtCharts/private/qchartglobal_p.h> QT_CHARTS_BEGIN_NAMESPACE class QValueAxis; -class PolarChartValueAxisAngular : public PolarChartAxisAngular +class QT_CHARTS_PRIVATE_EXPORT PolarChartValueAxisAngular : public PolarChartAxisAngular { Q_OBJECT public: diff --git a/src/charts/axis/valueaxis/polarchartvalueaxisradial_p.h b/src/charts/axis/valueaxis/polarchartvalueaxisradial_p.h index 8db1448d..8c4d4105 100644 --- a/src/charts/axis/valueaxis/polarchartvalueaxisradial_p.h +++ b/src/charts/axis/valueaxis/polarchartvalueaxisradial_p.h @@ -40,12 +40,13 @@ #define POLARCHARTVALUEAXISRADIAL_P_H #include <private/polarchartaxisradial_p.h> +#include <QtCharts/private/qchartglobal_p.h> QT_CHARTS_BEGIN_NAMESPACE class QValueAxis; -class PolarChartValueAxisRadial : public PolarChartAxisRadial +class QT_CHARTS_PRIVATE_EXPORT PolarChartValueAxisRadial : public PolarChartAxisRadial { Q_OBJECT public: diff --git a/src/charts/axis/valueaxis/qvalueaxis.h b/src/charts/axis/valueaxis/qvalueaxis.h index 2a53df09..45f54be9 100644 --- a/src/charts/axis/valueaxis/qvalueaxis.h +++ b/src/charts/axis/valueaxis/qvalueaxis.h @@ -46,11 +46,11 @@ class QT_CHARTS_EXPORT QValueAxis : public QAbstractAxis Q_PROPERTY(int minorTickCount READ minorTickCount WRITE setMinorTickCount NOTIFY minorTickCountChanged) public: - explicit QValueAxis(QObject *parent = Q_NULLPTR); + explicit QValueAxis(QObject *parent = nullptr); ~QValueAxis(); protected: - QValueAxis(QValueAxisPrivate &d, QObject *parent = Q_NULLPTR); + QValueAxis(QValueAxisPrivate &d, QObject *parent = nullptr); public: AxisType type() const; diff --git a/src/charts/axis/valueaxis/qvalueaxis_p.h b/src/charts/axis/valueaxis/qvalueaxis_p.h index 6e27377a..b020b0f7 100644 --- a/src/charts/axis/valueaxis/qvalueaxis_p.h +++ b/src/charts/axis/valueaxis/qvalueaxis_p.h @@ -41,10 +41,11 @@ #include <QtCharts/QValueAxis> #include <private/qabstractaxis_p.h> +#include <QtCharts/private/qchartglobal_p.h> QT_CHARTS_BEGIN_NAMESPACE -class QValueAxisPrivate : public QAbstractAxisPrivate +class QT_CHARTS_PRIVATE_EXPORT QValueAxisPrivate : public QAbstractAxisPrivate { Q_OBJECT public: diff --git a/src/charts/axis/verticalaxis_p.h b/src/charts/axis/verticalaxis_p.h index 687d03d2..670854c4 100644 --- a/src/charts/axis/verticalaxis_p.h +++ b/src/charts/axis/verticalaxis_p.h @@ -40,19 +40,20 @@ #define VERTICALAXIS_P_H #include <private/cartesianchartaxis_p.h> +#include <QtCharts/private/qchartglobal_p.h> QT_CHARTS_BEGIN_NAMESPACE -class VerticalAxis : public CartesianChartAxis +class QT_CHARTS_PRIVATE_EXPORT VerticalAxis : public CartesianChartAxis { public: VerticalAxis(QAbstractAxis *axis, QGraphicsItem *item = nullptr, bool intervalAxis = false); ~VerticalAxis(); - QSizeF sizeHint(Qt::SizeHint which, const QSizeF &constraint = QSizeF()) const Q_DECL_OVERRIDE; + QSizeF sizeHint(Qt::SizeHint which, const QSizeF &constraint = QSizeF()) const override; protected: - void updateGeometry() Q_DECL_OVERRIDE; + void updateGeometry() override; private: void updateMinorTickGeometry(); diff --git a/src/charts/barchart/abstractbarchartitem.cpp b/src/charts/barchart/abstractbarchartitem.cpp index f435044e..2d0d0e25 100644 --- a/src/charts/barchart/abstractbarchartitem.cpp +++ b/src/charts/barchart/abstractbarchartitem.cpp @@ -75,6 +75,10 @@ AbstractBarChartItem::AbstractBarChartItem(QAbstractBarSeries *series, QGraphics connect(series, SIGNAL(labelsPositionChanged(QAbstractBarSeries::LabelsPosition)), this, SLOT(handleLabelsPositionChanged())); connect(series, SIGNAL(labelsAngleChanged(qreal)), this, SLOT(positionLabels())); + connect(series, &QAbstractBarSeries::labelsPrecisionChanged, + this, &AbstractBarChartItem::handleUpdatedBars); + connect(series, &QAbstractBarSeries::labelsPrecisionChanged, + this, &AbstractBarChartItem::positionLabels); connect(series->chart()->d_ptr->m_dataset, &ChartDataSet::seriesAdded, this, &AbstractBarChartItem::handleSeriesAdded); connect(series->chart()->d_ptr->m_dataset, &ChartDataSet::seriesRemoved, @@ -552,13 +556,15 @@ QString AbstractBarChartItem::generateLabelText(int set, int category, qreal val Q_UNUSED(set); Q_UNUSED(category); static const QString valueTag(QLatin1String("@value")); + QString valueString = presenter()->numberToString(value, 'g', m_series->labelsPrecision()); QString valueLabel; if (m_series->labelsFormat().isEmpty()) { - valueLabel = presenter()->numberToString(value); + valueLabel = valueString; } else { valueLabel = m_series->labelsFormat(); - valueLabel.replace(valueTag, presenter()->numberToString(value)); + valueLabel.replace(valueTag, valueString); } + return valueLabel; } diff --git a/src/charts/barchart/abstractbarchartitem_p.h b/src/charts/barchart/abstractbarchartitem_p.h index d65b1bc9..7cb96c77 100644 --- a/src/charts/barchart/abstractbarchartitem_p.h +++ b/src/charts/barchart/abstractbarchartitem_p.h @@ -42,6 +42,7 @@ #include <private/chartitem_p.h> #include <QtCharts/QAbstractBarSeries> +#include <QtCharts/private/qchartglobal_p.h> #include <QtGui/QPen> #include <QtGui/QBrush> @@ -54,7 +55,7 @@ class BarAnimation; class QBarSetPrivate; class QAbstractAxis; -class AbstractBarChartItem : public ChartItem +class QT_CHARTS_PRIVATE_EXPORT AbstractBarChartItem : public ChartItem { Q_OBJECT public: diff --git a/src/charts/barchart/bar_p.h b/src/charts/barchart/bar_p.h index 03fd19a7..654d88a3 100644 --- a/src/charts/barchart/bar_p.h +++ b/src/charts/barchart/bar_p.h @@ -40,6 +40,7 @@ #define BAR_H #include <QtCharts/QChartGlobal> +#include <QtCharts/private/qchartglobal_p.h> #include <QtWidgets/QGraphicsRectItem> #include <QtWidgets/QGraphicsTextItem> @@ -48,7 +49,7 @@ QT_CHARTS_BEGIN_NAMESPACE class QBarSet; // Single visual bar item of chart -class Bar : public QObject, public QGraphicsRectItem +class QT_CHARTS_PRIVATE_EXPORT Bar : public QObject, public QGraphicsRectItem { Q_OBJECT public: diff --git a/src/charts/barchart/horizontal/bar/horizontalbarchartitem_p.h b/src/charts/barchart/horizontal/bar/horizontalbarchartitem_p.h index 9f616768..d9d5c515 100644 --- a/src/charts/barchart/horizontal/bar/horizontalbarchartitem_p.h +++ b/src/charts/barchart/horizontal/bar/horizontalbarchartitem_p.h @@ -41,10 +41,11 @@ #include <private/abstractbarchartitem_p.h> #include <QtWidgets/QGraphicsItem> +#include <QtCharts/private/qchartglobal_p.h> QT_CHARTS_BEGIN_NAMESPACE -class HorizontalBarChartItem : public AbstractBarChartItem +class QT_CHARTS_PRIVATE_EXPORT HorizontalBarChartItem : public AbstractBarChartItem { Q_OBJECT public: diff --git a/src/charts/barchart/horizontal/bar/qhorizontalbarseries.h b/src/charts/barchart/horizontal/bar/qhorizontalbarseries.h index 104093df..c3d07e0d 100644 --- a/src/charts/barchart/horizontal/bar/qhorizontalbarseries.h +++ b/src/charts/barchart/horizontal/bar/qhorizontalbarseries.h @@ -40,7 +40,7 @@ class QT_CHARTS_EXPORT QHorizontalBarSeries : public QAbstractBarSeries { Q_OBJECT public: - explicit QHorizontalBarSeries(QObject *parent = Q_NULLPTR); + explicit QHorizontalBarSeries(QObject *parent = nullptr); ~QHorizontalBarSeries(); QAbstractSeries::SeriesType type() const; diff --git a/src/charts/barchart/horizontal/bar/qhorizontalbarseries_p.h b/src/charts/barchart/horizontal/bar/qhorizontalbarseries_p.h index efdaf4ff..650bad5f 100644 --- a/src/charts/barchart/horizontal/bar/qhorizontalbarseries_p.h +++ b/src/charts/barchart/horizontal/bar/qhorizontalbarseries_p.h @@ -41,10 +41,11 @@ #include <private/qabstractbarseries_p.h> #include <private/abstractdomain_p.h> +#include <QtCharts/private/qchartglobal_p.h> QT_CHARTS_BEGIN_NAMESPACE -class QHorizontalBarSeriesPrivate: public QAbstractBarSeriesPrivate +class QT_CHARTS_PRIVATE_EXPORT QHorizontalBarSeriesPrivate: public QAbstractBarSeriesPrivate { public: QHorizontalBarSeriesPrivate(QHorizontalBarSeries *q); diff --git a/src/charts/barchart/horizontal/percent/horizontalpercentbarchartitem_p.h b/src/charts/barchart/horizontal/percent/horizontalpercentbarchartitem_p.h index 51180258..bff54e9b 100644 --- a/src/charts/barchart/horizontal/percent/horizontalpercentbarchartitem_p.h +++ b/src/charts/barchart/horizontal/percent/horizontalpercentbarchartitem_p.h @@ -41,10 +41,11 @@ #include <private/abstractbarchartitem_p.h> #include <QtWidgets/QGraphicsItem> +#include <QtCharts/private/qchartglobal_p.h> QT_CHARTS_BEGIN_NAMESPACE -class HorizontalPercentBarChartItem : public AbstractBarChartItem +class QT_CHARTS_PRIVATE_EXPORT HorizontalPercentBarChartItem : public AbstractBarChartItem { Q_OBJECT public: diff --git a/src/charts/barchart/horizontal/percent/qhorizontalpercentbarseries.h b/src/charts/barchart/horizontal/percent/qhorizontalpercentbarseries.h index 6c2928b9..5c78b029 100644 --- a/src/charts/barchart/horizontal/percent/qhorizontalpercentbarseries.h +++ b/src/charts/barchart/horizontal/percent/qhorizontalpercentbarseries.h @@ -40,7 +40,7 @@ class QT_CHARTS_EXPORT QHorizontalPercentBarSeries : public QAbstractBarSeries { Q_OBJECT public: - explicit QHorizontalPercentBarSeries(QObject *parent = Q_NULLPTR); + explicit QHorizontalPercentBarSeries(QObject *parent = nullptr); ~QHorizontalPercentBarSeries(); QAbstractSeries::SeriesType type() const; diff --git a/src/charts/barchart/horizontal/percent/qhorizontalpercentbarseries_p.h b/src/charts/barchart/horizontal/percent/qhorizontalpercentbarseries_p.h index f4a74917..e17381ff 100644 --- a/src/charts/barchart/horizontal/percent/qhorizontalpercentbarseries_p.h +++ b/src/charts/barchart/horizontal/percent/qhorizontalpercentbarseries_p.h @@ -41,10 +41,11 @@ #include <private/qabstractbarseries_p.h> #include <private/abstractdomain_p.h> +#include <QtCharts/private/qchartglobal_p.h> QT_CHARTS_BEGIN_NAMESPACE -class QHorizontalPercentBarSeriesPrivate: public QAbstractBarSeriesPrivate +class QT_CHARTS_PRIVATE_EXPORT QHorizontalPercentBarSeriesPrivate: public QAbstractBarSeriesPrivate { public: QHorizontalPercentBarSeriesPrivate(QHorizontalPercentBarSeries *q); diff --git a/src/charts/barchart/horizontal/stacked/horizontalstackedbarchartitem_p.h b/src/charts/barchart/horizontal/stacked/horizontalstackedbarchartitem_p.h index 4fb8ce27..d3744490 100644 --- a/src/charts/barchart/horizontal/stacked/horizontalstackedbarchartitem_p.h +++ b/src/charts/barchart/horizontal/stacked/horizontalstackedbarchartitem_p.h @@ -40,11 +40,12 @@ #define HORIZONTALSTACKEDBARCHARTITEM_P_H #include <private/abstractbarchartitem_p.h> +#include <QtCharts/private/qchartglobal_p.h> #include <QtWidgets/QGraphicsItem> QT_CHARTS_BEGIN_NAMESPACE -class HorizontalStackedBarChartItem : public AbstractBarChartItem +class QT_CHARTS_PRIVATE_EXPORT HorizontalStackedBarChartItem : public AbstractBarChartItem { Q_OBJECT public: diff --git a/src/charts/barchart/horizontal/stacked/qhorizontalstackedbarseries.h b/src/charts/barchart/horizontal/stacked/qhorizontalstackedbarseries.h index 3c2711d1..9f944262 100644 --- a/src/charts/barchart/horizontal/stacked/qhorizontalstackedbarseries.h +++ b/src/charts/barchart/horizontal/stacked/qhorizontalstackedbarseries.h @@ -40,7 +40,7 @@ class QT_CHARTS_EXPORT QHorizontalStackedBarSeries : public QAbstractBarSeries { Q_OBJECT public: - explicit QHorizontalStackedBarSeries(QObject *parent = Q_NULLPTR); + explicit QHorizontalStackedBarSeries(QObject *parent = nullptr); ~QHorizontalStackedBarSeries(); QAbstractSeries::SeriesType type() const; diff --git a/src/charts/barchart/horizontal/stacked/qhorizontalstackedbarseries_p.h b/src/charts/barchart/horizontal/stacked/qhorizontalstackedbarseries_p.h index 893510d3..1c3e014e 100644 --- a/src/charts/barchart/horizontal/stacked/qhorizontalstackedbarseries_p.h +++ b/src/charts/barchart/horizontal/stacked/qhorizontalstackedbarseries_p.h @@ -41,10 +41,11 @@ #include <private/qabstractbarseries_p.h> #include <private/abstractdomain_p.h> +#include <QtCharts/private/qchartglobal_p.h> QT_CHARTS_BEGIN_NAMESPACE -class QHorizontalStackedBarSeriesPrivate: public QAbstractBarSeriesPrivate +class QT_CHARTS_PRIVATE_EXPORT QHorizontalStackedBarSeriesPrivate: public QAbstractBarSeriesPrivate { public: QHorizontalStackedBarSeriesPrivate(QHorizontalStackedBarSeries *q); diff --git a/src/charts/barchart/qabstractbarseries.cpp b/src/charts/barchart/qabstractbarseries.cpp index cd27cd1c..410087f2 100644 --- a/src/charts/barchart/qabstractbarseries.cpp +++ b/src/charts/barchart/qabstractbarseries.cpp @@ -185,7 +185,7 @@ QT_CHARTS_BEGIN_NAMESPACE after the value. The labels are shown on the plot area, whereas labels on the edge of the plot area are cut. If the bars are close to each other, the labels may overlap. - \sa labelsVisible, labelsPosition + \sa labelsVisible, labelsPosition, labelsPrecision */ /*! \qmlproperty string AbstractBarSeries::labelsFormat @@ -250,6 +250,23 @@ QT_CHARTS_BEGIN_NAMESPACE */ /*! + \property QAbstractBarSeries::labelsPrecision + \brief The maximum amount of significant digits shown in value labels. + + Default value is 6. +*/ +/*! + \qmlproperty real AbstractBarSeries::labelsPrecision + The maximum amount of significant digits shown in value labels. + + Default value is 6. +*/ +/*! + \fn void QAbstractBarSeries::labelsPrecisionChanged(int precision) + This signal is emitted when the \a precision of the value labels changes. +*/ + +/*! \fn void QAbstractBarSeries::clicked(int index, QBarSet *barset) This signal is emitted when the user clicks the bar specified by \a index in the bar set specified by \a barset. @@ -629,6 +646,22 @@ QAbstractBarSeries::LabelsPosition QAbstractBarSeries::labelsPosition() const return d->m_labelsPosition; } +void QAbstractBarSeries::setLabelsPrecision(int precision) +{ + Q_D(QAbstractBarSeries); + if (d->m_labelsPrecision != precision) { + d->m_labelsPrecision = precision; + d->setLabelsDirty(true); + emit labelsPrecisionChanged(precision); + } +} + +int QAbstractBarSeries::labelsPrecision() const +{ + Q_D(const QAbstractBarSeries); + return d->m_labelsPrecision; +} + /////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////// QAbstractBarSeriesPrivate::QAbstractBarSeriesPrivate(QAbstractBarSeries *q) : @@ -640,6 +673,7 @@ QAbstractBarSeriesPrivate::QAbstractBarSeriesPrivate(QAbstractBarSeries *q) : m_labelsFormat(), m_labelsPosition(QAbstractBarSeries::LabelsCenter), m_labelsAngle(0), + m_labelsPrecision(6), m_visualsDirty(true), m_labelsDirty(true) { diff --git a/src/charts/barchart/qabstractbarseries.h b/src/charts/barchart/qabstractbarseries.h index 3bff84a4..82000d34 100644 --- a/src/charts/barchart/qabstractbarseries.h +++ b/src/charts/barchart/qabstractbarseries.h @@ -48,6 +48,7 @@ class QT_CHARTS_EXPORT QAbstractBarSeries : public QAbstractSeries Q_PROPERTY(QString labelsFormat READ labelsFormat WRITE setLabelsFormat NOTIFY labelsFormatChanged) Q_PROPERTY(LabelsPosition labelsPosition READ labelsPosition WRITE setLabelsPosition NOTIFY labelsPositionChanged) Q_PROPERTY(qreal labelsAngle READ labelsAngle WRITE setLabelsAngle NOTIFY labelsAngleChanged) + Q_PROPERTY(int labelsPrecision READ labelsPrecision WRITE setLabelsPrecision NOTIFY labelsPrecisionChanged) Q_ENUMS(LabelsPosition) public: @@ -85,8 +86,11 @@ public: void setLabelsPosition(QAbstractBarSeries::LabelsPosition position); QAbstractBarSeries::LabelsPosition labelsPosition() const; + void setLabelsPrecision(int precision); + int labelsPrecision() const; + protected: - explicit QAbstractBarSeries(QAbstractBarSeriesPrivate &d, QObject *parent = Q_NULLPTR); + explicit QAbstractBarSeries(QAbstractBarSeriesPrivate &d, QObject *parent = nullptr); Q_SIGNALS: void clicked(int index, QBarSet *barset); @@ -99,6 +103,7 @@ Q_SIGNALS: void labelsFormatChanged(const QString &format); void labelsPositionChanged(QAbstractBarSeries::LabelsPosition position); void labelsAngleChanged(qreal angle); + void labelsPrecisionChanged(int precision); void barsetsAdded(QList<QBarSet *> sets); void barsetsRemoved(QList<QBarSet *> sets); diff --git a/src/charts/barchart/qabstractbarseries_p.h b/src/charts/barchart/qabstractbarseries_p.h index 62ddb420..99fadeeb 100644 --- a/src/charts/barchart/qabstractbarseries_p.h +++ b/src/charts/barchart/qabstractbarseries_p.h @@ -43,6 +43,7 @@ #include <private/qabstractseries_p.h> #include <QtCore/QStringList> #include <QtCharts/QAbstractSeries> +#include <QtCharts/private/qchartglobal_p.h> QT_CHARTS_BEGIN_NAMESPACE @@ -50,7 +51,7 @@ class QBarModelMapper; class QBarCategoryAxis; class QLegendMarker; -class QAbstractBarSeriesPrivate : public QAbstractSeriesPrivate +class QT_CHARTS_PRIVATE_EXPORT QAbstractBarSeriesPrivate : public QAbstractSeriesPrivate { Q_OBJECT public: @@ -133,6 +134,7 @@ protected: QString m_labelsFormat; QAbstractBarSeries::LabelsPosition m_labelsPosition; qreal m_labelsAngle; + int m_labelsPrecision; bool m_visualsDirty; bool m_labelsDirty; diff --git a/src/charts/barchart/qbarmodelmapper.h b/src/charts/barchart/qbarmodelmapper.h index 1118fd22..6d08fb5a 100644 --- a/src/charts/barchart/qbarmodelmapper.h +++ b/src/charts/barchart/qbarmodelmapper.h @@ -47,7 +47,7 @@ class QT_CHARTS_EXPORT QBarModelMapper : public QObject Q_OBJECT protected: - explicit QBarModelMapper(QObject *parent = Q_NULLPTR); + explicit QBarModelMapper(QObject *parent = nullptr); QAbstractItemModel *model() const; void setModel(QAbstractItemModel *model); diff --git a/src/charts/barchart/qbarmodelmapper_p.h b/src/charts/barchart/qbarmodelmapper_p.h index 416028c5..cf08d5aa 100644 --- a/src/charts/barchart/qbarmodelmapper_p.h +++ b/src/charts/barchart/qbarmodelmapper_p.h @@ -41,6 +41,7 @@ #include <QtCore/QObject> #include <QtCharts/QBarModelMapper> +#include <QtCharts/private/qchartglobal_p.h> QT_BEGIN_NAMESPACE class QModelIndex; @@ -50,7 +51,7 @@ QT_CHARTS_BEGIN_NAMESPACE class QBarSet; -class QBarModelMapperPrivate : public QObject +class QT_CHARTS_PRIVATE_EXPORT QBarModelMapperPrivate : public QObject { Q_OBJECT public: diff --git a/src/charts/barchart/qbarset.h b/src/charts/barchart/qbarset.h index 0859bff5..7edd93e0 100644 --- a/src/charts/barchart/qbarset.h +++ b/src/charts/barchart/qbarset.h @@ -51,7 +51,7 @@ class QT_CHARTS_EXPORT QBarSet : public QObject Q_PROPERTY(QColor labelColor READ labelColor WRITE setLabelColor NOTIFY labelColorChanged) public: - explicit QBarSet(const QString label, QObject *parent = Q_NULLPTR); + explicit QBarSet(const QString label, QObject *parent = nullptr); virtual ~QBarSet(); void setLabel(const QString label); diff --git a/src/charts/barchart/qbarset_p.h b/src/charts/barchart/qbarset_p.h index bcecffe0..78876b7b 100644 --- a/src/charts/barchart/qbarset_p.h +++ b/src/charts/barchart/qbarset_p.h @@ -40,6 +40,7 @@ #define QBARSET_P_H #include <QtCharts/QBarSet> +#include <QtCharts/private/qchartglobal_p.h> #include <QtCore/QMap> #include <QtGui/QPen> #include <QtGui/QBrush> @@ -47,7 +48,7 @@ QT_CHARTS_BEGIN_NAMESPACE -class QBarSetPrivate : public QObject +class QT_CHARTS_PRIVATE_EXPORT QBarSetPrivate : public QObject { Q_OBJECT diff --git a/src/charts/barchart/qhbarmodelmapper.h b/src/charts/barchart/qhbarmodelmapper.h index 8063a811..23fe8e4f 100644 --- a/src/charts/barchart/qhbarmodelmapper.h +++ b/src/charts/barchart/qhbarmodelmapper.h @@ -45,7 +45,7 @@ class QT_CHARTS_EXPORT QHBarModelMapper : public QBarModelMapper Q_PROPERTY(int columnCount READ columnCount WRITE setColumnCount NOTIFY columnCountChanged) public: - explicit QHBarModelMapper(QObject *parent = Q_NULLPTR); + explicit QHBarModelMapper(QObject *parent = nullptr); QAbstractItemModel *model() const; void setModel(QAbstractItemModel *model); diff --git a/src/charts/barchart/qvbarmodelmapper.h b/src/charts/barchart/qvbarmodelmapper.h index a4e8ae39..84c7a6ea 100644 --- a/src/charts/barchart/qvbarmodelmapper.h +++ b/src/charts/barchart/qvbarmodelmapper.h @@ -45,7 +45,7 @@ class QT_CHARTS_EXPORT QVBarModelMapper : public QBarModelMapper Q_PROPERTY(int rowCount READ rowCount WRITE setRowCount NOTIFY rowCountChanged) public: - explicit QVBarModelMapper(QObject *parent = Q_NULLPTR); + explicit QVBarModelMapper(QObject *parent = nullptr); QAbstractItemModel *model() const; void setModel(QAbstractItemModel *model); diff --git a/src/charts/barchart/vertical/bar/barchartitem_p.h b/src/charts/barchart/vertical/bar/barchartitem_p.h index ef5f5220..174eaa7a 100644 --- a/src/charts/barchart/vertical/bar/barchartitem_p.h +++ b/src/charts/barchart/vertical/bar/barchartitem_p.h @@ -43,10 +43,11 @@ #include <private/abstractbarchartitem_p.h> #include <QtCharts/QStackedBarSeries> #include <QtWidgets/QGraphicsItem> +#include <QtCharts/private/qchartglobal_p.h> QT_CHARTS_BEGIN_NAMESPACE -class BarChartItem : public AbstractBarChartItem +class QT_CHARTS_PRIVATE_EXPORT BarChartItem : public AbstractBarChartItem { Q_OBJECT public: diff --git a/src/charts/barchart/vertical/bar/qbarseries.h b/src/charts/barchart/vertical/bar/qbarseries.h index 95d9ae24..5de28119 100644 --- a/src/charts/barchart/vertical/bar/qbarseries.h +++ b/src/charts/barchart/vertical/bar/qbarseries.h @@ -40,7 +40,7 @@ class QT_CHARTS_EXPORT QBarSeries : public QAbstractBarSeries { Q_OBJECT public: - explicit QBarSeries(QObject *parent = Q_NULLPTR); + explicit QBarSeries(QObject *parent = nullptr); ~QBarSeries(); QAbstractSeries::SeriesType type() const; diff --git a/src/charts/barchart/vertical/bar/qbarseries_p.h b/src/charts/barchart/vertical/bar/qbarseries_p.h index 620c57f4..270ac4bc 100644 --- a/src/charts/barchart/vertical/bar/qbarseries_p.h +++ b/src/charts/barchart/vertical/bar/qbarseries_p.h @@ -41,11 +41,12 @@ #include <private/qabstractbarseries_p.h> #include <private/abstractdomain_p.h> +#include <QtCharts/private/qchartglobal_p.h> QT_CHARTS_BEGIN_NAMESPACE -class QBarSeriesPrivate: public QAbstractBarSeriesPrivate +class QT_CHARTS_PRIVATE_EXPORT QBarSeriesPrivate: public QAbstractBarSeriesPrivate { public: QBarSeriesPrivate(QBarSeries *q); diff --git a/src/charts/barchart/vertical/percent/percentbarchartitem_p.h b/src/charts/barchart/vertical/percent/percentbarchartitem_p.h index 80016613..a922f62d 100644 --- a/src/charts/barchart/vertical/percent/percentbarchartitem_p.h +++ b/src/charts/barchart/vertical/percent/percentbarchartitem_p.h @@ -42,12 +42,13 @@ #include <private/abstractbarchartitem_p.h> #include <QtWidgets/QGraphicsItem> +#include <QtCharts/private/qchartglobal_p.h> QT_CHARTS_BEGIN_NAMESPACE class QAbstractBarSeries; -class PercentBarChartItem : public AbstractBarChartItem +class QT_CHARTS_PRIVATE_EXPORT PercentBarChartItem : public AbstractBarChartItem { Q_OBJECT public: diff --git a/src/charts/barchart/vertical/percent/qpercentbarseries.h b/src/charts/barchart/vertical/percent/qpercentbarseries.h index ee4796c4..e5545ec6 100644 --- a/src/charts/barchart/vertical/percent/qpercentbarseries.h +++ b/src/charts/barchart/vertical/percent/qpercentbarseries.h @@ -41,7 +41,7 @@ class QT_CHARTS_EXPORT QPercentBarSeries : public QAbstractBarSeries { Q_OBJECT public: - explicit QPercentBarSeries(QObject *parent = Q_NULLPTR); + explicit QPercentBarSeries(QObject *parent = nullptr); ~QPercentBarSeries(); QAbstractSeries::SeriesType type() const; diff --git a/src/charts/barchart/vertical/percent/qpercentbarseries_p.h b/src/charts/barchart/vertical/percent/qpercentbarseries_p.h index 8cd95f2e..7a422410 100644 --- a/src/charts/barchart/vertical/percent/qpercentbarseries_p.h +++ b/src/charts/barchart/vertical/percent/qpercentbarseries_p.h @@ -41,11 +41,12 @@ #include <private/qabstractbarseries_p.h> #include <private/abstractdomain_p.h> +#include <QtCharts/private/qchartglobal_p.h> QT_CHARTS_BEGIN_NAMESPACE -class QPercentBarSeriesPrivate: public QAbstractBarSeriesPrivate +class QT_CHARTS_PRIVATE_EXPORT QPercentBarSeriesPrivate: public QAbstractBarSeriesPrivate { public: QPercentBarSeriesPrivate(QPercentBarSeries *q); diff --git a/src/charts/barchart/vertical/stacked/qstackedbarseries.h b/src/charts/barchart/vertical/stacked/qstackedbarseries.h index d3efa99a..d6032350 100644 --- a/src/charts/barchart/vertical/stacked/qstackedbarseries.h +++ b/src/charts/barchart/vertical/stacked/qstackedbarseries.h @@ -41,7 +41,7 @@ class QT_CHARTS_EXPORT QStackedBarSeries : public QAbstractBarSeries { Q_OBJECT public: - explicit QStackedBarSeries(QObject *parent = Q_NULLPTR); + explicit QStackedBarSeries(QObject *parent = nullptr); ~QStackedBarSeries(); QAbstractSeries::SeriesType type() const; diff --git a/src/charts/barchart/vertical/stacked/qstackedbarseries_p.h b/src/charts/barchart/vertical/stacked/qstackedbarseries_p.h index 588d9e64..94916dfe 100644 --- a/src/charts/barchart/vertical/stacked/qstackedbarseries_p.h +++ b/src/charts/barchart/vertical/stacked/qstackedbarseries_p.h @@ -41,11 +41,12 @@ #include <private/qabstractbarseries_p.h> #include <private/abstractdomain_p.h> +#include <QtCharts/private/qchartglobal_p.h> QT_CHARTS_BEGIN_NAMESPACE -class QStackedBarSeriesPrivate: public QAbstractBarSeriesPrivate +class QT_CHARTS_PRIVATE_EXPORT QStackedBarSeriesPrivate: public QAbstractBarSeriesPrivate { public: QStackedBarSeriesPrivate(QStackedBarSeries *q); diff --git a/src/charts/barchart/vertical/stacked/stackedbarchartitem_p.h b/src/charts/barchart/vertical/stacked/stackedbarchartitem_p.h index 03010e16..58ea7264 100644 --- a/src/charts/barchart/vertical/stacked/stackedbarchartitem_p.h +++ b/src/charts/barchart/vertical/stacked/stackedbarchartitem_p.h @@ -43,10 +43,11 @@ #include <private/abstractbarchartitem_p.h> #include <QtCharts/QStackedBarSeries> #include <QtWidgets/QGraphicsItem> +#include <QtCharts/private/qchartglobal_p.h> QT_CHARTS_BEGIN_NAMESPACE -class StackedBarChartItem : public AbstractBarChartItem +class QT_CHARTS_PRIVATE_EXPORT StackedBarChartItem : public AbstractBarChartItem { Q_OBJECT public: diff --git a/src/charts/boxplotchart/boxplotchartitem_p.h b/src/charts/boxplotchart/boxplotchartitem_p.h index 4dbe6aa1..f7a7cd9e 100644 --- a/src/charts/boxplotchart/boxplotchartitem_p.h +++ b/src/charts/boxplotchart/boxplotchartitem_p.h @@ -42,6 +42,7 @@ #include <private/boxwhiskers_p.h> #include <QtCharts/QBoxPlotSeries> +#include <QtCharts/private/qchartglobal_p.h> #include <private/chartitem_p.h> #include <private/boxplotanimation_p.h> #include <QtCharts/QBoxSet> @@ -51,7 +52,7 @@ QT_CHARTS_BEGIN_NAMESPACE class BoxPlotSeriesPrivate; -class BoxPlotChartItem : public ChartItem +class QT_CHARTS_PRIVATE_EXPORT BoxPlotChartItem : public ChartItem { Q_OBJECT public: diff --git a/src/charts/boxplotchart/boxwhiskers_p.h b/src/charts/boxplotchart/boxwhiskers_p.h index b63f5024..6ce0bf53 100644 --- a/src/charts/boxplotchart/boxwhiskers_p.h +++ b/src/charts/boxplotchart/boxwhiskers_p.h @@ -41,6 +41,7 @@ #include <private/boxwhiskersdata_p.h> #include <QtCharts/QChartGlobal> +#include <QtCharts/private/qchartglobal_p.h> #include <private/abstractdomain_p.h> #include <QtCharts/QBoxSet> #include <QtWidgets/QGraphicsRectItem> @@ -52,7 +53,7 @@ QT_CHARTS_BEGIN_NAMESPACE class QBarSet; -class BoxWhiskers : public QGraphicsObject +class QT_CHARTS_PRIVATE_EXPORT BoxWhiskers : public QGraphicsObject { Q_OBJECT diff --git a/src/charts/boxplotchart/boxwhiskersdata_p.h b/src/charts/boxplotchart/boxwhiskersdata_p.h index b84a7295..3e9554f2 100644 --- a/src/charts/boxplotchart/boxwhiskersdata_p.h +++ b/src/charts/boxplotchart/boxwhiskersdata_p.h @@ -40,11 +40,12 @@ #define BOXWHISKERSDATA_P_H #include <QtCharts/QChartGlobal> +#include <QtCharts/private/qchartglobal_p.h> #include <QtCore/QSizeF> QT_CHARTS_BEGIN_NAMESPACE -class BoxWhiskersData +class QT_CHARTS_PRIVATE_EXPORT BoxWhiskersData { public: BoxWhiskersData() : diff --git a/src/charts/boxplotchart/qboxplotmodelmapper.h b/src/charts/boxplotchart/qboxplotmodelmapper.h index a48a69a7..4b57002b 100644 --- a/src/charts/boxplotchart/qboxplotmodelmapper.h +++ b/src/charts/boxplotchart/qboxplotmodelmapper.h @@ -47,7 +47,7 @@ class QT_CHARTS_EXPORT QBoxPlotModelMapper : public QObject Q_OBJECT protected: - explicit QBoxPlotModelMapper(QObject *parent = Q_NULLPTR); + explicit QBoxPlotModelMapper(QObject *parent = nullptr); QAbstractItemModel *model() const; void setModel(QAbstractItemModel *model); diff --git a/src/charts/boxplotchart/qboxplotmodelmapper_p.h b/src/charts/boxplotchart/qboxplotmodelmapper_p.h index 29cd77c0..4e4e2c8a 100644 --- a/src/charts/boxplotchart/qboxplotmodelmapper_p.h +++ b/src/charts/boxplotchart/qboxplotmodelmapper_p.h @@ -41,6 +41,7 @@ #include <QtCore/QObject> #include <QtCharts/QBoxPlotModelMapper> +#include <QtCharts/private/qchartglobal_p.h> QT_BEGIN_NAMESPACE class QModelIndex; @@ -48,7 +49,7 @@ QT_END_NAMESPACE QT_CHARTS_BEGIN_NAMESPACE -class QBoxSet; +class QT_CHARTS_PRIVATE_EXPORT QBoxSet; class QBoxPlotModelMapperPrivate : public QObject { diff --git a/src/charts/boxplotchart/qboxplotseries.h b/src/charts/boxplotchart/qboxplotseries.h index f86e1a87..fa736d56 100644 --- a/src/charts/boxplotchart/qboxplotseries.h +++ b/src/charts/boxplotchart/qboxplotseries.h @@ -47,7 +47,7 @@ class QT_CHARTS_EXPORT QBoxPlotSeries : public QAbstractSeries Q_PROPERTY(QBrush brush READ brush WRITE setBrush NOTIFY brushChanged) Q_PROPERTY(int count READ count NOTIFY countChanged REVISION 1) public: - explicit QBoxPlotSeries(QObject *parent = Q_NULLPTR); + explicit QBoxPlotSeries(QObject *parent = nullptr); ~QBoxPlotSeries(); bool append(QBoxSet *box); diff --git a/src/charts/boxplotchart/qboxplotseries_p.h b/src/charts/boxplotchart/qboxplotseries_p.h index 786da3d1..e15ef8b7 100644 --- a/src/charts/boxplotchart/qboxplotseries_p.h +++ b/src/charts/boxplotchart/qboxplotseries_p.h @@ -43,12 +43,13 @@ #include <private/qabstractbarseries_p.h> #include <private/abstractdomain_p.h> #include <QtCharts/QBarSet> +#include <QtCharts/private/qchartglobal_p.h> QT_CHARTS_BEGIN_NAMESPACE class BoxPlotAnimation; -class QBoxPlotSeriesPrivate : public QAbstractSeriesPrivate +class QT_CHARTS_PRIVATE_EXPORT QBoxPlotSeriesPrivate : public QAbstractSeriesPrivate { Q_OBJECT diff --git a/src/charts/boxplotchart/qboxset.h b/src/charts/boxplotchart/qboxset.h index 84a4ebff..eada7690 100644 --- a/src/charts/boxplotchart/qboxset.h +++ b/src/charts/boxplotchart/qboxset.h @@ -54,8 +54,8 @@ public: }; public: - explicit QBoxSet(const QString label = QString(), QObject *parent = Q_NULLPTR); - explicit QBoxSet(const qreal le, const qreal lq, const qreal m, const qreal uq, const qreal ue, const QString label = QString(), QObject *parent = Q_NULLPTR); + explicit QBoxSet(const QString label = QString(), QObject *parent = nullptr); + explicit QBoxSet(const qreal le, const qreal lq, const qreal m, const qreal uq, const qreal ue, const QString label = QString(), QObject *parent = nullptr); virtual ~QBoxSet(); void append(const qreal value); diff --git a/src/charts/boxplotchart/qboxset_p.h b/src/charts/boxplotchart/qboxset_p.h index 17b90253..12b765b5 100644 --- a/src/charts/boxplotchart/qboxset_p.h +++ b/src/charts/boxplotchart/qboxset_p.h @@ -40,6 +40,7 @@ #define QBOXSET_P_H #include <QtCharts/QBoxSet> +#include <QtCharts/private/qchartglobal_p.h> #include <QtCore/QMap> #include <QtGui/QPen> #include <QtGui/QBrush> @@ -49,7 +50,7 @@ QT_CHARTS_BEGIN_NAMESPACE class QBoxPlotSeriesPrivate; -class QBoxSetPrivate : public QObject +class QT_CHARTS_PRIVATE_EXPORT QBoxSetPrivate : public QObject { Q_OBJECT diff --git a/src/charts/boxplotchart/qvboxplotmodelmapper.h b/src/charts/boxplotchart/qvboxplotmodelmapper.h index b1508899..1f85c903 100644 --- a/src/charts/boxplotchart/qvboxplotmodelmapper.h +++ b/src/charts/boxplotchart/qvboxplotmodelmapper.h @@ -45,7 +45,7 @@ class QT_CHARTS_EXPORT QVBoxPlotModelMapper : public QBoxPlotModelMapper Q_PROPERTY(int rowCount READ rowCount WRITE setRowCount NOTIFY rowCountChanged) public: - explicit QVBoxPlotModelMapper(QObject *parent = Q_NULLPTR); + explicit QVBoxPlotModelMapper(QObject *parent = nullptr); QAbstractItemModel *model() const; void setModel(QAbstractItemModel *model); diff --git a/src/charts/candlestickchart/candlestick_p.h b/src/charts/candlestickchart/candlestick_p.h index fb39bbfa..80f2987e 100644 --- a/src/charts/candlestickchart/candlestick_p.h +++ b/src/charts/candlestickchart/candlestick_p.h @@ -44,13 +44,14 @@ #include <QtGui/QPen> #include <QtWidgets/QGraphicsObject> #include <private/candlestickdata_p.h> +#include <QtCharts/private/qchartglobal_p.h> QT_CHARTS_BEGIN_NAMESPACE class AbstractDomain; class QCandlestickSet; -class Candlestick : public QGraphicsObject +class QT_CHARTS_PRIVATE_EXPORT Candlestick : public QGraphicsObject { Q_OBJECT diff --git a/src/charts/candlestickchart/candlestickchartitem_p.h b/src/charts/candlestickchart/candlestickchartitem_p.h index ee3b1f71..ec1c12b4 100644 --- a/src/charts/candlestickchart/candlestickchartitem_p.h +++ b/src/charts/candlestickchart/candlestickchartitem_p.h @@ -40,6 +40,7 @@ #define CANDLESTICKCHARTITEM_P_H #include <private/chartitem_p.h> +#include <QtCharts/private/qchartglobal_p.h> QT_CHARTS_BEGIN_NAMESPACE @@ -48,7 +49,7 @@ class CandlestickAnimation; class QCandlestickSeries; class QCandlestickSet; -class CandlestickChartItem : public ChartItem +class QT_CHARTS_PRIVATE_EXPORT CandlestickChartItem : public ChartItem { Q_OBJECT diff --git a/src/charts/candlestickchart/candlestickdata_p.h b/src/charts/candlestickchart/candlestickdata_p.h index 8cb1ab8c..233d200b 100644 --- a/src/charts/candlestickchart/candlestickdata_p.h +++ b/src/charts/candlestickchart/candlestickdata_p.h @@ -40,10 +40,11 @@ #define CANDLESTICKDATA_P_H #include <QtCharts/QCandlestickSeries> +#include <QtCharts/private/qchartglobal_p.h> QT_CHARTS_BEGIN_NAMESPACE -class CandlestickData +class QT_CHARTS_PRIVATE_EXPORT CandlestickData { public: CandlestickData() : diff --git a/src/charts/candlestickchart/qcandlestickmodelmapper_p.h b/src/charts/candlestickchart/qcandlestickmodelmapper_p.h index 1d046358..7c14c9e8 100644 --- a/src/charts/candlestickchart/qcandlestickmodelmapper_p.h +++ b/src/charts/candlestickchart/qcandlestickmodelmapper_p.h @@ -40,6 +40,7 @@ #define QCANDLESTICKMODELMAPPER_P_H #include <QtCharts/QCandlestickModelMapper> +#include <QtCharts/private/qchartglobal_p.h> #include <QtCore/QObject> QT_BEGIN_NAMESPACE @@ -50,7 +51,7 @@ QT_CHARTS_BEGIN_NAMESPACE class QCandlestickSet; -class QCandlestickModelMapperPrivate : public QObject +class QT_CHARTS_PRIVATE_EXPORT QCandlestickModelMapperPrivate : public QObject { Q_OBJECT diff --git a/src/charts/candlestickchart/qcandlestickseries_p.h b/src/charts/candlestickchart/qcandlestickseries_p.h index 0994ffc7..e747f8c3 100644 --- a/src/charts/candlestickchart/qcandlestickseries_p.h +++ b/src/charts/candlestickchart/qcandlestickseries_p.h @@ -40,6 +40,7 @@ #define QCANDLESTICKSERIES_P_H #include <private/qabstractseries_p.h> +#include <QtCharts/private/qchartglobal_p.h> QT_CHARTS_BEGIN_NAMESPACE @@ -49,7 +50,7 @@ class QCandlestickSeries; class QCandlestickSet; class QDateTimeAxis; -class QCandlestickSeriesPrivate : public QAbstractSeriesPrivate +class QT_CHARTS_PRIVATE_EXPORT QCandlestickSeriesPrivate : public QAbstractSeriesPrivate { Q_OBJECT diff --git a/src/charts/candlestickchart/qcandlestickset_p.h b/src/charts/candlestickchart/qcandlestickset_p.h index 327e4ee8..58cc41e5 100644 --- a/src/charts/candlestickchart/qcandlestickset_p.h +++ b/src/charts/candlestickchart/qcandlestickset_p.h @@ -40,6 +40,7 @@ #define QCANDLESTICKSET_P_H #include <QtCharts/QChartGlobal> +#include <QtCharts/private/qchartglobal_p.h> #include <QtGui/QBrush> #include <QtGui/QPen> @@ -48,7 +49,7 @@ QT_CHARTS_BEGIN_NAMESPACE class QCandlestickSeriesPrivate; class QCandlestickSet; -class QCandlestickSetPrivate : public QObject +class QT_CHARTS_PRIVATE_EXPORT QCandlestickSetPrivate : public QObject { Q_OBJECT diff --git a/src/charts/chartbackground_p.h b/src/charts/chartbackground_p.h index 4bf9a7b3..a89f6035 100644 --- a/src/charts/chartbackground_p.h +++ b/src/charts/chartbackground_p.h @@ -41,6 +41,7 @@ #include <QtCharts/QChartGlobal> #include <QtWidgets/QGraphicsRectItem> +#include <QtCharts/private/qchartglobal_p.h> QT_BEGIN_NAMESPACE class QGraphicsDropShadowEffect; @@ -48,7 +49,7 @@ QT_END_NAMESPACE QT_CHARTS_BEGIN_NAMESPACE -class ChartBackground: public QGraphicsRectItem +class QT_CHARTS_PRIVATE_EXPORT ChartBackground: public QGraphicsRectItem { public: ChartBackground(QGraphicsItem *parent = 0); diff --git a/src/charts/chartconfig_p.h b/src/charts/chartconfig_p.h index 2c6d51fa..4ce09650 100644 --- a/src/charts/chartconfig_p.h +++ b/src/charts/chartconfig_p.h @@ -40,10 +40,11 @@ #define CHARTCONFIG_H #include <QtCharts/QChartGlobal> +#include <QtCharts/private/qchartglobal_p.h> QT_CHARTS_BEGIN_NAMESPACE -class ChartConfig +class QT_CHARTS_PRIVATE_EXPORT ChartConfig { private: ChartConfig() { diff --git a/src/charts/chartdataset_p.h b/src/charts/chartdataset_p.h index f8a1070c..00b4b2bb 100644 --- a/src/charts/chartdataset_p.h +++ b/src/charts/chartdataset_p.h @@ -42,6 +42,7 @@ #include <QtCharts/QAbstractSeries> #include <private/abstractdomain_p.h> #include <private/qabstractaxis_p.h> +#include <QtCharts/private/qchartglobal_p.h> #include <QtCore/QVector> QT_CHARTS_BEGIN_NAMESPACE @@ -50,7 +51,7 @@ class QAbstractAxis; class ChartPresenter; class GLXYSeriesDataManager; -class Q_AUTOTEST_EXPORT ChartDataSet : public QObject +class QT_CHARTS_PRIVATE_EXPORT ChartDataSet : public QObject { Q_OBJECT public: diff --git a/src/charts/chartelement_p.h b/src/charts/chartelement_p.h index 97740603..f29d6e2c 100644 --- a/src/charts/chartelement_p.h +++ b/src/charts/chartelement_p.h @@ -43,6 +43,7 @@ #include <QtCore/QObject> #include <QtCore/QRect> #include <QGraphicsObject> +#include <QtCharts/private/qchartglobal_p.h> QT_CHARTS_BEGIN_NAMESPACE @@ -53,7 +54,7 @@ class ChartThemeManager; class AbstractDomain; class ChartDataSet; -class ChartElement: public QGraphicsObject +class QT_CHARTS_PRIVATE_EXPORT ChartElement: public QGraphicsObject { public: diff --git a/src/charts/chartitem_p.h b/src/charts/chartitem_p.h index b6b30118..560764b7 100644 --- a/src/charts/chartitem_p.h +++ b/src/charts/chartitem_p.h @@ -41,11 +41,12 @@ #include <private/chartelement_p.h> #include <private/chartpresenter_p.h> +#include <QtCharts/private/qchartglobal_p.h> #include <QtWidgets/QGraphicsItem> QT_CHARTS_BEGIN_NAMESPACE -class ChartItem : public ChartElement +class QT_CHARTS_PRIVATE_EXPORT ChartItem : public ChartElement { Q_OBJECT enum ChartItemTypes { AXIS_ITEM = UserType + 1, XYLINE_ITEM }; diff --git a/src/charts/chartpresenter_p.h b/src/charts/chartpresenter_p.h index e3db5ff8..feda8558 100644 --- a/src/charts/chartpresenter_p.h +++ b/src/charts/chartpresenter_p.h @@ -41,6 +41,7 @@ #include <QtCharts/QChartGlobal> #include <QtCharts/QChart> //because of QChart::ChartThemeId +#include <QtCharts/private/qchartglobal_p.h> #include <private/glwidget_p.h> #include <QtCore/QRectF> #include <QtCore/QMargins> @@ -62,7 +63,7 @@ class ChartTitle; class ChartAnimation; class AbstractChartLayout; -class ChartPresenter: public QObject +class QT_CHARTS_PRIVATE_EXPORT ChartPresenter: public QObject { Q_OBJECT public: diff --git a/src/charts/charts.pro b/src/charts/charts.pro index bf262180..a412ba53 100644 --- a/src/charts/charts.pro +++ b/src/charts/charts.pro @@ -41,7 +41,8 @@ PRIVATE_HEADERS += \ $$PWD/scroller_p.h \ $$PWD/qabstractseries_p.h \ $$PWD/charttitle_p.h \ - $$PWD/charthelpers_p.h + $$PWD/charthelpers_p.h \ + $$PWD/qchartglobal_p.h contains(QT_CONFIG, opengl): PRIVATE_HEADERS += $$PWD/glwidget_p.h diff --git a/src/charts/chartthememanager.cpp b/src/charts/chartthememanager.cpp index 2840b132..6d6f6cb7 100644 --- a/src/charts/chartthememanager.cpp +++ b/src/charts/chartthememanager.cpp @@ -28,7 +28,6 @@ ****************************************************************************/ #include <private/qabstractseries_p.h> #include <private/qabstractaxis_p.h> -#include <QtCore/QTime> //themes #include <private/chartthemesystem_p.h> #include <private/chartthemelight_p.h> @@ -45,7 +44,6 @@ QT_CHARTS_BEGIN_NAMESPACE ChartThemeManager::ChartThemeManager(QChart* chart) : m_chart(chart) { - qsrand(QTime(0, 0, 0).secsTo(QTime::currentTime())); } diff --git a/src/charts/chartthememanager_p.h b/src/charts/chartthememanager_p.h index 0a7d2f81..63a70663 100644 --- a/src/charts/chartthememanager_p.h +++ b/src/charts/chartthememanager_p.h @@ -43,11 +43,12 @@ #include <QtCharts/QChart> #include <QtGui/QColor> #include <QtGui/QGradientStops> +#include <QtCharts/private/qchartglobal_p.h> QT_CHARTS_BEGIN_NAMESPACE class ChartTheme; -class ChartThemeManager: public QObject +class QT_CHARTS_PRIVATE_EXPORT ChartThemeManager: public QObject { Q_OBJECT public: diff --git a/src/charts/charttitle_p.h b/src/charts/charttitle_p.h index 784df23b..aaed6e9c 100644 --- a/src/charts/charttitle_p.h +++ b/src/charts/charttitle_p.h @@ -41,10 +41,11 @@ #include <QtCharts/QChartGlobal> #include <QtWidgets/QGraphicsTextItem> +#include <QtCharts/private/qchartglobal_p.h> QT_CHARTS_BEGIN_NAMESPACE -class ChartTitle : public QGraphicsTextItem +class QT_CHARTS_PRIVATE_EXPORT ChartTitle : public QGraphicsTextItem { public: ChartTitle(QGraphicsItem *parent = 0); diff --git a/src/charts/doc/images/examples_chartthemes_blue_cerulean.png b/src/charts/doc/images/examples_chartthemes_blue_cerulean.png Binary files differindex 69ac3793..858cd7b4 100644 --- a/src/charts/doc/images/examples_chartthemes_blue_cerulean.png +++ b/src/charts/doc/images/examples_chartthemes_blue_cerulean.png diff --git a/src/charts/doc/images/examples_chartthemes_brown_sand.png b/src/charts/doc/images/examples_chartthemes_brown_sand.png Binary files differindex ff5157a9..071595ed 100644 --- a/src/charts/doc/images/examples_chartthemes_brown_sand.png +++ b/src/charts/doc/images/examples_chartthemes_brown_sand.png diff --git a/src/charts/doc/images/examples_chartthemes_light.png b/src/charts/doc/images/examples_chartthemes_light.png Binary files differindex e6a64992..dedb6c6d 100644 --- a/src/charts/doc/images/examples_chartthemes_light.png +++ b/src/charts/doc/images/examples_chartthemes_light.png diff --git a/src/charts/doc/images/examples_qmlchart1.png b/src/charts/doc/images/examples_qmlchart1.png Binary files differindex 6a3c7812..38e7ab27 100644 --- a/src/charts/doc/images/examples_qmlchart1.png +++ b/src/charts/doc/images/examples_qmlchart1.png diff --git a/src/charts/doc/images/examples_qmlchart10.png b/src/charts/doc/images/examples_qmlchart10.png Binary files differindex 5fdd744c..e0429509 100644 --- a/src/charts/doc/images/examples_qmlchart10.png +++ b/src/charts/doc/images/examples_qmlchart10.png diff --git a/src/charts/doc/images/examples_qmlchart11.png b/src/charts/doc/images/examples_qmlchart11.png Binary files differindex 663967e7..dc072154 100644 --- a/src/charts/doc/images/examples_qmlchart11.png +++ b/src/charts/doc/images/examples_qmlchart11.png diff --git a/src/charts/doc/images/examples_qmlchart12.png b/src/charts/doc/images/examples_qmlchart12.png Binary files differindex e00465ad..e25945af 100644 --- a/src/charts/doc/images/examples_qmlchart12.png +++ b/src/charts/doc/images/examples_qmlchart12.png diff --git a/src/charts/doc/images/examples_qmlchart2.png b/src/charts/doc/images/examples_qmlchart2.png Binary files differindex 36a7873b..bcff9b95 100644 --- a/src/charts/doc/images/examples_qmlchart2.png +++ b/src/charts/doc/images/examples_qmlchart2.png diff --git a/src/charts/doc/images/examples_qmlchart3.png b/src/charts/doc/images/examples_qmlchart3.png Binary files differindex 74e3299c..d97636fd 100644 --- a/src/charts/doc/images/examples_qmlchart3.png +++ b/src/charts/doc/images/examples_qmlchart3.png diff --git a/src/charts/doc/images/examples_qmlchart4.png b/src/charts/doc/images/examples_qmlchart4.png Binary files differindex 7b0d96a3..5f2e3c56 100644 --- a/src/charts/doc/images/examples_qmlchart4.png +++ b/src/charts/doc/images/examples_qmlchart4.png diff --git a/src/charts/doc/images/examples_qmlchart5.png b/src/charts/doc/images/examples_qmlchart5.png Binary files differindex 129a4e90..76a61f9d 100644 --- a/src/charts/doc/images/examples_qmlchart5.png +++ b/src/charts/doc/images/examples_qmlchart5.png diff --git a/src/charts/doc/images/examples_qmlchart6.png b/src/charts/doc/images/examples_qmlchart6.png Binary files differindex 6968ffe3..2cfc889d 100644 --- a/src/charts/doc/images/examples_qmlchart6.png +++ b/src/charts/doc/images/examples_qmlchart6.png diff --git a/src/charts/doc/images/examples_qmlchart7.png b/src/charts/doc/images/examples_qmlchart7.png Binary files differindex acf29aed..99604414 100644 --- a/src/charts/doc/images/examples_qmlchart7.png +++ b/src/charts/doc/images/examples_qmlchart7.png diff --git a/src/charts/doc/images/examples_qmlchart8.png b/src/charts/doc/images/examples_qmlchart8.png Binary files differindex d1671758..3c4147b6 100644 --- a/src/charts/doc/images/examples_qmlchart8.png +++ b/src/charts/doc/images/examples_qmlchart8.png diff --git a/src/charts/doc/images/examples_qmlchart9.png b/src/charts/doc/images/examples_qmlchart9.png Binary files differindex 1ebbc7dc..c8a236fe 100644 --- a/src/charts/doc/images/examples_qmlchart9.png +++ b/src/charts/doc/images/examples_qmlchart9.png diff --git a/src/charts/doc/qtcharts.qdocconf b/src/charts/doc/qtcharts.qdocconf index 31d53d4f..ce695886 100644 --- a/src/charts/doc/qtcharts.qdocconf +++ b/src/charts/doc/qtcharts.qdocconf @@ -59,4 +59,5 @@ navigation.landingpage = Qt Charts navigation.cppclassespage = Qt Charts C++ Classes navigation.qmltypespage = Qt Charts QML Types -manifestmeta.highlighted.names += "QtCharts/Chart Themes Example" +manifestmeta.highlighted.names = "QtCharts/Chart Themes Example" \ + "QtCharts/Qml Charts Example" diff --git a/src/charts/doc/src/examples-chartthemes.qdoc b/src/charts/doc/src/examples-chartthemes.qdoc index bc9612bb..fc87f765 100644 --- a/src/charts/doc/src/examples-chartthemes.qdoc +++ b/src/charts/doc/src/examples-chartthemes.qdoc @@ -34,13 +34,76 @@ \brief The example shows the look and feel of the different built-in themes. - This example shows the look and feel of the different built-in themes for all supported chart - types. In order to give the result a more harmonious look, the background palette of the - application is customized to the theme selected. + This example shows the look and feel of the different built-in themes for some of the supported + chart types. \image examples_chartthemes_light.png \image examples_chartthemes_brown_sand.png \image examples_chartthemes_blue_cerulean.png \include examples-run.qdocinc + + \section1 Creating Charts + + The charts of different types are generated and added to the layout separately. For example, the + line chart is created as follows. The creation of other chart types is similar. + + First a chart is created. + + \snippet chartthemes/themewidget.cpp 1 + + A common set of random data is generated and placed in a list. This list is used in each chart + type to add data to the series of the chart. For the line series, QLineSeries instances are + created and added to the chart. + + \snippet chartthemes/themewidget.cpp 2 + + Default axes are created for the line series. We also specify ranges for the axes based on the + range of the data used for the series. + + \snippet chartthemes/themewidget.cpp 3 + + We also want to add more space between the labels and the y-axes. For this we specify a label + format that adds space characters to the labels. + + \snippet chartthemes/themewidget.cpp 4 + + Finally the line chart is added to the grid layout. + + \snippet chartthemes/themewidget.cpp 5 + + \section1 Changing Theme + + The user can select a built-in theme to be used in the example. This theme is then applied to + all charts in the layout. + + \snippet chartthemes/themewidget.cpp 6 + + \snippet chartthemes/themewidget.cpp 7 + + In order to give the result a more harmonious look, the background palette of the application is + customized to match the selected theme. The QPalette::Window and QPalette::WindowText roles are + set based on the selected theme. + + \snippet chartthemes/themewidget.cpp 8 + + \section1 Changing Animation, Legend and Anti-Aliasing + + In this example, it is also possible to see how changing animation, legend and anti-aliasing + affects the appearance of the chart. + + Based on the user's selection, the used animation type is set on each chart. It is possible to have + no animations in the chart, or have animations for grid axis or series, or both. + + \snippet chartthemes/themewidget.cpp 9 + + The chart can be shown with a legend. The legend can be aligned to different sides of the chart. + + \snippet chartthemes/themewidget.cpp 10 + + The user can also see how changing anti-aliasing option changes the appearance of the chart. + Anti-aliasing is updated based on the user's selection. + + \snippet chartthemes/themewidget.cpp 11 + */ diff --git a/src/charts/domain/abstractdomain_p.h b/src/charts/domain/abstractdomain_p.h index b6f5d7dd..9a5c8022 100644 --- a/src/charts/domain/abstractdomain_p.h +++ b/src/charts/domain/abstractdomain_p.h @@ -39,6 +39,7 @@ #ifndef ABSTRACTDOMAIN_H #define ABSTRACTDOMAIN_H #include <QtCharts/QChartGlobal> +#include <QtCharts/private/qchartglobal_p.h> #include <QtCore/QRectF> #include <QtCore/QSizeF> #include <QtCore/QDebug> @@ -47,7 +48,7 @@ QT_CHARTS_BEGIN_NAMESPACE class QAbstractAxis; -class Q_AUTOTEST_EXPORT AbstractDomain: public QObject +class QT_CHARTS_PRIVATE_EXPORT AbstractDomain: public QObject { Q_OBJECT public: diff --git a/src/charts/domain/logxlogydomain_p.h b/src/charts/domain/logxlogydomain_p.h index b91c99b4..e30dd8d4 100644 --- a/src/charts/domain/logxlogydomain_p.h +++ b/src/charts/domain/logxlogydomain_p.h @@ -39,12 +39,13 @@ #ifndef LOGXLOGYDOMAIN_H #define LOGXLOGYDOMAIN_H #include <private/abstractdomain_p.h> +#include <QtCharts/private/qchartglobal_p.h> #include <QtCore/QRectF> #include <QtCore/QSizeF> QT_CHARTS_BEGIN_NAMESPACE -class Q_AUTOTEST_EXPORT LogXLogYDomain: public AbstractDomain +class QT_CHARTS_PRIVATE_EXPORT LogXLogYDomain: public AbstractDomain { Q_OBJECT public: diff --git a/src/charts/domain/logxlogypolardomain_p.h b/src/charts/domain/logxlogypolardomain_p.h index 64c16d43..f25e6e03 100644 --- a/src/charts/domain/logxlogypolardomain_p.h +++ b/src/charts/domain/logxlogypolardomain_p.h @@ -39,12 +39,13 @@ #ifndef LOGXLOGYPOLARDOMAIN_H #define LOGXLOGYPOLARDOMAIN_H #include <private/polardomain_p.h> +#include <QtCharts/private/qchartglobal_p.h> #include <QtCore/QRectF> #include <QtCore/QSizeF> QT_CHARTS_BEGIN_NAMESPACE -class Q_AUTOTEST_EXPORT LogXLogYPolarDomain: public PolarDomain +class QT_CHARTS_PRIVATE_EXPORT LogXLogYPolarDomain: public PolarDomain { Q_OBJECT public: diff --git a/src/charts/domain/logxydomain_p.h b/src/charts/domain/logxydomain_p.h index d8559147..858a6d2e 100644 --- a/src/charts/domain/logxydomain_p.h +++ b/src/charts/domain/logxydomain_p.h @@ -39,12 +39,13 @@ #ifndef LOGXYDOMAIN_H #define LOGXYDOMAIN_H #include <private/abstractdomain_p.h> +#include <QtCharts/private/qchartglobal_p.h> #include <QtCore/QRectF> #include <QtCore/QSizeF> QT_CHARTS_BEGIN_NAMESPACE -class Q_AUTOTEST_EXPORT LogXYDomain: public AbstractDomain +class QT_CHARTS_PRIVATE_EXPORT LogXYDomain: public AbstractDomain { Q_OBJECT public: diff --git a/src/charts/domain/logxypolardomain_p.h b/src/charts/domain/logxypolardomain_p.h index fdf42b14..6057be1c 100644 --- a/src/charts/domain/logxypolardomain_p.h +++ b/src/charts/domain/logxypolardomain_p.h @@ -39,12 +39,13 @@ #ifndef LOGXYPOLARDOMAIN_H #define LOGXYPOLARDOMAIN_H #include <private/polardomain_p.h> +#include <QtCharts/private/qchartglobal_p.h> #include <QtCore/QRectF> #include <QtCore/QSizeF> QT_CHARTS_BEGIN_NAMESPACE -class Q_AUTOTEST_EXPORT LogXYPolarDomain: public PolarDomain +class QT_CHARTS_PRIVATE_EXPORT LogXYPolarDomain: public PolarDomain { Q_OBJECT public: diff --git a/src/charts/domain/polardomain.cpp b/src/charts/domain/polardomain.cpp index 1d5154e4..3c6e6b57 100644 --- a/src/charts/domain/polardomain.cpp +++ b/src/charts/domain/polardomain.cpp @@ -89,8 +89,8 @@ QVector<QPointF> PolarDomain::calculateGeometryPoints(const QVector<QPointF> &ve QPointF PolarDomain::polarCoordinateToPoint(qreal angularCoordinate, qreal radialCoordinate) const { - qreal dx = qSin(angularCoordinate * (M_PI / 180)) * radialCoordinate; - qreal dy = qCos(angularCoordinate * (M_PI / 180)) * radialCoordinate; + qreal dx = qSin(qDegreesToRadians(angularCoordinate)) * radialCoordinate; + qreal dy = qCos(qDegreesToRadians(angularCoordinate)) * radialCoordinate; return QPointF(dx, -dy); } diff --git a/src/charts/domain/polardomain_p.h b/src/charts/domain/polardomain_p.h index bcb4b6e1..14dc4236 100644 --- a/src/charts/domain/polardomain_p.h +++ b/src/charts/domain/polardomain_p.h @@ -39,12 +39,13 @@ #ifndef POLARDOMAIN_H #define POLARDOMAIN_H #include <private/abstractdomain_p.h> +#include <QtCharts/private/qchartglobal_p.h> #include <QtCore/QRectF> #include <QtCore/QSizeF> QT_CHARTS_BEGIN_NAMESPACE -class Q_AUTOTEST_EXPORT PolarDomain: public AbstractDomain +class QT_CHARTS_PRIVATE_EXPORT PolarDomain: public AbstractDomain { Q_OBJECT public: diff --git a/src/charts/domain/xlogydomain_p.h b/src/charts/domain/xlogydomain_p.h index f0f7bed3..f564f950 100644 --- a/src/charts/domain/xlogydomain_p.h +++ b/src/charts/domain/xlogydomain_p.h @@ -39,12 +39,13 @@ #ifndef XLOGYDOMAIN_H #define XLOGYDOMAIN_H #include <private/abstractdomain_p.h> +#include <QtCharts/private/qchartglobal_p.h> #include <QtCore/QRectF> #include <QtCore/QSizeF> QT_CHARTS_BEGIN_NAMESPACE -class Q_AUTOTEST_EXPORT XLogYDomain: public AbstractDomain +class QT_CHARTS_PRIVATE_EXPORT XLogYDomain: public AbstractDomain { Q_OBJECT public: diff --git a/src/charts/domain/xlogypolardomain_p.h b/src/charts/domain/xlogypolardomain_p.h index dfc3405e..e11d691e 100644 --- a/src/charts/domain/xlogypolardomain_p.h +++ b/src/charts/domain/xlogypolardomain_p.h @@ -39,12 +39,13 @@ #ifndef XLOGYPOLARDOMAIN_H #define XLOGYPOLARDOMAIN_H #include <private/polardomain_p.h> +#include <QtCharts/private/qchartglobal_p.h> #include <QtCore/QRectF> #include <QtCore/QSizeF> QT_CHARTS_BEGIN_NAMESPACE -class Q_AUTOTEST_EXPORT XLogYPolarDomain: public PolarDomain +class QT_CHARTS_PRIVATE_EXPORT XLogYPolarDomain: public PolarDomain { Q_OBJECT public: diff --git a/src/charts/domain/xydomain_p.h b/src/charts/domain/xydomain_p.h index c4d51a91..97c89989 100644 --- a/src/charts/domain/xydomain_p.h +++ b/src/charts/domain/xydomain_p.h @@ -39,12 +39,13 @@ #ifndef XYDOMAIN_H #define XYDOMAIN_H #include <private/abstractdomain_p.h> +#include <QtCharts/private/qchartglobal_p.h> #include <QtCore/QRectF> #include <QtCore/QSizeF> QT_CHARTS_BEGIN_NAMESPACE -class Q_AUTOTEST_EXPORT XYDomain: public AbstractDomain +class QT_CHARTS_PRIVATE_EXPORT XYDomain: public AbstractDomain { Q_OBJECT public: diff --git a/src/charts/domain/xypolardomain_p.h b/src/charts/domain/xypolardomain_p.h index a7bc55c3..9d027661 100644 --- a/src/charts/domain/xypolardomain_p.h +++ b/src/charts/domain/xypolardomain_p.h @@ -39,11 +39,12 @@ #ifndef XYPOLARDOMAIN_H #define XYPOLARDOMAIN_H #include <private/polardomain_p.h> +#include <QtCharts/private/qchartglobal_p.h> #include <QtCore/QRectF> QT_CHARTS_BEGIN_NAMESPACE -class Q_AUTOTEST_EXPORT XYPolarDomain: public PolarDomain +class QT_CHARTS_PRIVATE_EXPORT XYPolarDomain: public PolarDomain { Q_OBJECT public: diff --git a/src/charts/glwidget_p.h b/src/charts/glwidget_p.h index f80575bf..f2e85a34 100644 --- a/src/charts/glwidget_p.h +++ b/src/charts/glwidget_p.h @@ -73,13 +73,13 @@ public Q_SLOTS: void cleanXYSeriesResources(const QXYSeries *series); protected: - void initializeGL() Q_DECL_OVERRIDE; - void paintGL() Q_DECL_OVERRIDE; - void resizeGL(int width, int height) Q_DECL_OVERRIDE; - void mouseDoubleClickEvent(QMouseEvent *event) Q_DECL_OVERRIDE; - void mouseMoveEvent(QMouseEvent *event) Q_DECL_OVERRIDE; - void mousePressEvent(QMouseEvent *event) Q_DECL_OVERRIDE; - void mouseReleaseEvent(QMouseEvent *event) Q_DECL_OVERRIDE; + void initializeGL() override; + void paintGL() override; + void resizeGL(int width, int height) override; + void mouseDoubleClickEvent(QMouseEvent *event) override; + void mouseMoveEvent(QMouseEvent *event) override; + void mousePressEvent(QMouseEvent *event) override; + void mouseReleaseEvent(QMouseEvent *event) override; private: QXYSeries *findSeriesAtEvent(QMouseEvent *event); diff --git a/src/charts/layout/abstractchartlayout_p.h b/src/charts/layout/abstractchartlayout_p.h index f2ef7861..6cb07f97 100644 --- a/src/charts/layout/abstractchartlayout_p.h +++ b/src/charts/layout/abstractchartlayout_p.h @@ -42,6 +42,7 @@ #include <QtWidgets/QGraphicsLayout> #include <QtCore/QMargins> #include <QtCharts/QChartGlobal> +#include <QtCharts/private/qchartglobal_p.h> QT_CHARTS_BEGIN_NAMESPACE @@ -51,7 +52,7 @@ class ChartPresenter; class QLegend; class ChartBackground; -class AbstractChartLayout : public QGraphicsLayout +class QT_CHARTS_PRIVATE_EXPORT AbstractChartLayout : public QGraphicsLayout { public: AbstractChartLayout(ChartPresenter *presenter); diff --git a/src/charts/layout/cartesianchartlayout_p.h b/src/charts/layout/cartesianchartlayout_p.h index 10b4b988..d225e2af 100644 --- a/src/charts/layout/cartesianchartlayout_p.h +++ b/src/charts/layout/cartesianchartlayout_p.h @@ -40,10 +40,11 @@ #define CARTESIANCHARTLAYOUT_H #include <private/abstractchartlayout_p.h> +#include <QtCharts/private/qchartglobal_p.h> QT_CHARTS_BEGIN_NAMESPACE -class CartesianChartLayout : public AbstractChartLayout +class QT_CHARTS_PRIVATE_EXPORT CartesianChartLayout : public AbstractChartLayout { public: CartesianChartLayout(ChartPresenter *presenter); diff --git a/src/charts/layout/polarchartlayout_p.h b/src/charts/layout/polarchartlayout_p.h index 077b0935..597c4a3c 100644 --- a/src/charts/layout/polarchartlayout_p.h +++ b/src/charts/layout/polarchartlayout_p.h @@ -40,10 +40,11 @@ #define POLARCHARTLAYOUT_H #include <private/abstractchartlayout_p.h> +#include <QtCharts/private/qchartglobal_p.h> QT_CHARTS_BEGIN_NAMESPACE -class PolarChartLayout : public AbstractChartLayout +class QT_CHARTS_PRIVATE_EXPORT PolarChartLayout : public AbstractChartLayout { public: PolarChartLayout(ChartPresenter *presenter); diff --git a/src/charts/legend/legendlayout_p.h b/src/charts/legend/legendlayout_p.h index a9165973..7933c245 100644 --- a/src/charts/legend/legendlayout_p.h +++ b/src/charts/legend/legendlayout_p.h @@ -40,13 +40,14 @@ #define LEGENDLAYOUT_H #include <QtWidgets/QGraphicsLayout> #include <QtCharts/QChartGlobal> +#include <QtCharts/private/qchartglobal_p.h> QT_CHARTS_BEGIN_NAMESPACE class QLegend; class LegendMarkerItem; -class LegendLayout : public QGraphicsLayout +class QT_CHARTS_PRIVATE_EXPORT LegendLayout : public QGraphicsLayout { public: diff --git a/src/charts/legend/legendmarkeritem.cpp b/src/charts/legend/legendmarkeritem.cpp index 39ac8b6f..8b83a955 100644 --- a/src/charts/legend/legendmarkeritem.cpp +++ b/src/charts/legend/legendmarkeritem.cpp @@ -62,7 +62,6 @@ LegendMarkerItem::LegendMarkerItem(QLegendMarkerPrivate *marker, QGraphicsObject m_hovering(false), m_itemType(TypeRect) { - updateMarkerShapeAndSize(); m_textItem->document()->setDocumentMargin(ChartPresenter::textMargin()); setAcceptHoverEvents(true); } @@ -147,6 +146,9 @@ QBrush LegendMarkerItem::labelBrush() const void LegendMarkerItem::setGeometry(const QRectF &rect) { + if (!m_markerItem) + updateMarkerShapeAndSize(); + const qreal width = rect.width(); const qreal markerWidth = effectiveMarkerWidth(); const qreal x = m_margin + markerWidth + m_space + m_margin; diff --git a/src/charts/legend/legendmarkeritem_p.h b/src/charts/legend/legendmarkeritem_p.h index 5325f8d1..d3d71de3 100644 --- a/src/charts/legend/legendmarkeritem_p.h +++ b/src/charts/legend/legendmarkeritem_p.h @@ -47,12 +47,13 @@ #include <QtGui/QPen> #include <QtWidgets/QGraphicsTextItem> #include <QtWidgets/QGraphicsLayoutItem> +#include <QtCharts/private/qchartglobal_p.h> QT_CHARTS_BEGIN_NAMESPACE class QLegendMarkerPrivate; -class LegendMarkerItem : public QGraphicsObject, public QGraphicsLayoutItem +class QT_CHARTS_PRIVATE_EXPORT LegendMarkerItem : public QGraphicsObject, public QGraphicsLayoutItem { Q_OBJECT Q_INTERFACES(QGraphicsLayoutItem) diff --git a/src/charts/legend/legendscroller_p.h b/src/charts/legend/legendscroller_p.h index 89cee4c1..fc57a9d3 100644 --- a/src/charts/legend/legendscroller_p.h +++ b/src/charts/legend/legendscroller_p.h @@ -43,10 +43,11 @@ #include <QtCharts/qlegend.h> #include <private/qlegend_p.h> #include <private/scroller_p.h> +#include <QtCharts/private/qchartglobal_p.h> QT_CHARTS_BEGIN_NAMESPACE -class LegendScroller: public QLegend, public Scroller +class QT_CHARTS_PRIVATE_EXPORT LegendScroller: public QLegend, public Scroller { Q_OBJECT diff --git a/src/charts/legend/qarealegendmarker.h b/src/charts/legend/qarealegendmarker.h index e7541587..3d88fa08 100644 --- a/src/charts/legend/qarealegendmarker.h +++ b/src/charts/legend/qarealegendmarker.h @@ -43,7 +43,7 @@ class QT_CHARTS_EXPORT QAreaLegendMarker : public QLegendMarker Q_OBJECT public: - explicit QAreaLegendMarker(QAreaSeries *series, QLegend *legend, QObject *parent = Q_NULLPTR); + explicit QAreaLegendMarker(QAreaSeries *series, QLegend *legend, QObject *parent = nullptr); virtual ~QAreaLegendMarker(); virtual LegendMarkerType type() { return LegendMarkerTypeArea; } @@ -52,7 +52,7 @@ public: virtual QAreaSeries* series(); protected: - QAreaLegendMarker(QAreaLegendMarkerPrivate &d, QObject *parent = Q_NULLPTR); + QAreaLegendMarker(QAreaLegendMarkerPrivate &d, QObject *parent = nullptr); private: Q_DECLARE_PRIVATE(QAreaLegendMarker) diff --git a/src/charts/legend/qarealegendmarker_p.h b/src/charts/legend/qarealegendmarker_p.h index 3afa3321..f44f8e74 100644 --- a/src/charts/legend/qarealegendmarker_p.h +++ b/src/charts/legend/qarealegendmarker_p.h @@ -43,12 +43,13 @@ #include <private/qlegendmarker_p.h> #include <private/legendmarkeritem_p.h> #include <QtCharts/QAreaSeries> +#include <QtCharts/private/qchartglobal_p.h> QT_CHARTS_BEGIN_NAMESPACE class QAreaLegendMarker; -class QAreaLegendMarkerPrivate : public QLegendMarkerPrivate +class QT_CHARTS_PRIVATE_EXPORT QAreaLegendMarkerPrivate : public QLegendMarkerPrivate { Q_OBJECT public: diff --git a/src/charts/legend/qbarlegendmarker.h b/src/charts/legend/qbarlegendmarker.h index 127d3f85..e1b3dcda 100644 --- a/src/charts/legend/qbarlegendmarker.h +++ b/src/charts/legend/qbarlegendmarker.h @@ -43,7 +43,7 @@ class QT_CHARTS_EXPORT QBarLegendMarker : public QLegendMarker { Q_OBJECT public: - explicit QBarLegendMarker(QAbstractBarSeries *series, QBarSet *barset, QLegend *legend, QObject *parent = Q_NULLPTR); + explicit QBarLegendMarker(QAbstractBarSeries *series, QBarSet *barset, QLegend *legend, QObject *parent = nullptr); virtual ~QBarLegendMarker(); virtual LegendMarkerType type() { return LegendMarkerTypeBar; } @@ -53,7 +53,7 @@ public: QBarSet* barset(); protected: - QBarLegendMarker(QBarLegendMarkerPrivate &d, QObject *parent = Q_NULLPTR); + QBarLegendMarker(QBarLegendMarkerPrivate &d, QObject *parent = nullptr); private: Q_DECLARE_PRIVATE(QBarLegendMarker) diff --git a/src/charts/legend/qbarlegendmarker_p.h b/src/charts/legend/qbarlegendmarker_p.h index 58404111..7bfabd69 100644 --- a/src/charts/legend/qbarlegendmarker_p.h +++ b/src/charts/legend/qbarlegendmarker_p.h @@ -44,12 +44,13 @@ #include <private/legendmarkeritem_p.h> #include <QtCharts/QAbstractBarSeries> #include <QtCharts/QBarSet> +#include <QtCharts/private/qchartglobal_p.h> QT_CHARTS_BEGIN_NAMESPACE class QBarLegendMarker; -class QBarLegendMarkerPrivate : public QLegendMarkerPrivate +class QT_CHARTS_PRIVATE_EXPORT QBarLegendMarkerPrivate : public QLegendMarkerPrivate { Q_OBJECT public: diff --git a/src/charts/legend/qboxplotlegendmarker.h b/src/charts/legend/qboxplotlegendmarker.h index 2f977325..db6e9edd 100644 --- a/src/charts/legend/qboxplotlegendmarker.h +++ b/src/charts/legend/qboxplotlegendmarker.h @@ -43,7 +43,7 @@ class QT_CHARTS_EXPORT QBoxPlotLegendMarker : public QLegendMarker Q_OBJECT public: - explicit QBoxPlotLegendMarker(QBoxPlotSeries *series, QLegend *legend, QObject *parent = Q_NULLPTR); + explicit QBoxPlotLegendMarker(QBoxPlotSeries *series, QLegend *legend, QObject *parent = nullptr); virtual ~QBoxPlotLegendMarker(); virtual LegendMarkerType type() { return LegendMarkerTypeBoxPlot; } @@ -52,7 +52,7 @@ public: virtual QBoxPlotSeries* series(); protected: - QBoxPlotLegendMarker(QBoxPlotLegendMarkerPrivate &d, QObject *parent = Q_NULLPTR); + QBoxPlotLegendMarker(QBoxPlotLegendMarkerPrivate &d, QObject *parent = nullptr); private: Q_DECLARE_PRIVATE(QBoxPlotLegendMarker) diff --git a/src/charts/legend/qboxplotlegendmarker_p.h b/src/charts/legend/qboxplotlegendmarker_p.h index 1c788137..5d82965f 100644 --- a/src/charts/legend/qboxplotlegendmarker_p.h +++ b/src/charts/legend/qboxplotlegendmarker_p.h @@ -43,12 +43,13 @@ #include <private/qlegendmarker_p.h> #include <private/legendmarkeritem_p.h> #include <QtCharts/QBoxPlotSeries> +#include <QtCharts/private/qchartglobal_p.h> QT_CHARTS_BEGIN_NAMESPACE class QBoxPlotLegendMarker; -class QBoxPlotLegendMarkerPrivate : public QLegendMarkerPrivate +class QT_CHARTS_PRIVATE_EXPORT QBoxPlotLegendMarkerPrivate : public QLegendMarkerPrivate { Q_OBJECT public: diff --git a/src/charts/legend/qcandlesticklegendmarker_p.h b/src/charts/legend/qcandlesticklegendmarker_p.h index 1c786b3a..b92ea626 100644 --- a/src/charts/legend/qcandlesticklegendmarker_p.h +++ b/src/charts/legend/qcandlesticklegendmarker_p.h @@ -40,13 +40,14 @@ #define QCANDLESTICKLEGENDMARKER_P_H #include <private/qlegendmarker_p.h> +#include <QtCharts/private/qchartglobal_p.h> QT_CHARTS_BEGIN_NAMESPACE class QCandlestickLegendMarker; class QCandlestickSeries; -class QCandlestickLegendMarkerPrivate : public QLegendMarkerPrivate +class QT_CHARTS_PRIVATE_EXPORT QCandlestickLegendMarkerPrivate : public QLegendMarkerPrivate { Q_OBJECT public: diff --git a/src/charts/legend/qlegend.h b/src/charts/legend/qlegend.h index fa3a8258..7b5b3a2e 100644 --- a/src/charts/legend/qlegend.h +++ b/src/charts/legend/qlegend.h @@ -69,7 +69,7 @@ public: ~QLegend(); - void paint(QPainter *painter, const QStyleOptionGraphicsItem *option, QWidget *widget = Q_NULLPTR); + void paint(QPainter *painter, const QStyleOptionGraphicsItem *option, QWidget *widget = nullptr); void setBrush(const QBrush &brush); QBrush brush() const; @@ -99,7 +99,7 @@ public: void setBackgroundVisible(bool visible = true); bool isBackgroundVisible() const; - QList <QLegendMarker*> markers(QAbstractSeries *series = Q_NULLPTR) const; + QList <QLegendMarker*> markers(QAbstractSeries *series = nullptr) const; bool reverseMarkers(); void setReverseMarkers(bool reverseMarkers = true); diff --git a/src/charts/legend/qlegend_p.h b/src/charts/legend/qlegend_p.h index 83dd0c0b..0f69004c 100644 --- a/src/charts/legend/qlegend_p.h +++ b/src/charts/legend/qlegend_p.h @@ -40,6 +40,7 @@ #define QLEGEND_P_H #include <QtCharts/QLegend> +#include <QtCharts/private/qchartglobal_p.h> QT_CHARTS_BEGIN_NAMESPACE @@ -49,7 +50,7 @@ class QAbstractSeries; class LegendLayout; class QLegendMarker; -class QLegendPrivate : public QObject +class QT_CHARTS_PRIVATE_EXPORT QLegendPrivate : public QObject { Q_OBJECT public: diff --git a/src/charts/legend/qlegendmarker.h b/src/charts/legend/qlegendmarker.h index 72ad384c..1ae65f0e 100644 --- a/src/charts/legend/qlegendmarker.h +++ b/src/charts/legend/qlegendmarker.h @@ -105,7 +105,7 @@ Q_SIGNALS: void shapeChanged(); protected: - explicit QLegendMarker(QLegendMarkerPrivate &d, QObject *parent = Q_NULLPTR); + explicit QLegendMarker(QLegendMarkerPrivate &d, QObject *parent = nullptr); QScopedPointer<QLegendMarkerPrivate> d_ptr; friend class QLegendPrivate; diff --git a/src/charts/legend/qlegendmarker_p.h b/src/charts/legend/qlegendmarker_p.h index 00d24542..cd2ebea3 100644 --- a/src/charts/legend/qlegendmarker_p.h +++ b/src/charts/legend/qlegendmarker_p.h @@ -44,6 +44,7 @@ #include <QtGui/QBrush> #include <QtGui/QPen> #include <QtWidgets/QGraphicsLayoutItem> +#include <QtCharts/private/qchartglobal_p.h> QT_CHARTS_BEGIN_NAMESPACE @@ -53,7 +54,7 @@ class QLegend; class QLegendMarker; class LegendMarkerItem; -class QLegendMarkerPrivate : public QObject +class QT_CHARTS_PRIVATE_EXPORT QLegendMarkerPrivate : public QObject { Q_OBJECT public: diff --git a/src/charts/legend/qpielegendmarker.h b/src/charts/legend/qpielegendmarker.h index 233f5558..a4a0463d 100644 --- a/src/charts/legend/qpielegendmarker.h +++ b/src/charts/legend/qpielegendmarker.h @@ -44,7 +44,7 @@ class QT_CHARTS_EXPORT QPieLegendMarker : public QLegendMarker Q_OBJECT public: - explicit QPieLegendMarker(QPieSeries *series, QPieSlice *slice, QLegend *legend, QObject *parent = Q_NULLPTR); + explicit QPieLegendMarker(QPieSeries *series, QPieSlice *slice, QLegend *legend, QObject *parent = nullptr); virtual ~QPieLegendMarker(); virtual LegendMarkerType type() { return LegendMarkerTypePie; } @@ -54,7 +54,7 @@ public: QPieSlice* slice(); protected: - QPieLegendMarker(QPieLegendMarkerPrivate &d, QObject *parent = Q_NULLPTR); + QPieLegendMarker(QPieLegendMarkerPrivate &d, QObject *parent = nullptr); private: Q_DECLARE_PRIVATE(QPieLegendMarker) diff --git a/src/charts/legend/qpielegendmarker_p.h b/src/charts/legend/qpielegendmarker_p.h index 6aeb4ac9..72bdd7ec 100644 --- a/src/charts/legend/qpielegendmarker_p.h +++ b/src/charts/legend/qpielegendmarker_p.h @@ -44,12 +44,13 @@ #include <private/legendmarkeritem_p.h> #include <QtCharts/QPieSeries> #include <QtCharts/QPieSlice> +#include <QtCharts/private/qchartglobal_p.h> QT_CHARTS_BEGIN_NAMESPACE class QPieLegendMarker; -class QPieLegendMarkerPrivate : public QLegendMarkerPrivate +class QT_CHARTS_PRIVATE_EXPORT QPieLegendMarkerPrivate : public QLegendMarkerPrivate { Q_OBJECT public: diff --git a/src/charts/legend/qxylegendmarker.h b/src/charts/legend/qxylegendmarker.h index 0c452305..0a714428 100644 --- a/src/charts/legend/qxylegendmarker.h +++ b/src/charts/legend/qxylegendmarker.h @@ -42,7 +42,7 @@ class QT_CHARTS_EXPORT QXYLegendMarker : public QLegendMarker { Q_OBJECT public: - explicit QXYLegendMarker(QXYSeries *series, QLegend *legend, QObject *parent = Q_NULLPTR); + explicit QXYLegendMarker(QXYSeries *series, QLegend *legend, QObject *parent = nullptr); virtual ~QXYLegendMarker(); virtual LegendMarkerType type() { return LegendMarkerTypeXY; } @@ -51,7 +51,7 @@ public: virtual QXYSeries* series(); protected: - QXYLegendMarker(QXYLegendMarkerPrivate &d, QObject *parent = Q_NULLPTR); + QXYLegendMarker(QXYLegendMarkerPrivate &d, QObject *parent = nullptr); private: Q_DECLARE_PRIVATE(QXYLegendMarker) diff --git a/src/charts/legend/qxylegendmarker_p.h b/src/charts/legend/qxylegendmarker_p.h index 7322c116..995a3226 100644 --- a/src/charts/legend/qxylegendmarker_p.h +++ b/src/charts/legend/qxylegendmarker_p.h @@ -43,12 +43,13 @@ #include <private/qlegendmarker_p.h> #include <private/legendmarkeritem_p.h> #include <QtCharts/QXYSeries> +#include <QtCharts/private/qchartglobal_p.h> QT_CHARTS_BEGIN_NAMESPACE class QXYLegendMarker; -class QXYLegendMarkerPrivate : public QLegendMarkerPrivate +class QT_CHARTS_PRIVATE_EXPORT QXYLegendMarkerPrivate : public QLegendMarkerPrivate { Q_OBJECT public: diff --git a/src/charts/linechart/linechartitem_p.h b/src/charts/linechart/linechartitem_p.h index d4b64122..fd335168 100644 --- a/src/charts/linechart/linechartitem_p.h +++ b/src/charts/linechart/linechartitem_p.h @@ -43,13 +43,14 @@ #include <private/xychart_p.h> #include <QtCharts/QChart> #include <QtGui/QPen> +#include <QtCharts/private/qchartglobal_p.h> QT_CHARTS_BEGIN_NAMESPACE class QLineSeries; class ChartPresenter; -class LineChartItem : public XYChart +class QT_CHARTS_PRIVATE_EXPORT LineChartItem : public XYChart { Q_OBJECT Q_INTERFACES(QGraphicsItem) diff --git a/src/charts/linechart/qlineseries.h b/src/charts/linechart/qlineseries.h index ef694244..654afac2 100644 --- a/src/charts/linechart/qlineseries.h +++ b/src/charts/linechart/qlineseries.h @@ -43,12 +43,12 @@ class QT_CHARTS_EXPORT QLineSeries : public QXYSeries Q_OBJECT public: - explicit QLineSeries(QObject *parent = Q_NULLPTR); + explicit QLineSeries(QObject *parent = nullptr); ~QLineSeries(); QAbstractSeries::SeriesType type() const; protected: - QLineSeries(QLineSeriesPrivate &d, QObject *parent = Q_NULLPTR); + QLineSeries(QLineSeriesPrivate &d, QObject *parent = nullptr); private: Q_DECLARE_PRIVATE(QLineSeries) diff --git a/src/charts/linechart/qlineseries_p.h b/src/charts/linechart/qlineseries_p.h index 8276ae3f..a59d39c7 100644 --- a/src/charts/linechart/qlineseries_p.h +++ b/src/charts/linechart/qlineseries_p.h @@ -40,11 +40,12 @@ #define QLINESERIES_P_H #include <private/qxyseries_p.h> +#include <QtCharts/private/qchartglobal_p.h> QT_CHARTS_BEGIN_NAMESPACE -class QLineSeriesPrivate: public QXYSeriesPrivate +class QT_CHARTS_PRIVATE_EXPORT QLineSeriesPrivate: public QXYSeriesPrivate { public: QLineSeriesPrivate(QLineSeries *q); diff --git a/src/charts/piechart/piechartitem_p.h b/src/charts/piechart/piechartitem_p.h index 9c178271..53276313 100644 --- a/src/charts/piechart/piechartitem_p.h +++ b/src/charts/piechart/piechartitem_p.h @@ -43,6 +43,7 @@ #include <private/chartitem_p.h> #include <private/piesliceitem_p.h> #include <QtCore/QPointer> +#include <QtCharts/private/qchartglobal_p.h> QT_BEGIN_NAMESPACE class QGraphicsItem; @@ -53,7 +54,7 @@ class QPieSlice; class ChartPresenter; class PieAnimation; -class PieChartItem : public ChartItem +class QT_CHARTS_PRIVATE_EXPORT PieChartItem : public ChartItem { Q_OBJECT diff --git a/src/charts/piechart/piesliceitem.cpp b/src/charts/piechart/piesliceitem.cpp index 19d6e4ef..05a790e4 100644 --- a/src/charts/piechart/piesliceitem.cpp +++ b/src/charts/piechart/piesliceitem.cpp @@ -43,8 +43,8 @@ QT_CHARTS_BEGIN_NAMESPACE QPointF offset(qreal angle, qreal length) { - qreal dx = qSin(angle * (M_PI / 180)) * length; - qreal dy = qCos(angle * (M_PI / 180)) * length; + qreal dx = qSin(qDegreesToRadians(angle)) * length; + qreal dy = qCos(qDegreesToRadians(angle)) * length; return QPointF(dx, -dy); } diff --git a/src/charts/piechart/piesliceitem_p.h b/src/charts/piechart/piesliceitem_p.h index f24ddfb4..832ae431 100644 --- a/src/charts/piechart/piesliceitem_p.h +++ b/src/charts/piechart/piesliceitem_p.h @@ -43,6 +43,7 @@ #include <private/charttheme_p.h> #include <QtCharts/QPieSeries> #include <private/pieslicedata_p.h> +#include <QtCharts/private/qchartglobal_p.h> #include <QtWidgets/QGraphicsItem> #include <QtCore/QRectF> #include <QtGui/QColor> @@ -55,7 +56,7 @@ class PieChartItem; class PieSliceLabel; class QPieSlice; -class PieSliceItem : public QGraphicsObject +class QT_CHARTS_PRIVATE_EXPORT PieSliceItem : public QGraphicsObject { Q_OBJECT diff --git a/src/charts/piechart/qhpiemodelmapper.h b/src/charts/piechart/qhpiemodelmapper.h index 6857e64a..8698b35e 100644 --- a/src/charts/piechart/qhpiemodelmapper.h +++ b/src/charts/piechart/qhpiemodelmapper.h @@ -45,7 +45,7 @@ class QT_CHARTS_EXPORT QHPieModelMapper : public QPieModelMapper Q_PROPERTY(int columnCount READ columnCount WRITE setColumnCount NOTIFY columnCountChanged) public: - explicit QHPieModelMapper(QObject *parent = Q_NULLPTR); + explicit QHPieModelMapper(QObject *parent = nullptr); QAbstractItemModel *model() const; void setModel(QAbstractItemModel *model); diff --git a/src/charts/piechart/qpiemodelmapper.h b/src/charts/piechart/qpiemodelmapper.h index b6d0c68b..a9b07cf4 100644 --- a/src/charts/piechart/qpiemodelmapper.h +++ b/src/charts/piechart/qpiemodelmapper.h @@ -47,7 +47,7 @@ class QT_CHARTS_EXPORT QPieModelMapper : public QObject Q_OBJECT protected: - explicit QPieModelMapper(QObject *parent = Q_NULLPTR); + explicit QPieModelMapper(QObject *parent = nullptr); QAbstractItemModel *model() const; void setModel(QAbstractItemModel *model); diff --git a/src/charts/piechart/qpiemodelmapper_p.h b/src/charts/piechart/qpiemodelmapper_p.h index db1a3da4..a590f4b6 100644 --- a/src/charts/piechart/qpiemodelmapper_p.h +++ b/src/charts/piechart/qpiemodelmapper_p.h @@ -41,6 +41,7 @@ #include <QtCore/QObject> #include <QtCharts/QPieModelMapper> +#include <QtCharts/private/qchartglobal_p.h> QT_BEGIN_NAMESPACE class QModelIndex; @@ -50,7 +51,7 @@ QT_CHARTS_BEGIN_NAMESPACE class QPieSlice; -class QPieModelMapperPrivate : public QObject +class QT_CHARTS_PRIVATE_EXPORT QPieModelMapperPrivate : public QObject { Q_OBJECT diff --git a/src/charts/piechart/qpieseries.h b/src/charts/piechart/qpieseries.h index 1eabb6a5..34d3b6c9 100644 --- a/src/charts/piechart/qpieseries.h +++ b/src/charts/piechart/qpieseries.h @@ -49,7 +49,7 @@ class QT_CHARTS_EXPORT QPieSeries : public QAbstractSeries Q_PROPERTY(qreal holeSize READ holeSize WRITE setHoleSize) public: - explicit QPieSeries(QObject *parent = Q_NULLPTR); + explicit QPieSeries(QObject *parent = nullptr); virtual ~QPieSeries(); QAbstractSeries::SeriesType type() const; diff --git a/src/charts/piechart/qpieseries_p.h b/src/charts/piechart/qpieseries_p.h index 72392541..887d8531 100644 --- a/src/charts/piechart/qpieseries_p.h +++ b/src/charts/piechart/qpieseries_p.h @@ -41,11 +41,12 @@ #include <QtCharts/QPieSeries> #include <private/qabstractseries_p.h> +#include <QtCharts/private/qchartglobal_p.h> QT_CHARTS_BEGIN_NAMESPACE class QLegendPrivate; -class QPieSeriesPrivate : public QAbstractSeriesPrivate +class QT_CHARTS_PRIVATE_EXPORT QPieSeriesPrivate : public QAbstractSeriesPrivate { Q_OBJECT diff --git a/src/charts/piechart/qpieslice.h b/src/charts/piechart/qpieslice.h index e305bd64..d508e001 100644 --- a/src/charts/piechart/qpieslice.h +++ b/src/charts/piechart/qpieslice.h @@ -72,8 +72,8 @@ public: }; public: - explicit QPieSlice(QObject *parent = Q_NULLPTR); - QPieSlice(QString label, qreal value, QObject *parent = Q_NULLPTR); + explicit QPieSlice(QObject *parent = nullptr); + QPieSlice(QString label, qreal value, QObject *parent = nullptr); virtual ~QPieSlice(); void setLabel(QString label); diff --git a/src/charts/piechart/qpieslice_p.h b/src/charts/piechart/qpieslice_p.h index 3f343290..bb64b3d2 100644 --- a/src/charts/piechart/qpieslice_p.h +++ b/src/charts/piechart/qpieslice_p.h @@ -42,11 +42,12 @@ #include <QtCore/QObject> #include <QtCharts/QPieSlice> #include <private/pieslicedata_p.h> +#include <QtCharts/private/qchartglobal_p.h> QT_CHARTS_BEGIN_NAMESPACE class QPieSeries; -class QPieSlicePrivate : public QObject +class QT_CHARTS_PRIVATE_EXPORT QPieSlicePrivate : public QObject { Q_OBJECT diff --git a/src/charts/piechart/qvpiemodelmapper.h b/src/charts/piechart/qvpiemodelmapper.h index 55329247..1f2b7b50 100644 --- a/src/charts/piechart/qvpiemodelmapper.h +++ b/src/charts/piechart/qvpiemodelmapper.h @@ -45,7 +45,7 @@ class QT_CHARTS_EXPORT QVPieModelMapper : public QPieModelMapper Q_PROPERTY(int rowCount READ rowCount WRITE setRowCount NOTIFY rowCountChanged) public: - explicit QVPieModelMapper(QObject *parent = Q_NULLPTR); + explicit QVPieModelMapper(QObject *parent = nullptr); QAbstractItemModel *model() const; void setModel(QAbstractItemModel *model); diff --git a/src/charts/qabstractseries_p.h b/src/charts/qabstractseries_p.h index 0d50ea2b..1941b92f 100644 --- a/src/charts/qabstractseries_p.h +++ b/src/charts/qabstractseries_p.h @@ -42,6 +42,7 @@ #include <QtCharts/QAbstractSeries> #include <QtCharts/QChart> #include <private/abstractdomain_p.h> +#include <QtCharts/private/qchartglobal_p.h> QT_BEGIN_NAMESPACE class QGraphicsItem; @@ -61,7 +62,7 @@ class ChartAnimation; class ChartItem; class BoxPlotChartItem; -class QAbstractSeriesPrivate : public QObject +class QT_CHARTS_PRIVATE_EXPORT QAbstractSeriesPrivate : public QObject { Q_OBJECT public: diff --git a/src/charts/qchart.h b/src/charts/qchart.h index 225d296a..a193ba22 100644 --- a/src/charts/qchart.h +++ b/src/charts/qchart.h @@ -96,7 +96,7 @@ public: Q_DECLARE_FLAGS(AnimationOptions, AnimationOption) public: - explicit QChart(QGraphicsItem *parent = Q_NULLPTR, Qt::WindowFlags wFlags = Qt::WindowFlags()); + explicit QChart(QGraphicsItem *parent = nullptr, Qt::WindowFlags wFlags = Qt::WindowFlags()); ~QChart(); void addSeries(QAbstractSeries *series); @@ -105,15 +105,15 @@ public: QList<QAbstractSeries *> series() const; // *** deprecated *** - void setAxisX(QAbstractAxis *axis, QAbstractSeries *series = Q_NULLPTR); - void setAxisY(QAbstractAxis *axis, QAbstractSeries *series = Q_NULLPTR); - QAbstractAxis *axisX(QAbstractSeries *series = Q_NULLPTR) const; - QAbstractAxis *axisY(QAbstractSeries *series = Q_NULLPTR) const; + void setAxisX(QAbstractAxis *axis, QAbstractSeries *series = nullptr); + void setAxisY(QAbstractAxis *axis, QAbstractSeries *series = nullptr); + QAbstractAxis *axisX(QAbstractSeries *series = nullptr) const; + QAbstractAxis *axisY(QAbstractSeries *series = nullptr) const; // ****************** void addAxis(QAbstractAxis *axis, Qt::Alignment alignment); void removeAxis(QAbstractAxis *axis); - QList<QAbstractAxis*> axes(Qt::Orientations orientation = Qt::Horizontal|Qt::Vertical, QAbstractSeries *series = Q_NULLPTR) const; + QList<QAbstractAxis*> axes(Qt::Orientations orientation = Qt::Horizontal|Qt::Vertical, QAbstractSeries *series = nullptr) const; void createDefaultAxes(); @@ -173,8 +173,8 @@ public: void setLocale(const QLocale &locale); QLocale locale() const; - QPointF mapToValue(const QPointF &position, QAbstractSeries *series = Q_NULLPTR); - QPointF mapToPosition(const QPointF &value, QAbstractSeries *series = Q_NULLPTR); + QPointF mapToValue(const QPointF &position, QAbstractSeries *series = nullptr); + QPointF mapToPosition(const QPointF &value, QAbstractSeries *series = nullptr); ChartType chartType() const; diff --git a/src/charts/qchart_p.h b/src/charts/qchart_p.h index 1f11b3ca..7ed518b8 100644 --- a/src/charts/qchart_p.h +++ b/src/charts/qchart_p.h @@ -41,6 +41,7 @@ #include <QtCharts/QChartGlobal> #include <QtCharts/QChart> +#include <QtCharts/private/qchartglobal_p.h> QT_CHARTS_BEGIN_NAMESPACE @@ -49,7 +50,7 @@ class ChartPresenter; class QLegend; class ChartDataSet; -class QChartPrivate +class QT_CHARTS_PRIVATE_EXPORT QChartPrivate { public: diff --git a/src/charts/qchartglobal_p.h b/src/charts/qchartglobal_p.h new file mode 100644 index 00000000..59bf62f8 --- /dev/null +++ b/src/charts/qchartglobal_p.h @@ -0,0 +1,48 @@ +/**************************************************************************** +** +** Copyright (C) 2018 The Qt Company Ltd. +** Contact: https://www.qt.io/licensing/ +** +** This file is part of the Qt Charts module of the Qt Toolkit. +** +** $QT_BEGIN_LICENSE:GPL$ +** Commercial License Usage +** Licensees holding valid commercial Qt licenses may use this file in +** accordance with the commercial license agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and The Qt Company. For licensing terms +** and conditions see https://www.qt.io/terms-conditions. For further +** information use the contact form at https://www.qt.io/contact-us. +** +** GNU General Public License Usage +** Alternatively, this file may be used under the terms of the GNU +** General Public License version 3 or (at your option) any later version +** approved by the KDE Free Qt Foundation. The licenses are as published by +** the Free Software Foundation and appearing in the file LICENSE.GPL3 +** included in the packaging of this file. Please review the following +** information to ensure the GNU General Public License requirements will +** be met: https://www.gnu.org/licenses/gpl-3.0.html. +** +** $QT_END_LICENSE$ +** +****************************************************************************/ + +#ifndef QCHARTGLOBAL_P_H +#define QCHARTGLOBAL_P_H + +// +// W A R N I N G +// ------------- +// +// This file is not part of the Qt API. It exists purely as an +// implementation detail. This header file may change from version to +// version without notice, or even be removed. +// +// We mean it. +// + +#include "qchartglobal.h" + +#define QT_CHARTS_PRIVATE_EXPORT QT_CHARTS_EXPORT + +#endif // QCHARTGLOBAL_P_H diff --git a/src/charts/qchartview.h b/src/charts/qchartview.h index 84b269fb..1cf719b3 100644 --- a/src/charts/qchartview.h +++ b/src/charts/qchartview.h @@ -59,8 +59,8 @@ public: Q_DECLARE_FLAGS(RubberBands, RubberBand) - explicit QChartView(QWidget *parent = Q_NULLPTR); - explicit QChartView(QChart *chart, QWidget *parent = Q_NULLPTR); + explicit QChartView(QWidget *parent = nullptr); + explicit QChartView(QChart *chart, QWidget *parent = nullptr); ~QChartView(); void setRubberBand(const RubberBands &rubberBands); diff --git a/src/charts/qchartview_p.h b/src/charts/qchartview_p.h index a71366cf..01c66908 100644 --- a/src/charts/qchartview_p.h +++ b/src/charts/qchartview_p.h @@ -40,6 +40,7 @@ #define QCHARTVIEW_P_H #include <QtCharts/QChartView> +#include <QtCharts/private/qchartglobal_p.h> QT_BEGIN_NAMESPACE class QGraphicsScene; @@ -51,7 +52,7 @@ class QChart; class ChartPresenter; class QChartView; -class QChartViewPrivate +class QT_CHARTS_PRIVATE_EXPORT QChartViewPrivate { public: explicit QChartViewPrivate(QChartView *q, QChart *chart = 0); diff --git a/src/charts/qpolarchart.h b/src/charts/qpolarchart.h index 067363c2..8d3fa287 100644 --- a/src/charts/qpolarchart.h +++ b/src/charts/qpolarchart.h @@ -51,12 +51,12 @@ public: Q_DECLARE_FLAGS(PolarOrientations, PolarOrientation) public: - explicit QPolarChart(QGraphicsItem *parent = Q_NULLPTR, Qt::WindowFlags wFlags = Qt::WindowFlags()); + explicit QPolarChart(QGraphicsItem *parent = nullptr, Qt::WindowFlags wFlags = Qt::WindowFlags()); ~QPolarChart(); void addAxis(QAbstractAxis *axis, PolarOrientation polarOrientation); - QList<QAbstractAxis*> axes(PolarOrientations polarOrientation = PolarOrientations(PolarOrientationRadial | PolarOrientationAngular), QAbstractSeries *series = Q_NULLPTR) const; + QList<QAbstractAxis*> axes(PolarOrientations polarOrientation = PolarOrientations(PolarOrientationRadial | PolarOrientationAngular), QAbstractSeries *series = nullptr) const; static PolarOrientation axisPolarOrientation(QAbstractAxis *axis); diff --git a/src/charts/scatterchart/qscatterseries.h b/src/charts/scatterchart/qscatterseries.h index 74e44e37..ac3e5989 100644 --- a/src/charts/scatterchart/qscatterseries.h +++ b/src/charts/scatterchart/qscatterseries.h @@ -54,7 +54,7 @@ public: }; public: - explicit QScatterSeries(QObject *parent = Q_NULLPTR); + explicit QScatterSeries(QObject *parent = nullptr); ~QScatterSeries(); QAbstractSeries::SeriesType type() const; void setPen(const QPen &pen); diff --git a/src/charts/scatterchart/qscatterseries_p.h b/src/charts/scatterchart/qscatterseries_p.h index 6a90c0f1..7d9c723f 100644 --- a/src/charts/scatterchart/qscatterseries_p.h +++ b/src/charts/scatterchart/qscatterseries_p.h @@ -40,10 +40,11 @@ #define QSCATTERSERIES_P_H #include <private/qxyseries_p.h> +#include <QtCharts/private/qchartglobal_p.h> QT_CHARTS_BEGIN_NAMESPACE -class QScatterSeriesPrivate: public QXYSeriesPrivate +class QT_CHARTS_PRIVATE_EXPORT QScatterSeriesPrivate: public QXYSeriesPrivate { public: QScatterSeriesPrivate(QScatterSeries *q); diff --git a/src/charts/scatterchart/scatterchartitem_p.h b/src/charts/scatterchart/scatterchartitem_p.h index dffbf391..5bf52af0 100644 --- a/src/charts/scatterchart/scatterchartitem_p.h +++ b/src/charts/scatterchart/scatterchartitem_p.h @@ -44,12 +44,13 @@ #include <QtWidgets/QGraphicsEllipseItem> #include <QtGui/QPen> #include <QtWidgets/QGraphicsSceneMouseEvent> +#include <QtCharts/private/qchartglobal_p.h> QT_CHARTS_BEGIN_NAMESPACE class QScatterSeries; -class ScatterChartItem : public XYChart +class QT_CHARTS_PRIVATE_EXPORT ScatterChartItem : public XYChart { Q_OBJECT Q_INTERFACES(QGraphicsItem) @@ -102,7 +103,7 @@ private: bool m_mousePressed; }; -class CircleMarker: public QGraphicsEllipseItem +class QT_CHARTS_PRIVATE_EXPORT CircleMarker: public QGraphicsEllipseItem { public: @@ -149,7 +150,7 @@ private: ScatterChartItem *m_parent; }; -class RectangleMarker: public QGraphicsRectItem +class QT_CHARTS_PRIVATE_EXPORT RectangleMarker: public QGraphicsRectItem { public: diff --git a/src/charts/scroller_p.h b/src/charts/scroller_p.h index c6704334..3412a7ff 100644 --- a/src/charts/scroller_p.h +++ b/src/charts/scroller_p.h @@ -44,6 +44,7 @@ #include <QtCore/QBasicTimer> #include <QtCore/QTime> #include <QtCore/QPointF> +#include <QtCharts/private/qchartglobal_p.h> QT_BEGIN_NAMESPACE class QGraphicsSceneMouseEvent; @@ -54,7 +55,7 @@ QT_CHARTS_BEGIN_NAMESPACE class Scroller; class QLegend; -class ScrollTicker : public QObject +class QT_CHARTS_PRIVATE_EXPORT ScrollTicker : public QObject { Q_OBJECT public: @@ -69,7 +70,7 @@ private: Scroller *m_scroller; }; -class Scroller +class QT_CHARTS_PRIVATE_EXPORT Scroller { public: enum State { diff --git a/src/charts/splinechart/qsplineseries.h b/src/charts/splinechart/qsplineseries.h index 41059e37..35ebcf31 100644 --- a/src/charts/splinechart/qsplineseries.h +++ b/src/charts/splinechart/qsplineseries.h @@ -45,7 +45,7 @@ class QT_CHARTS_EXPORT QSplineSeries : public QLineSeries Q_OBJECT public: - explicit QSplineSeries(QObject *parent = Q_NULLPTR); + explicit QSplineSeries(QObject *parent = nullptr); ~QSplineSeries(); QAbstractSeries::SeriesType type() const; diff --git a/src/charts/splinechart/qsplineseries_p.h b/src/charts/splinechart/qsplineseries_p.h index e2b5fd85..dd3fc222 100644 --- a/src/charts/splinechart/qsplineseries_p.h +++ b/src/charts/splinechart/qsplineseries_p.h @@ -40,11 +40,12 @@ #define QSPLINESERIES_P_H #include <private/qlineseries_p.h> +#include <QtCharts/private/qchartglobal_p.h> QT_CHARTS_BEGIN_NAMESPACE -class QSplineSeriesPrivate: public QLineSeriesPrivate +class QT_CHARTS_PRIVATE_EXPORT QSplineSeriesPrivate: public QLineSeriesPrivate { Q_OBJECT public: diff --git a/src/charts/splinechart/splinechartitem_p.h b/src/charts/splinechart/splinechartitem_p.h index 66aa9032..bc5f5661 100644 --- a/src/charts/splinechart/splinechartitem_p.h +++ b/src/charts/splinechart/splinechartitem_p.h @@ -41,12 +41,13 @@ #include <QtCharts/QSplineSeries> #include <private/xychart_p.h> +#include <QtCharts/private/qchartglobal_p.h> QT_CHARTS_BEGIN_NAMESPACE class SplineAnimation; -class SplineChartItem : public XYChart +class QT_CHARTS_PRIVATE_EXPORT SplineChartItem : public XYChart { Q_OBJECT Q_INTERFACES(QGraphicsItem) diff --git a/src/charts/themes/charttheme_p.h b/src/charts/themes/charttheme_p.h index 4ef18e69..bb128134 100644 --- a/src/charts/themes/charttheme_p.h +++ b/src/charts/themes/charttheme_p.h @@ -42,10 +42,11 @@ #include <private/chartthememanager_p.h> #include <QtGui/QColor> #include <QtGui/QGradientStops> +#include <QtCharts/private/qchartglobal_p.h> QT_CHARTS_BEGIN_NAMESPACE -class ChartTheme +class QT_CHARTS_PRIVATE_EXPORT ChartTheme { public: diff --git a/src/charts/themes/chartthemebluecerulean_p.h b/src/charts/themes/chartthemebluecerulean_p.h index 5bae2adb..6bdcc10b 100644 --- a/src/charts/themes/chartthemebluecerulean_p.h +++ b/src/charts/themes/chartthemebluecerulean_p.h @@ -40,10 +40,11 @@ #define CHARTTHEMEBLUECERULEAN_P_H #include <private/charttheme_p.h> +#include <QtCharts/private/qchartglobal_p.h> QT_CHARTS_BEGIN_NAMESPACE -class ChartThemeBlueCerulean: public ChartTheme +class QT_CHARTS_PRIVATE_EXPORT ChartThemeBlueCerulean: public ChartTheme { public: ChartThemeBlueCerulean() : ChartTheme(QChart::ChartThemeBlueCerulean) { diff --git a/src/charts/themes/chartthemeblueicy_p.h b/src/charts/themes/chartthemeblueicy_p.h index d846a95b..808c16e5 100644 --- a/src/charts/themes/chartthemeblueicy_p.h +++ b/src/charts/themes/chartthemeblueicy_p.h @@ -40,10 +40,11 @@ #define CHARTTHEMEBLUEICY_P_H #include <private/charttheme_p.h> +#include <QtCharts/private/qchartglobal_p.h> QT_CHARTS_BEGIN_NAMESPACE -class ChartThemeBlueIcy: public ChartTheme +class QT_CHARTS_PRIVATE_EXPORT ChartThemeBlueIcy: public ChartTheme { public: ChartThemeBlueIcy() : ChartTheme(QChart::ChartThemeBlueIcy) diff --git a/src/charts/themes/chartthemebluencs_p.h b/src/charts/themes/chartthemebluencs_p.h index 06496d09..94234224 100644 --- a/src/charts/themes/chartthemebluencs_p.h +++ b/src/charts/themes/chartthemebluencs_p.h @@ -40,10 +40,11 @@ #define CHARTTHEMEBLUENCS_P_H #include <private/charttheme_p.h> +#include <QtCharts/private/qchartglobal_p.h> QT_CHARTS_BEGIN_NAMESPACE -class ChartThemeBlueNcs: public ChartTheme +class QT_CHARTS_PRIVATE_EXPORT ChartThemeBlueNcs: public ChartTheme { public: ChartThemeBlueNcs() : ChartTheme(QChart::ChartThemeBlueNcs) diff --git a/src/charts/themes/chartthemebrownsand_p.h b/src/charts/themes/chartthemebrownsand_p.h index 40d79d9f..5e48fd80 100644 --- a/src/charts/themes/chartthemebrownsand_p.h +++ b/src/charts/themes/chartthemebrownsand_p.h @@ -40,10 +40,11 @@ #define CHARTTHEMEBROWNSAND_P_H #include <private/charttheme_p.h> +#include <QtCharts/private/qchartglobal_p.h> QT_CHARTS_BEGIN_NAMESPACE -class ChartThemeBrownSand: public ChartTheme +class QT_CHARTS_PRIVATE_EXPORT ChartThemeBrownSand: public ChartTheme { public: ChartThemeBrownSand() : ChartTheme(QChart::ChartThemeBrownSand) diff --git a/src/charts/themes/chartthemedark_p.h b/src/charts/themes/chartthemedark_p.h index 8790a154..a8f9f477 100644 --- a/src/charts/themes/chartthemedark_p.h +++ b/src/charts/themes/chartthemedark_p.h @@ -40,10 +40,11 @@ #define CHARTTHEMEDARK_P_H #include <private/charttheme_p.h> +#include <QtCharts/private/qchartglobal_p.h> QT_CHARTS_BEGIN_NAMESPACE -class ChartThemeDark : public ChartTheme +class QT_CHARTS_PRIVATE_EXPORT ChartThemeDark : public ChartTheme { public: ChartThemeDark() : ChartTheme(QChart::ChartThemeDark) diff --git a/src/charts/themes/chartthemehighcontrast_p.h b/src/charts/themes/chartthemehighcontrast_p.h index 77b48b3d..b1cd8446 100644 --- a/src/charts/themes/chartthemehighcontrast_p.h +++ b/src/charts/themes/chartthemehighcontrast_p.h @@ -40,10 +40,11 @@ #define CHARTTHEMEHIGHCONTRAST_P_H #include <private/charttheme_p.h> +#include <QtCharts/private/qchartglobal_p.h> QT_CHARTS_BEGIN_NAMESPACE -class ChartThemeHighContrast : public ChartTheme +class QT_CHARTS_PRIVATE_EXPORT ChartThemeHighContrast : public ChartTheme { public: ChartThemeHighContrast() : ChartTheme(QChart::ChartThemeHighContrast) diff --git a/src/charts/themes/chartthemelight_p.h b/src/charts/themes/chartthemelight_p.h index 1121629b..e7ed47c0 100644 --- a/src/charts/themes/chartthemelight_p.h +++ b/src/charts/themes/chartthemelight_p.h @@ -40,10 +40,11 @@ #define CHARTTHEMELIGHT_P_H #include <private/charttheme_p.h> +#include <QtCharts/private/qchartglobal_p.h> QT_CHARTS_BEGIN_NAMESPACE -class ChartThemeLight: public ChartTheme +class QT_CHARTS_PRIVATE_EXPORT ChartThemeLight: public ChartTheme { public: ChartThemeLight() : ChartTheme(QChart::ChartThemeLight) diff --git a/src/charts/themes/chartthemeqt_p.h b/src/charts/themes/chartthemeqt_p.h index 4634bb71..af335a89 100644 --- a/src/charts/themes/chartthemeqt_p.h +++ b/src/charts/themes/chartthemeqt_p.h @@ -40,10 +40,11 @@ #define CHARTTHEMEQT_P_H #include <private/charttheme_p.h> +#include <QtCharts/private/qchartglobal_p.h> QT_CHARTS_BEGIN_NAMESPACE -class ChartThemeQt : public ChartTheme +class QT_CHARTS_PRIVATE_EXPORT ChartThemeQt : public ChartTheme { public: ChartThemeQt() : ChartTheme(QChart::ChartThemeQt) diff --git a/src/charts/themes/chartthemesystem_p.h b/src/charts/themes/chartthemesystem_p.h index 01cce56a..a79ac201 100644 --- a/src/charts/themes/chartthemesystem_p.h +++ b/src/charts/themes/chartthemesystem_p.h @@ -40,6 +40,7 @@ #define CHARTTHEMESYSTEM_P_H #include <private/charttheme_p.h> +#include <QtCharts/private/qchartglobal_p.h> #ifdef Q_OS_WIN #include <windows.h> #include <stdio.h> @@ -47,7 +48,7 @@ QT_CHARTS_BEGIN_NAMESPACE -class ChartThemeSystem: public ChartTheme +class QT_CHARTS_PRIVATE_EXPORT ChartThemeSystem: public ChartTheme { public: // System theme not used at the moment (the user is not able to select this theme) diff --git a/src/charts/xychart/glxyseriesdata_p.h b/src/charts/xychart/glxyseriesdata_p.h index 4a22e575..a5322d50 100644 --- a/src/charts/xychart/glxyseriesdata_p.h +++ b/src/charts/xychart/glxyseriesdata_p.h @@ -42,6 +42,7 @@ #include <QtCore/QMap> #include <QtCharts/QAbstractSeries> #include <QtCharts/QXYSeries> +#include <QtCharts/private/qchartglobal_p.h> #include <QtGui/QVector3D> #include <QtGui/QVector2D> #include <QtGui/QMatrix4x4> @@ -78,7 +79,7 @@ public: typedef QMap<const QXYSeries *, GLXYSeriesData *> GLXYDataMap; typedef QMapIterator<const QXYSeries *, GLXYSeriesData *> GLXYDataMapIterator; -class GLXYSeriesDataManager : public QObject +class QT_CHARTS_PRIVATE_EXPORT GLXYSeriesDataManager : public QObject { Q_OBJECT diff --git a/src/charts/xychart/qhxymodelmapper.h b/src/charts/xychart/qhxymodelmapper.h index 677517cc..c540e69b 100644 --- a/src/charts/xychart/qhxymodelmapper.h +++ b/src/charts/xychart/qhxymodelmapper.h @@ -45,7 +45,7 @@ class QT_CHARTS_EXPORT QHXYModelMapper : public QXYModelMapper Q_PROPERTY(int columnCount READ columnCount WRITE setColumnCount NOTIFY columnCountChanged) public: - explicit QHXYModelMapper(QObject *parent = Q_NULLPTR); + explicit QHXYModelMapper(QObject *parent = nullptr); QAbstractItemModel *model() const; void setModel(QAbstractItemModel *model); diff --git a/src/charts/xychart/qvxymodelmapper.h b/src/charts/xychart/qvxymodelmapper.h index 922121b5..0ab9ea4d 100644 --- a/src/charts/xychart/qvxymodelmapper.h +++ b/src/charts/xychart/qvxymodelmapper.h @@ -45,7 +45,7 @@ class QT_CHARTS_EXPORT QVXYModelMapper : public QXYModelMapper Q_PROPERTY(int rowCount READ rowCount WRITE setRowCount NOTIFY rowCountChanged) public: - explicit QVXYModelMapper(QObject *parent = Q_NULLPTR); + explicit QVXYModelMapper(QObject *parent = nullptr); QAbstractItemModel *model() const; void setModel(QAbstractItemModel *model); diff --git a/src/charts/xychart/qxymodelmapper.h b/src/charts/xychart/qxymodelmapper.h index 64b0aeab..c7d53284 100644 --- a/src/charts/xychart/qxymodelmapper.h +++ b/src/charts/xychart/qxymodelmapper.h @@ -47,7 +47,7 @@ class QT_CHARTS_EXPORT QXYModelMapper : public QObject Q_OBJECT protected: - explicit QXYModelMapper(QObject *parent = Q_NULLPTR); + explicit QXYModelMapper(QObject *parent = nullptr); QAbstractItemModel *model() const; void setModel(QAbstractItemModel *model); diff --git a/src/charts/xychart/qxymodelmapper_p.h b/src/charts/xychart/qxymodelmapper_p.h index d2a1b095..daa82342 100644 --- a/src/charts/xychart/qxymodelmapper_p.h +++ b/src/charts/xychart/qxymodelmapper_p.h @@ -40,6 +40,7 @@ #define QXYMODELMAPPER_P_H #include <QtCharts/QXYModelMapper> +#include <QtCharts/private/qchartglobal_p.h> #include <QtCore/QObject> QT_BEGIN_NAMESPACE @@ -53,7 +54,7 @@ QT_CHARTS_BEGIN_NAMESPACE class QXYModelMapper; class QXYSeries; -class QXYModelMapperPrivate : public QObject +class QT_CHARTS_PRIVATE_EXPORT QXYModelMapperPrivate : public QObject { Q_OBJECT diff --git a/src/charts/xychart/qxyseries.h b/src/charts/xychart/qxyseries.h index 11c87b50..f81161ff 100644 --- a/src/charts/xychart/qxyseries.h +++ b/src/charts/xychart/qxyseries.h @@ -56,7 +56,7 @@ class QT_CHARTS_EXPORT QXYSeries : public QAbstractSeries Q_PROPERTY(bool pointLabelsClipping READ pointLabelsClipping WRITE setPointLabelsClipping NOTIFY pointLabelsClippingChanged) protected: - explicit QXYSeries(QXYSeriesPrivate &d, QObject *parent = Q_NULLPTR); + explicit QXYSeries(QXYSeriesPrivate &d, QObject *parent = nullptr); public: ~QXYSeries(); diff --git a/src/charts/xychart/qxyseries_p.h b/src/charts/xychart/qxyseries_p.h index 2579d925..f803c52a 100644 --- a/src/charts/xychart/qxyseries_p.h +++ b/src/charts/xychart/qxyseries_p.h @@ -40,13 +40,14 @@ #define QXYSERIES_P_H #include <private/qabstractseries_p.h> +#include <QtCharts/private/qchartglobal_p.h> QT_CHARTS_BEGIN_NAMESPACE class QXYSeries; class QAbstractAxis; -class QXYSeriesPrivate: public QAbstractSeriesPrivate +class QT_CHARTS_PRIVATE_EXPORT QXYSeriesPrivate: public QAbstractSeriesPrivate { Q_OBJECT diff --git a/src/charts/xychart/xychart_p.h b/src/charts/xychart/xychart_p.h index c5737cca..64c51f33 100644 --- a/src/charts/xychart/xychart_p.h +++ b/src/charts/xychart/xychart_p.h @@ -43,6 +43,7 @@ #include <private/chartitem_p.h> #include <private/xyanimation_p.h> #include <QtCharts/QValueAxis> +#include <QtCharts/private/qchartglobal_p.h> #include <QtGui/QPen> QT_CHARTS_BEGIN_NAMESPACE @@ -50,7 +51,7 @@ QT_CHARTS_BEGIN_NAMESPACE class ChartPresenter; class QXYSeries; -class XYChart : public ChartItem +class QT_CHARTS_PRIVATE_EXPORT XYChart : public ChartItem { Q_OBJECT public: diff --git a/src/chartsqml2/chartsqml2.pro b/src/chartsqml2/chartsqml2.pro index 57407e4d..57b3bd37 100644 --- a/src/chartsqml2/chartsqml2.pro +++ b/src/chartsqml2/chartsqml2.pro @@ -1,6 +1,7 @@ TARGET = qtchartsqml2 CXX_MODULE = charts +DEFINES += QT_BUILD_QMLCHARTS_LIB QT += qml quick QT += charts charts-private @@ -27,30 +28,33 @@ SOURCES += \ declarativechartnode.cpp \ declarativecandlestickseries.cpp -HEADERS += \ - declarativechart.h \ - declarativexypoint.h \ - declarativexyseries.h \ - declarativelineseries.h \ - declarativesplineseries.h \ - declarativeareaseries.h \ - declarativescatterseries.h \ - declarativepieseries.h \ - declarativebarseries.h \ - declarativecategoryaxis.h \ - declarativemargins.h \ - declarativeaxes.h \ - declarativepolarchart.h \ - declarativeboxplotseries.h \ - declarativechartnode.h \ - declarativecandlestickseries.h \ - declarativeabstractrendernode.h +PRIVATE_HEADERS += \ + declarativechart_p.h \ + declarativexypoint_p.h \ + declarativexyseries_p.h \ + declarativelineseries_p.h \ + declarativesplineseries_p.h \ + declarativeareaseries_p.h \ + declarativescatterseries_p.h \ + declarativepieseries_p.h \ + declarativebarseries_p.h \ + declarativecategoryaxis_p.h \ + declarativemargins_p.h \ + declarativeaxes_p.h \ + declarativepolarchart_p.h \ + declarativeboxplotseries_p.h \ + declarativecandlestickseries_p.h \ + declarativeabstractrendernode_p.h \ + declarativechartnode_p.h \ + declarativechartglobal_p.h contains(QT_CONFIG, opengl) { SOURCES += declarativeopenglrendernode.cpp - HEADERS += declarativeopenglrendernode.h + PRIVATE_HEADERS += declarativeopenglrendernode_p.h } +HEADERS += $$PRIVATE_HEADERS +INCLUDEPATH += $$PWD load(qml_plugin) diff --git a/src/chartsqml2/chartsqml2_plugin.cpp b/src/chartsqml2/chartsqml2_plugin.cpp index cc95948b..b1a9d412 100644 --- a/src/chartsqml2/chartsqml2_plugin.cpp +++ b/src/chartsqml2/chartsqml2_plugin.cpp @@ -31,27 +31,27 @@ #include <QtCharts/QAbstractAxis> #include <QtCharts/QValueAxis> #include <QtCharts/QLogValueAxis> -#include "declarativecategoryaxis.h" +#include "declarativecategoryaxis_p.h" #include <QtCharts/QBarCategoryAxis> -#include "declarativechart.h" -#include "declarativepolarchart.h" -#include "declarativexypoint.h" -#include "declarativelineseries.h" -#include "declarativesplineseries.h" -#include "declarativeareaseries.h" -#include "declarativescatterseries.h" -#include "declarativebarseries.h" -#include "declarativeboxplotseries.h" -#include "declarativecandlestickseries.h" -#include "declarativepieseries.h" -#include "declarativeaxes.h" +#include "declarativechart_p.h" +#include "declarativepolarchart_p.h" +#include "declarativexypoint_p.h" +#include "declarativelineseries_p.h" +#include "declarativesplineseries_p.h" +#include "declarativeareaseries_p.h" +#include "declarativescatterseries_p.h" +#include "declarativebarseries_p.h" +#include "declarativeboxplotseries_p.h" +#include "declarativecandlestickseries_p.h" +#include "declarativepieseries_p.h" +#include "declarativeaxes_p.h" #include <QtCharts/QVXYModelMapper> #include <QtCharts/QHXYModelMapper> #include <QtCharts/QHPieModelMapper> #include <QtCharts/QVPieModelMapper> #include <QtCharts/QHBarModelMapper> #include <QtCharts/QVBarModelMapper> -#include "declarativemargins.h" +#include "declarativemargins_p.h" #include <QtCharts/QAreaLegendMarker> #include <QtCharts/QBarLegendMarker> #include <QtCharts/QPieLegendMarker> diff --git a/src/chartsqml2/declarativeabstractrendernode.h b/src/chartsqml2/declarativeabstractrendernode_p.h index 34bd1d19..905b6385 100644 --- a/src/chartsqml2/declarativeabstractrendernode.h +++ b/src/chartsqml2/declarativeabstractrendernode_p.h @@ -27,6 +27,15 @@ ** ****************************************************************************/ +// W A R N I N G +// ------------- +// +// This file is not part of the Qt Chart API. It exists purely as an +// implementation detail. This header file may change from version to +// version without notice, or even be removed. +// +// We mean it. + #ifndef DECLARATIVEABSTRACTRENDERNODE_H #define DECLARATIVEABSTRACTRENDERNODE_H @@ -34,10 +43,11 @@ #include <QtQuick/QSGNode> #include <QtQuick/QQuickWindow> #include <private/glxyseriesdata_p.h> +#include <private/declarativechartglobal_p.h> QT_CHARTS_BEGIN_NAMESPACE -class MouseEventResponse { +class QT_QMLCHARTS_PRIVATE_EXPORT MouseEventResponse { public: enum MouseEventType { None, @@ -61,7 +71,7 @@ public: const QXYSeries *series; }; -class DeclarativeAbstractRenderNode : public QSGRootNode +class QT_QMLCHARTS_PRIVATE_EXPORT DeclarativeAbstractRenderNode : public QSGRootNode { public: DeclarativeAbstractRenderNode() {} diff --git a/src/chartsqml2/declarativeareaseries.cpp b/src/chartsqml2/declarativeareaseries.cpp index 73c5960a..be4b9037 100644 --- a/src/chartsqml2/declarativeareaseries.cpp +++ b/src/chartsqml2/declarativeareaseries.cpp @@ -27,8 +27,8 @@ ** ****************************************************************************/ -#include "declarativeareaseries.h" -#include "declarativelineseries.h" +#include "declarativeareaseries_p.h" +#include "declarativelineseries_p.h" QT_CHARTS_BEGIN_NAMESPACE @@ -119,6 +119,6 @@ QBrush DeclarativeAreaSeries::brush() const return QAreaSeries::brush(); } -#include "moc_declarativeareaseries.cpp" +#include "moc_declarativeareaseries_p.cpp" QT_CHARTS_END_NAMESPACE diff --git a/src/chartsqml2/declarativeareaseries.h b/src/chartsqml2/declarativeareaseries_p.h index 24dfcc8a..b2c884be 100644 --- a/src/chartsqml2/declarativeareaseries.h +++ b/src/chartsqml2/declarativeareaseries_p.h @@ -27,16 +27,26 @@ ** ****************************************************************************/ +// W A R N I N G +// ------------- +// +// This file is not part of the Qt Chart API. It exists purely as an +// implementation detail. This header file may change from version to +// version without notice, or even be removed. +// +// We mean it. + #ifndef DECLARATIVEAREASERIES_H #define DECLARATIVEAREASERIES_H #include <QtCharts/QAreaSeries> -#include "declarativeaxes.h" +#include <private/declarativechartglobal_p.h> +#include <private/declarativeaxes_p.h> QT_CHARTS_BEGIN_NAMESPACE class DeclarativeLineSeries; -class DeclarativeAreaSeries : public QAreaSeries +class QT_QMLCHARTS_PRIVATE_EXPORT DeclarativeAreaSeries : public QAreaSeries { Q_OBJECT Q_PROPERTY(DeclarativeLineSeries *upperSeries READ upperSeries WRITE setUpperSeries) diff --git a/src/chartsqml2/declarativeaxes.cpp b/src/chartsqml2/declarativeaxes.cpp index 231f9c6e..334744c0 100644 --- a/src/chartsqml2/declarativeaxes.cpp +++ b/src/chartsqml2/declarativeaxes.cpp @@ -27,7 +27,7 @@ ** ****************************************************************************/ -#include "declarativeaxes.h" +#include "declarativeaxes_p.h" #include <QtCharts/QAbstractAxis> QT_CHARTS_BEGIN_NAMESPACE @@ -65,6 +65,6 @@ void DeclarativeAxes::setAxisYRight(QAbstractAxis *axis) emit axisYRightChanged(axis); } -#include "moc_declarativeaxes.cpp" +#include "moc_declarativeaxes_p.cpp" QT_CHARTS_END_NAMESPACE diff --git a/src/chartsqml2/declarativeaxes.h b/src/chartsqml2/declarativeaxes_p.h index 1115ee60..af5b13c2 100644 --- a/src/chartsqml2/declarativeaxes.h +++ b/src/chartsqml2/declarativeaxes_p.h @@ -27,17 +27,27 @@ ** ****************************************************************************/ +// W A R N I N G +// ------------- +// +// This file is not part of the Qt Chart API. It exists purely as an +// implementation detail. This header file may change from version to +// version without notice, or even be removed. +// +// We mean it. + #ifndef DECLARATIVEAXES_H #define DECLARATIVEAXES_H #include <QtCharts/QChartGlobal> #include <QtCore/QObject> +#include <private/declarativechartglobal_p.h> QT_CHARTS_BEGIN_NAMESPACE class QAbstractAxis; -class DeclarativeAxes : public QObject +class QT_QMLCHARTS_PRIVATE_EXPORT DeclarativeAxes : public QObject { Q_OBJECT Q_PROPERTY(QAbstractAxis *axisX READ axisX WRITE setAxisX NOTIFY axisXChanged) diff --git a/src/chartsqml2/declarativebarseries.cpp b/src/chartsqml2/declarativebarseries.cpp index d335f9d5..36a811bb 100644 --- a/src/chartsqml2/declarativebarseries.cpp +++ b/src/chartsqml2/declarativebarseries.cpp @@ -27,7 +27,7 @@ ** ****************************************************************************/ -#include "declarativebarseries.h" +#include "declarativebarseries_p.h" #include <QtCharts/QBarSet> #include <QtCharts/QVBarModelMapper> #include <QtCharts/QHBarModelMapper> @@ -513,6 +513,6 @@ DeclarativeBarSet *DeclarativeHorizontalPercentBarSeries::insert(int index, QStr return 0; } -#include "moc_declarativebarseries.cpp" +#include "moc_declarativebarseries_p.cpp" QT_CHARTS_END_NAMESPACE diff --git a/src/chartsqml2/declarativebarseries.h b/src/chartsqml2/declarativebarseries_p.h index 15ed554c..a419fb04 100644 --- a/src/chartsqml2/declarativebarseries.h +++ b/src/chartsqml2/declarativebarseries_p.h @@ -27,6 +27,15 @@ ** ****************************************************************************/ +// W A R N I N G +// ------------- +// +// This file is not part of the Qt Chart API. It exists purely as an +// implementation detail. This header file may change from version to +// version without notice, or even be removed. +// +// We mean it. + #ifndef DECLARATIVEBARSERIES_H #define DECLARATIVEBARSERIES_H @@ -37,7 +46,8 @@ #include <QtCharts/QHorizontalStackedBarSeries> #include <QtCharts/QHorizontalPercentBarSeries> #include <QtCharts/QBarSet> -#include "declarativeaxes.h" +#include <private/declarativechartglobal_p.h> +#include <private/declarativeaxes_p.h> #include <QtQuick/QQuickItem> #include <QtQml/QQmlParserStatus> @@ -46,7 +56,7 @@ QT_CHARTS_BEGIN_NAMESPACE class QChart; -class DeclarativeBarSet : public QBarSet +class QT_QMLCHARTS_PRIVATE_EXPORT DeclarativeBarSet : public QBarSet { Q_OBJECT Q_PROPERTY(QVariantList values READ values WRITE setValues) @@ -83,7 +93,7 @@ private: QImage m_brushImage; }; -class DeclarativeBarSeries : public QBarSeries, public QQmlParserStatus +class QT_QMLCHARTS_PRIVATE_EXPORT DeclarativeBarSeries : public QBarSeries, public QQmlParserStatus { Q_OBJECT Q_INTERFACES(QQmlParserStatus) @@ -130,7 +140,7 @@ public: DeclarativeAxes *m_axes; }; -class DeclarativeStackedBarSeries : public QStackedBarSeries, public QQmlParserStatus +class QT_QMLCHARTS_PRIVATE_EXPORT DeclarativeStackedBarSeries : public QStackedBarSeries, public QQmlParserStatus { Q_OBJECT Q_INTERFACES(QQmlParserStatus) @@ -177,7 +187,7 @@ public: DeclarativeAxes *m_axes; }; -class DeclarativePercentBarSeries : public QPercentBarSeries, public QQmlParserStatus +class QT_QMLCHARTS_PRIVATE_EXPORT DeclarativePercentBarSeries : public QPercentBarSeries, public QQmlParserStatus { Q_OBJECT Q_INTERFACES(QQmlParserStatus) @@ -224,7 +234,7 @@ public: DeclarativeAxes *m_axes; }; -class DeclarativeHorizontalBarSeries : public QHorizontalBarSeries, public QQmlParserStatus +class QT_QMLCHARTS_PRIVATE_EXPORT DeclarativeHorizontalBarSeries : public QHorizontalBarSeries, public QQmlParserStatus { Q_OBJECT Q_INTERFACES(QQmlParserStatus) @@ -271,7 +281,7 @@ public: DeclarativeAxes *m_axes; }; -class DeclarativeHorizontalStackedBarSeries : public QHorizontalStackedBarSeries, public QQmlParserStatus +class QT_QMLCHARTS_PRIVATE_EXPORT DeclarativeHorizontalStackedBarSeries : public QHorizontalStackedBarSeries, public QQmlParserStatus { Q_OBJECT Q_INTERFACES(QQmlParserStatus) @@ -318,7 +328,7 @@ public: DeclarativeAxes *m_axes; }; -class DeclarativeHorizontalPercentBarSeries : public QHorizontalPercentBarSeries, public QQmlParserStatus +class QT_QMLCHARTS_PRIVATE_EXPORT DeclarativeHorizontalPercentBarSeries : public QHorizontalPercentBarSeries, public QQmlParserStatus { Q_OBJECT Q_INTERFACES(QQmlParserStatus) diff --git a/src/chartsqml2/declarativeboxplotseries.cpp b/src/chartsqml2/declarativeboxplotseries.cpp index bbc2316d..219d7a7d 100644 --- a/src/chartsqml2/declarativeboxplotseries.cpp +++ b/src/chartsqml2/declarativeboxplotseries.cpp @@ -27,9 +27,10 @@ ** ****************************************************************************/ -#include "declarativebarseries.h" -#include "declarativeboxplotseries.h" +#include "declarativebarseries_p.h" +#include "declarativeboxplotseries_p.h" #include <QtCharts/QBoxSet> +#include <QtCharts/QHBoxPlotModelMapper> #include <QtCharts/QVBoxPlotModelMapper> QT_CHARTS_BEGIN_NAMESPACE @@ -405,6 +406,8 @@ void DeclarativeBoxPlotSeries::componentComplete() } else if (qobject_cast<QVBoxPlotModelMapper *>(child)) { QVBoxPlotModelMapper *mapper = qobject_cast<QVBoxPlotModelMapper *>(child); mapper->setSeries(this); + } else if (QHBoxPlotModelMapper *mapper = qobject_cast<QHBoxPlotModelMapper *>(child)) { + mapper->setSeries(this); } } } @@ -493,6 +496,6 @@ void DeclarativeBoxPlotSeries::handleBrushChanged() } } -#include "moc_declarativeboxplotseries.cpp" +#include "moc_declarativeboxplotseries_p.cpp" QT_CHARTS_END_NAMESPACE diff --git a/src/chartsqml2/declarativeboxplotseries.h b/src/chartsqml2/declarativeboxplotseries_p.h index a1f3177e..e035f8e2 100644 --- a/src/chartsqml2/declarativeboxplotseries.h +++ b/src/chartsqml2/declarativeboxplotseries_p.h @@ -27,19 +27,29 @@ ** ****************************************************************************/ +// W A R N I N G +// ------------- +// +// This file is not part of the Qt Chart API. It exists purely as an +// implementation detail. This header file may change from version to +// version without notice, or even be removed. +// +// We mean it. + #ifndef DECLARATIVEBOXPLOT_H #define DECLARATIVEBOXPLOT_H #include <QtCharts/QBoxSet> -#include "declarativeaxes.h" +#include <private/declarativeaxes_p.h> #include <QtCharts/QBoxPlotSeries> +#include <private/declarativechartglobal_p.h> #include <QtQuick/QQuickItem> #include <QtQml/QQmlParserStatus> QT_CHARTS_BEGIN_NAMESPACE -class DeclarativeBoxSet : public QBoxSet +class QT_QMLCHARTS_PRIVATE_EXPORT DeclarativeBoxSet : public QBoxSet { Q_OBJECT Q_PROPERTY(QVariantList values READ values WRITE setValues) @@ -83,7 +93,7 @@ private: QImage m_brushImage; }; -class DeclarativeBoxPlotSeries : public QBoxPlotSeries, public QQmlParserStatus +class QT_QMLCHARTS_PRIVATE_EXPORT DeclarativeBoxPlotSeries : public QBoxPlotSeries, public QQmlParserStatus { Q_OBJECT Q_INTERFACES(QQmlParserStatus) diff --git a/src/chartsqml2/declarativecandlestickseries.cpp b/src/chartsqml2/declarativecandlestickseries.cpp index 66e6cdbc..97a5d557 100644 --- a/src/chartsqml2/declarativecandlestickseries.cpp +++ b/src/chartsqml2/declarativecandlestickseries.cpp @@ -29,8 +29,8 @@ #include <QtCharts/QHCandlestickModelMapper> #include <QtCharts/QVCandlestickModelMapper> -#include "declarativeaxes.h" -#include "declarativecandlestickseries.h" +#include "declarativeaxes_p.h" +#include "declarativecandlestickseries_p.h" QT_CHARTS_BEGIN_NAMESPACE @@ -239,6 +239,6 @@ void DeclarativeCandlestickSeries::handleBrushChanged() } } -#include "moc_declarativecandlestickseries.cpp" +#include "moc_declarativecandlestickseries_p.cpp" QT_CHARTS_END_NAMESPACE diff --git a/src/chartsqml2/declarativecandlestickseries.h b/src/chartsqml2/declarativecandlestickseries_p.h index 9b7c0e37..96787de2 100644 --- a/src/chartsqml2/declarativecandlestickseries.h +++ b/src/chartsqml2/declarativecandlestickseries_p.h @@ -27,6 +27,15 @@ ** ****************************************************************************/ +// W A R N I N G +// ------------- +// +// This file is not part of the Qt Chart API. It exists purely as an +// implementation detail. This header file may change from version to +// version without notice, or even be removed. +// +// We mean it. + #ifndef DECLARATIVECANDLESTICKSERIES_H #define DECLARATIVECANDLESTICKSERIES_H @@ -34,13 +43,14 @@ #include <QtCharts/QCandlestickSet> #include <QtQml/QQmlParserStatus> #include <QtQuick/QQuickItem> +#include <private/declarativechartglobal_p.h> QT_CHARTS_BEGIN_NAMESPACE class DeclarativeAxes; class QAbstractAxis; -class DeclarativeCandlestickSet : public QCandlestickSet +class QT_QMLCHARTS_PRIVATE_EXPORT DeclarativeCandlestickSet : public QCandlestickSet { Q_OBJECT Q_PROPERTY(QString brushFilename READ brushFilename WRITE setBrushFilename NOTIFY brushFilenameChanged) diff --git a/src/chartsqml2/declarativecategoryaxis.cpp b/src/chartsqml2/declarativecategoryaxis.cpp index 21221404..dcfc928d 100644 --- a/src/chartsqml2/declarativecategoryaxis.cpp +++ b/src/chartsqml2/declarativecategoryaxis.cpp @@ -27,7 +27,7 @@ ** ****************************************************************************/ -#include "declarativecategoryaxis.h" +#include "declarativecategoryaxis_p.h" #include <QtCore/QDebug> QT_CHARTS_BEGIN_NAMESPACE @@ -133,6 +133,6 @@ void DeclarativeCategoryAxis::setLabelsPosition(AxisLabelsPosition position) } } -#include "moc_declarativecategoryaxis.cpp" +#include "moc_declarativecategoryaxis_p.cpp" QT_CHARTS_END_NAMESPACE diff --git a/src/chartsqml2/declarativecategoryaxis.h b/src/chartsqml2/declarativecategoryaxis_p.h index 9f9ef90c..e50844b2 100644 --- a/src/chartsqml2/declarativecategoryaxis.h +++ b/src/chartsqml2/declarativecategoryaxis_p.h @@ -27,17 +27,27 @@ ** ****************************************************************************/ +// W A R N I N G +// ------------- +// +// This file is not part of the Qt Chart API. It exists purely as an +// implementation detail. This header file may change from version to +// version without notice, or even be removed. +// +// We mean it. + #ifndef DECLARATIVECATEGORYAXIS_H #define DECLARATIVECATEGORYAXIS_H #include <QtCharts/QCategoryAxis> +#include <private/declarativechartglobal_p.h> #include <QtQml/QQmlListProperty> #include <QtQml/QQmlParserStatus> QT_CHARTS_BEGIN_NAMESPACE -class DeclarativeCategoryRange : public QObject +class QT_QMLCHARTS_PRIVATE_EXPORT DeclarativeCategoryRange : public QObject { Q_OBJECT Q_PROPERTY(qreal endValue READ endValue WRITE setEndValue) diff --git a/src/chartsqml2/declarativechart.cpp b/src/chartsqml2/declarativechart.cpp index 672a6b07..4782f3a4 100644 --- a/src/chartsqml2/declarativechart.cpp +++ b/src/chartsqml2/declarativechart.cpp @@ -27,26 +27,26 @@ ** ****************************************************************************/ -#include "declarativechart.h" +#include "declarativechart_p.h" #include <QtGui/QPainter> -#include "declarativelineseries.h" -#include "declarativeareaseries.h" -#include "declarativebarseries.h" -#include "declarativepieseries.h" -#include "declarativesplineseries.h" -#include "declarativeboxplotseries.h" -#include "declarativecandlestickseries.h" -#include "declarativescatterseries.h" -#include "declarativechartnode.h" -#include "declarativeabstractrendernode.h" +#include "declarativelineseries_p.h" +#include "declarativeareaseries_p.h" +#include "declarativebarseries_p.h" +#include "declarativepieseries_p.h" +#include "declarativesplineseries_p.h" +#include "declarativeboxplotseries_p.h" +#include "declarativecandlestickseries_p.h" +#include "declarativescatterseries_p.h" +#include "declarativechartnode_p.h" +#include "declarativeabstractrendernode_p.h" #include <QtCharts/QBarCategoryAxis> #include <QtCharts/QValueAxis> #include <QtCharts/QLogValueAxis> #include <QtCharts/QCategoryAxis> #include <private/qabstractseries_p.h> -#include "declarativemargins.h" +#include "declarativemargins_p.h" #include <private/chartdataset_p.h> -#include "declarativeaxes.h" +#include "declarativeaxes_p.h" #include <private/qchart_p.h> #include <private/chartpresenter_p.h> #include <QtCharts/QPolarChart> @@ -488,7 +488,7 @@ void DeclarativeChart::initChart(QChart::ChartType type) this, SLOT(changeMargins(int,int,int,int))); connect(m_chart->d_ptr->m_dataset, SIGNAL(seriesAdded(QAbstractSeries*)), this, SLOT(handleSeriesAdded(QAbstractSeries*))); connect(m_chart->d_ptr->m_dataset, SIGNAL(seriesRemoved(QAbstractSeries*)), this, SIGNAL(seriesRemoved(QAbstractSeries*))); - connect(m_chart, &QChart::plotAreaChanged, this, &DeclarativeChart::plotAreaChanged); + connect(m_chart, SIGNAL(plotAreaChanged(QRectF)), this, SIGNAL(plotAreaChanged(QRectF))); } void DeclarativeChart::handleSeriesAdded(QAbstractSeries *series) @@ -1469,6 +1469,6 @@ QPointF DeclarativeChart::mapToPosition(const QPointF &value, QAbstractSeries *s return m_chart->mapToPosition(value, series); } -#include "moc_declarativechart.cpp" +#include "moc_declarativechart_p.cpp" QT_CHARTS_END_NAMESPACE diff --git a/src/chartsqml2/declarativechart.h b/src/chartsqml2/declarativechart_p.h index 602e3b2c..1d8e6d31 100644 --- a/src/chartsqml2/declarativechart.h +++ b/src/chartsqml2/declarativechart_p.h @@ -27,11 +27,21 @@ ** ****************************************************************************/ +// W A R N I N G +// ------------- +// +// This file is not part of the Qt Chart API. It exists purely as an +// implementation detail. This header file may change from version to +// version without notice, or even be removed. +// +// We mean it. + #ifndef DECLARATIVECHART_H #define DECLARATIVECHART_H #include <private/glxyseriesdata_p.h> -#include "declarativeabstractrendernode.h" +#include <private/declarativechartglobal_p.h> +#include <private/declarativeabstractrendernode_p.h> #include <QtCore/QtGlobal> #include <QtQuick/QQuickItem> @@ -47,7 +57,7 @@ class DeclarativeMargins; class Domain; class DeclarativeAxes; -class DeclarativeChart : public QQuickItem +class QT_QMLCHARTS_PRIVATE_EXPORT DeclarativeChart : public QQuickItem { Q_OBJECT Q_PROPERTY(Theme theme READ theme WRITE setTheme) diff --git a/src/chartsqml2/declarativechartglobal_p.h b/src/chartsqml2/declarativechartglobal_p.h new file mode 100644 index 00000000..a897d4ca --- /dev/null +++ b/src/chartsqml2/declarativechartglobal_p.h @@ -0,0 +1,54 @@ +/**************************************************************************** +** +** Copyright (C) 2018 The Qt Company Ltd. +** Contact: https://www.qt.io/licensing/ +** +** This file is part of the Qt Charts module of the Qt Toolkit. +** +** $QT_BEGIN_LICENSE:GPL$ +** Commercial License Usage +** Licensees holding valid commercial Qt licenses may use this file in +** accordance with the commercial license agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and The Qt Company. For licensing terms +** and conditions see https://www.qt.io/terms-conditions. For further +** information use the contact form at https://www.qt.io/contact-us. +** +** GNU General Public License Usage +** Alternatively, this file may be used under the terms of the GNU +** General Public License version 3 or (at your option) any later version +** approved by the KDE Free Qt Foundation. The licenses are as published by +** the Free Software Foundation and appearing in the file LICENSE.GPL3 +** included in the packaging of this file. Please review the following +** information to ensure the GNU General Public License requirements will +** be met: https://www.gnu.org/licenses/gpl-3.0.html. +** +** $QT_END_LICENSE$ +** +****************************************************************************/ + +// W A R N I N G +// ------------- +// +// This file is not part of the Qt Chart API. It exists purely as an +// implementation detail. This header file may change from version to +// version without notice, or even be removed. +// +// We mean it. + +#ifndef DECLARATIVECHARTGLOBAL_H +#define DECLARATIVECHARTGLOBAL_H + +#include <QtCore/QtGlobal> + +#ifndef QT_STATIC +# if defined(QT_BUILD_QMLCHARTS_LIB) +# define QT_QMLCHARTS_PRIVATE_EXPORT Q_DECL_EXPORT +# else +# define QT_QMLCHARTS_PRIVATE_EXPORT Q_DECL_IMPORT +# endif +#else +# define QT_QMLCHARTS_PRIVATE_EXPORT +#endif + +#endif // DECLARATIVECHARTGLOBAL_H diff --git a/src/chartsqml2/declarativechartnode.cpp b/src/chartsqml2/declarativechartnode.cpp index 0b8f5a5a..76fddbc5 100644 --- a/src/chartsqml2/declarativechartnode.cpp +++ b/src/chartsqml2/declarativechartnode.cpp @@ -27,15 +27,15 @@ ** ****************************************************************************/ -#include "declarativechartnode.h" -#include "declarativeabstractrendernode.h" +#include "declarativechartnode_p.h" +#include "declarativeabstractrendernode_p.h" #include <QtQuick/QQuickWindow> #include <QtQuick/QSGImageNode> #include <QtQuick/QSGRendererInterface> #ifndef QT_NO_OPENGL -# include "declarativeopenglrendernode.h" +# include "declarativeopenglrendernode_p.h" #endif QT_CHARTS_BEGIN_NAMESPACE diff --git a/src/chartsqml2/declarativechartnode.h b/src/chartsqml2/declarativechartnode_p.h index c93307fc..cd7b9ee5 100644 --- a/src/chartsqml2/declarativechartnode.h +++ b/src/chartsqml2/declarativechartnode_p.h @@ -27,6 +27,15 @@ ** ****************************************************************************/ +// W A R N I N G +// ------------- +// +// This file is not part of the Qt Chart API. It exists purely as an +// implementation detail. This header file may change from version to +// version without notice, or even be removed. +// +// We mean it. + #ifndef DECLARATIVECHARTNODE_P_H #define DECLARATIVECHARTNODE_P_H diff --git a/src/chartsqml2/declarativelineseries.cpp b/src/chartsqml2/declarativelineseries.cpp index 49ee3210..73febddd 100644 --- a/src/chartsqml2/declarativelineseries.cpp +++ b/src/chartsqml2/declarativelineseries.cpp @@ -27,7 +27,7 @@ ** ****************************************************************************/ -#include "declarativelineseries.h" +#include "declarativelineseries_p.h" QT_CHARTS_BEGIN_NAMESPACE @@ -109,6 +109,6 @@ void DeclarativeLineSeries::appendDeclarativeChildren(QQmlListProperty<QObject> // Empty implementation, children are parsed in componentComplete } -#include "moc_declarativelineseries.cpp" +#include "moc_declarativelineseries_p.cpp" QT_CHARTS_END_NAMESPACE diff --git a/src/chartsqml2/declarativelineseries.h b/src/chartsqml2/declarativelineseries_p.h index 39c63150..e3fcc14a 100644 --- a/src/chartsqml2/declarativelineseries.h +++ b/src/chartsqml2/declarativelineseries_p.h @@ -27,19 +27,29 @@ ** ****************************************************************************/ +// W A R N I N G +// ------------- +// +// This file is not part of the Qt Chart API. It exists purely as an +// implementation detail. This header file may change from version to +// version without notice, or even be removed. +// +// We mean it. + #ifndef DECLARATIVELINESERIES_H #define DECLARATIVELINESERIES_H #include <QtCharts/QLineSeries> -#include "declarativexyseries.h" -#include "declarativeaxes.h" +#include <private/declarativechartglobal_p.h> +#include <private/declarativexyseries_p.h> +#include <private/declarativeaxes_p.h> #include <QtQml/QQmlListProperty> #include <QtQml/QQmlParserStatus> QT_CHARTS_BEGIN_NAMESPACE -class DeclarativeLineSeries : public QLineSeries, public DeclarativeXySeries, public QQmlParserStatus +class QT_QMLCHARTS_PRIVATE_EXPORT DeclarativeLineSeries : public QLineSeries, public DeclarativeXySeries, public QQmlParserStatus { Q_OBJECT Q_INTERFACES(QQmlParserStatus) diff --git a/src/chartsqml2/declarativemargins.cpp b/src/chartsqml2/declarativemargins.cpp index a4284dbc..66891e2a 100644 --- a/src/chartsqml2/declarativemargins.cpp +++ b/src/chartsqml2/declarativemargins.cpp @@ -27,7 +27,7 @@ ** ****************************************************************************/ -#include "declarativemargins.h" +#include "declarativemargins_p.h" #include <QtCore/QDataStream> #include <QtCore/QDebug> @@ -123,6 +123,6 @@ void DeclarativeMargins::setRight(int right) } } -#include "moc_declarativemargins.cpp" +#include "moc_declarativemargins_p.cpp" QT_CHARTS_END_NAMESPACE diff --git a/src/chartsqml2/declarativemargins.h b/src/chartsqml2/declarativemargins_p.h index bbc6b0cb..b9c7ab0a 100644 --- a/src/chartsqml2/declarativemargins.h +++ b/src/chartsqml2/declarativemargins_p.h @@ -27,16 +27,26 @@ ** ****************************************************************************/ +// W A R N I N G +// ------------- +// +// This file is not part of the Qt Chart API. It exists purely as an +// implementation detail. This header file may change from version to +// version without notice, or even be removed. +// +// We mean it. + #ifndef DECLARATIVE_MARGINS_H #define DECLARATIVE_MARGINS_H #include <QtCharts/QChartGlobal> #include <QtCore/QObject> #include <QtCore/QMargins> +#include <private/declarativechartglobal_p.h> QT_CHARTS_BEGIN_NAMESPACE -class DeclarativeMargins : public QObject, public QMargins +class QT_QMLCHARTS_PRIVATE_EXPORT DeclarativeMargins : public QObject, public QMargins { Q_OBJECT Q_PROPERTY(int top READ top WRITE setTop NOTIFY topChanged) diff --git a/src/chartsqml2/declarativeopenglrendernode.cpp b/src/chartsqml2/declarativeopenglrendernode.cpp index 742a9301..685c331b 100644 --- a/src/chartsqml2/declarativeopenglrendernode.cpp +++ b/src/chartsqml2/declarativeopenglrendernode.cpp @@ -27,7 +27,7 @@ ** ****************************************************************************/ -#include "declarativeopenglrendernode.h" +#include "declarativeopenglrendernode_p.h" #include <QtGui/QOpenGLContext> #include <QtGui/QOpenGLFunctions> diff --git a/src/chartsqml2/declarativeopenglrendernode.h b/src/chartsqml2/declarativeopenglrendernode_p.h index a07ed324..d4bb2372 100644 --- a/src/chartsqml2/declarativeopenglrendernode.h +++ b/src/chartsqml2/declarativeopenglrendernode_p.h @@ -27,10 +27,19 @@ ** ****************************************************************************/ +// W A R N I N G +// ------------- +// +// This file is not part of the Qt Chart API. It exists purely as an +// implementation detail. This header file may change from version to +// version without notice, or even be removed. +// +// We mean it. + #ifndef DECLARATIVEOPENGLRENDERNODE_P_H #define DECLARATIVEOPENGLRENDERNODE_P_H -#include "declarativeabstractrendernode.h" +#include <private/declarativeabstractrendernode_p.h> #include <QtCharts/QChartGlobal> #include <private/glxyseriesdata_p.h> diff --git a/src/chartsqml2/declarativepieseries.cpp b/src/chartsqml2/declarativepieseries.cpp index ade8e13e..300f5f37 100644 --- a/src/chartsqml2/declarativepieseries.cpp +++ b/src/chartsqml2/declarativepieseries.cpp @@ -27,7 +27,7 @@ ** ****************************************************************************/ -#include "declarativepieseries.h" +#include "declarativepieseries_p.h" #include <QtCharts/QPieSlice> #include <QtCharts/QVPieModelMapper> #include <QtCharts/QHPieModelMapper> @@ -158,6 +158,6 @@ void DeclarativePieSeries::handleRemoved(QList<QPieSlice *> slices) emit sliceRemoved(slice); } -#include "moc_declarativepieseries.cpp" +#include "moc_declarativepieseries_p.cpp" QT_CHARTS_END_NAMESPACE diff --git a/src/chartsqml2/declarativepieseries.h b/src/chartsqml2/declarativepieseries_p.h index 807783c6..33ff7586 100644 --- a/src/chartsqml2/declarativepieseries.h +++ b/src/chartsqml2/declarativepieseries_p.h @@ -27,18 +27,28 @@ ** ****************************************************************************/ +// W A R N I N G +// ------------- +// +// This file is not part of the Qt Chart API. It exists purely as an +// implementation detail. This header file may change from version to +// version without notice, or even be removed. +// +// We mean it. + #ifndef DECLARATIVEPIESERIES_H #define DECLARATIVEPIESERIES_H #include <QtCharts/QPieSeries> #include <QtCharts/QPieSlice> +#include <private/declarativechartglobal_p.h> #include <QtQuick/QQuickItem> #include <QtQml/QQmlParserStatus> QT_CHARTS_BEGIN_NAMESPACE -class DeclarativePieSlice : public QPieSlice +class QT_QMLCHARTS_PRIVATE_EXPORT DeclarativePieSlice : public QPieSlice { Q_OBJECT Q_PROPERTY(QString brushFilename READ brushFilename WRITE setBrushFilename NOTIFY brushFilenameChanged) diff --git a/src/chartsqml2/declarativepolarchart.cpp b/src/chartsqml2/declarativepolarchart.cpp index bc366d85..b342a6d2 100644 --- a/src/chartsqml2/declarativepolarchart.cpp +++ b/src/chartsqml2/declarativepolarchart.cpp @@ -27,7 +27,7 @@ ** ****************************************************************************/ -#include "declarativepolarchart.h" +#include "declarativepolarchart_p.h" #include <QtCharts/QChart> QT_CHARTS_BEGIN_NAMESPACE @@ -78,6 +78,6 @@ DeclarativePolarChart::~DeclarativePolarChart() { } -#include "moc_declarativepolarchart.cpp" +#include "moc_declarativepolarchart_p.cpp" QT_CHARTS_END_NAMESPACE diff --git a/src/chartsqml2/declarativepolarchart.h b/src/chartsqml2/declarativepolarchart_p.h index beb0f694..3d82f822 100644 --- a/src/chartsqml2/declarativepolarchart.h +++ b/src/chartsqml2/declarativepolarchart_p.h @@ -27,17 +27,26 @@ ** ****************************************************************************/ +// W A R N I N G +// ------------- +// +// This file is not part of the Qt Chart API. It exists purely as an +// implementation detail. This header file may change from version to +// version without notice, or even be removed. +// +// We mean it. + #ifndef DECLARATIVEPOLARCHART_H #define DECLARATIVEPOLARCHART_H #include <QtCore/QtGlobal> #include <QtQuick/QQuickItem> - -#include "declarativechart.h" +#include <private/declarativechartglobal_p.h> +#include <private/declarativechart_p.h> QT_CHARTS_BEGIN_NAMESPACE -class DeclarativePolarChart : public DeclarativeChart +class QT_QMLCHARTS_PRIVATE_EXPORT DeclarativePolarChart : public DeclarativeChart { Q_OBJECT public: diff --git a/src/chartsqml2/declarativescatterseries.cpp b/src/chartsqml2/declarativescatterseries.cpp index d62847fb..e53b1984 100644 --- a/src/chartsqml2/declarativescatterseries.cpp +++ b/src/chartsqml2/declarativescatterseries.cpp @@ -27,7 +27,7 @@ ** ****************************************************************************/ -#include "declarativescatterseries.h" +#include "declarativescatterseries_p.h" QT_CHARTS_BEGIN_NAMESPACE @@ -119,6 +119,6 @@ void DeclarativeScatterSeries::handleBrushChanged() } } -#include "moc_declarativescatterseries.cpp" +#include "moc_declarativescatterseries_p.cpp" QT_CHARTS_END_NAMESPACE diff --git a/src/chartsqml2/declarativescatterseries.h b/src/chartsqml2/declarativescatterseries_p.h index 9515243a..c02ed47e 100644 --- a/src/chartsqml2/declarativescatterseries.h +++ b/src/chartsqml2/declarativescatterseries_p.h @@ -27,19 +27,29 @@ ** ****************************************************************************/ +// W A R N I N G +// ------------- +// +// This file is not part of the Qt Chart API. It exists purely as an +// implementation detail. This header file may change from version to +// version without notice, or even be removed. +// +// We mean it. + #ifndef DECLARATIVESCATTERSERIES_H #define DECLARATIVESCATTERSERIES_H #include <QtCharts/QScatterSeries> -#include "declarativexyseries.h" -#include "declarativeaxes.h" +#include <private/declarativechartglobal_p.h> +#include <private/declarativexyseries_p.h> +#include <private/declarativeaxes_p.h> #include <QtQml/QQmlListProperty> #include <QtQml/QQmlParserStatus> QT_CHARTS_BEGIN_NAMESPACE -class DeclarativeScatterSeries : public QScatterSeries, public DeclarativeXySeries, public QQmlParserStatus +class QT_QMLCHARTS_PRIVATE_EXPORT DeclarativeScatterSeries : public QScatterSeries, public DeclarativeXySeries, public QQmlParserStatus { Q_OBJECT Q_INTERFACES(QQmlParserStatus) diff --git a/src/chartsqml2/declarativesplineseries.cpp b/src/chartsqml2/declarativesplineseries.cpp index 25e3e873..bcbfef14 100644 --- a/src/chartsqml2/declarativesplineseries.cpp +++ b/src/chartsqml2/declarativesplineseries.cpp @@ -27,7 +27,7 @@ ** ****************************************************************************/ -#include "declarativesplineseries.h" +#include "declarativesplineseries_p.h" QT_CHARTS_BEGIN_NAMESPACE @@ -109,6 +109,6 @@ void DeclarativeSplineSeries::appendDeclarativeChildren(QQmlListProperty<QObject // Empty implementation, children are parsed in componentComplete } -#include "moc_declarativesplineseries.cpp" +#include "moc_declarativesplineseries_p.cpp" QT_CHARTS_END_NAMESPACE diff --git a/src/chartsqml2/declarativesplineseries.h b/src/chartsqml2/declarativesplineseries_p.h index aa5f22ad..d6369a87 100644 --- a/src/chartsqml2/declarativesplineseries.h +++ b/src/chartsqml2/declarativesplineseries_p.h @@ -27,19 +27,29 @@ ** ****************************************************************************/ +// W A R N I N G +// ------------- +// +// This file is not part of the Qt Chart API. It exists purely as an +// implementation detail. This header file may change from version to +// version without notice, or even be removed. +// +// We mean it. + #ifndef DECLARATIVESPLINESERIES_H #define DECLARATIVESPLINESERIES_H #include <QtCharts/QSplineSeries> -#include "declarativexyseries.h" -#include "declarativeaxes.h" +#include <private/declarativechartglobal_p.h> +#include <private/declarativexyseries_p.h> +#include <private/declarativeaxes_p.h> #include <QtQml/QQmlListProperty> #include <QtQml/QQmlParserStatus> QT_CHARTS_BEGIN_NAMESPACE -class DeclarativeSplineSeries : public QSplineSeries, public DeclarativeXySeries, public QQmlParserStatus +class QT_QMLCHARTS_PRIVATE_EXPORT DeclarativeSplineSeries : public QSplineSeries, public DeclarativeXySeries, public QQmlParserStatus { Q_OBJECT Q_INTERFACES(QQmlParserStatus) diff --git a/src/chartsqml2/declarativexypoint.cpp b/src/chartsqml2/declarativexypoint.cpp index 91ade7c2..332ea165 100644 --- a/src/chartsqml2/declarativexypoint.cpp +++ b/src/chartsqml2/declarativexypoint.cpp @@ -27,7 +27,7 @@ ** ****************************************************************************/ -#include "declarativexypoint.h" +#include "declarativexypoint_p.h" #include <QtCore/QDataStream> QT_CHARTS_BEGIN_NAMESPACE @@ -62,6 +62,6 @@ DeclarativeXYPoint::DeclarativeXYPoint(QObject *parent) : setY(0.0); } -#include "moc_declarativexypoint.cpp" +#include "moc_declarativexypoint_p.cpp" QT_CHARTS_END_NAMESPACE diff --git a/src/chartsqml2/declarativexypoint.h b/src/chartsqml2/declarativexypoint_p.h index feb0af05..316ff962 100644 --- a/src/chartsqml2/declarativexypoint.h +++ b/src/chartsqml2/declarativexypoint_p.h @@ -27,16 +27,26 @@ ** ****************************************************************************/ +// W A R N I N G +// ------------- +// +// This file is not part of the Qt Chart API. It exists purely as an +// implementation detail. This header file may change from version to +// version without notice, or even be removed. +// +// We mean it. + #ifndef DECLARATIVE_XY_POINT_H #define DECLARATIVE_XY_POINT_H #include <QtCharts/QChartGlobal> +#include <private/declarativechartglobal_p.h> #include <QtCore/QObject> #include <QtCore/QPointF> QT_CHARTS_BEGIN_NAMESPACE -class DeclarativeXYPoint : public QObject, public QPointF +class QT_QMLCHARTS_PRIVATE_EXPORT DeclarativeXYPoint : public QObject, public QPointF { Q_OBJECT Q_PROPERTY(qreal x READ x WRITE setX) diff --git a/src/chartsqml2/declarativexyseries.cpp b/src/chartsqml2/declarativexyseries.cpp index 1d38cf68..88c971e9 100644 --- a/src/chartsqml2/declarativexyseries.cpp +++ b/src/chartsqml2/declarativexyseries.cpp @@ -28,8 +28,8 @@ ****************************************************************************/ -#include "declarativexyseries.h" -#include "declarativexypoint.h" +#include "declarativexyseries_p.h" +#include "declarativexypoint_p.h" #include <QtCharts/QVXYModelMapper> #include <QtCharts/QHXYModelMapper> diff --git a/src/chartsqml2/declarativexyseries.h b/src/chartsqml2/declarativexyseries_p.h index 26da8c42..e78fde67 100644 --- a/src/chartsqml2/declarativexyseries.h +++ b/src/chartsqml2/declarativexyseries_p.h @@ -27,17 +27,27 @@ ** ****************************************************************************/ +// W A R N I N G +// ------------- +// +// This file is not part of the Qt Chart API. It exists purely as an +// implementation detail. This header file may change from version to +// version without notice, or even be removed. +// +// We mean it. + #ifndef DECLARATIVE_XY_SERIES_H #define DECLARATIVE_XY_SERIES_H #include <QtCharts/QXYSeries> +#include <private/declarativechartglobal_p.h> QT_CHARTS_BEGIN_NAMESPACE class QChart; class QAbstractSeries; -class DeclarativeXySeries +class QT_QMLCHARTS_PRIVATE_EXPORT DeclarativeXySeries { public: explicit DeclarativeXySeries(); diff --git a/sync.profile b/sync.profile index 80332926..f21cc199 100644 --- a/sync.profile +++ b/sync.profile @@ -1,5 +1,5 @@ %modules = ( # path to module name map - "QtCharts" => "$basedir/src/charts", + "QtCharts" => "$basedir/src/charts;^$basedir/src/chartsqml2", ); %moduleheaders = ( # restrict the module headers to those found in relative path ); diff --git a/tests/auto/auto.pro b/tests/auto/auto.pro index 321ca26c..81557a7f 100644 --- a/tests/auto/auto.pro +++ b/tests/auto/auto.pro @@ -37,9 +37,6 @@ SUBDIRS += \ qtHaveModule(quick) { SUBDIRS += qml \ qml-qtquicktest - - # QTBUG-20268 - boot2qt: SUBDIRS -= qml-qtquicktest } !contains(QT_CONFIG, private_tests): SUBDIRS -= \ diff --git a/tests/auto/qbarseries/tst_qbarseries.cpp b/tests/auto/qbarseries/tst_qbarseries.cpp index 5fe2808c..ef49b1ca 100644 --- a/tests/auto/qbarseries/tst_qbarseries.cpp +++ b/tests/auto/qbarseries/tst_qbarseries.cpp @@ -72,6 +72,7 @@ private slots: void setLabelsFormat(); void setLabelsPosition(); void setLabelsAngle(); + void setLabelsPrecision(); void opacity(); void mouseclicked_data(); void mouseclicked(); @@ -430,6 +431,19 @@ void tst_QBarSeries::setLabelsAngle() QCOMPARE(m_barseries->labelsAngle(), 55.0); } +void tst_QBarSeries::setLabelsPrecision() +{ + QSignalSpy labelsPrecisionSpy(m_barseries, + SIGNAL(labelsPrecisionChanged(int))); + QCOMPARE(m_barseries->labelsPrecision(), 6); + + m_barseries->setLabelsPrecision(9); + TRY_COMPARE(labelsPrecisionSpy.count(), 1); + QList<QVariant> arguments = labelsPrecisionSpy.takeFirst(); + QVERIFY(arguments.at(0).value<int>() == 9); + QCOMPARE(m_barseries->labelsPrecision(), 9); +} + void tst_QBarSeries::opacity() { QSignalSpy opacitySpy(m_barseries, SIGNAL(opacityChanged())); diff --git a/tests/auto/qchart/BLACKLIST b/tests/auto/qchart/BLACKLIST deleted file mode 100644 index a73cce28..00000000 --- a/tests/auto/qchart/BLACKLIST +++ /dev/null @@ -1,3 +0,0 @@ -[zoomOut] -# QTBUG-20268 -b2qt diff --git a/tests/auto/qchart/tst_qchart.cpp b/tests/auto/qchart/tst_qchart.cpp index 8ca2b0e0..7347f16b 100644 --- a/tests/auto/qchart/tst_qchart.cpp +++ b/tests/auto/qchart/tst_qchart.cpp @@ -902,8 +902,8 @@ void tst_QChart::zoomOut() else QCOMPARE(minY, axisY->min()); - QVERIFY(maxX == axisX->max()); - QVERIFY(maxY == axisY->max()); + QCOMPARE(maxX, axisX->max()); + QCOMPARE(maxY, axisY->max()); } diff --git a/tests/auto/qxyseries/qlineseries.pro b/tests/auto/qxyseries/qlineseries.pro deleted file mode 100644 index cb353869..00000000 --- a/tests/auto/qxyseries/qlineseries.pro +++ /dev/null @@ -1,6 +0,0 @@ -!include( ../auto.pri ) { - error( "Couldn't find the auto.pri file!" ) -} -SOURCES += tst_qlineseries.cpp - -!system_build:mac: QMAKE_POST_LINK += "$$MAC_POST_LINK_PREFIX $$MAC_AUTOTESTS_BIN_DIR" diff --git a/tests/auto/qxyseries/tst_qxyseries.cpp b/tests/auto/qxyseries/tst_qxyseries.cpp index 767caca2..de878679 100644 --- a/tests/auto/qxyseries/tst_qxyseries.cpp +++ b/tests/auto/qxyseries/tst_qxyseries.cpp @@ -325,7 +325,7 @@ void tst_QXYSeries::remove_raw() // (simulate e.g. spamming a hypothetical "remove last point"-button) QList<QPointF> bunchOfPoints; for (int i = 0; i < 10; i++) - bunchOfPoints.append(QPointF(i, (qreal) rand() / (qreal) RAND_MAX)); + bunchOfPoints.append(QPointF(i, QRandomGenerator::global()->generateDouble())); m_series->replace(bunchOfPoints); QCOMPARE(m_series->points(), bunchOfPoints); QTest::qWait(1500); // Wait for append animations to be over @@ -337,7 +337,7 @@ void tst_QXYSeries::remove_raw() // Removal using index for (int i = 0; i < 10; i++) - bunchOfPoints.append(QPointF(i, (qreal) rand() / (qreal) RAND_MAX)); + bunchOfPoints.append(QPointF(i, QRandomGenerator::global()->generateDouble())); m_series->replace(bunchOfPoints); m_series->remove(5); m_series->remove(0); @@ -350,7 +350,7 @@ void tst_QXYSeries::remove_raw() // Multiple removal using index for (int i = 0; i < 10; i++) - bunchOfPoints.append(QPointF(i, (qreal) rand() / (qreal) RAND_MAX)); + bunchOfPoints.append(QPointF(i, QRandomGenerator::global()->generateDouble())); m_series->replace(bunchOfPoints); m_series->removePoints(5, 2); m_series->removePoints(0, 3); @@ -463,7 +463,7 @@ void tst_QXYSeries::replace_raw() // Replace all points QList<QPointF> allPoints; for (int i = 0; i < 10; i++) - allPoints.append(QPointF(i, (qreal) rand() / (qreal) RAND_MAX)); + allPoints.append(QPointF(i, QRandomGenerator::global()->generateDouble())); m_series->replace(allPoints); TRY_COMPARE(pointReplacedSpy.count(), points.count()); TRY_COMPARE(pointsReplacedSpy.count(), 1); diff --git a/tests/manual/barcharttester/chart-widget.cpp b/tests/manual/barcharttester/chart-widget.cpp index 6e7157b1..3c58f5ce 100644 --- a/tests/manual/barcharttester/chart-widget.cpp +++ b/tests/manual/barcharttester/chart-widget.cpp @@ -40,7 +40,6 @@ #include <QtCharts/QHorizontalStackedBarSeries> #include <QtCharts/QPercentBarSeries> #include <QtCharts/QStackedBarSeries> -#include <QtCore/QTime> #include <QElapsedTimer> #include <QDebug> @@ -152,8 +151,6 @@ ChartWidget::ChartWidget(QWidget *parent) : series->setBarWidth(barWidth); } - qsrand((uint) QTime::currentTime().msec()); - resize(800, 300); m_horizontalLayout = new QHBoxLayout(this); m_horizontalLayout->setSpacing(6); diff --git a/tests/manual/candlesticktester/mainwidget.cpp b/tests/manual/candlesticktester/mainwidget.cpp index 9c902a3f..ec2d5bd8 100644 --- a/tests/manual/candlesticktester/mainwidget.cpp +++ b/tests/manual/candlesticktester/mainwidget.cpp @@ -35,6 +35,7 @@ #include <QtCharts/QValueAxis> #include <QtCore/QDateTime> #include <QtCore/QDebug> +#include <QtCore/QRandomGenerator> #include <QtWidgets/QCheckBox> #include <QtWidgets/QComboBox> #include <QtWidgets/QDoubleSpinBox> @@ -64,8 +65,6 @@ MainWidget::MainWidget(QWidget *parent) m_customDecreasingColor(false), m_hModelMapper(new QHCandlestickModelMapper(this)) { - qsrand(QDateTime::currentDateTime().toTime_t()); - m_chartView->setRenderHint(QPainter::Antialiasing, false); m_hModelMapper->setModel(new CustomTableModel(this)); @@ -285,7 +284,9 @@ QGridLayout *MainWidget::createModelMapperControlsLayout() qreal MainWidget::randomValue(int min, int max) const { - return (qrand() / (qreal(RAND_MAX) + 1)) * ((qMax(min, max) - qMin(min, max)) + qMin(min, max)); + if (min > max) + qSwap(min, max); + return QRandomGenerator::global()->bounded(min, max); } QCandlestickSet *MainWidget::randomSet(qreal timestamp) diff --git a/tests/manual/chartviewer/model.h b/tests/manual/chartviewer/model.h index fcc53724..a4c3aa3c 100644 --- a/tests/manual/chartviewer/model.h +++ b/tests/manual/chartviewer/model.h @@ -33,8 +33,8 @@ #include <QtCore/QList> #include <QtCore/QPair> #include <QtCore/QPointF> +#include <QtCore/QRandomGenerator> #include <QtCore/QTime> -#include <stdlib.h> typedef QPair<QPointF, QString> Data; typedef QList<Data> DataList; @@ -51,17 +51,14 @@ public: { DataTable dataTable; - // set seed for random stuff - qsrand(QTime(0, 0, 0).secsTo(QTime::currentTime())); - // generate random data for (int i(0); i < listCount; i++) { DataList dataList; qreal yValue(0.1); for (int j(0); j < valueCount; j++) { - yValue = yValue + (qreal)(qrand() % valueMax) / (qreal) valueCount; + yValue = yValue + QRandomGenerator::global()->bounded(valueMax / (qreal) valueCount); QPointF value( - (j + (qreal) qrand() / (qreal) RAND_MAX) + (j + QRandomGenerator::global()->generateDouble()) * ((qreal) valueMax / (qreal) valueCount), yValue); QString label = "Slice " + QString::number(i) + ":" + QString::number(j); dataList << Data(value, label); diff --git a/tests/manual/chartwidgettest/mainwidget.cpp b/tests/manual/chartwidgettest/mainwidget.cpp index da44298e..ebb00f22 100644 --- a/tests/manual/chartwidgettest/mainwidget.cpp +++ b/tests/manual/chartwidgettest/mainwidget.cpp @@ -49,12 +49,12 @@ #include <QtWidgets/QSpacerItem> #include <QtWidgets/QMessageBox> #include <QtCore/QDebug> +#include <QtCore/QRandomGenerator> #include <QtGui/QStandardItemModel> #include <QtCharts/QBarCategoryAxis> #include <QtWidgets/QOpenGLWidget> -#include <math.h> -#include <cmath> +#include <qmath.h> QT_CHARTS_USE_NAMESPACE @@ -218,11 +218,11 @@ QList<RealList> MainWidget::generateTestData(int columnCount, int rowCount, QStr QList <qreal> newColumn; for (int i(0); i < rowCount; i++) { if (dataCharacteristics == "Sin") { - newColumn.append(std::abs(sin(3.14159265358979 / 50 * i) * 100)); + newColumn.append(std::abs(sin(M_PI / 50 * i) * 100)); } else if (dataCharacteristics == "Sin + random") { - newColumn.append(std::abs(sin(3.14159265358979 / 50 * i) * 100) + (rand() % 5)); + newColumn.append(std::abs(sin(M_PI / 50 * i) * 100) + QRandomGenerator::global()->bounded(5)); } else if (dataCharacteristics == "Random") { - newColumn.append(rand() % 10 + (qreal) rand() / (qreal) RAND_MAX); + newColumn.append(QRandomGenerator::global()->bounded(11.0)); } else if (dataCharacteristics == "Linear") { //newColumn.append(i * (j + 1.0)); // TODO: temporary hack to make pie work; prevent zero values: diff --git a/tests/manual/openglseriestest/datasource.cpp b/tests/manual/openglseriestest/datasource.cpp index 459b9f01..dbf6874c 100644 --- a/tests/manual/openglseriestest/datasource.cpp +++ b/tests/manual/openglseriestest/datasource.cpp @@ -29,6 +29,7 @@ #include "datasource.h" #include <QtCore/QtMath> +#include <QtCore/QRandomGenerator> QT_CHARTS_USE_NAMESPACE @@ -117,8 +118,8 @@ void DataSource::generateData(int seriesIndex, int rowCount, int colCount) qreal x(0); qreal y(0); // data with sin + random component - y = height + (yMultiplier * qSin(3.14159265358979 / 50 * j) - + (yMultiplier * (qreal) rand() / (qreal) RAND_MAX)); + y = height + (yMultiplier * qSin(M_PI / 50 * j) + + (yMultiplier * QRandomGenerator::global()->generateDouble())); // 0.000001 added to make values logaxis compatible x = 0.000001 + 20.0 * (qreal(j) / qreal(colCount)) + (xAdjustment * qreal(i)); points.append(QPointF(x, y)); diff --git a/tests/manual/openglseriestest/mainwindow.cpp b/tests/manual/openglseriestest/mainwindow.cpp index 4aaeed13..1497dad8 100644 --- a/tests/manual/openglseriestest/mainwindow.cpp +++ b/tests/manual/openglseriestest/mainwindow.cpp @@ -36,6 +36,7 @@ #include <QtCharts/QDateTimeAxis> #include <QtCharts/QCategoryAxis> #include <QtCharts/QChart> +#include <QtCore/QRandomGenerator> #include <QtCore/QDebug> #include <QtCore/QDateTime> @@ -548,7 +549,7 @@ void MainWindow::addSeries(bool gl) if (m_seriesList.size() < maxSeriesCount) { QXYSeries *series; - if (qrand() % 2) { + if (QRandomGenerator::global()->bounded(2)) { series = new QLineSeries; series->setPen(QPen(QBrush(color), width)); } else { diff --git a/tests/manual/presenterchart/chartview.cpp b/tests/manual/presenterchart/chartview.cpp index 4bbf8080..b7d575de 100644 --- a/tests/manual/presenterchart/chartview.cpp +++ b/tests/manual/presenterchart/chartview.cpp @@ -32,7 +32,7 @@ #include <QtCharts/QScatterSeries> #include <QtCharts/QSplineSeries> #include <QtCharts/QAreaSeries> -#include <QtCore/QTime> +#include <QtCore/QRandomGenerator> ChartView::ChartView(QChart *chart, QWidget *parent) : QChartView(chart, parent), @@ -62,7 +62,7 @@ ChartView::ChartView(QChart *chart, QWidget *parent) int numPoints = 10; for (int x = 0; x <= numPoints; ++x) { - qreal y = qrand() % 100; + qreal y = QRandomGenerator::global()->bounded(100); series0->append(x, y); series1->append(x, y); series2->append(x, y); diff --git a/tests/manual/qmlchartproperties/qml/qmlchartproperties/BarChart.qml b/tests/manual/qmlchartproperties/qml/qmlchartproperties/BarChart.qml index a0d9fa92..b987d4fc 100644 --- a/tests/manual/qmlchartproperties/qml/qmlchartproperties/BarChart.qml +++ b/tests/manual/qmlchartproperties/qml/qmlchartproperties/BarChart.qml @@ -45,7 +45,7 @@ ChartView { name: "bar" labelsFormat: "@value"; axisX: BarCategoryAxis { categories: ["2007", "2008", "2009", "2010", "2011", "2012" ] } - BarSet { label: "Bob"; values: [2, 2, 3, 4, 5, 6] + BarSet { label: "Bob"; values: [2, 2, 3, 4, 5, 6.567889] onClicked: console.log("barset.onClicked: " + index); onHovered: console.log("barset.onHovered: " + status + " " + index); onPenChanged: console.log("barset.onPenChanged: " + pen); @@ -78,6 +78,7 @@ ChartView { onCountChanged: console.log("barSeries.onCountChanged: " + count); onLabelsFormatChanged: console.log("barSeries.onLabelsFormatChanged: " + format); onLabelsPositionChanged: console.log("barSeries.onLabelsPositionChanged: " + series.labelsPosition); + onLabelsPrecisionChanged: console.log("barSeries.onLabelsPrecisionChanged: " + series.labelsPrecision); onPressed: console.log("barSeries.onPressed: " + barset + " " + index); onReleased: console.log("barSeries.onReleased: " + barset + " " + index); onDoubleClicked: console.log("barSeries.onDoubleClicked: " + barset + " " + index); diff --git a/tests/manual/qmlchartproperties/qml/qmlchartproperties/BarEditor.qml b/tests/manual/qmlchartproperties/qml/qmlchartproperties/BarEditor.qml index 14fd991c..8292b5c6 100644 --- a/tests/manual/qmlchartproperties/qml/qmlchartproperties/BarEditor.qml +++ b/tests/manual/qmlchartproperties/qml/qmlchartproperties/BarEditor.qml @@ -205,6 +205,16 @@ Row { text: "labels angle -" onClicked: series.labelsAngle = series.labelsAngle - 5; } + Button { + text: "labels precision" + onClicked: { + if (series.labelsPrecision == 2) + series.labelsPrecision = 4; + else + series.labelsPrecision = 2; + } + } + FontEditor { id: fontEditor fontDescription: "label" diff --git a/tests/manual/qmlchartproperties/qml/qmlchartproperties/HorizontalBarChart.qml b/tests/manual/qmlchartproperties/qml/qmlchartproperties/HorizontalBarChart.qml index 368ab78e..b2932a0c 100644 --- a/tests/manual/qmlchartproperties/qml/qmlchartproperties/HorizontalBarChart.qml +++ b/tests/manual/qmlchartproperties/qml/qmlchartproperties/HorizontalBarChart.qml @@ -78,6 +78,9 @@ ChartView { + format); onLabelsPositionChanged: console.log("horizontalBarSeries.onLabelsPositionChanged: " + series.labelsPosition); + onLabelsPrecisionChanged: console.log( + "horizontalBarSeries.onLabelsPrecisionChanged: " + + series.labelsPrecision); onPressed: console.log("horizontalBarSeries.onPressed: " + barset + " " + index); onReleased: console.log("horizontalBarSeries.onReleased: " + barset + " " + index); onDoubleClicked: console.log("horizontalBarSeries.onDoubleClicked: " + barset + " " + index); diff --git a/tests/manual/qmlchartproperties/qml/qmlchartproperties/HorizontalPercentBarChart.qml b/tests/manual/qmlchartproperties/qml/qmlchartproperties/HorizontalPercentBarChart.qml index 9f230d06..6e23dba4 100644 --- a/tests/manual/qmlchartproperties/qml/qmlchartproperties/HorizontalPercentBarChart.qml +++ b/tests/manual/qmlchartproperties/qml/qmlchartproperties/HorizontalPercentBarChart.qml @@ -80,6 +80,9 @@ ChartView { onLabelsPositionChanged: console.log( "horizontalPercentBarSeries.onLabelsPositionChanged: " + series.labelsPosition); + onLabelsPrecisionChanged: console.log( + "horizontalPercentBarSeries.onLabelsPrecisionChanged: " + + series.labelsPrecision); onPressed: console.log("horizontalPercentBarSeries.onPressed: " + barset + " " + index); onReleased: console.log("horizontalPercentBarSeries.onReleased: " + barset + " " + index); onDoubleClicked: console.log("horizontalPercentBarSeries.onDoubleClicked: " + barset + " " + index); diff --git a/tests/manual/qmlchartproperties/qml/qmlchartproperties/HorizontalStackedBarChart.qml b/tests/manual/qmlchartproperties/qml/qmlchartproperties/HorizontalStackedBarChart.qml index 3a728c24..00f1ff39 100644 --- a/tests/manual/qmlchartproperties/qml/qmlchartproperties/HorizontalStackedBarChart.qml +++ b/tests/manual/qmlchartproperties/qml/qmlchartproperties/HorizontalStackedBarChart.qml @@ -80,6 +80,9 @@ ChartView { onLabelsPositionChanged: console.log( "horizontalStackedBarSeries.onLabelsPositionChanged: " + series.labelsPosition); + onLabelsPrecisionChanged: console.log( + "horizontalPercentBarSeries.onLabelsPrecisionChanged: " + + series.labelsPrecision); onPressed: console.log("horizontalStackedBarSeries.onPressed: " + barset + " " + index); onReleased: console.log("horizontalStackedBarSeries.onReleased: " + barset + " " + index); onDoubleClicked: console.log("horizontalStackedBarSeries.onDoubleClicked: " + barset + " " + index); diff --git a/tests/manual/qmlchartproperties/qml/qmlchartproperties/PercentBarChart.qml b/tests/manual/qmlchartproperties/qml/qmlchartproperties/PercentBarChart.qml index 2c7fb574..d9eb78dd 100644 --- a/tests/manual/qmlchartproperties/qml/qmlchartproperties/PercentBarChart.qml +++ b/tests/manual/qmlchartproperties/qml/qmlchartproperties/PercentBarChart.qml @@ -79,6 +79,9 @@ ChartView { + format); onLabelsPositionChanged: console.log("percentBarSeries.onLabelsPositionChanged: " + series.labelsPosition); + onLabelsPrecisionChanged: console.log( + "percentBarSeries.onLabelsPrecisionChanged: " + + series.labelsPrecision); onPressed: console.log("percentBarSeries.onPressed: " + barset + " " + index); onReleased: console.log("percentBarSeries.onReleased: " + barset + " " + index); onDoubleClicked: console.log("percentBarSeries.onDoubleClicked: " + barset + " " + index); diff --git a/tests/manual/qmlchartproperties/qml/qmlchartproperties/StackedBarChart.qml b/tests/manual/qmlchartproperties/qml/qmlchartproperties/StackedBarChart.qml index 266d49dc..ec3595b7 100644 --- a/tests/manual/qmlchartproperties/qml/qmlchartproperties/StackedBarChart.qml +++ b/tests/manual/qmlchartproperties/qml/qmlchartproperties/StackedBarChart.qml @@ -78,6 +78,9 @@ ChartView { + format); onLabelsPositionChanged: console.log("stackedBarSeries.onLabelsPositionChanged: " + series.labelsPosition); + onLabelsPrecisionChanged: console.log( + "stackedBarSeries.onLabelsPrecisionChanged: " + + series.labelsPrecision); onPressed: console.log("stackedBarSeries.onPressed: " + barset + " " + index); onReleased: console.log("stackedBarSeries.onReleased: " + barset + " " + index); onDoubleClicked: console.log("stackedBarSeries.onDoubleClicked: " + barset + " " + index); diff --git a/tests/manual/wavechart/wavechart.cpp b/tests/manual/wavechart/wavechart.cpp index b8abff92..695ddc72 100644 --- a/tests/manual/wavechart/wavechart.cpp +++ b/tests/manual/wavechart/wavechart.cpp @@ -28,18 +28,18 @@ ****************************************************************************/ #include "wavechart.h" -#include <math.h> +#include <qmath.h> +#include <qrandom.h> QT_CHARTS_USE_NAMESPACE -#define PI 3.14159265358979 static const int numPoints =100; WaveChart::WaveChart(QChart* chart, QWidget* parent) : QChartView(chart, parent), m_series(new QLineSeries()), m_wave(0), - m_step(2 * PI / numPoints) + m_step(2 * M_PI / numPoints) { QPen blue(Qt::blue); blue.setWidth(3); @@ -47,12 +47,9 @@ WaveChart::WaveChart(QChart* chart, QWidget* parent) : chart->legend()->setVisible(false); - QTime now = QTime::currentTime(); - qsrand((uint) now.msec()); - int fluctuate = 100; - for (qreal x = 0; x <= 2 * PI; x += m_step) { + for (qreal x = 0; x <= 2 * M_PI; x += m_step) { m_series->append(x, fabs(sin(x) * fluctuate)); } @@ -69,8 +66,8 @@ void WaveChart::update() int fluctuate; const QList<QPointF>& points = m_series->points(); - for (qreal i = 0, x = 0; x <= 2 * PI; x += m_step, i++) { - fluctuate = qrand() % 100; + for (qreal i = 0, x = 0; x <= 2 * M_PI; x += m_step, i++) { + fluctuate = QRandomGenerator::global()->bounded(100); m_series->replace(x,points[i].y(),x,fabs(sin(x) * fluctuate)); } |
