diff options
author | Titta Heikkala <titta.heikkala@digia.com> | 2014-07-01 07:10:00 +0300 |
---|---|---|
committer | Titta Heikkala <titta.heikkala@theqtcompany.com> | 2014-10-14 13:04:52 +0300 |
commit | c544258484ff4fd5d2b88402fbaa5d154b89a3a2 (patch) | |
tree | 7659625abb566dec55d3783ed820b928542d9b2b /examples/charts/donutbreakdown | |
parent | 76339f714f088645e911cee65bdb66055fe029aa (diff) |
Qt Charts project file structure change
Charts repository structure is changed to follow the structure of a
Qt Add-On module. The task includes following changes:
- All macros and definitions named 'commercial' have been renamed.
- Compile errors related to QString and qSort usage have been fixed.
- Old demos are moved under examples. The QML examples now support only
Qt Quick 2.0, the support for Qt Quick 1 is removed.
- The QML examples with multiple views are updated so that they are
usable also with touch devices.
- Unnecessary version checks are removed from examples.
- The build stamp has been removed as it was only meant for Charts
development purposes and it's no longer needed. Also development
build related debug prints are removed as __DATE__ can't be used
for all OS thus it doesn't make much sense.
- Documentation structure has been updated based on the new module
structure. The raw HTML files have been removed. Demos are
combined to examples.
- Unnecessary .qdocinc files are no longer needed. The content is
moved to the corresponding .cpp files.
- The Charts widget designer plugin is updated according to the module
change.
- The test cases updated according to the project structure change.
Tests are added also for version 2.0.
- cmake modules generation is not needed with Qt 5.4 and Qt Charts
so it's disabled.
- The new module name and version are updated to the plugin.qmltypes
file.
Task-number: QTRD-2844, QTRD-3217, QTRD-3218, QTRD-3277, QTRD-3228,
QTRD-2526, QTRD-3233, QTRD-3222
Change-Id: Ib7fb26057cde710ffaf6bc780c8bf52a16f45160
Reviewed-by: Miikka Heikkinen <miikka.heikkinen@theqtcompany.com>
Diffstat (limited to 'examples/charts/donutbreakdown')
-rw-r--r-- | examples/charts/donutbreakdown/donutbreakdown.pro | 12 | ||||
-rw-r--r-- | examples/charts/donutbreakdown/donutbreakdownchart.cpp | 110 | ||||
-rw-r--r-- | examples/charts/donutbreakdown/donutbreakdownchart.h | 42 | ||||
-rw-r--r-- | examples/charts/donutbreakdown/main.cpp | 77 | ||||
-rw-r--r-- | examples/charts/donutbreakdown/mainslice.cpp | 57 | ||||
-rw-r--r-- | examples/charts/donutbreakdown/mainslice.h | 48 |
6 files changed, 346 insertions, 0 deletions
diff --git a/examples/charts/donutbreakdown/donutbreakdown.pro b/examples/charts/donutbreakdown/donutbreakdown.pro new file mode 100644 index 00000000..fecef7b8 --- /dev/null +++ b/examples/charts/donutbreakdown/donutbreakdown.pro @@ -0,0 +1,12 @@ +!include( ../examples.pri ) { + error( "Couldn't find the examples.pri file!" ) +} + +TARGET = donutbreakdown +SOURCES += main.cpp\ + donutbreakdownchart.cpp \ + mainslice.cpp + +HEADERS += \ + donutbreakdownchart.h \ + mainslice.h diff --git a/examples/charts/donutbreakdown/donutbreakdownchart.cpp b/examples/charts/donutbreakdown/donutbreakdownchart.cpp new file mode 100644 index 00000000..5272f105 --- /dev/null +++ b/examples/charts/donutbreakdown/donutbreakdownchart.cpp @@ -0,0 +1,110 @@ +/**************************************************************************** +** +** Copyright (C) 2014 Digia Plc +** All rights reserved. +** For any questions to Digia, please use contact form at http://qt.digia.com +** +** This file is part of the Qt Enterprise Charts Add-on. +** +** $QT_BEGIN_LICENSE$ +** Licensees holding valid Qt Enterprise licenses may use this file in +** accordance with the Qt Enterprise License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Digia. +** +** If you have questions regarding the use of this file, please use +** contact form at http://qt.digia.com +** $QT_END_LICENSE$ +** +****************************************************************************/ +#include "donutbreakdownchart.h" +#include "mainslice.h" +#include <QPieSlice> +#include <QPieLegendMarker> + +QT_CHARTS_USE_NAMESPACE + +//![1] +DonutBreakdownChart::DonutBreakdownChart(QGraphicsItem *parent, Qt::WindowFlags wFlags) + : QChart(QChart::ChartTypeCartesian, parent, wFlags) +{ + // create the series for main center pie + m_mainSeries = new QPieSeries(); + m_mainSeries->setPieSize(0.7); + QChart::addSeries(m_mainSeries); +} +//![1] + +//![2] +void DonutBreakdownChart::addBreakdownSeries(QPieSeries *breakdownSeries, QColor color) +{ + QFont font("Arial", 8); + + // add breakdown series as a slice to center pie + MainSlice *mainSlice = new MainSlice(breakdownSeries); + mainSlice->setName(breakdownSeries->name()); + mainSlice->setValue(breakdownSeries->sum()); + m_mainSeries->append(mainSlice); + + // customize the slice + mainSlice->setBrush(color); + mainSlice->setLabelVisible(); + mainSlice->setLabelColor(Qt::white); + mainSlice->setLabelPosition(QPieSlice::LabelInsideHorizontal); + mainSlice->setLabelFont(font); + + // position and customize the breakdown series + breakdownSeries->setPieSize(0.8); + breakdownSeries->setHoleSize(0.7); + breakdownSeries->setLabelsVisible(); + foreach (QPieSlice *slice, breakdownSeries->slices()) { + color = color.lighter(115); + slice->setBrush(color); + slice->setLabelFont(font); + } + + // add the series to the chart + QChart::addSeries(breakdownSeries); + + // recalculate breakdown donut segments + recalculateAngles(); + + // update customize legend markers + updateLegendMarkers(); +} +//![2] + +//![3] +void DonutBreakdownChart::recalculateAngles() +{ + qreal angle = 0; + foreach (QPieSlice *slice, m_mainSeries->slices()) { + QPieSeries *breakdownSeries = qobject_cast<MainSlice *>(slice)->breakdownSeries(); + breakdownSeries->setPieStartAngle(angle); + angle += slice->percentage() * 360.0; // full pie is 360.0 + breakdownSeries->setPieEndAngle(angle); + } +} +//![3] + +//![4] +void DonutBreakdownChart::updateLegendMarkers() +{ + // go through all markers + foreach (QAbstractSeries *series, QChart::series()) { + foreach (QLegendMarker *marker, legend()->markers(series)) { + QPieLegendMarker *pieMarker = qobject_cast<QPieLegendMarker *>(marker); + if (series == m_mainSeries) { + // hide markers from main series + pieMarker->setVisible(false); + } else { + // modify markers from breakdown series + pieMarker->setLabel(QString("%1 %2%") + .arg(pieMarker->slice()->label()) + .arg(pieMarker->slice()->percentage() * 100, 0, 'f', 2)); + pieMarker->setFont(QFont("Arial", 8)); + } + } + } +} +//![4] diff --git a/examples/charts/donutbreakdown/donutbreakdownchart.h b/examples/charts/donutbreakdown/donutbreakdownchart.h new file mode 100644 index 00000000..71b3ecf4 --- /dev/null +++ b/examples/charts/donutbreakdown/donutbreakdownchart.h @@ -0,0 +1,42 @@ +/**************************************************************************** +** +** Copyright (C) 2014 Digia Plc +** All rights reserved. +** For any questions to Digia, please use contact form at http://qt.digia.com +** +** This file is part of the Qt Enterprise Charts Add-on. +** +** $QT_BEGIN_LICENSE$ +** Licensees holding valid Qt Enterprise licenses may use this file in +** accordance with the Qt Enterprise License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Digia. +** +** If you have questions regarding the use of this file, please use +** contact form at http://qt.digia.com +** $QT_END_LICENSE$ +** +****************************************************************************/ +#ifndef DONUTBREAKDOWNCHART_H +#define DONUTBREAKDOWNCHART_H + +#include <QChart> +#include <QPieSeries> + +QT_CHARTS_USE_NAMESPACE + +class DonutBreakdownChart : public QChart +{ +public: + DonutBreakdownChart(QGraphicsItem *parent = 0, Qt::WindowFlags wFlags = 0); + void addBreakdownSeries(QPieSeries *series, QColor color); + +private: + void recalculateAngles(); + void updateLegendMarkers(); + +private: + QPieSeries *m_mainSeries; +}; + +#endif // DONUTBREAKDOWNCHART_H diff --git a/examples/charts/donutbreakdown/main.cpp b/examples/charts/donutbreakdown/main.cpp new file mode 100644 index 00000000..fb3925b6 --- /dev/null +++ b/examples/charts/donutbreakdown/main.cpp @@ -0,0 +1,77 @@ +/**************************************************************************** +** +** Copyright (C) 2014 Digia Plc +** All rights reserved. +** For any questions to Digia, please use contact form at http://qt.digia.com +** +** This file is part of the Qt Enterprise Charts Add-on. +** +** $QT_BEGIN_LICENSE$ +** Licensees holding valid Qt Enterprise licenses may use this file in +** accordance with the Qt Enterprise License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Digia. +** +** If you have questions regarding the use of this file, please use +** contact form at http://qt.digia.com +** $QT_END_LICENSE$ +** +****************************************************************************/ +#include <QApplication> +#include <QMainWindow> +#include <QStatusBar> +#include <QChartView> +#include "donutbreakdownchart.h" + +QT_CHARTS_USE_NAMESPACE + +int main(int argc, char *argv[]) +{ + QApplication a(argc, argv); + + //![1] + // Graph is based on data of 'Total consumption of energy increased by 10 per cent in 2010' + // Statistics Finland, 13 December 2011 + // http://www.stat.fi/til/ekul/2010/ekul_2010_2011-12-13_tie_001_en.html + + QPieSeries *series1 = new QPieSeries(); + series1->setName("Fossil fuels"); + series1->append("Oil", 353295); + series1->append("Coal", 188500); + series1->append("Natural gas", 148680); + series1->append("Peat", 94545); + + QPieSeries *series2 = new QPieSeries(); + series2->setName("Renewables"); + series2->append("Wood fuels", 319663); + series2->append("Hydro power", 45875); + series2->append("Wind power", 1060); + + QPieSeries *series3 = new QPieSeries(); + series3->setName("Others"); + series3->append("Nuclear energy", 238789); + series3->append("Import energy", 37802); + series3->append("Other", 32441); + //![1] + + //![2] + DonutBreakdownChart *donutBreakdown = new DonutBreakdownChart(); + donutBreakdown->setAnimationOptions(QChart::AllAnimations); + donutBreakdown->setTitle("Total consumption of energy in Finland 2010"); + donutBreakdown->legend()->setAlignment(Qt::AlignRight); + donutBreakdown->addBreakdownSeries(series1, Qt::red); + donutBreakdown->addBreakdownSeries(series2, Qt::darkGreen); + donutBreakdown->addBreakdownSeries(series3, Qt::darkBlue); + //![2] + + //![3] + QMainWindow window; + QChartView *chartView = new QChartView(donutBreakdown); + chartView->setRenderHint(QPainter::Antialiasing); + window.setCentralWidget(chartView); + window.resize(800, 500); + window.show(); + //![3] + + return a.exec(); +} diff --git a/examples/charts/donutbreakdown/mainslice.cpp b/examples/charts/donutbreakdown/mainslice.cpp new file mode 100644 index 00000000..0ac83b3c --- /dev/null +++ b/examples/charts/donutbreakdown/mainslice.cpp @@ -0,0 +1,57 @@ +/**************************************************************************** +** +** Copyright (C) 2014 Digia Plc +** All rights reserved. +** For any questions to Digia, please use contact form at http://qt.digia.com +** +** This file is part of the Qt Enterprise Charts Add-on. +** +** $QT_BEGIN_LICENSE$ +** Licensees holding valid Qt Enterprise licenses may use this file in +** accordance with the Qt Enterprise License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Digia. +** +** If you have questions regarding the use of this file, please use +** contact form at http://qt.digia.com +** $QT_END_LICENSE$ +** +****************************************************************************/ + +#include "mainslice.h" + +QT_CHARTS_USE_NAMESPACE + +//![1] +MainSlice::MainSlice(QPieSeries *breakdownSeries, QObject *parent) + : QPieSlice(parent), + m_breakdownSeries(breakdownSeries) +{ + connect(this, SIGNAL(percentageChanged()), this, SLOT(updateLabel())); +} +//![1] + +QPieSeries *MainSlice::breakdownSeries() const +{ + return m_breakdownSeries; +} + +void MainSlice::setName(QString name) +{ + m_name = name; +} + +QString MainSlice::name() const +{ + return m_name; +} + +//![2] +void MainSlice::updateLabel() +{ + this->setLabel(QString("%1 %2%").arg(m_name).arg(percentage() * 100, 0, 'f', 2)); +} +//![2] + +#include "moc_mainslice.cpp" + diff --git a/examples/charts/donutbreakdown/mainslice.h b/examples/charts/donutbreakdown/mainslice.h new file mode 100644 index 00000000..6c6d63c2 --- /dev/null +++ b/examples/charts/donutbreakdown/mainslice.h @@ -0,0 +1,48 @@ +/**************************************************************************** +** +** Copyright (C) 2014 Digia Plc +** All rights reserved. +** For any questions to Digia, please use contact form at http://qt.digia.com +** +** This file is part of the Qt Enterprise Charts Add-on. +** +** $QT_BEGIN_LICENSE$ +** Licensees holding valid Qt Enterprise licenses may use this file in +** accordance with the Qt Enterprise License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Digia. +** +** If you have questions regarding the use of this file, please use +** contact form at http://qt.digia.com +** $QT_END_LICENSE$ +** +****************************************************************************/ + +#ifndef MAINSLICE_H +#define MAINSLICE_H + +#include <QPieSlice> +#include <QPieSeries> + +QT_CHARTS_USE_NAMESPACE + +class MainSlice : public QPieSlice +{ + Q_OBJECT +public: + MainSlice(QPieSeries *breakdownSeries, QObject *parent = 0); + + QPieSeries *breakdownSeries() const; + + void setName(QString name); + QString name() const; + +public Q_SLOTS: + void updateLabel(); + +private: + QPieSeries *m_breakdownSeries; + QString m_name; +}; + +#endif // MAINSLICE_H |