diff options
-rw-r--r-- | configure.json | 5 | ||||
-rw-r--r-- | examples/charts/charts.pro | 104 | ||||
-rw-r--r-- | src/charts/animations/animations.pri | 52 | ||||
-rw-r--r-- | src/charts/charts.pro | 27 | ||||
-rw-r--r-- | src/charts/configure.json | 68 | ||||
-rw-r--r-- | src/charts/legend/legend.pri | 47 | ||||
-rw-r--r-- | src/charts/legend/legendmarkeritem.cpp | 34 | ||||
-rw-r--r-- | src/charts/legend/qarealegendmarker.h | 3 | ||||
-rw-r--r-- | src/charts/legend/qxylegendmarker.cpp | 8 | ||||
-rw-r--r-- | src/charts/linechart/qlineseries.h | 4 | ||||
-rw-r--r-- | src/charts/qchartglobal.h | 3 | ||||
-rw-r--r-- | src/charts/qchartglobal_p.h | 4 | ||||
-rw-r--r-- | src/charts/splinechart/qsplineseries.h | 5 | ||||
-rw-r--r-- | src/charts/xychart/glxyseriesdata.cpp | 9 | ||||
-rw-r--r-- | src/charts/xychart/glxyseriesdata_p.h | 2 | ||||
-rw-r--r-- | src/chartsqml2/chartsqml2.pro | 53 | ||||
-rw-r--r-- | src/chartsqml2/chartsqml2_plugin.cpp | 394 | ||||
-rw-r--r-- | src/chartsqml2/declarativechart.cpp | 83 | ||||
-rw-r--r-- | tests/auto/chartdataset/chartdataset.pro | 2 | ||||
-rw-r--r-- | tests/auto/domain/domain.pro | 2 | ||||
-rw-r--r-- | tests/auto/domain/tst_domain.cpp | 4 |
21 files changed, 599 insertions, 314 deletions
diff --git a/configure.json b/configure.json new file mode 100644 index 00000000..1efae2ed --- /dev/null +++ b/configure.json @@ -0,0 +1,5 @@ +{ + "subconfigs": [ + "src/charts" + ] +} diff --git a/examples/charts/charts.pro b/examples/charts/charts.pro index b64b464f..d94eec1b 100644 --- a/examples/charts/charts.pro +++ b/examples/charts/charts.pro @@ -1,55 +1,79 @@ +include($$OUT_PWD/../../src/charts/qtcharts-config.pri) +QT_FOR_CONFIG += charts TEMPLATE = subdirs -SUBDIRS += \ - areachart \ - barchart \ - barmodelmapper \ - boxplotchart \ - callout \ - candlestickchart \ - chartinteractions \ - chartthemes \ - customchart \ - donutbreakdown \ - donutchart \ - dynamicspline \ - horizontalbarchart \ - horizontalpercentbarchart \ - horizontalstackedbarchart \ - legend \ - legendmarkers \ - lineandbar \ - linechart \ - logvalueaxis \ - modeldata \ - multiaxis \ - nesteddonuts \ - percentbarchart \ - piechart \ - piechartcustomization \ - piechartdrilldown \ - polarchart \ - scatterchart \ - scatterinteractions \ - splinechart \ - stackedbarchart \ - stackedbarchartdrilldown \ - temperaturerecords \ - zoomlinechart +qtConfig(charts-area-chart) { + SUBDIRS += areachart +} +qtConfig(charts-line-chart) { + SUBDIRS += \ + callout \ + chartinteractions \ + customchart \ + linechart \ + lineandbar \ + legendmarkers \ + logvalueaxis \ + modeldata \ + zoomlinechart +} +qtConfig(charts-spline-chart) { + SUBDIRS += \ + dynamicspline \ + multiaxis \ + splinechart + qtConfig(charts-area-chart) { + SUBDIRS += \ + chartthemes \ + polarchart + } +} +qtConfig(charts-bar-chart) { + SUBDIRS += \ + barchart \ + barmodelmapper \ + horizontalbarchart \ + horizontalpercentbarchart \ + horizontalstackedbarchart \ + stackedbarchart \ + stackedbarchartdrilldown \ + percentbarchart \ + legend \ + temperaturerecords +} +qtConfig(charts-pie-chart) { + SUBDIRS += \ + donutchart \ + donutbreakdown \ + nesteddonuts \ + piechart \ + piechartcustomization \ + piechartdrilldown + qtHaveModule(quick): SUBDIRS += qmlpiechart +} +qtConfig(charts-boxplot-chart) { + SUBDIRS += boxplotchart + qtHaveModule(quick): SUBDIRS += qmlboxplot +} +qtConfig(charts-candlestick-chart) { + SUBDIRS += candlestickchart + qtHaveModule(quick): SUBDIRS += qmlcandlestick +} +qtConfig(charts-scatter-chart) { + SUBDIRS += \ + scatterchart \ + scatterinteractions +} qtHaveModule(quick) { SUBDIRS += \ qmlaxes \ - qmlboxplot \ - qmlcandlestick \ qmlchart \ qmlcustomizations \ qmlcustomlegend \ qmlf1legends \ qmloscilloscope \ - qmlpiechart \ qmlpolarchart \ qmlweather - } qtHaveModule(multimedia) { diff --git a/src/charts/animations/animations.pri b/src/charts/animations/animations.pri index 37480b13..1e0a14a5 100644 --- a/src/charts/animations/animations.pri +++ b/src/charts/animations/animations.pri @@ -3,27 +3,41 @@ INCLUDEPATH += $$PWD SOURCES += \ $$PWD/axisanimation.cpp \ $$PWD/xyanimation.cpp \ - $$PWD/pieanimation.cpp \ - $$PWD/piesliceanimation.cpp \ - $$PWD/splineanimation.cpp \ - $$PWD/baranimation.cpp \ - $$PWD/scatteranimation.cpp \ - $$PWD/boxplotanimation.cpp \ - $$PWD/boxwhiskersanimation.cpp \ - $$PWD/candlestickanimation.cpp \ - $$PWD/candlestickbodywicksanimation.cpp \ $$PWD/chartanimation.cpp PRIVATE_HEADERS += \ $$PWD/axisanimation_p.h \ $$PWD/chartanimation_p.h \ - $$PWD/xyanimation_p.h \ - $$PWD/pieanimation_p.h \ - $$PWD/piesliceanimation_p.h \ - $$PWD/splineanimation_p.h \ - $$PWD/baranimation_p.h \ - $$PWD/scatteranimation_p.h \ - $$PWD/boxplotanimation_p.h \ - $$PWD/boxwhiskersanimation_p.h \ - $$PWD/candlestickanimation_p.h \ - $$PWD/candlestickbodywicksanimation_p.h + $$PWD/xyanimation_p.h + +qtConfig(charts-spline-chart) { + SOURCES += $$PWD/splineanimation.cpp + PRIVATE_HEADERS += $$PWD/splineanimation_p.h +} +qtConfig(charts-scatter-chart) { + SOURCES += $$PWD/scatteranimation.cpp + PRIVATE_HEADERS += $$PWD/scatteranimation_p.h +} +qtConfig(charts-pie-chart) { + SOURCES += $$PWD/pieanimation.cpp \ + $$PWD/piesliceanimation.cpp + PRIVATE_HEADERS += $$PWD/pieanimation_p.h \ + $$PWD/piesliceanimation_p.h +} +qtConfig(charts-bar-chart) { + SOURCES += $$PWD/baranimation.cpp + PRIVATE_HEADERS += $$PWD/baranimation_p.h +} +qtConfig(charts-boxplot-chart) { + SOURCES += $$PWD/boxplotanimation.cpp \ + $$PWD/boxwhiskersanimation.cpp + PRIVATE_HEADERS += $$PWD/boxplotanimation_p.h \ + $$PWD/boxwhiskersanimation_p.h + +} +qtConfig(charts-candlestick-chart) { + SOURCES += $$PWD/candlestickanimation.cpp \ + $$PWD/candlestickbodywicksanimation.cpp + PRIVATE_HEADERS += $$PWD/candlestickanimation_p.h \ + $$PWD/candlestickbodywicksanimation_p.h +} diff --git a/src/charts/charts.pro b/src/charts/charts.pro index 88ba0ac9..0d86aeac 100644 --- a/src/charts/charts.pro +++ b/src/charts/charts.pro @@ -1,8 +1,6 @@ -############################# BUILD CONFIG ###################################### - TARGET = QtCharts - QT = core gui widgets opengl openglwidgets +QT_PRIVATE += core-private contains(QT_COORD_TYPE, float): DEFINES += QT_QREAL_IS_FLOAT QMAKE_DOCS = $$PWD/doc/qtcharts.qdocconf @@ -55,20 +53,21 @@ PUBLIC_HEADERS += \ $$PWD/qpolarchart.h include($$PWD/animations/animations.pri) -include($$PWD/areachart/areachart.pri) -include($$PWD/axis/axis.pri) -include($$PWD/domain/domain.pri) -include($$PWD/barchart/barchart.pri) -include($$PWD/legend/legend.pri) -include($$PWD/linechart/linechart.pri) -include($$PWD/piechart/piechart.pri) -include($$PWD/scatterchart/scatter.pri) -include($$PWD/splinechart/splinechart.pri) include($$PWD/themes/themes.pri) include($$PWD/xychart/xychart.pri) include($$PWD/layout/layout.pri) -include($$PWD/boxplotchart/boxplotchart.pri) -include($$PWD/candlestickchart/candlestickchart.pri) +include($$PWD/axis/axis.pri) +include($$PWD/domain/domain.pri) +include($$PWD/legend/legend.pri) + +qtConfig(charts-area-chart): include($$PWD/areachart/areachart.pri) +qtConfig(charts-bar-chart): include($$PWD/barchart/barchart.pri) +qtConfig(charts-line-chart): include($$PWD/linechart/linechart.pri) +qtConfig(charts-pie-chart): include($$PWD/piechart/piechart.pri) +qtConfig(charts-scatter-chart): include($$PWD/scatterchart/scatter.pri) +qtConfig(charts-spline-chart): include($$PWD/splinechart/splinechart.pri) +qtConfig(charts-boxplot-chart): include($$PWD/boxplotchart/boxplotchart.pri) +qtConfig(charts-candlestick-chart): include($$PWD/candlestickchart/candlestickchart.pri) HEADERS += $$PUBLIC_HEADERS HEADERS += $$PRIVATE_HEADERS diff --git a/src/charts/configure.json b/src/charts/configure.json new file mode 100644 index 00000000..48d76868 --- /dev/null +++ b/src/charts/configure.json @@ -0,0 +1,68 @@ +{ + "module" : "charts", + "depends" : [ + "widgets", + "graphicsview", + "quick" + ], + "features": { + "charts-line-chart" : { + "label": "Line Chart", + "purpose": "Support for line charts", + "output": [ "publicFeature" ] + }, + "charts-spline-chart" : { + "label": "Spline Chart", + "purpose": "Support for spline charts", + "condition": "features.charts-line-chart", + "output": [ "publicFeature" ] + }, + "charts-area-chart" : { + "label": "Area Chart", + "purpose": "Support for area charts", + "condition": "features.charts-line-chart", + "output": [ "publicFeature" ] + }, + "charts-scatter-chart" : { + "label": "Scatter Chart", + "purpose": "Support for scatter charts", + "condition": "features.charts-line-chart", + "output": [ "publicFeature" ] + }, + "charts-bar-chart" : { + "label": "Bar Chart", + "purpose": "Support for bar charts", + "output": [ "publicFeature" ] + }, + "charts-pie-chart" : { + "label": "Pie Chart", + "purpose": "Support for pie charts", + "output": [ "publicFeature" ] + }, + "charts-boxplot-chart" : { + "label": "Boxplot Chart", + "purpose": "Support for box plot charts", + "output": [ "publicFeature" ] + }, + "charts-candlestick-chart" : { + "label": "Candlestick Chart", + "purpose": "Support for candlestick charts", + "output": [ "publicFeature" ] + } + }, + "summary": [ + { + "section": "Qt Charts Types", + "entries": [ + "charts-area-chart", + "charts-line-chart", + "charts-spline-chart", + "charts-scatter-chart", + "charts-bar-chart", + "charts-pie-chart", + "charts-boxplot-chart", + "charts-candlestick-chart" + ] + } + ] +} diff --git a/src/charts/legend/legend.pri b/src/charts/legend/legend.pri index 86afec5c..2862d215 100644 --- a/src/charts/legend/legend.pri +++ b/src/charts/legend/legend.pri @@ -4,14 +4,9 @@ SOURCES += \ $$PWD/qlegend.cpp \ $$PWD/legendlayout.cpp \ $$PWD/qlegendmarker.cpp \ - $$PWD/qpielegendmarker.cpp \ $$PWD/legendmarkeritem.cpp \ - $$PWD/qbarlegendmarker.cpp \ $$PWD/qxylegendmarker.cpp \ - $$PWD/qarealegendmarker.cpp \ - $$PWD/legendscroller.cpp \ - $$PWD/qboxplotlegendmarker.cpp \ - $$PWD/qcandlesticklegendmarker.cpp + $$PWD/legendscroller.cpp PRIVATE_HEADERS += \ $$PWD/legendscroller_p.h \ @@ -19,19 +14,35 @@ PRIVATE_HEADERS += \ $$PWD/legendlayout_p.h \ $$PWD/qlegendmarker_p.h \ $$PWD/legendmarkeritem_p.h \ - $$PWD/qpielegendmarker_p.h \ - $$PWD/qbarlegendmarker_p.h \ - $$PWD/qxylegendmarker_p.h \ - $$PWD/qarealegendmarker_p.h \ - $$PWD/qboxplotlegendmarker_p.h \ - $$PWD/qcandlesticklegendmarker_p.h + $$PWD/qxylegendmarker_p.h PUBLIC_HEADERS += \ $$PWD/qlegend.h \ $$PWD/qlegendmarker.h \ - $$PWD/qpielegendmarker.h \ - $$PWD/qbarlegendmarker.h \ - $$PWD/qxylegendmarker.h \ - $$PWD/qarealegendmarker.h \ - $$PWD/qboxplotlegendmarker.h \ - $$PWD/qcandlesticklegendmarker.h + $$PWD/qxylegendmarker.h + +qtConfig(charts-area-chart) { + PRIVATE_HEADERS += $$PWD/qarealegendmarker_p.h + PUBLIC_HEADERS += $$PWD/qarealegendmarker.h + SOURCES += $$PWD/qarealegendmarker.cpp +} +qtConfig(charts-pie-chart) { + PRIVATE_HEADERS += $$PWD/qpielegendmarker_p.h + PUBLIC_HEADERS += $$PWD/qpielegendmarker.h + SOURCES += $$PWD/qpielegendmarker.cpp +} +qtConfig(charts-bar-chart) { + PRIVATE_HEADERS += $$PWD/qbarlegendmarker_p.h + PUBLIC_HEADERS += $$PWD/qbarlegendmarker.h + SOURCES += $$PWD/qbarlegendmarker.cpp +} +qtConfig(charts-boxplot-chart) { + PRIVATE_HEADERS += $$PWD/qboxplotlegendmarker_p.h + PUBLIC_HEADERS += $$PWD/qboxplotlegendmarker.h + SOURCES += $$PWD/qboxplotlegendmarker.cpp +} +qtConfig(charts-candlestick-chart) { + PRIVATE_HEADERS += $$PWD/qcandlesticklegendmarker_p.h + PUBLIC_HEADERS += $$PWD/qcandlesticklegendmarker.h + SOURCES += $$PWD/qcandlesticklegendmarker.cpp +} diff --git a/src/charts/legend/legendmarkeritem.cpp b/src/charts/legend/legendmarkeritem.cpp index dca69ffc..46c20ba8 100644 --- a/src/charts/legend/legendmarkeritem.cpp +++ b/src/charts/legend/legendmarkeritem.cpp @@ -27,6 +27,21 @@ ** ****************************************************************************/ +#include "legendmarkeritem_p.h" +#include "qlegendmarker_p.h" +#include "chartpresenter_p.h" +#include "qlegend.h" +#include "qlegend_p.h" +#include "qlegendmarker.h" +#if QT_CONFIG(charts_scatter_chart) +#include "qscatterseries.h" +#endif +#if QT_CONFIG(charts_line_chart) +#include "qlineseries.h" +#endif +#if QT_CONFIG(charts_spline_chart) +#include "qsplineseries.h" +#endif #include <QtGui/QPainter> #include <QtWidgets/QGraphicsSceneEvent> #include <QtWidgets/QGraphicsTextItem> @@ -36,16 +51,6 @@ #include <QtGui/QTextDocument> #include <QtCore/QtMath> -#include <QtCharts/QLegend> -#include <QtCharts/QScatterSeries> -#include <QtCharts/QLineSeries> -#include <QtCharts/QSplineSeries> -#include <private/qlegend_p.h> -#include <QtCharts/QLegendMarker> -#include <private/qlegendmarker_p.h> -#include <private/legendmarkeritem_p.h> -#include <private/chartpresenter_p.h> - QT_CHARTS_BEGIN_NAMESPACE LegendMarkerItem::LegendMarkerItem(QLegendMarkerPrivate *marker, QGraphicsObject *parent) : @@ -268,17 +273,24 @@ void LegendMarkerItem::updateMarkerShapeAndSize() ItemType itemType = TypeRect; QRectF newRect = m_defaultMarkerRect; if (shape == QLegend::MarkerShapeFromSeries) { +#if QT_CONFIG(charts_scatter_chart) QScatterSeries *scatter = qobject_cast<QScatterSeries *>(m_marker->series()); if (scatter) { newRect.setSize(QSizeF(scatter->markerSize(), scatter->markerSize())); if (scatter->markerShape() == QScatterSeries::MarkerShapeCircle) itemType = TypeCircle; - } else if (qobject_cast<QLineSeries *>(m_marker->series()) + } else +#endif +#if QT_CONFIG(charts_spline_chart) + if (qobject_cast<QLineSeries *>(m_marker->series()) || qobject_cast<QSplineSeries *>(m_marker->series())) { newRect.setHeight(m_seriesPen.width()); newRect.setWidth(qRound(m_defaultMarkerRect.width() * 1.5)); itemType = TypeLine; } +#else + { } +#endif } else if (shape == QLegend::MarkerShapeCircle) { itemType = TypeCircle; } diff --git a/src/charts/legend/qarealegendmarker.h b/src/charts/legend/qarealegendmarker.h index a16e7622..6a42b6a6 100644 --- a/src/charts/legend/qarealegendmarker.h +++ b/src/charts/legend/qarealegendmarker.h @@ -27,10 +27,12 @@ ** ****************************************************************************/ + #ifndef QAREALEGENDMARKER_H #define QAREALEGENDMARKER_H #include <QtCharts/QChartGlobal> +#if QT_CONFIG(charts_area_chart) #include <QtCharts/QLegendMarker> #include <QtCharts/QAreaSeries> @@ -62,4 +64,5 @@ private: QT_CHARTS_END_NAMESPACE +#endif // QT_CONFIG(charts_area_chart) #endif // QAREALEGENDMARKER_H diff --git a/src/charts/legend/qxylegendmarker.cpp b/src/charts/legend/qxylegendmarker.cpp index 6700e15d..8df81f57 100644 --- a/src/charts/legend/qxylegendmarker.cpp +++ b/src/charts/legend/qxylegendmarker.cpp @@ -31,7 +31,9 @@ #include <private/qxylegendmarker_p.h> #include <private/qxyseries_p.h> #include <QtCharts/QXYSeries> +#if QT_CONFIG(charts_scatter_chart) #include <QtCharts/QScatterSeries> +#endif QT_CHARTS_BEGIN_NAMESPACE @@ -118,7 +120,7 @@ void QXYLegendMarkerPrivate::updated() m_item->setLabel(m_series->name()); labelChanged = true; } - +#if QT_CONFIG(charts_scatter_chart) if (m_series->type()== QAbstractSeries::SeriesTypeScatter) { if (!m_customBrush && (m_item->brush() != m_series->brush())) { m_item->setBrush(m_series->brush()); @@ -136,7 +138,9 @@ void QXYLegendMarkerPrivate::updated() m_item->updateMarkerShapeAndSize(); } } - } else { + } else +#endif + { QBrush emptyBrush; if (!m_customBrush && (m_item->brush() == emptyBrush diff --git a/src/charts/linechart/qlineseries.h b/src/charts/linechart/qlineseries.h index 63c6f974..3f3ca91b 100644 --- a/src/charts/linechart/qlineseries.h +++ b/src/charts/linechart/qlineseries.h @@ -27,10 +27,11 @@ ** ****************************************************************************/ + #ifndef QLINESERIES_H #define QLINESERIES_H - #include <QtCharts/QChartGlobal> +#if QT_CONFIG(charts_line_chart) #include <QtCharts/QXYSeries> #include <QtGui/QPen> @@ -58,4 +59,5 @@ private: QT_CHARTS_END_NAMESPACE +#endif // QT_CONFIG(charts_line_chart) #endif // QLINESERIES_H diff --git a/src/charts/qchartglobal.h b/src/charts/qchartglobal.h index 759293d0..820e50df 100644 --- a/src/charts/qchartglobal.h +++ b/src/charts/qchartglobal.h @@ -30,7 +30,8 @@ #ifndef QCHARTGLOBAL_H #define QCHARTGLOBAL_H -#include <QtCore/QtGlobal> +#include <QtCore/qglobal.h> +#include <QtCharts/qtcharts-config.h> #define QT_CHARTS_VERSION_STR QT_VERSION_STR /* diff --git a/src/charts/qchartglobal_p.h b/src/charts/qchartglobal_p.h index 24e4922b..3f8d0338 100644 --- a/src/charts/qchartglobal_p.h +++ b/src/charts/qchartglobal_p.h @@ -41,7 +41,9 @@ // We mean it. // -#include "qchartglobal.h" +#include <QtCharts/qchartglobal.h> +#include <QtCore/private/qglobal_p.h> +#include <QtCharts/private/qtcharts-config_p.h> #define Q_CHARTS_PRIVATE_EXPORT Q_CHARTS_EXPORT diff --git a/src/charts/splinechart/qsplineseries.h b/src/charts/splinechart/qsplineseries.h index ba6ffe50..90182e2b 100644 --- a/src/charts/splinechart/qsplineseries.h +++ b/src/charts/splinechart/qsplineseries.h @@ -29,12 +29,11 @@ #ifndef QSPLINESERIES_H #define QSPLINESERIES_H - #include <QtCharts/QChartGlobal> +#if QT_CONFIG(charts_spline_chart) #include <QtCharts/qlineseries.h> #include <QtCore/QList> #include <QtCore/QPointF> -#include <QtCore/QtGlobal> QT_CHARTS_BEGIN_NAMESPACE @@ -57,4 +56,6 @@ private: QT_CHARTS_END_NAMESPACE +#endif // QT_CONFIG(charts_spline_chart) #endif // QSPLINESERIES_H + diff --git a/src/charts/xychart/glxyseriesdata.cpp b/src/charts/xychart/glxyseriesdata.cpp index 5385a2b2..fbe0f8f8 100644 --- a/src/charts/xychart/glxyseriesdata.cpp +++ b/src/charts/xychart/glxyseriesdata.cpp @@ -29,7 +29,9 @@ #include "private/glxyseriesdata_p.h" #include "private/abstractdomain_p.h" +#if QT_CONFIG(charts_scatter_chart) #include <QtCharts/QScatterSeries> +#endif QT_CHARTS_BEGIN_NAMESPACE @@ -52,6 +54,7 @@ void GLXYSeriesDataManager::setPoints(QXYSeries *series, const AbstractDomain *d data->type = series->type(); data->visible = series->isVisible(); QColor sc; +#if QT_CONFIG(charts_scatter_chart) if (data->type == QAbstractSeries::SeriesTypeScatter) { QScatterSeries *scatter = static_cast<QScatterSeries *>(series); data->width = float(scatter->markerSize()); @@ -60,7 +63,9 @@ void GLXYSeriesDataManager::setPoints(QXYSeries *series, const AbstractDomain *d &GLXYSeriesDataManager::handleScatterColorChange); connect(scatter, &QScatterSeries::markerSizeChanged, this, &GLXYSeriesDataManager::handleScatterMarkerSizeChange); - } else { + } else +#endif + { data->width = float(series->pen().widthF()); sc = series->color(); connect(series, &QXYSeries::penChanged, this, @@ -196,6 +201,7 @@ void GLXYSeriesDataManager::handleSeriesVisibilityChange() } } +#if QT_CONFIG(charts_scatter_chart) void GLXYSeriesDataManager::handleScatterColorChange() { QScatterSeries *series = qobject_cast<QScatterSeries *>(sender()); @@ -220,6 +226,7 @@ void GLXYSeriesDataManager::handleScatterMarkerSizeChange() } } } +#endif void GLXYSeriesDataManager::handleAxisReverseChanged(const QList<QAbstractSeries *> &seriesList) { diff --git a/src/charts/xychart/glxyseriesdata_p.h b/src/charts/xychart/glxyseriesdata_p.h index ba2a5538..ac5c156c 100644 --- a/src/charts/xychart/glxyseriesdata_p.h +++ b/src/charts/xychart/glxyseriesdata_p.h @@ -106,8 +106,10 @@ public Q_SLOTS: void handleSeriesPenChange(); void handleSeriesOpenGLChange(); void handleSeriesVisibilityChange(); +#if QT_CONFIG(charts_scatter_chart) void handleScatterColorChange(); void handleScatterMarkerSizeChange(); +#endif Q_SIGNALS: void seriesRemoved(const QXYSeries *series); diff --git a/src/chartsqml2/chartsqml2.pro b/src/chartsqml2/chartsqml2.pro index 514cf926..b98dd09f 100644 --- a/src/chartsqml2/chartsqml2.pro +++ b/src/chartsqml2/chartsqml2.pro @@ -1,3 +1,5 @@ +include($$OUT_PWD/../../src/charts/qtcharts-config.pri) +QT_FOR_CONFIG += charts TARGET = qtchartsqml2 CXX_MODULE = charts @@ -5,6 +7,7 @@ DEFINES += QT_BUILD_QMLCHARTS_LIB QT += opengl qml quick QT += charts charts-private +QT_PRIVATE += core-private charts-private contains(QT_COORD_TYPE, float): DEFINES += QT_QREAL_IS_FLOAT include($$PWD/designer/designer.pri) @@ -14,36 +17,20 @@ SOURCES += \ declarativechart.cpp \ declarativexypoint.cpp \ declarativexyseries.cpp \ - declarativelineseries.cpp \ - declarativesplineseries.cpp \ - declarativeareaseries.cpp \ - declarativescatterseries.cpp \ - declarativepieseries.cpp \ - declarativebarseries.cpp \ declarativecategoryaxis.cpp \ declarativemargins.cpp \ declarativeaxes.cpp \ declarativepolarchart.cpp \ - declarativeboxplotseries.cpp \ - declarativechartnode.cpp \ - declarativecandlestickseries.cpp + declarativechartnode.cpp 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 @@ -52,6 +39,38 @@ contains(QT_CONFIG, opengl) { SOURCES += declarativeopenglrendernode.cpp PRIVATE_HEADERS += declarativeopenglrendernode_p.h } +qtConfig(charts-line-chart) { + SOURCES += declarativelineseries.cpp + PRIVATE_HEADERS += declarativelineseries_p.h +} +qtConfig(charts-spline-chart) { + SOURCES += declarativesplineseries.cpp + PRIVATE_HEADERS += declarativesplineseries_p.h +} +qtConfig(charts-area-chart) { + SOURCES += declarativeareaseries.cpp + PRIVATE_HEADERS += declarativeareaseries_p.h +} +qtConfig(charts-scatter-chart) { + SOURCES += declarativescatterseries.cpp + PRIVATE_HEADERS += declarativescatterseries_p.h +} +qtConfig(charts-pie-chart) { + SOURCES += declarativepieseries.cpp + PRIVATE_HEADERS += declarativepieseries_p.h +} +qtConfig(charts-bar-chart) { + SOURCES += declarativebarseries.cpp + PRIVATE_HEADERS += declarativebarseries_p.h +} +qtConfig(charts-boxplot-chart) { + SOURCES += declarativeboxplotseries.cpp + PRIVATE_HEADERS += declarativeboxplotseries_p.h +} +qtConfig(charts-candlestick-chart) { + SOURCES += declarativecandlestickseries.cpp + PRIVATE_HEADERS += declarativecandlestickseries_p.h +} HEADERS += $$PRIVATE_HEADERS INCLUDEPATH += $$PWD diff --git a/src/chartsqml2/chartsqml2_plugin.cpp b/src/chartsqml2/chartsqml2_plugin.cpp index 32ee69ae..efba5372 100644 --- a/src/chartsqml2/chartsqml2_plugin.cpp +++ b/src/chartsqml2/chartsqml2_plugin.cpp @@ -27,117 +27,157 @@ ** ****************************************************************************/ -#include <QtCharts/QChart> -#include <QtCharts/QAbstractAxis> -#include <QtCharts/QValueAxis> -#include <QtCharts/QLogValueAxis> #include "declarativecategoryaxis_p.h" -#include <QtCharts/QBarCategoryAxis> #include "declarativechart_p.h" #include "declarativepolarchart_p.h" #include "declarativexypoint_p.h" +#if QT_CONFIG(charts_line_chart) #include "declarativelineseries_p.h" +#endif +#if QT_CONFIG(charts_spline_chart) #include "declarativesplineseries_p.h" +#endif +#if QT_CONFIG(charts_area_chart) #include "declarativeareaseries_p.h" +#include <QtCharts/QAreaLegendMarker> +#endif +#if QT_CONFIG(charts_scatter_chart) #include "declarativescatterseries_p.h" +#endif +#if QT_CONFIG(charts_bar_chart) #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/QBarCategoryAxis> #include <QtCharts/QHBarModelMapper> #include <QtCharts/QVBarModelMapper> -#include "declarativemargins_p.h" -#include <QtCharts/QAreaLegendMarker> #include <QtCharts/QBarLegendMarker> +#endif +#if QT_CONFIG(charts_pie_chart) +#include "declarativepieseries_p.h" #include <QtCharts/QPieLegendMarker> -#include <QtCharts/QXYLegendMarker> -#include <QtCharts/QBoxPlotModelMapper> -#include <QtCharts/QHBoxPlotModelMapper> -#include <QtCharts/QVBoxPlotModelMapper> +#include <QtCharts/QHPieModelMapper> +#include <QtCharts/QVPieModelMapper> +#endif +#if QT_CONFIG(charts_boxplot_chart) +#include "declarativeboxplotseries_p.h" +#endif +#if QT_CONFIG(charts_candlestick_chart) +#include "declarativecandlestickseries_p.h" #include <QtCharts/QCandlestickModelMapper> #include <QtCharts/QHCandlestickModelMapper> #include <QtCharts/QVCandlestickModelMapper> -#ifndef QT_QREAL_IS_FLOAT - #include <QtCharts/QDateTimeAxis> #endif +#include "declarativeaxes_p.h" +#include "declarativemargins_p.h" +#include <QtCharts/QChart> +#include <QtCharts/QAbstractAxis> +#include <QtCharts/QValueAxis> +#include <QtCharts/QLogValueAxis> +#include <QtCharts/QXYLegendMarker> +#include <QtCharts/QBoxPlotModelMapper> +#include <QtCharts/QHBoxPlotModelMapper> +#include <QtCharts/QVBoxPlotModelMapper> +#include <QtCharts/QVXYModelMapper> +#include <QtCharts/QHXYModelMapper> #include <QtCore/QAbstractItemModel> #include <QtQml> -QT_CHARTS_USE_NAMESPACE +#ifndef QT_QREAL_IS_FLOAT +#include <QtCharts/QDateTimeAxis> +#endif -QML_DECLARE_TYPE(QList<QPieSlice *>) -QML_DECLARE_TYPE(QList<QBarSet *>) -QML_DECLARE_TYPE(QList<QAbstractAxis *>) +QT_CHARTS_USE_NAMESPACE -QML_DECLARE_TYPE(DeclarativeChart) -QML_DECLARE_TYPE(DeclarativePolarChart) -QML_DECLARE_TYPE(DeclarativeMargins) -QML_DECLARE_TYPE(DeclarativeAreaSeries) -QML_DECLARE_TYPE(DeclarativeBarSeries) -QML_DECLARE_TYPE(DeclarativeBarSet) +#if QT_CONFIG(charts_boxplot_chart) QML_DECLARE_TYPE(DeclarativeBoxPlotSeries) QML_DECLARE_TYPE(DeclarativeBoxSet) +QML_DECLARE_TYPE(QBoxPlotModelMapper) +QML_DECLARE_TYPE(QHBoxPlotModelMapper) +QML_DECLARE_TYPE(QVBoxPlotModelMapper) +#endif + +#if QT_CONFIG(charts_candlestick_chart) QML_DECLARE_TYPE(DeclarativeCandlestickSeries) QML_DECLARE_TYPE(DeclarativeCandlestickSet) +QML_DECLARE_TYPE(QCandlestickModelMapper) +QML_DECLARE_TYPE(QHCandlestickModelMapper) +QML_DECLARE_TYPE(QVCandlestickModelMapper) +#endif + +#if QT_CONFIG(charts_scatter_chart) +QML_DECLARE_TYPE(DeclarativeScatterSeries) +#endif + +#if QT_CONFIG(charts_line_chart) QML_DECLARE_TYPE(DeclarativeLineSeries) +QML_DECLARE_TYPE(QLineSeries) +#endif + +#if QT_CONFIG(charts_spline_chart) +QML_DECLARE_TYPE(DeclarativeSplineSeries) +QML_DECLARE_TYPE(QSplineSeries) +#endif + +#if QT_CONFIG(charts_area_chart) +QML_DECLARE_TYPE(DeclarativeAreaSeries) +QML_DECLARE_TYPE(QAreaLegendMarker) +QML_DECLARE_TYPE(QAreaSeries) +#endif + +#if QT_CONFIG(charts_bar_chart) +QML_DECLARE_TYPE(QList<QBarSet *>) +QML_DECLARE_TYPE(DeclarativeBarSeries) +QML_DECLARE_TYPE(DeclarativeBarSet) +QML_DECLARE_TYPE(QBarCategoryAxis) +QML_DECLARE_TYPE(QBarLegendMarker) +QML_DECLARE_TYPE(QBarSeries) +QML_DECLARE_TYPE(QBarSet) +QML_DECLARE_TYPE(QHorizontalBarSeries) +QML_DECLARE_TYPE(QHorizontalPercentBarSeries) +QML_DECLARE_TYPE(QHorizontalStackedBarSeries) +QML_DECLARE_TYPE(QPercentBarSeries) +QML_DECLARE_TYPE(QHBarModelMapper) +QML_DECLARE_TYPE(QBarModelMapper) +QML_DECLARE_TYPE(QVBarModelMapper) +QML_DECLARE_TYPE(QAbstractBarSeries) +QML_DECLARE_TYPE(QStackedBarSeries) +#endif + +#if QT_CONFIG(charts_pie_chart) +QML_DECLARE_TYPE(QList<QPieSlice *>) +QML_DECLARE_TYPE(QPieSeries) +QML_DECLARE_TYPE(QPieSlice) QML_DECLARE_TYPE(DeclarativePieSeries) QML_DECLARE_TYPE(DeclarativePieSlice) -QML_DECLARE_TYPE(DeclarativeScatterSeries) -QML_DECLARE_TYPE(DeclarativeSplineSeries) +QML_DECLARE_TYPE(QPieLegendMarker) +QML_DECLARE_TYPE(QPieModelMapper) +QML_DECLARE_TYPE(QHPieModelMapper) +QML_DECLARE_TYPE(QVPieModelMapper) +#endif + +#if QT_CONFIG(charts_scatter_chart) +QML_DECLARE_TYPE(QScatterSeries) +#endif +#ifndef QT_QREAL_IS_FLOAT +QML_DECLARE_TYPE(QDateTimeAxis) +#endif + +QML_DECLARE_TYPE(QList<QAbstractAxis *>) +QML_DECLARE_TYPE(DeclarativeChart) +QML_DECLARE_TYPE(DeclarativePolarChart) +QML_DECLARE_TYPE(DeclarativeMargins) QML_DECLARE_TYPE(QAbstractAxis) QML_DECLARE_TYPE(QValueAxis) -QML_DECLARE_TYPE(QBarCategoryAxis) QML_DECLARE_TYPE(QCategoryAxis) -#ifndef QT_QREAL_IS_FLOAT - QML_DECLARE_TYPE(QDateTimeAxis) -#endif QML_DECLARE_TYPE(QLogValueAxis) - QML_DECLARE_TYPE(QLegend) QML_DECLARE_TYPE(QLegendMarker) -QML_DECLARE_TYPE(QAreaLegendMarker) -QML_DECLARE_TYPE(QBarLegendMarker) -QML_DECLARE_TYPE(QPieLegendMarker) - -QML_DECLARE_TYPE(QHPieModelMapper) QML_DECLARE_TYPE(QHXYModelMapper) -QML_DECLARE_TYPE(QPieModelMapper) -QML_DECLARE_TYPE(QHBarModelMapper) -QML_DECLARE_TYPE(QBarModelMapper) -QML_DECLARE_TYPE(QVBarModelMapper) -QML_DECLARE_TYPE(QVPieModelMapper) QML_DECLARE_TYPE(QVXYModelMapper) QML_DECLARE_TYPE(QXYLegendMarker) QML_DECLARE_TYPE(QXYModelMapper) -QML_DECLARE_TYPE(QBoxPlotModelMapper) -QML_DECLARE_TYPE(QHBoxPlotModelMapper) -QML_DECLARE_TYPE(QVBoxPlotModelMapper) -QML_DECLARE_TYPE(QCandlestickModelMapper) -QML_DECLARE_TYPE(QHCandlestickModelMapper) -QML_DECLARE_TYPE(QVCandlestickModelMapper) - QML_DECLARE_TYPE(QAbstractSeries) QML_DECLARE_TYPE(QXYSeries) -QML_DECLARE_TYPE(QAbstractBarSeries) -QML_DECLARE_TYPE(QBarSeries) -QML_DECLARE_TYPE(QBarSet) -QML_DECLARE_TYPE(QAreaSeries) -QML_DECLARE_TYPE(QHorizontalBarSeries) -QML_DECLARE_TYPE(QHorizontalPercentBarSeries) -QML_DECLARE_TYPE(QHorizontalStackedBarSeries) -QML_DECLARE_TYPE(QLineSeries) -QML_DECLARE_TYPE(QPercentBarSeries) -QML_DECLARE_TYPE(QPieSeries) -QML_DECLARE_TYPE(QPieSlice) -QML_DECLARE_TYPE(QScatterSeries) -QML_DECLARE_TYPE(QSplineSeries) -QML_DECLARE_TYPE(QStackedBarSeries) QT_CHARTS_BEGIN_NAMESPACE @@ -154,33 +194,139 @@ public: Q_ASSERT(QLatin1String(uri) == QLatin1String("QtCharts")); // @uri QtCharts - - qRegisterMetaType<QList<QPieSlice *> >(); - qRegisterMetaType<QList<QBarSet *> >(); qRegisterMetaType<QList<QAbstractAxis *> >(); // QtCharts 1.0 qmlRegisterType<DeclarativeChart>(uri, 1, 0, "ChartView"); qmlRegisterType<DeclarativeXYPoint>(uri, 1, 0, "XYPoint"); - qmlRegisterType<DeclarativeScatterSeries>(uri, 1, 0, "ScatterSeries"); + +#if QT_CONFIG(charts_line_chart) qmlRegisterType<DeclarativeLineSeries>(uri, 1, 0, "LineSeries"); + qmlRegisterType<DeclarativeLineSeries, 1>(uri, 1, 1, "LineSeries"); + qmlRegisterType<DeclarativeLineSeries, 2>(uri, 1, 2, "LineSeries"); + qmlRegisterType<DeclarativeLineSeries, 3>(uri, 1, 3, "LineSeries"); + qmlRegisterType<DeclarativeLineSeries, 3>(uri, 2, 0, "LineSeries"); + qmlRegisterType<DeclarativeLineSeries, 4>(uri, 2, 1, "LineSeries"); +#endif +#if QT_CONFIG(charts_spline_chart) qmlRegisterType<DeclarativeSplineSeries>(uri, 1, 0, "SplineSeries"); + qmlRegisterType<DeclarativeSplineSeries, 1>(uri, 1, 1, "SplineSeries"); + qmlRegisterType<DeclarativeSplineSeries, 2>(uri, 1, 2, "SplineSeries"); + qmlRegisterType<DeclarativeSplineSeries, 3>(uri, 1, 3, "SplineSeries"); + qmlRegisterType<DeclarativeSplineSeries, 3>(uri, 2, 0, "SplineSeries"); + qmlRegisterType<DeclarativeSplineSeries, 4>(uri, 2, 1, "SplineSeries"); +#endif +#if QT_CONFIG(charts_area_chart) qmlRegisterType<DeclarativeAreaSeries>(uri, 1, 0, "AreaSeries"); + qmlRegisterType<DeclarativeAreaSeries, 1>(uri, 1, 1, "AreaSeries"); + qmlRegisterType<DeclarativeAreaSeries, 2>(uri, 1, 2, "AreaSeries"); + qmlRegisterType<DeclarativeAreaSeries, 3>(uri, 1, 3, "AreaSeries"); + qmlRegisterType<DeclarativeAreaSeries, 4>(uri, 1, 4, "AreaSeries"); + qmlRegisterType<DeclarativeAreaSeries, 4>(uri, 2, 0, "AreaSeries"); +#endif +#if QT_CONFIG(charts_scatter_chart) + qmlRegisterType<DeclarativeScatterSeries>(uri, 1, 0, "ScatterSeries"); + qmlRegisterType<DeclarativeScatterSeries, 1>(uri, 1, 1, "ScatterSeries"); + qmlRegisterType<DeclarativeScatterSeries, 2>(uri, 1, 2, "ScatterSeries"); + qmlRegisterType<DeclarativeScatterSeries, 3>(uri, 1, 3, "ScatterSeries"); + qmlRegisterType<DeclarativeScatterSeries, 4>(uri, 1, 4, "ScatterSeries"); + qmlRegisterType<DeclarativeScatterSeries, 4>(uri, 2, 0, "ScatterSeries"); + qmlRegisterType<DeclarativeScatterSeries, 5>(uri, 2, 1, "ScatterSeries"); +#endif +#if QT_CONFIG(charts_bar_chart) + qRegisterMetaType<QList<QBarSet *> >(); qmlRegisterType<DeclarativeBarSeries>(uri, 1, 0, "BarSeries"); qmlRegisterType<DeclarativeStackedBarSeries>(uri, 1, 0, "StackedBarSeries"); qmlRegisterType<DeclarativePercentBarSeries>(uri, 1, 0, "PercentBarSeries"); + qmlRegisterType<DeclarativeBarSet>(uri, 1, 0, "BarSet"); + qmlRegisterType<QHBarModelMapper>(uri, 1, 0, "HBarModelMapper"); + qmlRegisterType<QVBarModelMapper>(uri, 1, 0, "VBarModelMapper"); + qmlRegisterType<QBarCategoryAxis>(uri, 1, 0, "BarCategoriesAxis"); + qmlRegisterUncreatableType<QBarSet>(uri, 1, 0, "BarSetBase", + QLatin1String("Trying to create uncreatable: BarsetBase.")); + qmlRegisterUncreatableType<QBarModelMapper>(uri, 1, 0, "BarModelMapper", + QLatin1String("Trying to create uncreatable: BarModelMapper.")); + qmlRegisterUncreatableType<QAbstractBarSeries>(uri, 1, 0, "AbstractBarSeries", + QLatin1String("Trying to create uncreatable: AbstractBarSeries.")); + qmlRegisterType<DeclarativeBarSeries, 1>(uri, 1, 1, "BarSeries"); + qmlRegisterType<DeclarativeStackedBarSeries, 1>(uri, 1, 1, "StackedBarSeries"); + qmlRegisterType<DeclarativePercentBarSeries, 1>(uri, 1, 1, "PercentBarSeries"); + qmlRegisterType<DeclarativeHorizontalBarSeries, 1>(uri, 1, 1, "HorizontalBarSeries"); + qmlRegisterType<DeclarativeHorizontalStackedBarSeries, 1>(uri, 1, 1, "HorizontalStackedBarSeries"); + qmlRegisterType<DeclarativeHorizontalPercentBarSeries, 1>(uri, 1, 1, "HorizontalPercentBarSeries"); + qmlRegisterType<DeclarativeBarSet>(uri, 1, 1, "BarSet"); + qmlRegisterType<DeclarativeBarSeries, 2>(uri, 1, 2, "BarSeries"); + qmlRegisterType<DeclarativeStackedBarSeries, 2>(uri, 1, 2, "StackedBarSeries"); + qmlRegisterType<DeclarativePercentBarSeries, 2>(uri, 1, 2, "PercentBarSeries"); + qmlRegisterType<DeclarativeHorizontalBarSeries, 2>(uri, 1, 2, "HorizontalBarSeries"); + qmlRegisterType<DeclarativeHorizontalStackedBarSeries, 2>(uri, 1, 2, "HorizontalStackedBarSeries"); + qmlRegisterType<DeclarativeHorizontalPercentBarSeries, 2>(uri, 1, 2, "HorizontalPercentBarSeries"); + qmlRegisterType<DeclarativeBarSeries, 2>(uri, 2, 0, "BarSeries"); + qmlRegisterType<DeclarativeBarSet, 2>(uri, 1, 4, "BarSet"); + qmlRegisterType<DeclarativeStackedBarSeries, 2>(uri, 2, 0, "StackedBarSeries"); + qmlRegisterType<DeclarativePercentBarSeries, 2>(uri, 2, 0, "PercentBarSeries"); + qmlRegisterType<DeclarativeHorizontalBarSeries, 2>(uri, 2, 0, "HorizontalBarSeries"); + qmlRegisterType<DeclarativeHorizontalStackedBarSeries, 2>(uri, 2, 0, "HorizontalStackedBarSeries"); + qmlRegisterType<DeclarativeHorizontalPercentBarSeries, 2>(uri, 2, 0, "HorizontalPercentBarSeries"); + qmlRegisterType<DeclarativeBarSet, 2>(uri, 2, 0, "BarSet"); + qmlRegisterUncreatableType<QBarSet>(uri, 2, 0, "BarSetBase", + QLatin1String("Trying to create uncreatable: BarsetBase.")); + qmlRegisterType<QHBarModelMapper>(uri, 2, 0, "HBarModelMapper"); + qmlRegisterType<QVBarModelMapper>(uri, 2, 0, "VBarModelMapper"); + qmlRegisterUncreatableType<QBarModelMapper>(uri, 2, 0, "BarModelMapper", + QLatin1String("Trying to create uncreatable: BarModelMapper.")); + qmlRegisterUncreatableType<QAbstractBarSeries>(uri, 2, 0, "AbstractBarSeries", + QLatin1String("Trying to create uncreatable: AbstractBarSeries.")); + +#endif +#if QT_CONFIG(charts_pie_chart) + qRegisterMetaType<QList<QPieSlice *> >(); qmlRegisterType<DeclarativePieSeries>(uri, 1, 0, "PieSeries"); qmlRegisterType<QPieSlice>(uri, 1, 0, "PieSlice"); - qmlRegisterType<DeclarativeBarSet>(uri, 1, 0, "BarSet"); - qmlRegisterType<QHXYModelMapper>(uri, 1, 0, "HXYModelMapper"); - qmlRegisterType<QVXYModelMapper>(uri, 1, 0, "VXYModelMapper"); qmlRegisterType<QHPieModelMapper>(uri, 1, 0, "HPieModelMapper"); qmlRegisterType<QVPieModelMapper>(uri, 1, 0, "VPieModelMapper"); - qmlRegisterType<QHBarModelMapper>(uri, 1, 0, "HBarModelMapper"); - qmlRegisterType<QVBarModelMapper>(uri, 1, 0, "VBarModelMapper"); + qmlRegisterUncreatableType<QPieModelMapper>(uri, 1, 0, "PieModelMapper", + QLatin1String("Trying to create uncreatable: PieModelMapper.")); + qmlRegisterUncreatableType<QPieSeries>(uri, 1, 0, "QPieSeries", + QLatin1String("Trying to create uncreatable: QPieSeries. Use PieSeries instead.")); + qmlRegisterType<DeclarativePieSeries>(uri, 1, 1, "PieSeries"); + qmlRegisterType<DeclarativePieSlice>(uri, 1, 4, "PieSlice"); + qmlRegisterType<DeclarativePieSlice>(uri, 2, 0, "PieSlice"); + qmlRegisterType<DeclarativePieSeries>(uri, 2, 0, "PieSeries"); + qmlRegisterType<QPieSlice>(uri, 2, 0, "PieSlice"); + qmlRegisterType<QHPieModelMapper>(uri, 2, 0, "HPieModelMapper"); + qmlRegisterType<QVPieModelMapper>(uri, 2, 0, "VPieModelMapper"); + qmlRegisterUncreatableType<QPieSeries>(uri, 2, 0, "QPieSeries", + QLatin1String("Trying to create uncreatable: QPieSeries. Use PieSeries instead.")); + qmlRegisterUncreatableType<QPieModelMapper>(uri, 2, 0, "PieModelMapper", + QLatin1String("Trying to create uncreatable: PieModelMapper.")); +#endif + +#if QT_CONFIG(charts_boxplot_chart) + qmlRegisterType<DeclarativeBoxPlotSeries>(uri, 1, 3, "BoxPlotSeries"); + qmlRegisterType<DeclarativeBoxSet>(uri, 1, 3, "BoxSet"); + qmlRegisterType<DeclarativeBoxPlotSeries, 1>(uri, 1, 4, "BoxPlotSeries"); + qmlRegisterType<DeclarativeBoxSet, 1>(uri, 1, 4, "BoxSet"); + qmlRegisterType<QHBoxPlotModelMapper>(uri, 2, 0, "HBoxPlotModelMapper"); + qmlRegisterType<QVBoxPlotModelMapper>(uri, 2, 0, "VBoxPlotModelMapper"); + qmlRegisterUncreatableType<QBoxPlotModelMapper>(uri, 2, 0, "BoxPlotModelMapper", + QLatin1String("Trying to create uncreatable: BoxPlotModelMapper.")); + qmlRegisterType<DeclarativeBoxPlotSeries, 1>(uri, 2, 0, "BoxPlotSeries"); + qmlRegisterType<DeclarativeBoxSet, 1>(uri, 2, 0, "BoxSet"); +#endif + +#if QT_CONFIG(charts_candlestick_chart) + qmlRegisterType<DeclarativeCandlestickSeries>(uri, 2, 2, "CandlestickSeries"); + qmlRegisterType<DeclarativeCandlestickSet>(uri, 2, 2, "CandlestickSet"); + qmlRegisterUncreatableType<QCandlestickModelMapper>(uri, 2, 2, "CandlestickModelMapper", + QLatin1String("Trying to create uncreatable: CandlestickModelMapper.")); + qmlRegisterType<QHCandlestickModelMapper>(uri, 2, 2, "HCandlestickModelMapper"); + qmlRegisterType<QVCandlestickModelMapper>(uri, 2, 2, "VCandlestickModelMapper"); +#endif + qmlRegisterType<QHXYModelMapper>(uri, 1, 0, "HXYModelMapper"); + qmlRegisterType<QVXYModelMapper>(uri, 1, 0, "VXYModelMapper"); qmlRegisterType<QValueAxis>(uri, 1, 0, "ValuesAxis"); - qmlRegisterType<QBarCategoryAxis>(uri, 1, 0, "BarCategoriesAxis"); qmlRegisterUncreatableType<QLegend>(uri, 1, 0, "Legend", QLatin1String("Trying to create uncreatable: Legend.")); qmlRegisterUncreatableType<QXYSeries>(uri, 1, 0, "XYSeries", @@ -189,37 +335,15 @@ public: QLatin1String("Trying to create uncreatable: AbstractItemModel.")); qmlRegisterUncreatableType<QXYModelMapper>(uri, 1, 0, "XYModelMapper", QLatin1String("Trying to create uncreatable: XYModelMapper.")); - qmlRegisterUncreatableType<QPieModelMapper>(uri, 1, 0, "PieModelMapper", - QLatin1String("Trying to create uncreatable: PieModelMapper.")); - qmlRegisterUncreatableType<QBarModelMapper>(uri, 1, 0, "BarModelMapper", - QLatin1String("Trying to create uncreatable: BarModelMapper.")); qmlRegisterUncreatableType<QAbstractSeries>(uri, 1, 0, "AbstractSeries", QLatin1String("Trying to create uncreatable: AbstractSeries.")); - qmlRegisterUncreatableType<QAbstractBarSeries>(uri, 1, 0, "AbstractBarSeries", - QLatin1String("Trying to create uncreatable: AbstractBarSeries.")); qmlRegisterUncreatableType<QAbstractAxis>(uri, 1, 0, "AbstractAxis", QLatin1String("Trying to create uncreatable: AbstractAxis. Use specific types of axis instead.")); - qmlRegisterUncreatableType<QBarSet>(uri, 1, 0, "BarSetBase", - QLatin1String("Trying to create uncreatable: BarsetBase.")); - qmlRegisterUncreatableType<QPieSeries>(uri, 1, 0, "QPieSeries", - QLatin1String("Trying to create uncreatable: QPieSeries. Use PieSeries instead.")); qmlRegisterUncreatableType<DeclarativeAxes>(uri, 1, 0, "DeclarativeAxes", QLatin1String("Trying to create uncreatable: DeclarativeAxes.")); // QtCharts 1.1 qmlRegisterType<DeclarativeChart, 1>(uri, 1, 1, "ChartView"); - qmlRegisterType<DeclarativeScatterSeries, 1>(uri, 1, 1, "ScatterSeries"); - qmlRegisterType<DeclarativeLineSeries, 1>(uri, 1, 1, "LineSeries"); - qmlRegisterType<DeclarativeSplineSeries, 1>(uri, 1, 1, "SplineSeries"); - qmlRegisterType<DeclarativeAreaSeries, 1>(uri, 1, 1, "AreaSeries"); - qmlRegisterType<DeclarativeBarSeries, 1>(uri, 1, 1, "BarSeries"); - qmlRegisterType<DeclarativeStackedBarSeries, 1>(uri, 1, 1, "StackedBarSeries"); - qmlRegisterType<DeclarativePercentBarSeries, 1>(uri, 1, 1, "PercentBarSeries"); - qmlRegisterType<DeclarativeHorizontalBarSeries, 1>(uri, 1, 1, "HorizontalBarSeries"); - qmlRegisterType<DeclarativeHorizontalStackedBarSeries, 1>(uri, 1, 1, "HorizontalStackedBarSeries"); - qmlRegisterType<DeclarativeHorizontalPercentBarSeries, 1>(uri, 1, 1, "HorizontalPercentBarSeries"); - qmlRegisterType<DeclarativePieSeries>(uri, 1, 1, "PieSeries"); - qmlRegisterType<DeclarativeBarSet>(uri, 1, 1, "BarSet"); qmlRegisterType<QValueAxis>(uri, 1, 1, "ValueAxis"); #ifndef QT_QREAL_IS_FLOAT qmlRegisterType<QDateTimeAxis>(uri, 1, 1, "DateTimeAxis"); @@ -229,62 +353,21 @@ public: qmlRegisterType<QBarCategoryAxis>(uri, 1, 1, "BarCategoryAxis"); qmlRegisterUncreatableType<DeclarativeMargins>(uri, 1, 1, "Margins", QLatin1String("Trying to create uncreatable: Margins.")); - // QtCharts 1.2 qmlRegisterType<DeclarativeChart, 2>(uri, 1, 2, "ChartView"); - qmlRegisterType<DeclarativeScatterSeries, 2>(uri, 1, 2, "ScatterSeries"); - qmlRegisterType<DeclarativeLineSeries, 2>(uri, 1, 2, "LineSeries"); - qmlRegisterType<DeclarativeSplineSeries, 2>(uri, 1, 2, "SplineSeries"); - qmlRegisterType<DeclarativeAreaSeries, 2>(uri, 1, 2, "AreaSeries"); - qmlRegisterType<DeclarativeBarSeries, 2>(uri, 1, 2, "BarSeries"); - qmlRegisterType<DeclarativeStackedBarSeries, 2>(uri, 1, 2, "StackedBarSeries"); - qmlRegisterType<DeclarativePercentBarSeries, 2>(uri, 1, 2, "PercentBarSeries"); - qmlRegisterType<DeclarativeHorizontalBarSeries, 2>(uri, 1, 2, "HorizontalBarSeries"); - qmlRegisterType<DeclarativeHorizontalStackedBarSeries, 2>(uri, 1, 2, "HorizontalStackedBarSeries"); - qmlRegisterType<DeclarativeHorizontalPercentBarSeries, 2>(uri, 1, 2, "HorizontalPercentBarSeries"); // QtCharts 1.3 qmlRegisterType<DeclarativeChart, 3>(uri, 1, 3, "ChartView"); qmlRegisterType<DeclarativePolarChart, 1>(uri, 1, 3, "PolarChartView"); - qmlRegisterType<DeclarativeSplineSeries, 3>(uri, 1, 3, "SplineSeries"); - qmlRegisterType<DeclarativeScatterSeries, 3>(uri, 1, 3, "ScatterSeries"); - qmlRegisterType<DeclarativeLineSeries, 3>(uri, 1, 3, "LineSeries"); - qmlRegisterType<DeclarativeAreaSeries, 3>(uri, 1, 3, "AreaSeries"); qmlRegisterType<QLogValueAxis>(uri, 1, 3, "LogValueAxis"); - qmlRegisterType<DeclarativeBoxPlotSeries>(uri, 1, 3, "BoxPlotSeries"); - qmlRegisterType<DeclarativeBoxSet>(uri, 1, 3, "BoxSet"); // QtCharts 1.4 - qmlRegisterType<DeclarativeAreaSeries, 4>(uri, 1, 4, "AreaSeries"); - qmlRegisterType<DeclarativeBarSet, 2>(uri, 1, 4, "BarSet"); - qmlRegisterType<DeclarativeBoxPlotSeries, 1>(uri, 1, 4, "BoxPlotSeries"); - qmlRegisterType<DeclarativeBoxSet, 1>(uri, 1, 4, "BoxSet"); - qmlRegisterType<DeclarativePieSlice>(uri, 1, 4, "PieSlice"); - qmlRegisterType<DeclarativeScatterSeries, 4>(uri, 1, 4, "ScatterSeries"); // QtCharts 2.0 - qmlRegisterType<QHBoxPlotModelMapper>(uri, 2, 0, "HBoxPlotModelMapper"); - qmlRegisterType<QVBoxPlotModelMapper>(uri, 2, 0, "VBoxPlotModelMapper"); - qmlRegisterUncreatableType<QBoxPlotModelMapper>(uri, 2, 0, "BoxPlotModelMapper", - QLatin1String("Trying to create uncreatable: BoxPlotModelMapper.")); qmlRegisterType<DeclarativeChart, 4>(uri, 2, 0, "ChartView"); qmlRegisterType<DeclarativeXYPoint>(uri, 2, 0, "XYPoint"); - qmlRegisterType<DeclarativeScatterSeries, 4>(uri, 2, 0, "ScatterSeries"); - qmlRegisterType<DeclarativeLineSeries, 3>(uri, 2, 0, "LineSeries"); - qmlRegisterType<DeclarativeSplineSeries, 3>(uri, 2, 0, "SplineSeries"); - qmlRegisterType<DeclarativeAreaSeries, 4>(uri, 2, 0, "AreaSeries"); - qmlRegisterType<DeclarativeBarSeries, 2>(uri, 2, 0, "BarSeries"); - qmlRegisterType<DeclarativeStackedBarSeries, 2>(uri, 2, 0, "StackedBarSeries"); - qmlRegisterType<DeclarativePercentBarSeries, 2>(uri, 2, 0, "PercentBarSeries"); - qmlRegisterType<DeclarativePieSeries>(uri, 2, 0, "PieSeries"); - qmlRegisterType<QPieSlice>(uri, 2, 0, "PieSlice"); - qmlRegisterType<DeclarativeBarSet, 2>(uri, 2, 0, "BarSet"); qmlRegisterType<QHXYModelMapper>(uri, 2, 0, "HXYModelMapper"); qmlRegisterType<QVXYModelMapper>(uri, 2, 0, "VXYModelMapper"); - qmlRegisterType<QHPieModelMapper>(uri, 2, 0, "HPieModelMapper"); - qmlRegisterType<QVPieModelMapper>(uri, 2, 0, "VPieModelMapper"); - qmlRegisterType<QHBarModelMapper>(uri, 2, 0, "HBarModelMapper"); - qmlRegisterType<QVBarModelMapper>(uri, 2, 0, "VBarModelMapper"); qmlRegisterType<QValueAxis>(uri, 2, 0, "ValueAxis"); #ifndef QT_QREAL_IS_FLOAT qmlRegisterType<QDateTimeAxis>(uri, 2, 0, "DateTimeAxis"); @@ -294,12 +377,6 @@ public: qmlRegisterType<QBarCategoryAxis>(uri, 2, 0, "BarCategoryAxis"); qmlRegisterType<DeclarativePolarChart, 1>(uri, 2, 0, "PolarChartView"); qmlRegisterType<QLogValueAxis, 1>(uri, 2, 0, "LogValueAxis"); - qmlRegisterType<DeclarativeBoxPlotSeries, 1>(uri, 2, 0, "BoxPlotSeries"); - qmlRegisterType<DeclarativeBoxSet, 1>(uri, 2, 0, "BoxSet"); - qmlRegisterType<DeclarativeHorizontalBarSeries, 2>(uri, 2, 0, "HorizontalBarSeries"); - qmlRegisterType<DeclarativeHorizontalStackedBarSeries, 2>(uri, 2, 0, "HorizontalStackedBarSeries"); - qmlRegisterType<DeclarativeHorizontalPercentBarSeries, 2>(uri, 2, 0, "HorizontalPercentBarSeries"); - qmlRegisterType<DeclarativePieSlice>(uri, 2, 0, "PieSlice"); qmlRegisterUncreatableType<QLegend>(uri, 2, 0, "Legend", QLatin1String("Trying to create uncreatable: Legend.")); qmlRegisterUncreatableType<QXYSeries>(uri, 2, 0, "XYSeries", @@ -308,42 +385,21 @@ public: QLatin1String("Trying to create uncreatable: AbstractItemModel.")); qmlRegisterUncreatableType<QXYModelMapper>(uri, 2, 0, "XYModelMapper", QLatin1String("Trying to create uncreatable: XYModelMapper.")); - qmlRegisterUncreatableType<QPieModelMapper>(uri, 2, 0, "PieModelMapper", - QLatin1String("Trying to create uncreatable: PieModelMapper.")); - qmlRegisterUncreatableType<QBarModelMapper>(uri, 2, 0, "BarModelMapper", - QLatin1String("Trying to create uncreatable: BarModelMapper.")); qmlRegisterUncreatableType<QAbstractSeries>(uri, 2, 0, "AbstractSeries", QLatin1String("Trying to create uncreatable: AbstractSeries.")); - qmlRegisterUncreatableType<QAbstractBarSeries>(uri, 2, 0, "AbstractBarSeries", - QLatin1String("Trying to create uncreatable: AbstractBarSeries.")); qmlRegisterUncreatableType<QAbstractAxis>(uri, 2, 0, "AbstractAxis", QLatin1String("Trying to create uncreatable: AbstractAxis. Use specific types of axis instead.")); - qmlRegisterUncreatableType<QBarSet>(uri, 2, 0, "BarSetBase", - QLatin1String("Trying to create uncreatable: BarsetBase.")); - qmlRegisterUncreatableType<QPieSeries>(uri, 2, 0, "QPieSeries", - QLatin1String("Trying to create uncreatable: QPieSeries. Use PieSeries instead.")); qmlRegisterUncreatableType<DeclarativeAxes>(uri, 2, 0, "DeclarativeAxes", QLatin1String("Trying to create uncreatable: DeclarativeAxes.")); qmlRegisterUncreatableType<DeclarativeMargins>(uri, 2, 0, "Margins", QLatin1String("Trying to create uncreatable: Margins.")); - // QtCharts 2.1 qmlRegisterType<DeclarativeCategoryAxis, 1>(uri, 2, 1, "CategoryAxis"); qmlRegisterUncreatableType<QAbstractAxis>(uri, 2, 1, "AbstractAxis", QLatin1String("Trying to create uncreatable: AbstractAxis. Use specific types of axis instead.")); qmlRegisterType<DeclarativeChart, 5>(uri, 2, 1, "ChartView"); - qmlRegisterType<DeclarativeScatterSeries, 5>(uri, 2, 1, "ScatterSeries"); - qmlRegisterType<DeclarativeLineSeries, 4>(uri, 2, 1, "LineSeries"); - qmlRegisterType<DeclarativeSplineSeries, 4>(uri, 2, 1, "SplineSeries"); // QtCharts 2.2 - qmlRegisterType<DeclarativeCandlestickSeries>(uri, 2, 2, "CandlestickSeries"); - qmlRegisterType<DeclarativeCandlestickSet>(uri, 2, 2, "CandlestickSet"); - qmlRegisterUncreatableType<QCandlestickModelMapper>(uri, 2, 2, "CandlestickModelMapper", - QLatin1String("Trying to create uncreatable: CandlestickModelMapper.")); - qmlRegisterType<QHCandlestickModelMapper>(uri, 2, 2, "HCandlestickModelMapper"); - qmlRegisterType<QVCandlestickModelMapper>(uri, 2, 2, "VCandlestickModelMapper"); - // QtCharts 2.3 qmlRegisterType<QValueAxis, 1>(uri, 2, 3, "ValueAxis"); diff --git a/src/chartsqml2/declarativechart.cpp b/src/chartsqml2/declarativechart.cpp index 273595de..cdb88c09 100644 --- a/src/chartsqml2/declarativechart.cpp +++ b/src/chartsqml2/declarativechart.cpp @@ -29,32 +29,41 @@ #include "declarativechart_p.h" #include <QtGui/QPainter> +#if QT_CONFIG(charts_line_chart) #include "declarativelineseries_p.h" +#endif +#if QT_CONFIG(charts_area_chart) #include "declarativeareaseries_p.h" +#endif #include "declarativebarseries_p.h" +#if QT_CONFIG(charts_pie_chart) #include "declarativepieseries_p.h" +#endif +#if QT_CONFIG(charts_spline_chart) #include "declarativesplineseries_p.h" +#endif +#if QT_CONFIG(charts_boxplot_chart) #include "declarativeboxplotseries_p.h" +#endif +#if QT_CONFIG(charts_candlestick_chart) #include "declarativecandlestickseries_p.h" +#endif +#if QT_CONFIG(charts_scatter_chart) #include "declarativescatterseries_p.h" +#endif #include "declarativechartnode_p.h" #include "declarativeabstractrendernode_p.h" +#include "declarativemargins_p.h" +#include "declarativeaxes_p.h" +#include <QtCharts/private/qabstractseries_p.h> +#include <QtCharts/private/chartdataset_p.h> +#include <QtCharts/private/qchart_p.h> +#include <QtCharts/private/chartpresenter_p.h> #include <QtCharts/QBarCategoryAxis> #include <QtCharts/QValueAxis> #include <QtCharts/QLogValueAxis> #include <QtCharts/QCategoryAxis> -#include <private/qabstractseries_p.h> -#include "declarativemargins_p.h" -#include <private/chartdataset_p.h> -#include "declarativeaxes_p.h" -#include <private/qchart_p.h> -#include <private/chartpresenter_p.h> #include <QtCharts/QPolarChart> - -#ifndef QT_QREAL_IS_FLOAT - #include <QtCharts/QDateTimeAxis> -#endif - #include <QtWidgets/QGraphicsSceneMouseEvent> #include <QtWidgets/QGraphicsSceneHoverEvent> #include <QtWidgets/QApplication> @@ -62,6 +71,10 @@ #include <QtCore/QThread> #include <QtQuick/QQuickWindow> +#ifndef QT_QREAL_IS_FLOAT +#include <QtCharts/QDateTimeAxis> +#endif + QT_CHARTS_BEGIN_NAMESPACE /*! @@ -442,6 +455,7 @@ DeclarativeChart::DeclarativeChart(QChart::ChartType type, QQuickItem *parent) initChart(type); } +#if QT_CONFIG(charts_bar_chart) // QTBUG-71013 // The symbol resides in qbarmodelmapper.cpp#548 in the C++ module. // Here, it gets imported and reset to the DeclarativeBarSet allocator @@ -458,6 +472,7 @@ QBarSet *qt_allocate_bar_set_qml(const QString &label) bar->setLabel(label); return bar; } +#endif void DeclarativeChart::initChart(QChart::ChartType type) { @@ -470,9 +485,11 @@ void DeclarativeChart::initChart(QChart::ChartType type) setFlag(ItemHasContents, true); +#if QT_CONFIG(charts_bar_chart) // Reset allocator for QBarSet to create // Declarative BarSets by default qt_allocate_bar_set = &qt_allocate_bar_set_qml; +#endif if (type == QChart::ChartTypePolar) m_chart = new QPolarChart(); @@ -612,7 +629,10 @@ void DeclarativeChart::componentComplete() m_chart->addSeries(series); // Connect to axis changed signals (unless this is a pie series) - if (!qobject_cast<DeclarativePieSeries *>(series)) { +#if QT_CONFIG(charts_pie_chart) + if (!qobject_cast<DeclarativePieSeries *>(series)) +#endif + { connect(series, SIGNAL(axisXChanged(QAbstractAxis*)), this, SLOT(handleAxisXSet(QAbstractAxis*))); connect(series, SIGNAL(axisXTopChanged(QAbstractAxis*)), this, SLOT(handleAxisXTopSet(QAbstractAxis*))); connect(series, SIGNAL(axisYChanged(QAbstractAxis*)), this, SLOT(handleAxisYSet(QAbstractAxis*))); @@ -1271,9 +1291,12 @@ QAbstractSeries *DeclarativeChart::createSeries(int type, QString name, QAbstrac QAbstractSeries *series = 0; switch (type) { +#if QT_CONFIG(charts_line_chart) case DeclarativeChart::SeriesTypeLine: series = new DeclarativeLineSeries(); break; +#endif +#if QT_CONFIG(charts_area_chart) case DeclarativeChart::SeriesTypeArea: { DeclarativeAreaSeries *area = new DeclarativeAreaSeries(); DeclarativeLineSeries *line = new DeclarativeLineSeries(); @@ -1282,6 +1305,8 @@ QAbstractSeries *DeclarativeChart::createSeries(int type, QString name, QAbstrac series = area; break; } +#endif +#if QT_CONFIG(charts_bar_chart) case DeclarativeChart::SeriesTypeStackedBar: series = new DeclarativeStackedBarSeries(); break; @@ -1300,28 +1325,42 @@ QAbstractSeries *DeclarativeChart::createSeries(int type, QString name, QAbstrac case DeclarativeChart::SeriesTypeHorizontalStackedBar: series = new DeclarativeHorizontalStackedBarSeries(); break; +#endif +#if QT_CONFIG(charts_boxplot_chart) case DeclarativeChart::SeriesTypeBoxPlot: series = new DeclarativeBoxPlotSeries(); break; +#endif +#if QT_CONFIG(charts_candlestick_chart) case DeclarativeChart::SeriesTypeCandlestick: series = new DeclarativeCandlestickSeries(); break; +#endif +#if QT_CONFIG(charts_pie_chart) case DeclarativeChart::SeriesTypePie: series = new DeclarativePieSeries(); break; +#endif +#if QT_CONFIG(charts_scatter_chart) case DeclarativeChart::SeriesTypeScatter: series = new DeclarativeScatterSeries(); break; +#endif +#if QT_CONFIG(charts_spline_chart) case DeclarativeChart::SeriesTypeSpline: series = new DeclarativeSplineSeries(); break; +#endif default: qWarning() << "Illegal series type"; } if (series) { // Connect to axis changed signals (unless this is a pie series) - if (!qobject_cast<DeclarativePieSeries *>(series)) { +#if QT_CONFIG(charts_pie_chart) + if (!qobject_cast<DeclarativePieSeries *>(series)) +#endif + { connect(series, SIGNAL(axisXChanged(QAbstractAxis*)), this, SLOT(handleAxisXSet(QAbstractAxis*))); connect(series, SIGNAL(axisXTopChanged(QAbstractAxis*)), this, SLOT(handleAxisXSet(QAbstractAxis*))); connect(series, SIGNAL(axisYChanged(QAbstractAxis*)), this, SLOT(handleAxisYSet(QAbstractAxis*))); @@ -1396,14 +1435,25 @@ QAbstractAxis *DeclarativeChart::defaultAxis(Qt::Orientation orientation, QAbstr void DeclarativeChart::initializeAxes(QAbstractSeries *series) { - if (qobject_cast<DeclarativeLineSeries *>(series)) + if (false) { + } +#if QT_CONFIG(charts_line_chart) + else if (qobject_cast<DeclarativeLineSeries *>(series)) doInitializeAxes(series, qobject_cast<DeclarativeLineSeries *>(series)->m_axes); +#endif +#if QT_CONFIG(charts_scatter_chart) else if (qobject_cast<DeclarativeScatterSeries *>(series)) doInitializeAxes(series, qobject_cast<DeclarativeScatterSeries *>(series)->m_axes); +#endif +#if QT_CONFIG(charts_spline_chart) else if (qobject_cast<DeclarativeSplineSeries *>(series)) doInitializeAxes(series, qobject_cast<DeclarativeSplineSeries *>(series)->m_axes); +#endif +#if QT_CONFIG(charts_area_chart) else if (qobject_cast<DeclarativeAreaSeries *>(series)) doInitializeAxes(series, qobject_cast<DeclarativeAreaSeries *>(series)->m_axes); +#endif +#if QT_CONFIG(charts_bar_chart) else if (qobject_cast<DeclarativeBarSeries *>(series)) doInitializeAxes(series, qobject_cast<DeclarativeBarSeries *>(series)->m_axes); else if (qobject_cast<DeclarativeStackedBarSeries *>(series)) @@ -1416,10 +1466,15 @@ void DeclarativeChart::initializeAxes(QAbstractSeries *series) doInitializeAxes(series, qobject_cast<DeclarativeHorizontalStackedBarSeries *>(series)->m_axes); else if (qobject_cast<DeclarativeHorizontalPercentBarSeries *>(series)) doInitializeAxes(series, qobject_cast<DeclarativeHorizontalPercentBarSeries *>(series)->m_axes); +#endif +#if QT_CONFIG(charts_boxplot_chart) else if (qobject_cast<DeclarativeBoxPlotSeries *>(series)) doInitializeAxes(series, qobject_cast<DeclarativeBoxPlotSeries *>(series)->m_axes); +#endif +#if QT_CONFIG(charts_candlestick_chart) else if (qobject_cast<DeclarativeCandlestickSeries *>(series)) doInitializeAxes(series, qobject_cast<DeclarativeCandlestickSeries *>(series)->m_axes); +#endif // else: do nothing } diff --git a/tests/auto/chartdataset/chartdataset.pro b/tests/auto/chartdataset/chartdataset.pro index 754f3e9b..d5c18732 100644 --- a/tests/auto/chartdataset/chartdataset.pro +++ b/tests/auto/chartdataset/chartdataset.pro @@ -2,7 +2,7 @@ error( "Couldn't find the auto.pri file!" ) } -QT += charts-private +QT += charts-private core-private contains(QT_COORD_TYPE, float): DEFINES += QT_QREAL_IS_FLOAT SOURCES += tst_chartdataset.cpp diff --git a/tests/auto/domain/domain.pro b/tests/auto/domain/domain.pro index f0e90136..4eebe20e 100644 --- a/tests/auto/domain/domain.pro +++ b/tests/auto/domain/domain.pro @@ -2,6 +2,6 @@ error( "Couldn't find the auto.pri file!" ) } -QT += charts-private +QT += charts-private core-private SOURCES += tst_domain.cpp diff --git a/tests/auto/domain/tst_domain.cpp b/tests/auto/domain/tst_domain.cpp index 44497940..14c769f1 100644 --- a/tests/auto/domain/tst_domain.cpp +++ b/tests/auto/domain/tst_domain.cpp @@ -27,8 +27,8 @@ ** ****************************************************************************/ #include <QtTest/QtTest> -#include <private/xydomain_p.h> -#include <private/qabstractaxis_p.h> +#include <QtCharts/private/xydomain_p.h> +#include <QtCharts/private/qabstractaxis_p.h> #include <tst_definitions.h> QT_CHARTS_USE_NAMESPACE |