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 /src/xychart/qvxymodelmapper.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 'src/xychart/qvxymodelmapper.cpp')
-rw-r--r-- | src/xychart/qvxymodelmapper.cpp | 246 |
1 files changed, 0 insertions, 246 deletions
diff --git a/src/xychart/qvxymodelmapper.cpp b/src/xychart/qvxymodelmapper.cpp deleted file mode 100644 index 6446c112..00000000 --- a/src/xychart/qvxymodelmapper.cpp +++ /dev/null @@ -1,246 +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 "qvxymodelmapper.h" - -QTCOMMERCIALCHART_BEGIN_NAMESPACE - -/*! - \class QVXYModelMapper - \inmodule Qt Charts - \mainclass - - Model mappers allow you to use QAbstractItemModel derived models as a data source for a chart series. - Vertical model mapper is used to create a connection between QXYSeries and QAbstractItemModel derived model object. - It is possible to use both QAbstractItemModel and QXYSeries model API. QXYModelMapper makes sure that QXYSeries and the model are kept in sync. - Note: used model has to support adding/removing rows/columns and modifying the data of the cells. -*/ -#ifdef QDOC_QT5 -/*! - \qmltype VXYModelMapper - \instantiates QVXYModelMapper - \inqmlmodule QtCommercial.Chart - - \include doc/src/vxymodelmapper.qdocinc -*/ -#else -/*! - \qmlclass VXYModelMapper QVXYModelMapper - - \include ../doc/src/vxymodelmapper.qdocinc -*/ -#endif - -/*! - \property QVXYModelMapper::series - \brief Defines the QXYSeries object that is used by the mapper. - - All the data in the series is discarded when it is set to the mapper. - When new series is specified the old series is disconnected (it preserves its data) -*/ -/*! - \qmlproperty XYSeries VXYModelMapper::series - Defines the XYSeries object that is used by the mapper. All the data in the series is discarded when it is set to - the mapper. When new series is specified the old series is disconnected (it preserves its data). -*/ - -/*! - \property QVXYModelMapper::model - \brief Defines the model that is used by the mapper. -*/ -/*! - \qmlproperty SomeModel VXYModelMapper::model - The QAbstractItemModel based model that is used by the mapper. You need to implement the model - and expose it to QML. Note: the model has to support adding/removing rows/columns and modifying - the data of the cells. -*/ - -/*! - \property QVXYModelMapper::xColumn - \brief Defines which column of the model is kept in sync with the x values of QXYSeries. - - Default value is: -1 (invalid mapping) -*/ -/*! - \qmlproperty int VXYModelMapper::xColumn - Defines which column of the model is kept in sync with the x values of the series. Default value is -1 (invalid - mapping). -*/ - -/*! - \property QVXYModelMapper::yColumn - \brief Defines which column of the model is kept in sync with the y values of QXYSeries. - - Default value is: -1 (invalid mapping) -*/ -/*! - \qmlproperty int VXYModelMapper::yColumn - Defines which column of the model is kept in sync with the y values of the series. Default value is -1 (invalid - mapping). -*/ - -/*! - \property QVXYModelMapper::firstRow - \brief Defines which row of the model contains the data for the first point of the series. - - Minimal and default value is: 0 -*/ -/*! - \qmlproperty int VXYModelMapper::firstRow - Defines which row of the model contains the data for the first point of the series. - The default value is 0. -*/ - -/*! - \property QVXYModelMapper::rowCount - \brief Defines the number of rows of the model that are mapped as the data for series. - - Minimal and default value is: -1 (count limited by the number of rows in the model) -*/ -/*! - \qmlproperty int VXYModelMapper::columnCount - Defines the number of rows of the model that are mapped as the data for series. The default value is - -1 (count limited by the number of rows in the model). -*/ - -/*! - \fn void QVXYModelMapper::seriesReplaced() - - Emitted when the series to which mapper is connected to has changed. -*/ - -/*! - \fn void QVXYModelMapper::modelReplaced() - - Emitted when the model to which mapper is connected to has changed. -*/ - -/*! - \fn void QVXYModelMapper::xColumnChanged() - - Emitted when the xColumn has changed. -*/ - -/*! - \fn void QVXYModelMapper::yColumnChanged() - - Emitted when the yColumn has changed. -*/ - -/*! - \fn void QVXYModelMapper::firstRowChanged() - Emitted when the firstRow has changed. -*/ - -/*! - \fn void QVXYModelMapper::rowCountChanged() - Emitted when the rowCount has changed. -*/ - -/*! - Constructs a mapper object which is a child of \a parent. -*/ -QVXYModelMapper::QVXYModelMapper(QObject *parent) : - QXYModelMapper(parent) -{ - QXYModelMapper::setOrientation(Qt::Vertical); -} - -QAbstractItemModel *QVXYModelMapper::model() const -{ - return QXYModelMapper::model(); -} - -void QVXYModelMapper::setModel(QAbstractItemModel *model) -{ - if (model != QXYModelMapper::model()) { - QXYModelMapper::setModel(model); - emit modelReplaced(); - } -} - -QXYSeries *QVXYModelMapper::series() const -{ - return QXYModelMapper::series(); -} - -void QVXYModelMapper::setSeries(QXYSeries *series) -{ - if (series != QXYModelMapper::series()) { - QXYModelMapper::setSeries(series); - emit seriesReplaced(); - } -} - -int QVXYModelMapper::xColumn() const -{ - return QXYModelMapper::xSection(); -} - -void QVXYModelMapper::setXColumn(int xColumn) -{ - if (xColumn != xSection()) { - QXYModelMapper::setXSection(xColumn); - emit xColumnChanged(); - } -} - -int QVXYModelMapper::yColumn() const -{ - return QXYModelMapper::ySection(); -} - -void QVXYModelMapper::setYColumn(int yColumn) -{ - if (yColumn != ySection()) { - QXYModelMapper::setYSection(yColumn); - emit yColumnChanged(); - } -} - -int QVXYModelMapper::firstRow() const -{ - return first(); -} - -void QVXYModelMapper::setFirstRow(int firstRow) -{ - if (firstRow != first()) { - setFirst(firstRow); - emit firstRowChanged(); - } -} - -int QVXYModelMapper::rowCount() const -{ - return count(); -} - -void QVXYModelMapper::setRowCount(int rowCount) -{ - if (rowCount != count()) { - setCount(rowCount); - emit rowCountChanged(); - } -} - -#include "moc_qvxymodelmapper.cpp" - -QTCOMMERCIALCHART_END_NAMESPACE |