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/polarchart/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/polarchart/chartview.cpp')
-rw-r--r-- | examples/polarchart/chartview.cpp | 111 |
1 files changed, 0 insertions, 111 deletions
diff --git a/examples/polarchart/chartview.cpp b/examples/polarchart/chartview.cpp deleted file mode 100644 index 311a2ab4..00000000 --- a/examples/polarchart/chartview.cpp +++ /dev/null @@ -1,111 +0,0 @@ -/**************************************************************************** -** -** 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 <QMouseEvent> -#include <QDebug> -#include <QAbstractAxis> -#include <QValueAxis> - -QTCOMMERCIALCHART_USE_NAMESPACE - -ChartView::ChartView(QWidget *parent) - : QChartView(parent) -{ -} - -//![1] -void ChartView::keyPressEvent(QKeyEvent *event) -{ - switch (event->key()) { - case Qt::Key_Plus: - chart()->zoomIn(); - break; - case Qt::Key_Minus: - chart()->zoomOut(); - break; - case Qt::Key_Left: - chart()->scroll(-1.0, 0); - break; - case Qt::Key_Right: - chart()->scroll(1.0, 0); - break; - case Qt::Key_Up: - chart()->scroll(0, 1.0); - break; - case Qt::Key_Down: - chart()->scroll(0, -1.0); - break; - case Qt::Key_Space: - switchChartType(); - break; - default: - QGraphicsView::keyPressEvent(event); - break; - } -} -//![1] - -//![2] -void ChartView::switchChartType() -{ - QChart *newChart; - QChart *oldChart = chart(); - - if (oldChart->chartType() == QChart::ChartTypeCartesian) - newChart = new QPolarChart(); - else - newChart = new QChart(); - - // Move series and axes from old chart to new one - QList<QAbstractSeries *> seriesList = oldChart->series(); - QList<QAbstractAxis *> axisList = oldChart->axes(); - QList<QPair<qreal, qreal> > axisRanges; - - foreach (QAbstractAxis *axis, axisList) { - QValueAxis *valueAxis = static_cast<QValueAxis *>(axis); - axisRanges.append(QPair<qreal, qreal>(valueAxis->min(), valueAxis->max())); - } - - foreach (QAbstractSeries *series, seriesList) - oldChart->removeSeries(series); - - foreach (QAbstractAxis *axis, axisList) { - oldChart->removeAxis(axis); - newChart->addAxis(axis, axis->alignment()); - } - - foreach (QAbstractSeries *series, seriesList) { - newChart->addSeries(series); - foreach (QAbstractAxis *axis, axisList) - series->attachAxis(axis); - } - - int count = 0; - foreach (QAbstractAxis *axis, axisList) { - axis->setRange(axisRanges[count].first, axisRanges[count].second); - count++; - } - - newChart->setTitle(oldChart->title()); - setChart(newChart); - delete oldChart; -} -//![2] |