##// END OF EJS Templates
HG_REPOSITORIES » LPP » INSTRUMENTATION » USERS » JEANDET » qtcharts
RSS

Clone from http://code.qt.io/qt/qtcharts.git

Some more work on mapping with limits
Some more work on mapping with limits
Marek Rosa - - Load All Authors

File last commit:

r735:8b3d19ded350
r735:8b3d19ded350
Show More
qxyseries.cpp
519 lines | 14.3 KiB | text/x-c | CppLexer
/ src / xychart / qxyseries.cpp
History | Source | Raw |Copy content |Copy permalink
Michal Klocek
Add missing files from previous commit
 r466 #include "qxyseries.h"
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 /*!
\fn void QXYSeries::pointReplaced(int index)
\brief \internal \a index
*/
/*!
\fn void QXYSeries::pointAdded(int index)
\brief \internal \a index
*/
/*!
\fn void QXYSeries::pointRemoved(int index)
\brief \internal \a index
*/
/*!
\fn void QXYSeries::updated()
\brief \internal
*/
/*!
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
Refactor scatter chart to fit the other classes...
 r470 QXYSeries::QXYSeries(QObject* parent):QSeries(parent)
Michal Klocek
Add missing files from previous commit
 r466 {
Marek Rosa
QXYSeries: model data orientation added. QBarSeries: some model data function placeholders
 r527 m_mapX = -1;
m_mapY = -1;
Marek Rosa
XYSeries: added support for limited mapping area
 r734 m_mapFirst = 0;
m_mapCount = 0;
m_mapLimited = false;
Marek Rosa
QXYSeries: model data orientation added. QBarSeries: some model data function placeholders
 r527 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 // m_mapYOrientation = Qt::Vertical;
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.
*/
void QXYSeries::add(qreal x,qreal y)
{
Q_ASSERT(m_x.size() == m_y.size());
m_x<<x;
m_y<<y;
emit pointAdded(m_x.size()-1);
}
/*!
This is an overloaded function.
Adds data \a point to the series. Points are connected with lines on the chart.
*/
void QXYSeries::add(const QPointF& point)
{
add(point.x(),point.y());
}
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.
*/
void QXYSeries::add(const QList<QPointF> points)
{
foreach(const QPointF& point , points) {
add(point.x(),point.y());
}
}
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)
{
int index = m_x.indexOf(x);
m_x[index]=x;
m_y[index]=y;
emit pointReplaced(index);
}
/*!
This is an overloaded function.
Replaces current y value of for given \a point x value with \a point y value.
*/
void QXYSeries::replace(const QPointF& point)
{
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)
{
int index = m_x.indexOf(x);
if(index==-1) return;
m_x.remove(index);
m_y.remove(index);
emit pointRemoved(index);
}
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 missing scatter intercation implementation...
 r541 int index =-1;
do{
index = m_x.indexOf(x,index+1);
}while(index !=-1 && m_y.at(index)!=y);
if(index==-1) return;
Marek Rosa
Added support for adding and removing data with model. Updated the example
 r545
Michal Klocek
Add missing files from previous commit
 r466 m_x.remove(index);
m_y.remove(index);
Marek Rosa
Added support for adding and removing data with model. Updated the example
 r545 emit pointRemoved(index);
Michal Klocek
Add missing files from previous commit
 r466 }
