##// END OF EJS Templates
Merge remote-tracking branch 'origin/5.6' into 5.7...
Merge remote-tracking branch 'origin/5.6' into 5.7 Conflicts: src/charts/charts.pro src/charts/qchartglobal.h src/chartsqml2/chartsqml2.pro tests/auto/chartdataset/tst_chartdataset.cpp tests/auto/domain/tst_domain.cpp Change-Id: I9bfc63f6e93f9a3b86e53aca218dd3a48bb2ffc1

File last commit:

r2854:46147b040d06
r2898:03a6177a3223 merge master
Show More
qhbarmodelmapper.cpp
266 lines | 8.1 KiB | text/x-c | CppLexer
/ src / charts / barchart / qhbarmodelmapper.cpp
Miikka Heikkinen
Updated license...
r2854 /****************************************************************************
Marek Rosa
Added license text to mapper classes
r1355 **
Miikka Heikkinen
Updated license...
r2854 ** Copyright (C) 2016 The Qt Company Ltd.
** Contact: https://www.qt.io/licensing/
Marek Rosa
Added license text to mapper classes
r1355 **
Miikka Heikkinen
Updated license...
r2854 ** This file is part of the Qt Charts module of the Qt Toolkit.
Marek Rosa
Added license text to mapper classes
r1355 **
Miikka Heikkinen
Updated license...
r2854 ** $QT_BEGIN_LICENSE:GPL$
Titta Heikkala
Updated license headers...
r2845 ** Commercial License Usage
** Licensees holding valid commercial Qt licenses may use this file in
** accordance with the commercial license agreement provided with the
** Software or, alternatively, in accordance with the terms contained in
** a written agreement between you and The Qt Company. For licensing terms
Miikka Heikkinen
Updated license...
r2854 ** and conditions see https://www.qt.io/terms-conditions. For further
** information use the contact form at https://www.qt.io/contact-us.
**
** GNU General Public License Usage
** Alternatively, this file may be used under the terms of the GNU
** General Public License version 3 or (at your option) any later version
** approved by the KDE Free Qt Foundation. The licenses are as published by
** the Free Software Foundation and appearing in the file LICENSE.GPL3
** included in the packaging of this file. Please review the following
** information to ensure the GNU General Public License requirements will
** be met: https://www.gnu.org/licenses/gpl-3.0.html.
Marek Rosa
Added license text to mapper classes
r1355 **
Titta Heikkala
Updated license headers...
r2845 ** $QT_END_LICENSE$
**
Miikka Heikkinen
Updated license...
r2854 ****************************************************************************/
Marek Rosa
Added license text to mapper classes
r1355
Titta Heikkala
Fix include syntax...
r2714 #include <QtCharts/QHBarModelMapper>
Marek Rosa
Added Vertical and Horizontal BarModelMappers
r1294
Titta Heikkala
Qt Charts project file structure change...
r2712 QT_CHARTS_BEGIN_NAMESPACE
Marek Rosa
Added Vertical and Horizontal BarModelMappers
r1294
Marek Rosa
Added placeholders for mappers documentation
r1331 /*!
\class QHBarModelMapper
Titta Heikkala
Fix Charts documentation...
r2639 \inmodule Qt Charts
Miikka Heikkinen
Fix some documentation issues...
r2520 \brief Horizontal model mapper for bar series.
Marek Rosa
Added placeholders for mappers documentation
r1331
Marek Rosa
Updated mapper classes descriptions
r1397 Model mappers allow you to use QAbstractItemModel derived models as a data source for a chart series.
sauimone
renamed barseries files to abstractbarseries
r1586 Horizontal model mapper is used to create a connection between QAbstractBarSeries and QAbstractItemModel derived model object.
Marek Rosa
Updated BarModelMapper docs
r1485 Model mapper maintains equal size of all the BarSets.
Adding/removing value from the BarSet causes the the same change in the rest of the BarSets added to the same series.
Miikka Heikkinen
Documentation updates...
r2494 \note Used model has to support adding/removing rows/columns and modifying the data of the cells.
Marek Rosa
Added placeholders for mappers documentation
r1331 */
Titta Heikkala
Fix Charts documentation...
r2639 /*!
\qmltype HBarModelMapper
\instantiates QHBarModelMapper
Titta Heikkala
Qt Charts project file structure change...
r2712 \inqmlmodule QtCharts
Titta Heikkala
Fix Charts documentation...
r2639
Titta Heikkala
Qt Charts project file structure change...
r2712 \brief Horizontal model mapper for bar series.
Tero Ahola
Documenting QML bar model mappers
r1492
Titta Heikkala
Qt Charts project file structure change...
r2712 HBarModelMapper allows you to use your own QAbstractItemModel derived model with data in rows as
a data source for any bar series. It is possible to use both QAbstractItemModel and bar series
data API to manipulate data. HBarModelMapper keeps the series and the model in sync.
The following QML example would create a bar series with three bar sets (assuming the model has
at least four rows). Each bar set would contain data starting from column 1. The name of a set
would be defined by the vertical header (of the row).
\code
BarSeries {
HBarModelMapper {
model: myCustomModel // QAbstractItemModel derived implementation
firstBarSetRow: 1
lastBarSetRow: 3
firstColumn: 1
}
}
\endcode
Tero Ahola
Documenting QML bar model mappers
r1492 */
Marek Rosa
Added placeholders for mappers documentation
r1331
Marek Rosa
BarModelMapper removed from the docs
r1509 /*!
\property QHBarModelMapper::series
\brief Defines the QPieSeries 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)
*/
Tero Ahola
QML bar model mapper documentation
r1497 /*!
sauimone
changed barseries to abstractbarseries in documentation
r1590 \qmlproperty AbstractBarSeries HBarModelMapper::series
Defines the AbstractBarSeries based object that is used by the mapper. All the data in the series is discarded when it is
Tero Ahola
QML bar model mapper documentation
r1497 set to the mapper. When new series is specified the old series is disconnected (it preserves its data).
*/
Marek Rosa
BarModelMapper removed from the docs
r1509 /*!
\property QHBarModelMapper::model
\brief Defines the model that is used by the mapper.
*/
Tero Ahola
QML bar model mapper documentation
r1497 /*!
Tero Ahola
QML model mapper documentation for pie and xy
r1516 \qmlproperty SomeModel HBarModelMapper::model
Titta Heikkala
Remove qmlcustommodel demo...
r2618 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.
Tero Ahola
QML bar model mapper documentation
r1497 */
Marek Rosa
Added documentation for BarModelMapper classes
r1348 /*!
\property QHBarModelMapper::firstBarSetRow
Miikka Heikkinen
Fix some documentation issues...
r2520 \brief Defines which column of the model is used as the data source for the first bar set.
Marek Rosa
Added documentation for BarModelMapper classes
r1348 Default value is: -1 (invalid mapping)
*/
Tero Ahola
QML bar model mapper documentation
r1497 /*!
\qmlproperty int HBarModelMapper::firstBarSetRow
Defines which column of the model is used as the data source for the first bar set. The default value is -1
(invalid mapping).
*/
Marek Rosa
Added documentation for BarModelMapper classes
r1348
/*!
\property QHBarModelMapper::lastBarSetRow
Miikka Heikkinen
Fix some documentation issues...
r2520 \brief Defines which column of the model is used as the data source for the last bar set.
Marek Rosa
Added documentation for BarModelMapper classes
r1348 Default value is: -1 (invalid mapping)
*/
Tero Ahola
QML bar model mapper documentation
r1497 /*!
\qmlproperty int HBarModelMapper::lastBarSetRow
Defines which column of the model is used as the data source for the last bar set. The default value is -1
(invalid mapping).
*/
Marek Rosa
Added documentation for BarModelMapper classes
r1348
Marek Rosa
BarModel mapper properties first, count moved to Vertical and Horizontal mappers with more descriptive names
r1495 /*!
\property QHBarModelMapper::firstColumn
\brief Defines which column of the model contains the first values of the QBarSets in the series.
Miikka Heikkinen
Fix some documentation issues...
r2520
Marek Rosa
BarModel mapper properties first, count moved to Vertical and Horizontal mappers with more descriptive names
r1495 Minimal and default value is: 0
*/
/*!
Tero Ahola
QML bar model mapper documentation
r1497 \qmlproperty int HBarModelMapper::firstColumn
Marek Rosa
BarModel mapper properties first, count moved to Vertical and Horizontal mappers with more descriptive names
r1495 Defines which column of the model contains the first values of the QBarSets in the series.
The default value is 0.
*/
/*!
\property QHBarModelMapper::columnCount
Miikka Heikkinen
Fix some documentation issues...
r2520 \brief Defines the number of columns of the model that are mapped as the data for QAbstractBarSeries.
Tero Ahola
QML bar model mapper documentation
r1497 Minimal and default value is: -1 (count limited by the number of columns in the model)
Marek Rosa
BarModel mapper properties first, count moved to Vertical and Horizontal mappers with more descriptive names
r1495 */
/*!
Tero Ahola
QML bar model mapper documentation
r1497 \qmlproperty int HBarModelMapper::columnCount
sauimone
renamed barseries files to abstractbarseries
r1586 Defines the number of columns of the model that are mapped as the data for QAbstractBarSeries. The default value is
Tero Ahola
QML bar model mapper documentation
r1497 -1 (count limited by the number of columns in the model)
Marek Rosa
BarModel mapper properties first, count moved to Vertical and Horizontal mappers with more descriptive names
r1495 */
Marek Rosa
BarModelMapper removed from the docs
r1509 /*!
\fn void QHBarModelMapper::seriesReplaced()
Emitted when the series to which mapper is connected to has changed.
*/
/*!
\fn void QHBarModelMapper::modelReplaced()
Emitted when the model to which mapper is connected to has changed.
*/
Marek Rosa
Added NOTIFY to BarModelMapper properties
r1478 /*!
\fn void QHBarModelMapper::firstBarSetRowChanged()
Emitted when the firstBarSetRow has changed.
*/
/*!
\fn void QHBarModelMapper::lastBarSetRowChanged()
Emitted when the lastBarSetRow has changed.
*/
Marek Rosa
BarModel mapper properties first, count moved to Vertical and Horizontal mappers with more descriptive names
r1495 /*!
\fn void QHBarModelMapper::firstColumnChanged()
Emitted when the firstColumn has changed.
*/
/*!
\fn void QHBarModelMapper::columnCountChanged()
Emitted when the columnCount has changed.
*/
Marek Rosa
ModelMappers dosc update
r1347 /*!
Constructs a mapper object which is a child of \a parent.
*/
Marek Rosa
Added Vertical and Horizontal BarModelMappers
r1294 QHBarModelMapper::QHBarModelMapper(QObject *parent) :
QBarModelMapper(parent)
{
Marek Rosa
Minor fix to barModelMapper
r1311 QBarModelMapper::setOrientation(Qt::Horizontal);
Marek Rosa
Added Vertical and Horizontal BarModelMappers
r1294 }
Jani Honkonen
more coding style fixes for src-folder...
r2104 QAbstractItemModel *QHBarModelMapper::model() const
Marek Rosa
BarModelMapper removed from the docs
r1509 {
return QBarModelMapper::model();
}
void QHBarModelMapper::setModel(QAbstractItemModel *model)
{
if (model != QBarModelMapper::model()) {
QBarModelMapper::setModel(model);
emit modelReplaced();
}
}
Jani Honkonen
more coding style fixes for src-folder...
r2104 QAbstractBarSeries *QHBarModelMapper::series() const
Marek Rosa
BarModelMapper removed from the docs
r1509 {
return QBarModelMapper::series();
}
sauimone
QBarSeries to QAbstractBarSeries
r1584 void QHBarModelMapper::setSeries(QAbstractBarSeries *series)
Marek Rosa
BarModelMapper removed from the docs
r1509 {
if (series != QBarModelMapper::series()) {
QBarModelMapper::setSeries(series);
emit seriesReplaced();
}
}
Marek Rosa
Replaced 'Bar' with 'BarSet' in BarModelMapper functions and member variables
r1312 int QHBarModelMapper::firstBarSetRow() const
Marek Rosa
Added Vertical and Horizontal BarModelMappers
r1294 {
Marek Rosa
Replaced 'Bar' with 'BarSet' in BarModelMapper functions and member variables
r1312 return QBarModelMapper::firstBarSetSection();
Marek Rosa
Added Vertical and Horizontal BarModelMappers
r1294 }
Marek Rosa
Replaced 'Bar' with 'BarSet' in BarModelMapper functions and member variables
r1312 void QHBarModelMapper::setFirstBarSetRow(int firstBarSetRow)
Marek Rosa
Added Vertical and Horizontal BarModelMappers
r1294 {
Marek Rosa
Added NOTIFY to BarModelMapper properties
r1478 if (firstBarSetRow != firstBarSetSection()) {
Marek Rosa
BarModel mapper properties first, count moved to Vertical and Horizontal mappers with more descriptive names
r1495 QBarModelMapper::setFirstBarSetSection(firstBarSetRow);
Marek Rosa
Added NOTIFY to BarModelMapper properties
r1478 emit firstBarSetRowChanged();
}
Marek Rosa
Added Vertical and Horizontal BarModelMappers
r1294 }
Marek Rosa
Replaced 'Bar' with 'BarSet' in BarModelMapper functions and member variables
r1312 int QHBarModelMapper::lastBarSetRow() const
Marek Rosa
Added Vertical and Horizontal BarModelMappers
r1294 {
Marek Rosa
Replaced 'Bar' with 'BarSet' in BarModelMapper functions and member variables
r1312 return QBarModelMapper::lastBarSetSection();
Marek Rosa
Added Vertical and Horizontal BarModelMappers
r1294 }
Marek Rosa
Replaced 'Bar' with 'BarSet' in BarModelMapper functions and member variables
r1312 void QHBarModelMapper::setLastBarSetRow(int lastBarSetRow)
Marek Rosa
Added Vertical and Horizontal BarModelMappers
r1294 {
Marek Rosa
Added NOTIFY to BarModelMapper properties
r1478 if (lastBarSetRow != lastBarSetSection()) {
Marek Rosa
BarModel mapper properties first, count moved to Vertical and Horizontal mappers with more descriptive names
r1495 QBarModelMapper::setLastBarSetSection(lastBarSetRow);
Marek Rosa
Added NOTIFY to BarModelMapper properties
r1478 emit lastBarSetRowChanged();
}
Marek Rosa
Added Vertical and Horizontal BarModelMappers
r1294 }
Marek Rosa
BarModel mapper properties first, count moved to Vertical and Horizontal mappers with more descriptive names
r1495 int QHBarModelMapper::firstColumn() const
{
return QBarModelMapper::first();
}
void QHBarModelMapper::setFirstColumn(int firstColumn)
{
if (firstColumn != first()) {
QBarModelMapper::setFirst(firstColumn);
emit firstColumnChanged();
}
}
int QHBarModelMapper::columnCount() const
{
return QBarModelMapper::count();
}
void QHBarModelMapper::setColumnCount(int columnCount)
{
if (columnCount != count()) {
QBarModelMapper::setCount(columnCount);
Marek Rosa
Fix: wrong signal emitted in pie and bar model mappers
r1923 emit columnCountChanged();
Marek Rosa
BarModel mapper properties first, count moved to Vertical and Horizontal mappers with more descriptive names
r1495 }
}
Marek Rosa
Added Vertical and Horizontal BarModelMappers
r1294 #include "moc_qhbarmodelmapper.cpp"
Titta Heikkala
Qt Charts project file structure change...
r2712 QT_CHARTS_END_NAMESPACE