diff options
25 files changed, 163 insertions, 97 deletions
diff --git a/examples/charts/areachart/main.cpp b/examples/charts/areachart/main.cpp index 86fb4e45..1bed9770 100644 --- a/examples/charts/areachart/main.cpp +++ b/examples/charts/areachart/main.cpp @@ -70,8 +70,8 @@ int main(int argc, char *argv[]) chart->addSeries(series); chart->setTitle("Simple areachart example"); chart->createDefaultAxes(); - chart->axisX()->setRange(0, 20); - chart->axisY()->setRange(0, 10); + chart->axes(Qt::Horizontal).first()->setRange(0, 20); + chart->axes(Qt::Vertical).first()->setRange(0, 10); //![4] //![5] diff --git a/examples/charts/barchart/main.cpp b/examples/charts/barchart/main.cpp index 8463100f..adf5a8d8 100644 --- a/examples/charts/barchart/main.cpp +++ b/examples/charts/barchart/main.cpp @@ -34,6 +34,7 @@ #include <QtCharts/QBarSet> #include <QtCharts/QLegend> #include <QtCharts/QBarCategoryAxis> +#include <QtCharts/QValueAxis> QT_CHARTS_USE_NAMESPACE @@ -75,10 +76,15 @@ int main(int argc, char *argv[]) //![4] QStringList categories; categories << "Jan" << "Feb" << "Mar" << "Apr" << "May" << "Jun"; - QBarCategoryAxis *axis = new QBarCategoryAxis(); - axis->append(categories); - chart->createDefaultAxes(); - chart->setAxisX(axis, series); + QBarCategoryAxis *axisX = new QBarCategoryAxis(); + axisX->append(categories); + chart->addAxis(axisX, Qt::AlignBottom); + series->attachAxis(axisX); + + QValueAxis *axisY = new QValueAxis(); + axisY->setRange(0,15); + chart->addAxis(axisY, Qt::AlignLeft); + series->attachAxis(axisY); //![4] //![5] diff --git a/examples/charts/barmodelmapper/tablewidget.cpp b/examples/charts/barmodelmapper/tablewidget.cpp index bca89d47..89680d2e 100644 --- a/examples/charts/barmodelmapper/tablewidget.cpp +++ b/examples/charts/barmodelmapper/tablewidget.cpp @@ -39,6 +39,7 @@ #include <QtCharts/QVBarModelMapper> #include <QtWidgets/QHeaderView> #include <QtCharts/QBarCategoryAxis> +#include <QtCharts/QValueAxis> QT_CHARTS_USE_NAMESPACE @@ -97,10 +98,13 @@ TableWidget::TableWidget(QWidget *parent) //! [6] QStringList categories; categories << "April" << "May" << "June" << "July" << "August"; - QBarCategoryAxis *axis = new QBarCategoryAxis(); - axis->append(categories); - chart->createDefaultAxes(); - chart->setAxisX(axis, series); + QBarCategoryAxis *axisX = new QBarCategoryAxis(); + axisX->append(categories); + chart->addAxis(axisX, Qt::AlignBottom); + series->attachAxis(axisX); + QValueAxis *axisY = new QValueAxis(); + chart->addAxis(axisY, Qt::AlignLeft); + series->attachAxis(axisY); //! [6] //! [7] diff --git a/examples/charts/boxplotchart/main.cpp b/examples/charts/boxplotchart/main.cpp index 2bd45171..671b34cc 100644 --- a/examples/charts/boxplotchart/main.cpp +++ b/examples/charts/boxplotchart/main.cpp @@ -88,8 +88,8 @@ int main(int argc, char *argv[]) //! [5] chart->createDefaultAxes(); - chart->axisY()->setMin(15.0); - chart->axisY()->setMax(34.0); + chart->axes(Qt::Vertical).first()->setMin(15.0); + chart->axes(Qt::Horizontal).first()->setMax(34.0); //! [5] //! [6] diff --git a/examples/charts/chartinteractions/chart.cpp b/examples/charts/chartinteractions/chart.cpp index ca63a3de..a6d3b887 100644 --- a/examples/charts/chartinteractions/chart.cpp +++ b/examples/charts/chartinteractions/chart.cpp @@ -78,12 +78,12 @@ void Chart::handlePointMove(const QPoint &point) //Get the x- and y axis to be able to convert the mapped //coordinate point to the charts scale. - QAbstractAxis *axisx = this->axisX(); + QAbstractAxis *axisx = axes(Qt::Horizontal).first(); QValueAxis *haxis = 0; if (axisx->type() == QAbstractAxis::AxisTypeValue) haxis = qobject_cast<QValueAxis *>(axisx); - QAbstractAxis *axisy = this->axisY(); + QAbstractAxis *axisy = axes(Qt::Vertical).first(); QValueAxis *vaxis = 0; if (axisy->type() == QAbstractAxis::AxisTypeValue) vaxis = qobject_cast<QValueAxis *>(axisy); diff --git a/examples/charts/chartinteractions/main.cpp b/examples/charts/chartinteractions/main.cpp index 5b8bac5b..a6ffdd16 100644 --- a/examples/charts/chartinteractions/main.cpp +++ b/examples/charts/chartinteractions/main.cpp @@ -58,16 +58,17 @@ int main(int argc, char *argv[]) QPen p = series->pen(); p.setWidth(5); series->setPen(p); - chart->createDefaultAxes(); chart->setTitle("Drag'n drop to move data points"); QValueAxis *axisX = new QValueAxis(); - chart->setAxisX(axisX, series); + chart->addAxis(axisX, Qt::AlignBottom); axisX->setRange(0, 20); + series->attachAxis(axisX); QValueAxis *axisY = new QValueAxis(); - chart->setAxisY(axisY, series); + chart->addAxis(axisY, Qt::AlignLeft); axisY->setRange(0, 13); + series->attachAxis(axisY); QObject::connect(series, &QLineSeries::pressed, chart, &Chart::clickPoint); diff --git a/examples/charts/chartthemes/themewidget.cpp b/examples/charts/chartthemes/themewidget.cpp index 84ea8231..cbcdb5c9 100644 --- a/examples/charts/chartthemes/themewidget.cpp +++ b/examples/charts/chartthemes/themewidget.cpp @@ -198,10 +198,12 @@ QChart *ThemeWidget::createAreaChart() const } chart->createDefaultAxes(); - chart->axisX()->setRange(0, m_valueCount - 1); - chart->axisY()->setRange(0, m_valueMax); + chart->axes(Qt::Horizontal).first()->setRange(0, m_valueCount - 1); + chart->axes(Qt::Vertical).first()->setRange(0, m_valueMax); // Add space to label to add space between labels and axis - static_cast<QValueAxis *>(chart->axisY())->setLabelFormat("%.1f "); + QValueAxis *axisY = qobject_cast<QValueAxis*>(chart->axes(Qt::Vertical).first()); + Q_ASSERT(axisY); + axisY->setLabelFormat("%.1f "); return chart; } @@ -222,9 +224,11 @@ QChart *ThemeWidget::createBarChart(int valueCount) const chart->addSeries(series); chart->createDefaultAxes(); - chart->axisY()->setRange(0, m_valueMax * 2); + chart->axes(Qt::Vertical).first()->setRange(0, m_valueMax * 2); // Add space to label to add space between labels and axis - static_cast<QValueAxis *>(chart->axisY())->setLabelFormat("%.1f "); + QValueAxis *axisY = qobject_cast<QValueAxis*>(chart->axes(Qt::Vertical).first()); + Q_ASSERT(axisY); + axisY->setLabelFormat("%.1f "); return chart; } @@ -251,12 +255,14 @@ QChart *ThemeWidget::createLineChart() const //![3] chart->createDefaultAxes(); - chart->axisX()->setRange(0, m_valueMax); - chart->axisY()->setRange(0, m_valueCount); + chart->axes(Qt::Horizontal).first()->setRange(0, m_valueMax); + chart->axes(Qt::Vertical).first()->setRange(0, m_valueCount); //![3] //![4] // Add space to label to add space between labels and axis - static_cast<QValueAxis *>(chart->axisY())->setLabelFormat("%.1f "); + QValueAxis *axisY = qobject_cast<QValueAxis*>(chart->axes(Qt::Vertical).first()); + Q_ASSERT(axisY); + axisY->setLabelFormat("%.1f "); //![4] return chart; @@ -299,11 +305,13 @@ QChart *ThemeWidget::createSplineChart() const } chart->createDefaultAxes(); - chart->axisX()->setRange(0, m_valueMax); - chart->axisY()->setRange(0, m_valueCount); - // Add space to label to add space between labels and axis - static_cast<QValueAxis *>(chart->axisY())->setLabelFormat("%.1f "); + chart->axes(Qt::Horizontal).first()->setRange(0, m_valueMax); + chart->axes(Qt::Vertical).first()->setRange(0, m_valueCount); + // Add space to label to add space between labels and axis + QValueAxis *axisY = qobject_cast<QValueAxis*>(chart->axes(Qt::Vertical).first()); + Q_ASSERT(axisY); + axisY->setLabelFormat("%.1f "); return chart; } @@ -324,11 +332,12 @@ QChart *ThemeWidget::createScatterChart() const } chart->createDefaultAxes(); - chart->axisX()->setRange(0, m_valueMax); - chart->axisY()->setRange(0, m_valueCount); + chart->axes(Qt::Horizontal).first()->setRange(0, m_valueMax); + chart->axes(Qt::Vertical).first()->setRange(0, m_valueCount); // Add space to label to add space between labels and axis - static_cast<QValueAxis *>(chart->axisY())->setLabelFormat("%.1f "); - + QValueAxis *axisY = qobject_cast<QValueAxis*>(chart->axes(Qt::Vertical).first()); + Q_ASSERT(axisY); + axisY->setLabelFormat("%.1f "); return chart; } diff --git a/examples/charts/customchart/main.cpp b/examples/charts/customchart/main.cpp index fbba6031..2ddc45c4 100644 --- a/examples/charts/customchart/main.cpp +++ b/examples/charts/customchart/main.cpp @@ -120,8 +120,10 @@ int main(int argc, char *argv[]) axisY->append("fast", 30); axisY->setRange(0, 30); - chart->setAxisX(axisX, series); - chart->setAxisY(axisY, series); + chart->addAxis(axisX, Qt::AlignBottom); + chart->addAxis(axisY, Qt::AlignLeft); + series->attachAxis(axisX); + series->attachAxis(axisY); //![4] //![5] diff --git a/examples/charts/dynamicspline/chart.cpp b/examples/charts/dynamicspline/chart.cpp index beba2513..d19b7f02 100644 --- a/examples/charts/dynamicspline/chart.cpp +++ b/examples/charts/dynamicspline/chart.cpp @@ -37,7 +37,8 @@ Chart::Chart(QGraphicsItem *parent, Qt::WindowFlags wFlags): QChart(QChart::ChartTypeCartesian, parent, wFlags), m_series(0), - m_axis(new QValueAxis), + m_axisX(new QValueAxis()), + m_axisY(new QValueAxis()), m_step(0), m_x(5), m_y(1) @@ -52,11 +53,14 @@ Chart::Chart(QGraphicsItem *parent, Qt::WindowFlags wFlags): m_series->append(m_x, m_y); addSeries(m_series); - createDefaultAxes(); - setAxisX(m_axis, m_series); - m_axis->setTickCount(5); - axisX()->setRange(0, 10); - axisY()->setRange(-5, 10); + + addAxis(m_axisX,Qt::AlignBottom); + addAxis(m_axisY,Qt::AlignLeft); + m_series->attachAxis(m_axisX); + m_series->attachAxis(m_axisY); + m_axisX->setTickCount(5); + m_axisX->setRange(0, 10); + m_axisY->setRange(-5, 10); m_timer.start(); } @@ -68,8 +72,8 @@ Chart::~Chart() void Chart::handleTimeout() { - qreal x = plotArea().width() / m_axis->tickCount(); - qreal y = (m_axis->max() - m_axis->min()) / m_axis->tickCount(); + qreal x = plotArea().width() / m_axisX->tickCount(); + qreal y = (m_axisX->max() - m_axisX->min()) / m_axisX->tickCount(); m_x += y; m_y = QRandomGenerator::global()->bounded(5) - 2.5; m_series->append(m_x, m_y); diff --git a/examples/charts/dynamicspline/chart.h b/examples/charts/dynamicspline/chart.h index 66a0ab8c..954a0946 100644 --- a/examples/charts/dynamicspline/chart.h +++ b/examples/charts/dynamicspline/chart.h @@ -55,7 +55,8 @@ private: QTimer m_timer; QSplineSeries *m_series; QStringList m_titles; - QValueAxis *m_axis; + QValueAxis *m_axisX; + QValueAxis *m_axisY; qreal m_step; qreal m_x; qreal m_y; diff --git a/examples/charts/horizontalbarchart/main.cpp b/examples/charts/horizontalbarchart/main.cpp index 4cc35488..98198758 100644 --- a/examples/charts/horizontalbarchart/main.cpp +++ b/examples/charts/horizontalbarchart/main.cpp @@ -78,9 +78,11 @@ int main(int argc, char *argv[]) categories << "Jan" << "Feb" << "Mar" << "Apr" << "May" << "Jun"; QBarCategoryAxis *axisY = new QBarCategoryAxis(); axisY->append(categories); - chart->setAxisY(axisY, series); + chart->addAxis(axisY, Qt::AlignLeft); + series->attachAxis(axisY); QValueAxis *axisX = new QValueAxis(); - chart->setAxisX(axisX, series); + chart->addAxis(axisX, Qt::AlignBottom); + series->attachAxis(axisX); axisX->applyNiceNumbers(); //![4] diff --git a/examples/charts/horizontalpercentbarchart/main.cpp b/examples/charts/horizontalpercentbarchart/main.cpp index ff4180c8..da636c1a 100644 --- a/examples/charts/horizontalpercentbarchart/main.cpp +++ b/examples/charts/horizontalpercentbarchart/main.cpp @@ -35,6 +35,7 @@ #include <QtCharts/QLegend> #include <QtCharts/QBarCategoryAxis> #include <QtCharts/QHorizontalPercentBarSeries> +#include <QtCharts/QValueAxis> QT_CHARTS_USE_NAMESPACE @@ -76,10 +77,13 @@ int main(int argc, char *argv[]) //![4] QStringList categories; categories << "Jan" << "Feb" << "Mar" << "Apr" << "May" << "Jun"; - QBarCategoryAxis *axis = new QBarCategoryAxis(); - axis->append(categories); - chart->createDefaultAxes(); - chart->setAxisY(axis, series); + QBarCategoryAxis *axisY = new QBarCategoryAxis(); + axisY->append(categories); + chart->addAxis(axisY, Qt::AlignLeft); + series->attachAxis(axisY); + QValueAxis *axisX = new QValueAxis(); + chart->addAxis(axisX, Qt::AlignBottom); + series->attachAxis(axisX); //![4] //![5] diff --git a/examples/charts/horizontalstackedbarchart/main.cpp b/examples/charts/horizontalstackedbarchart/main.cpp index 312a5fff..dd0f7578 100644 --- a/examples/charts/horizontalstackedbarchart/main.cpp +++ b/examples/charts/horizontalstackedbarchart/main.cpp @@ -35,6 +35,7 @@ #include <QtCharts/QLegend> #include <QtCharts/QBarCategoryAxis> #include <QtCharts/QHorizontalStackedBarSeries> +#include <QtCharts/QValueAxis> QT_CHARTS_USE_NAMESPACE @@ -76,10 +77,13 @@ int main(int argc, char *argv[]) //![4] QStringList categories; categories << "Jan" << "Feb" << "Mar" << "Apr" << "May" << "Jun"; - QBarCategoryAxis *axis = new QBarCategoryAxis(); - axis->append(categories); - chart->createDefaultAxes(); - chart->setAxisY(axis, series); + QBarCategoryAxis *axisY = new QBarCategoryAxis(); + axisY->append(categories); + chart->addAxis(axisY, Qt::AlignLeft); + series->attachAxis(axisY); + QValueAxis *axisX = new QValueAxis(); + chart->addAxis(axisX, Qt::AlignBottom); + series->attachAxis(axisX); //![4] //![5] diff --git a/examples/charts/lineandbar/main.cpp b/examples/charts/lineandbar/main.cpp index be267307..f2370997 100644 --- a/examples/charts/lineandbar/main.cpp +++ b/examples/charts/lineandbar/main.cpp @@ -89,13 +89,15 @@ int main(int argc, char *argv[]) categories << "Jan" << "Feb" << "Mar" << "Apr" << "May" << "Jun"; QBarCategoryAxis *axisX = new QBarCategoryAxis(); axisX->append(categories); - chart->setAxisX(axisX, lineseries); - chart->setAxisX(axisX, barseries); + chart->addAxis(axisX, Qt::AlignBottom); + lineseries->attachAxis(axisX); + barseries->attachAxis(axisX); axisX->setRange(QString("Jan"), QString("Jun")); QValueAxis *axisY = new QValueAxis(); - chart->setAxisY(axisY, lineseries); - chart->setAxisY(axisY, barseries); + chart->addAxis(axisY, Qt::AlignLeft); + lineseries->attachAxis(axisY); + barseries->attachAxis(axisY); axisY->setRange(0, 20); //![4] diff --git a/examples/charts/percentbarchart/main.cpp b/examples/charts/percentbarchart/main.cpp index 34946fb4..38ef3f3f 100644 --- a/examples/charts/percentbarchart/main.cpp +++ b/examples/charts/percentbarchart/main.cpp @@ -34,6 +34,7 @@ #include <QtCharts/QBarSet> #include <QtCharts/QLegend> #include <QtCharts/QBarCategoryAxis> +#include <QtCharts/QValueAxis> QT_CHARTS_USE_NAMESPACE @@ -74,10 +75,13 @@ int main(int argc, char *argv[]) //![4] QStringList categories; categories << "Jan" << "Feb" << "Mar" << "Apr" << "May" << "Jun"; - QBarCategoryAxis *axis = new QBarCategoryAxis(); - axis->append(categories); - chart->createDefaultAxes(); - chart->setAxisX(axis, series); + QBarCategoryAxis *axisX = new QBarCategoryAxis(); + axisX->append(categories); + chart->addAxis(axisX, Qt::AlignBottom); + series->attachAxis(axisX); + QValueAxis *axisY = new QValueAxis(); + chart->addAxis(axisY, Qt::AlignLeft); + series->attachAxis(axisY); //![4] //![5] diff --git a/examples/charts/scatterinteractions/chartview.cpp b/examples/charts/scatterinteractions/chartview.cpp index 9c2e8da3..85c859a2 100644 --- a/examples/charts/scatterinteractions/chartview.cpp +++ b/examples/charts/scatterinteractions/chartview.cpp @@ -54,8 +54,8 @@ ChartView::ChartView(QWidget *parent) chart()->addSeries(m_scatter2); chart()->addSeries(m_scatter); chart()->createDefaultAxes(); - chart()->axisX()->setRange(0, 4.5); - chart()->axisY()->setRange(0, 4.5); + chart()->axes(Qt::Horizontal).first()->setRange(0, 4.5); + chart()->axes(Qt::Vertical).first()->setRange(0, 4.5); connect(m_scatter, &QScatterSeries::clicked, this, &ChartView::handleClickedPoint); } diff --git a/examples/charts/splinechart/main.cpp b/examples/charts/splinechart/main.cpp index db3a9324..b1fbb232 100644 --- a/examples/charts/splinechart/main.cpp +++ b/examples/charts/splinechart/main.cpp @@ -58,7 +58,7 @@ int main(int argc, char *argv[]) chart->addSeries(series); chart->setTitle("Simple spline chart example"); chart->createDefaultAxes(); - chart->axisY()->setRange(0, 10); + chart->axes(Qt::Vertical).first()->setRange(0, 10); //![3] //![4] diff --git a/examples/charts/stackedbarchart/main.cpp b/examples/charts/stackedbarchart/main.cpp index f25d3ee6..6294f844 100644 --- a/examples/charts/stackedbarchart/main.cpp +++ b/examples/charts/stackedbarchart/main.cpp @@ -34,6 +34,7 @@ #include <QtCharts/QBarSet> #include <QtCharts/QLegend> #include <QtCharts/QBarCategoryAxis> +#include <QtCharts/QValueAxis> QT_CHARTS_USE_NAMESPACE @@ -74,10 +75,13 @@ int main(int argc, char *argv[]) //![4] QStringList categories; categories << "Jan" << "Feb" << "Mar" << "Apr" << "May" << "Jun"; - QBarCategoryAxis *axis = new QBarCategoryAxis(); - axis->append(categories); - chart->createDefaultAxes(); - chart->setAxisX(axis, series); + QBarCategoryAxis *axisX = new QBarCategoryAxis(); + axisX->append(categories); + chart->addAxis(axisX, Qt::AlignBottom); + series->attachAxis(axisX); + QValueAxis *axisY = new QValueAxis(); + chart->addAxis(axisY, Qt::AlignLeft); + series->attachAxis(axisY); //![4] //![5] diff --git a/examples/charts/stackedbarchartdrilldown/drilldownchart.cpp b/examples/charts/stackedbarchartdrilldown/drilldownchart.cpp index 2af737d2..696b5397 100644 --- a/examples/charts/stackedbarchartdrilldown/drilldownchart.cpp +++ b/examples/charts/stackedbarchartdrilldown/drilldownchart.cpp @@ -29,13 +29,18 @@ #include "drilldownchart.h" #include <QtCharts/QBarCategoryAxis> +#include <QtCharts/QValueAxis> QT_CHARTS_USE_NAMESPACE DrilldownChart::DrilldownChart(QGraphicsItem *parent, Qt::WindowFlags wFlags) : QChart(QChart::ChartTypeCartesian, parent, wFlags), - m_currentSeries(0) + m_currentSeries(0), + m_axisX(new QBarCategoryAxis()), + m_axisY(new QValueAxis()) { + addAxis(m_axisY, Qt::AlignLeft); + addAxis(m_axisX, Qt::AlignBottom); } void DrilldownChart::changeSeries(DrilldownBarSeries *series) @@ -46,15 +51,11 @@ void DrilldownChart::changeSeries(DrilldownBarSeries *series) m_currentSeries = series; // Reset axis - QBarCategoryAxis *axis = new QBarCategoryAxis(); - axis->append(m_currentSeries->categories()); - + m_axisX->setCategories(m_currentSeries->categories()); addSeries(series); - - createDefaultAxes(); - setAxisX(axis, series); - axisY()->setTitleText("Crops"); - + series->attachAxis(m_axisX); + series->attachAxis(m_axisY); + m_axisY->setRange(0,m_currentSeries->maxValue()); setTitle(series->name()); } diff --git a/examples/charts/stackedbarchartdrilldown/drilldownchart.h b/examples/charts/stackedbarchartdrilldown/drilldownchart.h index 61725f17..7544bae5 100644 --- a/examples/charts/stackedbarchartdrilldown/drilldownchart.h +++ b/examples/charts/stackedbarchartdrilldown/drilldownchart.h @@ -33,6 +33,11 @@ #include <QtCharts/QChart> #include "drilldownseries.h" +namespace QtCharts { +class QBarCategoryAxis; +class QValueAxis; +} + QT_CHARTS_USE_NAMESPACE //! [1] @@ -49,6 +54,8 @@ public Q_SLOTS: private: DrilldownBarSeries *m_currentSeries; + QBarCategoryAxis *m_axisX; + QValueAxis *m_axisY; }; //! [1] diff --git a/examples/charts/stackedbarchartdrilldown/drilldownseries.cpp b/examples/charts/stackedbarchartdrilldown/drilldownseries.cpp index 80efd2c8..e5c143c9 100644 --- a/examples/charts/stackedbarchartdrilldown/drilldownseries.cpp +++ b/examples/charts/stackedbarchartdrilldown/drilldownseries.cpp @@ -31,8 +31,9 @@ QT_CHARTS_USE_NAMESPACE -DrilldownBarSeries::DrilldownBarSeries(QStringList categories, QObject *parent) - : QStackedBarSeries(parent) +DrilldownBarSeries::DrilldownBarSeries(QStringList categories, int maxValue, QObject *parent) + : QStackedBarSeries(parent), + m_maxValue(maxValue) { m_categories = categories; } @@ -52,4 +53,9 @@ QStringList DrilldownBarSeries::categories() return m_categories; } +int DrilldownBarSeries::maxValue() +{ + return m_maxValue; +} + #include "moc_drilldownseries.cpp" diff --git a/examples/charts/stackedbarchartdrilldown/drilldownseries.h b/examples/charts/stackedbarchartdrilldown/drilldownseries.h index 1d0ec193..7cd28f0a 100644 --- a/examples/charts/stackedbarchartdrilldown/drilldownseries.h +++ b/examples/charts/stackedbarchartdrilldown/drilldownseries.h @@ -40,7 +40,7 @@ class DrilldownBarSeries : public QStackedBarSeries { Q_OBJECT public: - DrilldownBarSeries(QStringList categories, QObject *parent = 0); + DrilldownBarSeries(QStringList categories, int maxValue, QObject *parent = 0); void mapDrilldownSeries(int index, DrilldownBarSeries *drilldownSeries); @@ -48,9 +48,12 @@ public: QStringList categories(); + int maxValue(); + private: QMap<int, DrilldownBarSeries *> m_DrilldownSeries; QStringList m_categories; + int m_maxValue; }; //! [1] diff --git a/examples/charts/stackedbarchartdrilldown/main.cpp b/examples/charts/stackedbarchartdrilldown/main.cpp index 87035aea..c86bd0c3 100644 --- a/examples/charts/stackedbarchartdrilldown/main.cpp +++ b/examples/charts/stackedbarchartdrilldown/main.cpp @@ -63,14 +63,14 @@ int main(int argc, char *argv[]) //! [3] // Create drilldown structure - DrilldownBarSeries *seasonSeries = new DrilldownBarSeries(months, drilldownChart); + DrilldownBarSeries *seasonSeries = new DrilldownBarSeries(months, 320, drilldownChart); seasonSeries->setName("Crop by month - Season"); // Each month in season series has drilldown series for weekly data for (int month = 0; month < months.count(); month++) { // Create drilldown series for every week - DrilldownBarSeries *weeklySeries = new DrilldownBarSeries(weeks, drilldownChart); + DrilldownBarSeries *weeklySeries = new DrilldownBarSeries(weeks, 80, drilldownChart); seasonSeries->mapDrilldownSeries(month, weeklySeries); // Drilling down from weekly data brings us back to season data. @@ -112,7 +112,7 @@ int main(int argc, char *argv[]) //! [5] //! [6] - drilldownChart->axisX()->setGridLineVisible(false); + drilldownChart->axes(Qt::Horizontal).first()->setGridLineVisible(false); drilldownChart->legend()->setVisible(true); drilldownChart->legend()->setAlignment(Qt::AlignBottom); //! [6] diff --git a/examples/charts/temperaturerecords/main.cpp b/examples/charts/temperaturerecords/main.cpp index b521dee7..92508b58 100644 --- a/examples/charts/temperaturerecords/main.cpp +++ b/examples/charts/temperaturerecords/main.cpp @@ -35,6 +35,7 @@ #include <QtCharts/QLegend> #include <QtCharts/QBarCategoryAxis> #include <QtCharts/QStackedBarSeries> +#include <QtCharts/QValueAxis> QT_CHARTS_USE_NAMESPACE @@ -70,13 +71,16 @@ int main(int argc, char *argv[]) "Jan", "Feb", "Mar", "Apr", "May", "Jun", "Jul", "Aug", "Sep", "Oct", "Nov", "Dec" }; - QBarCategoryAxis *axis = new QBarCategoryAxis(); - axis->append(categories); - axis->setTitleText("Month"); - chart->createDefaultAxes(); - chart->setAxisX(axis, series); - chart->axisY(series)->setRange(-52, 52); - chart->axisY(series)->setTitleText("Temperature [°C]"); + QBarCategoryAxis *axisX = new QBarCategoryAxis(); + axisX->append(categories); + axisX->setTitleText("Month"); + chart->addAxis(axisX, Qt::AlignBottom); + QValueAxis *axisY = new QValueAxis(); + axisY->setRange(-52, 52); + axisY->setTitleText("Temperature [°C]"); + chart->addAxis(axisY, Qt::AlignLeft); + series->attachAxis(axisX); + series->attachAxis(axisY); //![4] //![5] diff --git a/src/charts/qchart.h b/src/charts/qchart.h index a193ba22..722451dc 100644 --- a/src/charts/qchart.h +++ b/src/charts/qchart.h @@ -104,12 +104,10 @@ public: void removeAllSeries(); QList<QAbstractSeries *> series() const; - // *** deprecated *** - 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; - // ****************** + Q_DECL_DEPRECATED void setAxisX(QAbstractAxis *axis, QAbstractSeries *series = nullptr); + Q_DECL_DEPRECATED void setAxisY(QAbstractAxis *axis, QAbstractSeries *series = nullptr); + Q_DECL_DEPRECATED QAbstractAxis *axisX(QAbstractSeries *series = nullptr) const; + Q_DECL_DEPRECATED QAbstractAxis *axisY(QAbstractSeries *series = nullptr) const; void addAxis(QAbstractAxis *axis, Qt::Alignment alignment); void removeAxis(QAbstractAxis *axis); |