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/scatterchart/chartview.cpp | |
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/scatterchart/chartview.cpp')
-rw-r--r-- | examples/charts/scatterchart/chartview.cpp | 98 |
1 files changed, 98 insertions, 0 deletions
diff --git a/examples/charts/scatterchart/chartview.cpp b/examples/charts/scatterchart/chartview.cpp new file mode 100644 index 00000000..345be195 --- /dev/null +++ b/examples/charts/scatterchart/chartview.cpp @@ -0,0 +1,98 @@ +/**************************************************************************** +** +** 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 "chartview.h" +#include <QScatterSeries> +#include <QLegendMarker> +#include <QImage> +#include <QPainter> +#include <qmath.h> + +const float Pi = 3.14159f; + +ChartView::ChartView(QWidget *parent) : + QChartView(new QChart(), parent) +{ + //![1] + QScatterSeries *series0 = new QScatterSeries(); + series0->setName("scatter1"); + series0->setMarkerShape(QScatterSeries::MarkerShapeCircle); + series0->setMarkerSize(15.0); + + QScatterSeries *series1 = new QScatterSeries(); + series1->setName("scatter2"); + series1->setMarkerShape(QScatterSeries::MarkerShapeRectangle); + series1->setMarkerSize(20.0); + + QScatterSeries *series2 = new QScatterSeries(); + series2->setName("scatter3"); + series2->setMarkerShape(QScatterSeries::MarkerShapeRectangle); + series2->setMarkerSize(30.0); + //![1] + + //![2] + series0->append(0, 6); + series0->append(2, 4); + series0->append(3, 8); + series0->append(7, 4); + series0->append(10, 5); + + *series1 << QPointF(1, 1) << QPointF(3, 3) << QPointF(7, 6) << QPointF(8, 3) << QPointF(10, 2); + *series2 << QPointF(1, 5) << QPointF(4, 6) << QPointF(6, 3) << QPointF(9, 5); + //![2] + + //![3] + QPainterPath starPath; + starPath.moveTo(30, 15); + for (int i = 1; i < 5; ++i) { + starPath.lineTo(15 + 15 * qCos(0.8 * i * Pi), + 15 + 15 * qSin(0.8 * i * Pi)); + } + starPath.closeSubpath(); + + QImage star(30, 30, QImage::Format_ARGB32); + star.fill(Qt::transparent); + + QPainter painter(&star); + painter.setRenderHint(QPainter::Antialiasing); + painter.setPen(QRgb(0xf6a625)); + painter.setBrush(painter.pen().color()); + painter.drawPath(starPath); + + series2->setBrush(star); + //![3] + + //![4] + setRenderHint(QPainter::Antialiasing); + chart()->addSeries(series0); + chart()->addSeries(series1); + chart()->addSeries(series2); + + chart()->setTitle("Simple scatterchart example"); + chart()->createDefaultAxes(); + chart()->setDropShadowEnabled(false); + //![4] + + //![5] + QList<QLegendMarker *> markers = chart()->legend()->markers(series2); + for (int i = 0; i < markers.count(); i++) + markers.at(i)->setBrush(painter.pen().color()); + //![5] +} |