##// END OF EJS Templates
barchart PIMPL part 2. Cleaning up leftovers in public api
barchart PIMPL part 2. Cleaning up leftovers in public api

File last commit:

r961:2e9183bac7df
r962:95a77193fc29
Show More
qxyseries.cpp
660 lines | 19.0 KiB | text/x-c | CppLexer
Jani Honkonen
Add license headers
r794 /****************************************************************************
**
** Copyright (C) 2012 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 Commercial Charts Add-on.
**
** $QT_BEGIN_LICENSE$
** Licensees holding valid Qt Commercial licenses may use this file in
** accordance with the Qt Commercial 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$
**
****************************************************************************/
Michal Klocek
Add missing files from previous commit
r466 #include "qxyseries.h"
Michal Klocek
Adds big fat pimpl to series classes...
r938 #include "qxyseries_p.h"
Michal Klocek
Refactor to use qseries private for implmentation interface...
r943 #include "domain_p.h"
Michal Klocek
Adds qlegend pimpl...
r950 #include "legendmarker_p.h"
Marek Rosa
Fixed: QAbstractItemModel could be forward declaration
r862 #include <QAbstractItemModel>
Michal Klocek
Add missing files from previous commit
r466
QTCOMMERCIALCHART_BEGIN_NAMESPACE
/*!
\class QXYSeries
Michal Klocek
Refactor scatter chart to fit the other classes...
r470 \brief The QXYSeries class is a base class for line, spline and scatter series.
Michal Klocek
Add missing files from previous commit
r466 */
/*!
\fn QPen QXYSeries::pen() const
Michal Klocek
minor. some docs fix
r480 \brief Returns pen used to draw points for series.
Michal Klocek
Add missing files from previous commit
r466 \sa setPen()
*/
Michal Klocek
minor. some docs fix
r480 /*!
\fn QBrush QXYSeries::brush() const
\brief Returns brush used to draw points for series.
\sa setBrush()
*/
Michal Klocek
Updates presenter example documentation
r574 /*!
\fn void QXYSeries::clicked(const QPointF& point)
\brief Signal is emitted when user clicks the \a point on chart.
*/
Michal Klocek
Add missing files from previous commit
r466 /*!
Marek Rosa
gdpbarchart moved to test. Few small doc fixes
r940 \fn void QXYSeriesPrivate::pointReplaced(int index)
Michal Klocek
Add missing files from previous commit
r466 \brief \internal \a index
*/
/*!
Marek Rosa
gdpbarchart moved to test. Few small doc fixes
r940 \fn void QXYSeriesPrivate::pointAdded(int index)
Michal Klocek
Add missing files from previous commit
r466 \brief \internal \a index
*/
/*!
Marek Rosa
gdpbarchart moved to test. Few small doc fixes
r940 \fn void QXYSeriesPrivate::pointRemoved(int index)
Michal Klocek
Add missing files from previous commit
r466 \brief \internal \a index
*/
/*!
Marek Rosa
gdpbarchart moved to test. Few small doc fixes
r940 \fn void QXYSeriesPrivate::updated()
Michal Klocek
Add missing files from previous commit
r466 \brief \internal
*/
Marek Rosa
Added documentation for model related funtions
r900 /*!
\fn int QXYSeries::mapFirst() const
Returns the index of the model's item that is used as a first one for the series.
\sa mapCount()
*/
/*!
\fn int QXYSeries::mapCount() const
Returns the number of the items that are taken from the model.
If -1 it means all the items of the model following the first one are used.
\sa mapFirst()
*/
Michal Klocek
Add missing files from previous commit
r466 /*!
Constructs empty series object which is a child of \a parent.
When series object is added to QChartView or QChart instance ownerships is transfered.
*/
Michal Klocek
Adds big fat pimpl to series classes...
r938 QXYSeries::QXYSeries(QXYSeriesPrivate &d,QObject *parent):QSeries(d,parent)
{
Michal Klocek
Add missing files from previous commit
r466 }
/*!
Destroys the object. Series added to QChartView or QChart instances are owned by those,
and are deleted when mentioned object are destroyed.
*/
QXYSeries::~QXYSeries()
{
}
/*!
Adds data point \a x \a y to the series. Points are connected with lines on the chart.
*/
Jani Honkonen
rename functions add() -> append()
r796 void QXYSeries::append(qreal x,qreal y)
Michal Klocek
Add missing files from previous commit
r466 {
Michal Klocek
Adds big fat pimpl to series classes...
r938 Q_D(QXYSeries);
Q_ASSERT(d->m_x.size() == d->m_y.size());
d->m_x<<x;
d->m_y<<y;
emit d->pointAdded(d->m_x.size()-1);
Michal Klocek
Add missing files from previous commit
r466 }
/*!
This is an overloaded function.
Adds data \a point to the series. Points are connected with lines on the chart.
*/
Jani Honkonen
rename functions add() -> append()
r796 void QXYSeries::append(const QPointF &point)
Michal Klocek
Add missing files from previous commit
r466 {
Jani Honkonen
rename functions add() -> append()
r796 append(point.x(),point.y());
Michal Klocek
Add missing files from previous commit
r466 }
Michal Klocek
Fixes for docs , adds xyseries docs
r481 /*!
This is an overloaded function.
Adds list of data \a points to the series. Points are connected with lines on the chart.
*/
Jani Honkonen
rename functions add() -> append()
r796 void QXYSeries::append(const QList<QPointF> points)
Michal Klocek
Fixes for docs , adds xyseries docs
r481 {
foreach(const QPointF& point , points) {
Jani Honkonen
rename functions add() -> append()
r796 append(point.x(),point.y());
Michal Klocek
Fixes for docs , adds xyseries docs
r481 }
}
Michal Klocek
Add missing files from previous commit
r466 /*!
Modifies \a y value for given \a x a value.
*/
void QXYSeries::replace(qreal x,qreal y)
{
Michal Klocek
Adds big fat pimpl to series classes...
r938 Q_D(QXYSeries);
int index = d->m_x.indexOf(x);
d->m_x[index] = x;
d->m_y[index] = y;
emit d->pointReplaced(index);
Michal Klocek
Add missing files from previous commit
r466 }
/*!
This is an overloaded function.
Replaces current y value of for given \a point x value with \a point y value.
*/
sauimone
minor code review issues. indent, spaces, brackets etc.
r743 void QXYSeries::replace(const QPointF &point)
Michal Klocek
Add missing files from previous commit
r466 {
Marek Rosa
Table model data example
r519 replace(point.x(),point.y());
Michal Klocek
Add missing files from previous commit
r466 }
Michal Klocek
Improves spline interpolation...
r622 /*!
Removes first \a x value and related y value.
*/
void QXYSeries::remove(qreal x)
{
Michal Klocek
Adds big fat pimpl to series classes...
r938 Q_D(QXYSeries);
int index = d->m_x.indexOf(x);
Michal Klocek
Improves spline interpolation...
r622
sauimone
minor code review issues. indent, spaces, brackets etc.
r743 if (index == -1) return;
Michal Klocek
Improves spline interpolation...
r622
Michal Klocek
Adds big fat pimpl to series classes...
r938 d->m_x.remove(index);
d->m_y.remove(index);
Michal Klocek
Improves spline interpolation...
r622
Michal Klocek
Adds big fat pimpl to series classes...
r938 emit d->pointRemoved(index);
Michal Klocek
Improves spline interpolation...
r622 }
Michal Klocek
Add missing files from previous commit
r466 /*!
Michal Klocek
Adds missing scatter intercation implementation...
r541 Removes current \a x and \a y value.
Michal Klocek
Add missing files from previous commit
r466 */
Michal Klocek
Adds missing scatter intercation implementation...
r541 void QXYSeries::remove(qreal x,qreal y)
Michal Klocek
Add missing files from previous commit
r466 {
Michal Klocek
Adds big fat pimpl to series classes...
r938 Q_D(QXYSeries);
Michal Klocek
Adds missing scatter intercation implementation...
r541 int index =-1;
sauimone
minor code review issues. indent, spaces, brackets etc.
r743 do {
Michal Klocek
Adds big fat pimpl to series classes...
r938 index = d->m_x.indexOf(x,index+1);
} while (index !=-1 && d->m_y.at(index)!=y);
Michal Klocek
Adds missing scatter intercation implementation...
r541
sauimone
minor code review issues. indent, spaces, brackets etc.
r743 if (index==-1) return;
Marek Rosa
Added support for adding and removing data with model. Updated the example
r545
Michal Klocek
Adds big fat pimpl to series classes...
r938 d->m_x.remove(index);
d->m_y.remove(index);
emit d->pointRemoved(index);
Michal Klocek
Add missing files from previous commit
r466 }
/*!
Removes current \a point x value. Note \a point y value is ignored.
*/
sauimone
minor code review issues. indent, spaces, brackets etc.
r743 void QXYSeries::remove(const QPointF &point)
Michal Klocek
Add missing files from previous commit
r466 {
Michal Klocek
Adds missing scatter intercation implementation...
r541 remove(point.x(),point.y());
Michal Klocek
Add missing files from previous commit
r466 }
/*!
Michal Klocek
Fixes for docs , adds xyseries docs
r481 Removes all data points from the series.
Michal Klocek
Add missing files from previous commit
r466 */
Michal Klocek
Fixes for docs , adds xyseries docs
r481 void QXYSeries::removeAll()
Michal Klocek
Add missing files from previous commit
r466 {
Michal Klocek
Adds big fat pimpl to series classes...
r938 Q_D(QXYSeries);
d->m_x.clear();
d->m_y.clear();
Michal Klocek
Add missing files from previous commit
r466 }
/*!
\internal \a pos
*/
qreal QXYSeries::x(int pos) const
{
Michal Klocek
Adds big fat pimpl to series classes...
r938 Q_D(const QXYSeries);
if (d->m_model) {
if (d->m_mapOrientation == Qt::Vertical)
Marek Rosa
QXYSeries: model data orientation added. QBarSeries: some model data function placeholders
r527 // consecutive data is read from model's column
Michal Klocek
Adds big fat pimpl to series classes...
r938 return d->m_model->data(d->m_model->index(pos + d->m_mapFirst, d->m_mapX), Qt::DisplayRole).toDouble();
Marek Rosa
QXYSeries: model data orientation added. QBarSeries: some model data function placeholders
r527 else
// consecutive data is read from model's row
Michal Klocek
Adds big fat pimpl to series classes...
r938 return d->m_model->data(d->m_model->index(d->m_mapX, pos + d->m_mapFirst), Qt::DisplayRole).toDouble();
sauimone
minor code review issues. indent, spaces, brackets etc.
r743 } else {
Marek Rosa
QXYSeries: model data orientation added. QBarSeries: some model data function placeholders
r527 // model is not specified, return the data from series' internal data store
Michal Klocek
Adds big fat pimpl to series classes...
r938 return d->m_x.at(pos);
sauimone
minor code review issues. indent, spaces, brackets etc.
r743 }
Michal Klocek
Add missing files from previous commit
r466 }
/*!
\internal \a pos
*/
qreal QXYSeries::y(int pos) const
{
Michal Klocek
Adds big fat pimpl to series classes...
r938 Q_D(const QXYSeries);
if (d->m_model) {
if (d->m_mapOrientation == Qt::Vertical)
Marek Rosa
QXYSeries: model data orientation added. QBarSeries: some model data function placeholders
r527 // consecutive data is read from model's column
Michal Klocek
Adds big fat pimpl to series classes...
r938 return d->m_model->data(d->m_model->index(pos + d->m_mapFirst, d->m_mapY), Qt::DisplayRole).toDouble();
Marek Rosa
QXYSeries: model data orientation added. QBarSeries: some model data function placeholders
r527 else
// consecutive data is read from model's row
Michal Klocek
Adds big fat pimpl to series classes...
r938 return d->m_model->data(d->m_model->index(d->m_mapY, pos + d->m_mapFirst), Qt::DisplayRole).toDouble();
sauimone
minor code review issues. indent, spaces, brackets etc.
r743 } else {
Marek Rosa
QXYSeries: model data orientation added. QBarSeries: some model data function placeholders
r527 // model is not specified, return the data from series' internal data store
Michal Klocek
Adds big fat pimpl to series classes...
r938 return d->m_y.at(pos);
sauimone
minor code review issues. indent, spaces, brackets etc.
r743 }
Michal Klocek
Add missing files from previous commit
r466 }
/*!
Returns number of data points within series.
*/
int QXYSeries::count() const
{
Michal Klocek
Adds big fat pimpl to series classes...
r938 Q_D(const QXYSeries);
Q_ASSERT(d->m_x.size() == d->m_y.size());
Michal Klocek
Add missing files from previous commit
r466
Michal Klocek
Adds big fat pimpl to series classes...
r938 if (d->m_model) {
if (d->m_mapOrientation == Qt::Vertical) {
Marek Rosa
XYSeries: added support for limited mapping area
r734 // data is in a column. Return the number of mapped items if the model's column have enough items
// or the number of items that can be mapped
Michal Klocek
Adds big fat pimpl to series classes...
r938 if (d->m_mapLimited)
return qMin(d->m_mapCount, qMax(d->m_model->rowCount() - d->m_mapFirst, 0));
Marek Rosa
XYSeries: added support for limited mapping area
r734 else
Michal Klocek
Adds big fat pimpl to series classes...
r938 return qMax(d->m_model->rowCount() - d->m_mapFirst, 0);
sauimone
minor code review issues. indent, spaces, brackets etc.
r743 } else {
Marek Rosa
XYSeries: added support for limited mapping area
r734 // data is in a row. Return the number of mapped items if the model's row have enough items
// or the number of items that can be mapped
Michal Klocek
Adds big fat pimpl to series classes...
r938 if (d->m_mapLimited)
return qMin(d->m_mapCount, qMax(d->m_model->columnCount() - d->m_mapFirst, 0));
Marek Rosa
XYSeries: added support for limited mapping area
r734 else
Michal Klocek
Adds big fat pimpl to series classes...
r938 return qMax(d->m_model->columnCount() - d->m_mapFirst, 0);
Marek Rosa
XYSeries: added support for limited mapping area
r734 }
Jani Honkonen
We have so many stupid warnings that "treat warnings as errors" flag is needed...
r609 }
// model is not specified, return the number of points in the series internal data store
Michal Klocek
Adds big fat pimpl to series classes...
r938 return d->m_x.size();
Michal Klocek
Add missing files from previous commit
r466 }
Tero Ahola
Added data getter for XY series; example for customizing the looks
r491 /*!
Returns the data points of the series.
*/
QList<QPointF> QXYSeries::data()
{
Michal Klocek
Adds big fat pimpl to series classes...
r938 Q_D(QXYSeries);
Tero Ahola
Added data getter for XY series; example for customizing the looks
r491 QList<QPointF> data;
Michal Klocek
Adds big fat pimpl to series classes...
r938 for (int i(0); i < d->m_x.count() && i < d->m_y.count(); i++)
data.append(QPointF(d->m_x.at(i), d->m_y.at(i)));
Tero Ahola
Added data getter for XY series; example for customizing the looks
r491 return data;
}
Michal Klocek
Spline series windows compilation fix
r467 /*!
Michal Klocek
Fixes for docs , adds xyseries docs
r481 Sets \a pen used for drawing points on the chart. If the pen is not defined, the
pen from chart theme is used.
Marek Rosa
Various documentation fixes
r909 \sa QChart::setTheme()
Michal Klocek
Spline series windows compilation fix
r467 */
sauimone
minor code review issues. indent, spaces, brackets etc.
r743 void QXYSeries::setPen(const QPen &pen)
Michal Klocek
Spline series windows compilation fix
r467 {
Michal Klocek
Adds big fat pimpl to series classes...
r938 Q_D(QXYSeries);
if (d->m_pen!=pen) {
d->m_pen = pen;
emit d->updated();
Michal Klocek
Spline series windows compilation fix
r467 }
}
Michal Klocek
Adds big fat pimpl to series classes...
r938 QPen QXYSeries::pen() const
{
Q_D(const QXYSeries);
return d->m_pen;
}
Michal Klocek
Spline series windows compilation fix
r467 /*!
Michal Klocek
Fixes for docs , adds xyseries docs
r481 Sets \a brush used for drawing points on the chart. If the brush is not defined, brush
from chart theme setting is used.
Marek Rosa
Various documentation fixes
r909 \sa QChart::setTheme()
Michal Klocek
Spline series windows compilation fix
r467 */
sauimone
minor code review issues. indent, spaces, brackets etc.
r743 void QXYSeries::setBrush(const QBrush &brush)
Michal Klocek
Spline series windows compilation fix
r467 {
Michal Klocek
Adds big fat pimpl to series classes...
r938 Q_D(QXYSeries);
if (d->m_brush!=brush) {
d->m_brush = brush;
emit d->updated();
Michal Klocek
Spline series windows compilation fix
r467 }
}
Michal Klocek
Adds big fat pimpl to series classes...
r938 QBrush QXYSeries::brush() const
{
Q_D(const QXYSeries);
return d->m_brush;
}
/*!
Sets if data points are \a visible and should be drawn on line.
*/
void QXYSeries::setPointsVisible(bool visible)
{
Q_D(QXYSeries);
if (d->m_pointsVisible != visible){
d->m_pointsVisible = visible;
emit d->updated();
}
}
bool QXYSeries::pointsVisible() const
{
Q_D(const QXYSeries);
return d->m_pointsVisible;
}
Michal Klocek
Spline series windows compilation fix
r467
Michal Klocek
Add missing files from previous commit
r466 /*!
Stream operator for adding a data \a point to the series.
Jani Honkonen
rename functions add() -> append()
r796 \sa append()
Michal Klocek
Add missing files from previous commit
r466 */
QXYSeries& QXYSeries::operator<< (const QPointF &point)
{
Jani Honkonen
rename functions add() -> append()
r796 append(point);
Michal Klocek
Add missing files from previous commit
r466 return *this;
}
Michal Klocek
Fixes for docs , adds xyseries docs
r481 /*!
Stream operator for adding a list of \a points to the series.
Jani Honkonen
rename functions add() -> append()
r796 \sa append()
Michal Klocek
Fixes for docs , adds xyseries docs
r481 */
QXYSeries& QXYSeries::operator<< (const QList<QPointF> points)
{
Jani Honkonen
rename functions add() -> append()
r796 append(points);
Michal Klocek
Fixes for docs , adds xyseries docs
r481 return *this;
}
Marek Rosa
BarSeries - renamed internal model getter to modelInternal. Some smaller changes to other files to have in headers forward declarations for model related members instead of include
r877 /*!
\internal
*/
Marek Rosa
Table model data example
r519 void QXYSeries::modelUpdated(QModelIndex topLeft, QModelIndex bottomRight)
{
Tero Ahola
Squashed bunch of warnings
r611 Q_UNUSED(bottomRight)
Michal Klocek
Adds big fat pimpl to series classes...
r938 Q_D(QXYSeries);
if (d->m_mapOrientation == Qt::Vertical) {
if (topLeft.row() >= d->m_mapFirst && (!d->m_mapLimited || topLeft.row() < d->m_mapFirst + d->m_mapCount))
emit d->pointReplaced(topLeft.row() - d->m_mapFirst);
sauimone
minor code review issues. indent, spaces, brackets etc.
r743 } else {
Michal Klocek
Adds big fat pimpl to series classes...
r938 if (topLeft.column() >= d->m_mapFirst && (!d->m_mapLimited || topLeft.column() < d->m_mapFirst + d->m_mapCount))
emit d->pointReplaced(topLeft.column() - d->m_mapFirst);
Marek Rosa
tablemodelchart moved to test folder
r961 }
Marek Rosa
XYSeries: added support for limited mapping area
r734 }
Marek Rosa
BarSeries - renamed internal model getter to modelInternal. Some smaller changes to other files to have in headers forward declarations for model related members instead of include
r877 /*!
\internal
*/
Marek Rosa
XYSeries: added support for limited mapping area
r734 void QXYSeries::modelDataAboutToBeAdded(QModelIndex parent, int start, int end)
{
Q_UNUSED(parent)
// Q_UNUSED(end)
Michal Klocek
Adds big fat pimpl to series classes...
r938 Q_D(QXYSeries);
if (d->m_mapLimited) {
if (start >= d->m_mapFirst + d->m_mapCount) {
Marek Rosa
XYSeries: added support for limited mapping area
r734 // the added data is below mapped area
// therefore it has no relevance
return;
sauimone
minor code review issues. indent, spaces, brackets etc.
r743 } else {
Marek Rosa
XYSeries: added support for limited mapping area
r734 // the added data is in the mapped area or before it and update is needed
// check how many mapped items there is currently (before new items are added)
// if the number of items currently is equal the m_mapCount then some needs to be removed from xychartitem
// internal storage before new ones can be added
Marek Rosa
Some more work on mapping with limits
r735
Michal Klocek
Adds big fat pimpl to series classes...
r938 int itemsToRemove = qMin(count() - qMax(start - d->m_mapFirst, 0), end - start + 1);
if (d->m_mapCount == count()) {
Marek Rosa
Some more work on mapping with limits
r735 for (int i = 0; i < itemsToRemove; i++)
Michal Klocek
Adds big fat pimpl to series classes...
r938 emit d->pointRemoved(qMin(end, count()) - i);
sauimone
minor code review issues. indent, spaces, brackets etc.
r743 }
Marek Rosa
XYSeries: added support for limited mapping area
r734 }
sauimone
minor code review issues. indent, spaces, brackets etc.
r743 } else {
Marek Rosa
XYSeries: added support for limited mapping area
r734 // map is not limited (it includes all the items starting from m_mapFirst till the end of model)
// nothing to do
// emit pointAdded(qMax(start - m_mapFirst, 0));
}
Marek Rosa
Table model data example
r519 }
Marek Rosa
BarSeries - renamed internal model getter to modelInternal. Some smaller changes to other files to have in headers forward declarations for model related members instead of include
r877 /*!
\internal
*/
Marek Rosa
Added support for adding and removing data with model. Updated the example
r545 void QXYSeries::modelDataAdded(QModelIndex parent, int start, int end)
{
Tero Ahola
Squashed bunch of warnings
r611 Q_UNUSED(parent)
Marek Rosa
XYSeries: added support for limited mapping area
r734 // Q_UNUSED(end)
Michal Klocek
Adds big fat pimpl to series classes...
r938 Q_D(QXYSeries);
if (d->m_mapLimited) {
if (start >= d->m_mapFirst + d->m_mapCount) {
Marek Rosa
XYSeries: added support for limited mapping area
r734 // the added data is below mapped area
// therefore it has no relevance
return;
sauimone
minor code review issues. indent, spaces, brackets etc.
r743 } else {
Marek Rosa
XYSeries: added support for limited mapping area
r734 // the added data is in the mapped area or before it
// update needed
sauimone
minor code review issues. indent, spaces, brackets etc.
r743 if (count() > 0) {
Michal Klocek
Adds big fat pimpl to series classes...
r938 int toBeAdded = qMin(d->m_mapCount - (start - d->m_mapFirst), end - start + 1);
Marek Rosa
XYSeries model with limits working.
r833 for (int i = 0; i < toBeAdded; i++)
Michal Klocek
Adds big fat pimpl to series classes...
r938 if (start + i >= d->m_mapFirst)
emit d->pointAdded(start + i);
sauimone
minor code review issues. indent, spaces, brackets etc.
r743 }
Marek Rosa
XYSeries: added support for limited mapping area
r734 }
sauimone
minor code review issues. indent, spaces, brackets etc.
r743 } else {
Marek Rosa
XYSeries: added support for limited mapping area
r734 // map is not limited (it included all the items starting from m_mapFirst till the end of model)
for (int i = 0; i < end - start + 1; i++)
Michal Klocek
Adds big fat pimpl to series classes...
r938 emit d->pointAdded(start + i);
Marek Rosa
XYSeries: added support for limited mapping area
r734 }
}
Marek Rosa
BarSeries - renamed internal model getter to modelInternal. Some smaller changes to other files to have in headers forward declarations for model related members instead of include
r877 /*!
\internal
*/
Marek Rosa
XYSeries: added support for limited mapping area
r734 void QXYSeries::modelDataAboutToBeRemoved(QModelIndex parent, int start, int end)
{
Q_UNUSED(parent)
// Q_UNUSED(end)
Michal Klocek
Adds big fat pimpl to series classes...
r938 Q_D(QXYSeries);
if (d->m_mapLimited) {
if (start >= d->m_mapFirst + d->m_mapCount) {
Marek Rosa
XYSeries: added support for limited mapping area
r734 // the removed data is below mapped area
// therefore it has no relevance
return;
sauimone
minor code review issues. indent, spaces, brackets etc.
r743 } else {
Marek Rosa
XYSeries: added support for limited mapping area
r734 // the removed data is in the mapped area or before it
// update needed
Marek Rosa
Some more work on mapping with limits
r735
// check how many items need to be removed from the xychartitem storage
// the number equals the number of items that are removed and that lay before
// or in the mapped area. Items that lay beyond the map do not count
// the max is the current number of items in storage (count())
Michal Klocek
Adds big fat pimpl to series classes...
r938 int itemsToRemove = qMin(count(), qMin(end, d->m_mapFirst + d->m_mapCount - 1) - start + 1);
Marek Rosa
XYSeries: added support for limited mapping area
r734 for (int i = 0; i < itemsToRemove; i++)
Michal Klocek
Adds big fat pimpl to series classes...
r938 emit d->pointRemoved(start);
Marek Rosa
XYSeries: added support for limited mapping area
r734 }
sauimone
minor code review issues. indent, spaces, brackets etc.
r743 } else {
Marek Rosa
XYSeries: added support for limited mapping area
r734 // map is not limited (it included all the items starting from m_mapFirst till the end of model)
for (int i = 0; i < end - start + 1; i++)
Michal Klocek
Adds big fat pimpl to series classes...
r938 emit d->pointRemoved(start);
Marek Rosa
XYSeries: added support for limited mapping area
r734 }
Marek Rosa
Added support for adding and removing data with model. Updated the example
r545 }
Marek Rosa
BarSeries - renamed internal model getter to modelInternal. Some smaller changes to other files to have in headers forward declarations for model related members instead of include
r877 /*!
\internal
*/
Marek Rosa
Added support for adding and removing data with model. Updated the example
r545 void QXYSeries::modelDataRemoved(QModelIndex parent, int start, int end)
{
Michal Klocek
Adds big fat pimpl to series classes...
r938
Tero Ahola
Squashed bunch of warnings
r611 Q_UNUSED(parent)
Q_UNUSED(end)
Michal Klocek
Adds big fat pimpl to series classes...
r938 Q_D(QXYSeries);
Marek Rosa
XYSeries: added support for limited mapping area
r734 // how many items there were before data was removed
// int oldCount = count() - 1;
Michal Klocek
Adds big fat pimpl to series classes...
r938 if (d->m_mapLimited) {
if (start >= d->m_mapFirst + d->m_mapCount) {
Marek Rosa
XYSeries: added support for limited mapping area
r734 // the removed data is below mapped area
// therefore it has no relevance
return;
sauimone
minor code review issues. indent, spaces, brackets etc.
r743 } else {
Marek Rosa
Some more work on mapping with limits
r735 // if the current items count in the whole model is bigger than the index of the last item
// that was removed than it means there are some extra items available
Marek Rosa
XYSeries model with limits working.
r833
Michal Klocek
Adds big fat pimpl to series classes...
r938 int removedItemsCount = qMin(count(), qMin(end, d->m_mapFirst + d->m_mapCount - 1) - start + 1);
Marek Rosa
XYSeries: added support for limited mapping area
r734 int extraItemsAvailable = 0;
Michal Klocek
Adds big fat pimpl to series classes...
r938 if (d->m_mapOrientation == Qt::Vertical) {
extraItemsAvailable = qMax(d->m_model->rowCount() + (end - start + 1) - qMax(end + 1, d->m_mapFirst + d->m_mapCount), 0);
sauimone
minor code review issues. indent, spaces, brackets etc.
r743 } else {
Michal Klocek
Adds big fat pimpl to series classes...
r938 extraItemsAvailable = qMax(d->m_model->columnCount() + (end - start + 1) - qMax(end + 1, d->m_mapFirst + d->m_mapCount), 0);
Marek Rosa
XYSeries: added support for limited mapping area
r734 }
Marek Rosa
Some more work on mapping with limits
r735 // if there are excess items available (below the mapped area) use them to repopulate mapped area
int toBeAdded = qMin(extraItemsAvailable, removedItemsCount);
for (int k = 0; k < toBeAdded; k++)
Michal Klocek
Adds big fat pimpl to series classes...
r938 emit d->pointAdded(d->m_mapFirst + d->m_mapCount - removedItemsCount + k);
Marek Rosa
XYSeries: added support for limited mapping area
r734 }
sauimone
minor code review issues. indent, spaces, brackets etc.
r743 } else {
Marek Rosa
Some more work on mapping with limits
r735 // data was removed from XYSeries interal storage. Nothing more to do
Marek Rosa
XYSeries: added support for limited mapping area
r734 }
Marek Rosa
Added support for adding and removing data with model. Updated the example
r545 }
Marek Rosa
BarSeries - renamed internal model getter to modelInternal. Some smaller changes to other files to have in headers forward declarations for model related members instead of include
r877 /*!
\fn bool QXYSeries::setModel(QAbstractItemModel *model)
Sets the \a model to be used as a data source
Marek Rosa
Added documentation for model related funtions
r900 \sa setModelMapping(), setModelMappingRange()
Marek Rosa
BarSeries - renamed internal model getter to modelInternal. Some smaller changes to other files to have in headers forward declarations for model related members instead of include
r877 */
Michal Klocek
Adds big fat pimpl to series classes...
r938 bool QXYSeries::setModel(QAbstractItemModel *model)
{
Q_D(QXYSeries);
Marek Rosa
Added support for data from model to QBarSeries. Various fixes and small modifications to data from model support to other series
r630 // disconnect signals from old model
Michal Klocek
Adds big fat pimpl to series classes...
r938 if (d->m_model) {
QObject::disconnect(d->m_model, 0, this, 0);
d->m_mapX = -1;
d->m_mapY = -1;
d->m_mapFirst = 0;
d->m_mapCount = 0;
d->m_mapLimited = false;
d->m_mapOrientation = Qt::Vertical;
Marek Rosa
Added support for data from model to QBarSeries. Various fixes and small modifications to data from model support to other series
r630 }
// set new model
sauimone
minor code review issues. indent, spaces, brackets etc.
r743 if (model) {
Michal Klocek
Adds big fat pimpl to series classes...
r938 d->m_model = model;
Marek Rosa
Added support for data from model to QBarSeries. Various fixes and small modifications to data from model support to other series
r630 return true;
sauimone
minor code review issues. indent, spaces, brackets etc.
r743 } else {
Michal Klocek
Adds big fat pimpl to series classes...
r938 d->m_model = 0;
Marek Rosa
Added support for data from model to QBarSeries. Various fixes and small modifications to data from model support to other series
r630 return false;
}
Marek Rosa
Table model data example
r519 }
Marek Rosa
Added documentation for model related funtions
r900 /*!
\fn bool QXYSeries::setModelMapping(int modelX, int modelY, Qt::Orientation orientation)
Sets the \a modelX to be used as a data source for x coordinate and \a modelY to be used
as a data source for y coordinate. The \a orientation paramater specifies whether the data
is in columns or in rows.
\sa setModel(), setModelMappingRange()
*/
Marek Rosa
QXYSeries: model data orientation added. QBarSeries: some model data function placeholders
r527 void QXYSeries::setModelMapping(int modelX, int modelY, Qt::Orientation orientation)
{
Michal Klocek
Adds big fat pimpl to series classes...
r938 Q_D(QXYSeries);
if (d->m_model == 0)
Marek Rosa
Added support for data from model to QBarSeries. Various fixes and small modifications to data from model support to other series
r630 return;
Michal Klocek
Adds big fat pimpl to series classes...
r938 d->m_mapX = modelX;
d->m_mapY = modelY;
d->m_mapFirst = 0;
d->m_mapOrientation = orientation;
if (d->m_mapOrientation == Qt::Vertical) {
connect(d->m_model,SIGNAL(dataChanged(QModelIndex,QModelIndex)), this, SLOT(modelUpdated(QModelIndex, QModelIndex)));
connect(d->m_model,SIGNAL(rowsAboutToBeInserted(QModelIndex, int, int)), this, SLOT(modelDataAboutToBeAdded(QModelIndex,int,int)));
connect(d->m_model,SIGNAL(rowsInserted(QModelIndex, int, int)), this, SLOT(modelDataAdded(QModelIndex,int,int)));
connect(d->m_model, SIGNAL(rowsAboutToBeRemoved(QModelIndex, int, int)), this, SLOT(modelDataAboutToBeRemoved(QModelIndex,int,int)));
connect(d->m_model, SIGNAL(rowsRemoved(QModelIndex, int, int)), this, SLOT(modelDataRemoved(QModelIndex,int,int)));
sauimone
minor code review issues. indent, spaces, brackets etc.
r743 } else {
Michal Klocek
Adds big fat pimpl to series classes...
r938 connect(d->m_model,SIGNAL(dataChanged(QModelIndex,QModelIndex)), this, SLOT(modelUpdated(QModelIndex, QModelIndex)));
connect(d->m_model,SIGNAL(columnsAboutToBeInserted(QModelIndex, int, int)), this, SLOT(modelDataAboutToBeAdded(QModelIndex,int,int)));
connect(d->m_model,SIGNAL(columnsInserted(QModelIndex, int, int)), this, SLOT(modelDataAdded(QModelIndex,int,int)));
connect(d->m_model, SIGNAL(columnsAboutToBeRemoved(QModelIndex, int, int)), this, SLOT(modelDataAboutToBeRemoved(QModelIndex,int,int)));
connect(d->m_model, SIGNAL(columnsRemoved(QModelIndex, int, int)), this, SLOT(modelDataRemoved(QModelIndex,int,int)));
Marek Rosa
Added support for data from model to QBarSeries. Various fixes and small modifications to data from model support to other series
r630 }
Marek Rosa
QXYSeries: model data orientation added. QBarSeries: some model data function placeholders
r527 }
Marek Rosa
Added documentation for model related funtions
r900 /*!
\fn bool QXYSeries::setModelMappingRange(int first, int count)
Allows limiting the model mapping.
Parameter \a first specifies which element of the model should be used as a first one of the series.
Parameter \a count specifies how many elements should be mapped. If count is not specified (defaults to -1)
then all the items following \a first item in a model are used.
\sa setModel(), setModelMapping()
*/
Marek Rosa
Quick fix: Refactoring the name did not work correctly
r864 void QXYSeries::setModelMappingRange(int first, int count)
Marek Rosa
XYSeries: added support for limited mapping area
r734 {
Michal Klocek
Adds big fat pimpl to series classes...
r938 Q_D(QXYSeries);
d->m_mapFirst = first;
sauimone
minor code review issues. indent, spaces, brackets etc.
r743 if (count == 0) {
Michal Klocek
Adds big fat pimpl to series classes...
r938 d->m_mapLimited = false;
sauimone
minor code review issues. indent, spaces, brackets etc.
r743 } else {
Michal Klocek
Adds big fat pimpl to series classes...
r938 d->m_mapCount = count;
d->m_mapLimited = true;
Marek Rosa
XYSeries: added support for limited mapping area
r734 }
}
Marek Rosa
QXYSeries: model data orientation added. QBarSeries: some model data function placeholders
r527
Michal Klocek
Adds big fat pimpl to series classes...
r938 int QXYSeries::mapFirst() const
{
Q_D(const QXYSeries);
return d->m_mapFirst;
}
int QXYSeries::mapCount() const
{
Q_D(const QXYSeries);
return d->m_mapCount;
}
//////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////
QXYSeriesPrivate::QXYSeriesPrivate(QXYSeries *q): QSeriesPrivate(q),
m_mapX(-1),
m_mapY(-1),
m_mapFirst(0),
m_mapCount(0),
m_mapLimited(false),
m_mapOrientation( Qt::Vertical),
m_pointsVisible(false)
{
}
Michal Klocek
Refactor to use qseries private for implmentation interface...
r943 void QXYSeriesPrivate::scaleDomain(Domain& domain)
{
qreal minX(domain.minX());
qreal minY(domain.minY());
qreal maxX(domain.maxX());
qreal maxY(domain.maxY());
int tickXCount(domain.tickXCount());
int tickYCount(domain.tickYCount());
Q_Q(QXYSeries);
for (int i = 0; i < q->count(); i++)
{
qreal x = q->x(i);
qreal y = q->y(i);
minX = qMin(minX, x);
minY = qMin(minY, y);
maxX = qMax(maxX, x);
maxY = qMax(maxY, y);
}
domain.setRangeX(minX,maxX,tickXCount);
domain.setRangeY(minY,maxY,tickYCount);
}
Michal Klocek
Adds qlegend pimpl...
r950 QList<LegendMarker*> QXYSeriesPrivate::createLegendMarker(QLegend* legend)
{
Q_Q(QXYSeries);
QList<LegendMarker*> list;
return list << new XYLegendMarker(q,legend);
}
Michal Klocek
Add missing files from previous commit
r466 #include "moc_qxyseries.cpp"
Michal Klocek
Adds big fat pimpl to series classes...
r938 #include "moc_qxyseries_p.cpp"
Michal Klocek
Add missing files from previous commit
r466
QTCOMMERCIALCHART_END_NAMESPACE