##// END OF EJS Templates
Fix point label drawing for XYSeries...
Fix point label drawing for XYSeries Reverting change 810e912b2c05d5f4305b0f1e56be57e765a30479. m_points is used for the point label because that has the series point information. The points variable that is passed to the function is used for positioning the label as it has the coordinates. Change-Id: Iad48660d245c06b736c14161e5c86a4746df2b28 Reviewed-by: Miikka Heikkinen <miikka.heikkinen@theqtcompany.com>

File last commit:

r2776:bc1f6aa59d42
r2779:ce2af37ac88e
Show More
qvxymodelmapper.cpp
241 lines | 6.5 KiB | text/x-c | CppLexer
/ src / charts / xychart / qvxymodelmapper.cpp
Marek Rosa
Added license text to mapper classes
r1355 /****************************************************************************
**
Titta Heikkala
Copyright header changes...
r2776 ** Copyright (C) 2015 The Qt Company Ltd
Marek Rosa
Added license text to mapper classes
r1355 ** All rights reserved.
Titta Heikkala
Copyright header changes...
r2776 ** For any questions to The Qt Company, please use contact form at http://qt.io
Marek Rosa
Added license text to mapper classes
r1355 **
Titta Heikkala
Updated license headers...
r2740 ** This file is part of the Qt Charts module.
Marek Rosa
Added license text to mapper classes
r1355 **
Titta Heikkala
Updated license headers...
r2740 ** Licensees holding valid commercial license for Qt may use this file in
** accordance with the Qt License Agreement provided with the Software
** or, alternatively, in accordance with the terms contained in a written
Titta Heikkala
Copyright header changes...
r2776 ** agreement between you and The Qt Company.
Marek Rosa
Added license text to mapper classes
r1355 **
** If you have questions regarding the use of this file, please use
Titta Heikkala
Updated license headers...
r2740 ** contact form at http://qt.io
Marek Rosa
Added license text to mapper classes
r1355 **
****************************************************************************/
Titta Heikkala
Fix include syntax...
r2714 #include <QtCharts/QVXYModelMapper>
Marek Rosa
Added Vertical and Horizontal QXYModelMapper
r1252
Titta Heikkala
Qt Charts project file structure change...
r2712 QT_CHARTS_BEGIN_NAMESPACE
Marek Rosa
Added Vertical and Horizontal QXYModelMapper
r1252
Marek Rosa
Added placeholders for mappers documentation
r1331 /*!
\class QVXYModelMapper
Titta Heikkala
Fix Charts documentation...
r2639 \inmodule Qt Charts
Titta Heikkala
Qt Charts project file structure change...
r2712 \brief Vertical model mapper for QXYSeries.
Marek Rosa
Added placeholders for mappers documentation
r1331 \mainclass
Marek Rosa
Updated mapper classes descriptions
r1397 Model mappers allow you to use QAbstractItemModel derived models as a data source for a chart series.
Marek Rosa
Removed commented out code and unnecessary lines from model mapper classes
r1379 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.
Marek Rosa
Replaced NOTE: with Note: in modelmapper classes and qdatetimeaxis to remove it from QtCreator TODO entries
r2396 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 */
Tero Ahola
QML model mapper documentation for pie and xy
r1516 /*!
Titta Heikkala
Fix Charts documentation...
r2639 \qmltype VXYModelMapper
\instantiates QVXYModelMapper
Titta Heikkala
Qt Charts project file structure change...
r2712 \inqmlmodule QtCharts
Tero Ahola
QML model mapper documentation for pie and xy
r1516
Titta Heikkala
Qt Charts project file structure change...
r2712 \brief Vertical model mapper for QXYSeries.
Titta Heikkala
Fix Charts documentation...
r2639
Titta Heikkala
Qt Charts project file structure change...
r2712 VXYModelMapper allows you to use your own QAbstractItemModel derived model with data in columns
as a data source for XYSeries based series. It is possible to use both QAbstractItemModel and
XYSeries data API to manipulate data. VXYModelMapper keeps the series and the model in sync.
Titta Heikkala
Fix Charts documentation...
r2639 */
Marek Rosa
Added placeholders for mappers documentation
r1331
Marek Rosa
QXYModelMapper removed from the docs
r1507 /*!
\property QVXYModelMapper::series
\brief Defines the QXYSeries object that is used by the mapper.
Miikka Heikkinen
Fix some documentation issues...
r2520
Marek Rosa
QXYModelMapper removed from the docs
r1507 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 model mapper documentation for pie and xy
r1516 /*!
\qmlproperty XYSeries VXYModelMapper::series
Tero Ahola
Minor doc fix in model mappers
r1519 Defines the XYSeries object that is used by the mapper. All the data in the series is discarded when it is set to
Tero Ahola
QML model mapper documentation for pie and xy
r1516 the mapper. When new series is specified the old series is disconnected (it preserves its data).
*/
Marek Rosa
QXYModelMapper removed from the docs
r1507
/*!
\property QVXYModelMapper::model
\brief Defines the model that is used by the mapper.
*/
Tero Ahola
QML model mapper documentation for pie and xy
r1516 /*!
\qmlproperty SomeModel VXYModelMapper::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 model mapper documentation for pie and xy
r1516 */
Marek Rosa
QXYModelMapper removed from the docs
r1507
Marek Rosa
Added documentation for XYModelMapper classes
r1344 /*!
\property QVXYModelMapper::xColumn
Miikka Heikkinen
Fix some documentation issues...
r2520 \brief Defines which column of the model is kept in sync with the x values of QXYSeries.
Marek Rosa
Added documentation for XYModelMapper classes
r1344 Default value is: -1 (invalid mapping)
*/
Tero Ahola
QML model mapper documentation for pie and xy
r1516 /*!
\qmlproperty int VXYModelMapper::xColumn
Tero Ahola
Minor doc fix in model mappers
r1519 Defines which column of the model is kept in sync with the x values of the series. Default value is -1 (invalid
Tero Ahola
QML model mapper documentation for pie and xy
r1516 mapping).
*/
Marek Rosa
Added documentation for XYModelMapper classes
r1344
/*!
\property QVXYModelMapper::yColumn
Miikka Heikkinen
Fix some documentation issues...
r2520 \brief Defines which column of the model is kept in sync with the y values of QXYSeries.
Marek Rosa
Added documentation for XYModelMapper classes
r1344 Default value is: -1 (invalid mapping)
*/
Tero Ahola
QML model mapper documentation for pie and xy
r1516 /*!
\qmlproperty int VXYModelMapper::yColumn
Tero Ahola
Minor doc fix in model mappers
r1519 Defines which column of the model is kept in sync with the y values of the series. Default value is -1 (invalid
Tero Ahola
QML model mapper documentation for pie and xy
r1516 mapping).
*/
Marek Rosa
Added documentation for XYModelMapper classes
r1344
Marek Rosa
QXYModelMapper removed from the docs
r1507 /*!
\property QVXYModelMapper::firstRow
\brief Defines which row of the model contains the data for the first point of the series.
Miikka Heikkinen
Fix some documentation issues...
r2520
Marek Rosa
QXYModelMapper removed from the docs
r1507 Minimal and default value is: 0
*/
/*!
Tero Ahola
QML model mapper documentation for pie and xy
r1516 \qmlproperty int VXYModelMapper::firstRow
Marek Rosa
QXYModelMapper removed from the docs
r1507 Defines which row of the model contains the data for the first point of the series.
The default value is 0.
*/
/*!
\property QVXYModelMapper::rowCount
Miikka Heikkinen
Fix some documentation issues...
r2520 \brief Defines the number of rows of the model that are mapped as the data for series.
Marek Rosa
QXYModelMapper removed from the docs
r1507 Minimal and default value is: -1 (count limited by the number of rows in the model)
*/
/*!
Tero Ahola
QML model mapper documentation for pie and xy
r1516 \qmlproperty int VXYModelMapper::columnCount
Marek Rosa
QXYModelMapper removed from the docs
r1507 Defines the number of rows of the model that are mapped as the data for series. The default value is
Tero Ahola
QML model mapper documentation for pie and xy
r1516 -1 (count limited by the number of rows in the model).
Marek Rosa
QXYModelMapper removed from the docs
r1507 */
/*!
\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.
*/
Marek Rosa
Added NOTIFY to XYModelMapper properties
r1477 /*!
\fn void QVXYModelMapper::xColumnChanged()
Emitted when the xColumn has changed.
*/
/*!
\fn void QVXYModelMapper::yColumnChanged()
Emitted when the yColumn has changed.
*/
Marek Rosa
QXYModelMapper removed from the docs
r1507 /*!
\fn void QVXYModelMapper::firstRowChanged()
Emitted when the firstRow has changed.
*/
/*!
\fn void QVXYModelMapper::rowCountChanged()
Emitted when the rowCount 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 QXYModelMapper
r1252 QVXYModelMapper::QVXYModelMapper(QObject *parent) :
QXYModelMapper(parent)
{
Marek Rosa
Minor fix to QXYModelMapper
r1310 QXYModelMapper::setOrientation(Qt::Vertical);
Marek Rosa
Added Vertical and Horizontal QXYModelMapper
r1252 }
Jani Honkonen
more coding style fixes for src-folder...
r2104 QAbstractItemModel *QVXYModelMapper::model() const
Marek Rosa
QXYModelMapper removed from the docs
r1507 {
return QXYModelMapper::model();
}
void QVXYModelMapper::setModel(QAbstractItemModel *model)
{
if (model != QXYModelMapper::model()) {
QXYModelMapper::setModel(model);
emit modelReplaced();
}
}
Jani Honkonen
more coding style fixes for src-folder...
r2104 QXYSeries *QVXYModelMapper::series() const
Marek Rosa
QXYModelMapper removed from the docs
r1507 {
return QXYModelMapper::series();
}
void QVXYModelMapper::setSeries(QXYSeries *series)
{
if (series != QXYModelMapper::series()) {
QXYModelMapper::setSeries(series);
emit seriesReplaced();
}
}
Marek Rosa
Added Vertical and Horizontal QXYModelMapper
r1252 int QVXYModelMapper::xColumn() const
{
return QXYModelMapper::xSection();
}
void QVXYModelMapper::setXColumn(int xColumn)
{
Marek Rosa
Added NOTIFY to XYModelMapper properties
r1477 if (xColumn != xSection()) {
Marek Rosa
XY model mappers: removed wrongly placed return statements
r1920 QXYModelMapper::setXSection(xColumn);
Marek Rosa
Added NOTIFY to XYModelMapper properties
r1477 emit xColumnChanged();
}
Marek Rosa
Added Vertical and Horizontal QXYModelMapper
r1252 }
int QVXYModelMapper::yColumn() const
{
return QXYModelMapper::ySection();
}
void QVXYModelMapper::setYColumn(int yColumn)
{
Marek Rosa
Added NOTIFY to XYModelMapper properties
r1477 if (yColumn != ySection()) {
Marek Rosa
XY model mappers: removed wrongly placed return statements
r1920 QXYModelMapper::setYSection(yColumn);
Marek Rosa
Added NOTIFY to XYModelMapper properties
r1477 emit yColumnChanged();
}
Marek Rosa
Added Vertical and Horizontal QXYModelMapper
r1252 }
Marek Rosa
QXYModelMapper removed from the docs
r1507 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);
Marek Rosa
Added signals test cases to xymodelmapper plus fix to xymodelmapper
r1922 emit rowCountChanged();
Marek Rosa
QXYModelMapper removed from the docs
r1507 }
}
Marek Rosa
Added Vertical and Horizontal QXYModelMapper
r1252 #include "moc_qvxymodelmapper.cpp"
Titta Heikkala
Qt Charts project file structure change...
r2712 QT_CHARTS_END_NAMESPACE