/*!
Removes current \a point x value. Note \a point y value is ignored.
*/
void QXYSeries::remove(const QPointF& point)
{
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 {
m_x.clear();
m_y.clear();
}
/*!
\internal \a pos
*/
qreal QXYSeries::x(int pos) const
{
Marek Rosa
Table model data example
 r519 if (m_model)
Marek Rosa
QXYSeries: model data orientation added. QBarSeries: some model data function placeholders
 r527 if (m_mapOrientation == Qt::Vertical)
// consecutive data is read from model's column
Marek Rosa
XYSeries: added support for limited mapping area
 r734 return m_model->data(m_model->index(pos + m_mapFirst, 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
Marek Rosa
XYSeries: added support for limited mapping area
 r734 return m_model->data(m_model->index(m_mapX, pos + m_mapFirst), Qt::DisplayRole).toDouble();
Marek Rosa
Table model data example
 r519 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
Marek Rosa
Table model data example
 r519 return m_x.at(pos);
Michal Klocek
Add missing files from previous commit
 r466 }
/*!
\internal \a pos
*/
qreal QXYSeries::y(int pos) const
{
Marek Rosa
Table model data example
 r519 if (m_model)
Marek Rosa
QXYSeries: model data orientation added. QBarSeries: some model data function placeholders
 r527 if (m_mapOrientation == Qt::Vertical)
// consecutive data is read from model's column
Marek Rosa
XYSeries: added support for limited mapping area
 r734 return m_model->data(m_model->index(pos + m_mapFirst, 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
Marek Rosa
XYSeries: added support for limited mapping area
 r734 return m_model->data(m_model->index(m_mapY, pos + m_mapFirst), Qt::DisplayRole).toDouble();
Marek Rosa
Table model data example
 r519 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
Marek Rosa
Table model data example
 r519 return m_y.at(pos);
Michal Klocek
Add missing files from previous commit
 r466 }
/*!
Returns number of data points within series.
*/
int QXYSeries::count() const
{
Marek Rosa
Table model data example
 r519 Q_ASSERT(m_x.size() == m_y.size());
Michal Klocek
Add missing files from previous commit
 r466
Jani Honkonen
We have so many stupid warnings that "treat warnings as errors" flag is needed...
 r609 if (m_model) {
Marek Rosa
QXYSeries: model data orientation added. QBarSeries: some model data function placeholders
 r527 if (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
if (m_mapLimited)
return qMin(m_mapCount, qMax(m_model->rowCount() - m_mapFirst, 0));
else
return qMax(m_model->rowCount() - m_mapFirst, 0);
}
Marek Rosa
QXYSeries: model data orientation added. QBarSeries: some model data function placeholders
 r527 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
if (m_mapLimited)
return qMin(m_mapCount, qMax(m_model->columnCount() - m_mapFirst, 0));
else
return qMax(m_model->columnCount() - m_mapFirst, 0);
}
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
return 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()
{
QList<QPointF> data;
for (int i(0); i < m_x.count() && i < m_y.count(); i++)
data.append(QPointF(m_x.at(i), m_y.at(i)));
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.
\sa QChart::setChartTheme()
Michal Klocek
Spline series windows compilation fix
 r467 */
void QXYSeries::setPen(const QPen& pen)
{
if(pen!=m_pen){
Michal Klocek
Refactor scatter chart to fit the other classes...
 r470 m_pen=pen;
emit updated();
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.
\sa QChart::setChartTheme()
Michal Klocek
Spline series windows compilation fix
 r467 */
Michal Klocek
Refactor scatter chart to fit the other classes...
 r470
void QXYSeries::setBrush(const QBrush& brush)
Michal Klocek
Spline series windows compilation fix
 r467 {
Michal Klocek
Refactor scatter chart to fit the other classes...
 r470 if(brush!=m_brush){
m_brush=brush;
emit updated();
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.
\sa add()
*/
QXYSeries& QXYSeries::operator<< (const QPointF &point)
{
add(point);
return *this;
}
Michal Klocek
Fixes for docs , adds xyseries docs
 r481 /*!
Stream operator for adding a list of \a points to the series.
\sa add()
*/
QXYSeries& QXYSeries::operator<< (const QList<QPointF> points)
{
add(points);
return *this;
}
Marek Rosa
Table model data example
 r519 void QXYSeries::modelUpdated(QModelIndex topLeft, QModelIndex bottomRight)
{
Tero Ahola
Squashed bunch of warnings
 r611 Q_UNUSED(bottomRight)
Marek Rosa
Added data from model support to QPieSeries(modify, remove). Data from model example updated
 r597 if (m_mapOrientation == Qt::Vertical)
Marek Rosa
XYSeries: added support for limited mapping area
 r734 {
if (topLeft.row() >= m_mapFirst && (!m_mapLimited || topLeft.row() < m_mapFirst + m_mapCount))
emit pointReplaced(topLeft.row() - m_mapFirst);
}
else
{
if (topLeft.column() >= m_mapFirst && (!m_mapLimited || topLeft.column() < m_mapFirst + m_mapCount))
emit pointReplaced(topLeft.column() - m_mapFirst);
}
}
void QXYSeries::modelDataAboutToBeAdded(QModelIndex parent, int start, int end)
{
Q_UNUSED(parent)
// Q_UNUSED(end)
if (m_mapLimited)
{
if (start >= m_mapFirst + m_mapCount)
// the added data is below mapped area
// therefore it has no relevance
return;
else
{
// 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
int itemsToRemove = qMin(count() - (start - m_mapFirst), end - start + 1);
Marek Rosa
XYSeries: added support for limited mapping area
 r734 if (m_mapCount == count())
Marek Rosa
Some more work on mapping with limits
 r735 for (int i = 0; i < itemsToRemove; i++)
Marek Rosa
XYSeries: added support for limited mapping area
 r734 emit pointRemoved(count() - 1 - i);
}
}
Marek Rosa
Added data from model support to QPieSeries(modify, remove). Data from model example updated
 r597 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
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)
if (m_mapLimited)
{
if (start >= m_mapFirst + m_mapCount)
// the added data is below mapped area
// therefore it has no relevance
return;
else
{
// the added data is in the mapped area or before it
// update needed
if (count() > 0)
Marek Rosa
Some more work on mapping with limits
 r735 for (int i = 0; i < qMin(m_mapCount - (start - m_mapFirst), end - start + 1); i++)
Marek Rosa
XYSeries: added support for limited mapping area
 r734 emit pointAdded(qMax(start + i - m_mapFirst, 0));
}
}
else
{
// 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++)
emit pointAdded(qMax(start + i - m_mapFirst, 0));
}
}
void QXYSeries::modelDataAboutToBeRemoved(QModelIndex parent, int start, int end)
{
Q_UNUSED(parent)
// Q_UNUSED(end)
if (m_mapLimited)
{
if (start >= m_mapFirst + m_mapCount)
// the removed data is below mapped area
// therefore it has no relevance
return;
else
{
// 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())
int itemsToRemove = qMin(count(), qMin(end, m_mapFirst + m_mapCount - 1) - start + 1);
Marek Rosa
XYSeries: added support for limited mapping area
 r734 for (int i = 0; i < itemsToRemove; i++)
emit pointRemoved(qMax(start - m_mapFirst, 0));
}
}
else
{
// 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++)
emit pointRemoved(qMax(start - m_mapFirst, 0));
}
Marek Rosa
Added support for adding and removing data with model. Updated the example
 r545 }
void QXYSeries::modelDataRemoved(QModelIndex parent, int start, int end)
{
Tero Ahola
Squashed bunch of warnings
 r611 Q_UNUSED(parent)
Q_UNUSED(end)
Marek Rosa
XYSeries: added support for limited mapping area
 r734
// how many items there were before data was removed
// int oldCount = count() - 1;
if (m_mapLimited)
{
if (start >= m_mapFirst + m_mapCount)
// the removed data is below mapped area
// therefore it has no relevance
return;
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: added support for limited mapping area
 r734 int extraItemsAvailable = 0;
if (m_mapOrientation == Qt::Vertical)
{
Marek Rosa
Some more work on mapping with limits
 r735 extraItemsAvailable = qMax(m_model->rowCount() - end, 0);
Marek Rosa
XYSeries: added support for limited mapping area
 r734 }
else
{
Marek Rosa
Some more work on mapping with limits
 r735 extraItemsAvailable = qMax(m_model->columnCount() - end, 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 removedItemsCount = qMin(count(), qMin(end, m_mapFirst + m_mapCount - 1) - qMax(start, m_mapFirst) + 1);
int toBeAdded = qMin(extraItemsAvailable, removedItemsCount);
for (int k = 0; k < toBeAdded; k++)
emit pointAdded(qMax(start - m_mapFirst, m_mapFirst) + k);
Marek Rosa
XYSeries: added support for limited mapping area
 r734 }
}
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
Table model data example
 r519 bool QXYSeries::setModel(QAbstractItemModel* 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
// disconnect signals from old model
if(m_model)
{
disconnect(m_model, 0, this, 0);
m_mapX = -1;
m_mapY = -1;
Marek Rosa
XYSeries: added support for limited mapping area
 r734 m_mapFirst = 0;
m_mapCount = 0;
m_mapLimited = false;
Marek Rosa
Added support for data from model to QBarSeries. Various fixes and small modifications to data from model support to other series
 r630 m_mapOrientation = Qt::Vertical;
}
// set new model
if(model)
{
m_model = model;
return true;
}
else
{
m_model = NULL;
return false;
}
Marek Rosa
Table model data example
 r519 }
Marek Rosa
QXYSeries: model data orientation added. QBarSeries: some model data function placeholders
 r527 void QXYSeries::setModelMapping(int modelX, int modelY, Qt::Orientation orientation)
{
Marek Rosa
Added support for data from model to QBarSeries. Various fixes and small modifications to data from model support to other series
 r630 if (m_model == NULL)
return;
Marek Rosa
QXYSeries: model data orientation added. QBarSeries: some model data function placeholders
 r527 m_mapX = modelX;
m_mapY = modelY;
Marek Rosa
XYSeries: added support for limited mapping area
 r734 m_mapFirst = 0;
Marek Rosa
QXYSeries: model data orientation added. QBarSeries: some model data function placeholders
 r527 m_mapOrientation = orientation;
Marek Rosa
Added support for data from model to QBarSeries. Various fixes and small modifications to data from model support to other series
 r630 if (m_mapOrientation == Qt::Vertical)
{
Marek Rosa
XYSeries: added support for limited mapping area
 r734 // m_mapCount = m_model->rowCount();
Marek Rosa
Added support for data from model to QBarSeries. Various fixes and small modifications to data from model support to other series
 r630 connect(m_model,SIGNAL(dataChanged(QModelIndex,QModelIndex)), this, SLOT(modelUpdated(QModelIndex, QModelIndex)));
Marek Rosa
XYSeries: added support for limited mapping area
 r734 connect(m_model,SIGNAL(rowsAboutToBeInserted(QModelIndex, int, int)), this, SLOT(modelDataAboutToBeAdded(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 connect(m_model,SIGNAL(rowsInserted(QModelIndex, int, int)), this, SLOT(modelDataAdded(QModelIndex,int,int)));
Marek Rosa
XYSeries: added support for limited mapping area
 r734 connect(m_model, SIGNAL(rowsAboutToBeRemoved(QModelIndex, int, int)), this, SLOT(modelDataAboutToBeRemoved(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 connect(m_model, SIGNAL(rowsRemoved(QModelIndex, int, int)), this, SLOT(modelDataRemoved(QModelIndex,int,int)));
}
else
{
Marek Rosa
XYSeries: added support for limited mapping area
 r734 // m_mapCount = m_model->columnCount();
Marek Rosa
Added support for data from model to QBarSeries. Various fixes and small modifications to data from model support to other series
 r630 connect(m_model,SIGNAL(dataChanged(QModelIndex,QModelIndex)), this, SLOT(modelUpdated(QModelIndex, QModelIndex)));
Marek Rosa
XYSeries: added support for limited mapping area
 r734 connect(m_model,SIGNAL(columnsAboutToBeInserted(QModelIndex, int, int)), this, SLOT(modelDataAboutToBeAdded(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 connect(m_model,SIGNAL(columnsInserted(QModelIndex, int, int)), this, SLOT(modelDataAdded(QModelIndex,int,int)));
Marek Rosa
XYSeries: added support for limited mapping area
 r734 connect(m_model, SIGNAL(columnsAboutToBeRemoved(QModelIndex, int, int)), this, SLOT(modelDataAboutToBeRemoved(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 connect(m_model, SIGNAL(columnsRemoved(QModelIndex, int, int)), this, SLOT(modelDataRemoved(QModelIndex,int,int)));
}
Marek Rosa
QXYSeries: model data orientation added. QBarSeries: some model data function placeholders
 r527 }
Marek Rosa
XYSeries: added support for limited mapping area
 r734 void QXYSeries::setModelMappingShift(int first, int count)
{
m_mapFirst = first;
if (count == 0)
m_mapLimited = false;
else
{
m_mapCount = count;
m_mapLimited = true;
}
}
Marek Rosa
QXYSeries: model data orientation added. QBarSeries: some model data function placeholders
 r527
Michal Klocek
Add missing files from previous commit
 r466 #include "moc_qxyseries.cpp"
QTCOMMERCIALCHART_END_NAMESPACE