diff options
104 files changed, 589 insertions, 248 deletions
diff --git a/.qmake.conf b/.qmake.conf index 0338efe0..dc68d388 100644 --- a/.qmake.conf +++ b/.qmake.conf @@ -1,3 +1,3 @@ load(qt_build_config) -MODULE_VERSION = 5.10.1 +MODULE_VERSION = 5.11.0 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/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/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/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/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/horizontalaxis_p.h b/src/charts/axis/horizontalaxis_p.h index f9b4e148..079783fc 100644 --- a/src/charts/axis/horizontalaxis_p.h +++ b/src/charts/axis/horizontalaxis_p.h @@ -50,10 +50,10 @@ 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/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/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/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/verticalaxis_p.h b/src/charts/axis/verticalaxis_p.h index ba87b83a..670854c4 100644 --- a/src/charts/axis/verticalaxis_p.h +++ b/src/charts/axis/verticalaxis_p.h @@ -50,10 +50,10 @@ 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/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/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/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/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 4c00147e..99fadeeb 100644 --- a/src/charts/barchart/qabstractbarseries_p.h +++ b/src/charts/barchart/qabstractbarseries_p.h @@ -134,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/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/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/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/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/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/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/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/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/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/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/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/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/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/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/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/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/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/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/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/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/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/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/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/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/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/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/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/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/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/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..98feea82 100644 --- a/src/chartsqml2/declarativeboxplotseries.cpp +++ b/src/chartsqml2/declarativeboxplotseries.cpp @@ -27,8 +27,8 @@ ** ****************************************************************************/ -#include "declarativebarseries.h" -#include "declarativeboxplotseries.h" +#include "declarativebarseries_p.h" +#include "declarativeboxplotseries_p.h" #include <QtCharts/QBoxSet> #include <QtCharts/QVBoxPlotModelMapper> @@ -493,6 +493,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/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/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); |