##// END OF EJS Templates
Fixed integrated build on OSX
Fixed integrated build on OSX

File last commit:

r630:dd8db9a3a988
r721:a5d0004908a0
Show More
qxyseries.cpp
361 lines | 8.2 KiB | text/x-c | CppLexer
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;
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
return m_model->data(m_model->index(pos, m_mapX), Qt::DisplayRole).toDouble();
else
// consecutive data is read from model's row
return m_model->data(m_model->index(m_mapX, pos), 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
return m_model->data(m_model->index(pos, m_mapY), Qt::DisplayRole).toDouble();
else
// consecutive data is read from model's row
return m_model->data(m_model->index(m_mapY, pos), 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)
// data is in a column, so return the number of items in single column
return m_model->rowCount();
else
// data is in a row, so return the number of items in single row
Jani Honkonen
We have so many stupid warnings that "treat warnings as errors" flag is needed...
r609 return m_model->columnCount();
}
// 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)
emit pointReplaced(topLeft.row());
else
emit pointReplaced(topLeft.column());
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)
Q_UNUSED(end)
Marek Rosa
Added support for adding and removing data with model. Updated the example
r545 emit pointAdded(start);
}
void QXYSeries::modelDataRemoved(QModelIndex parent, int start, int end)
{
Tero Ahola
Squashed bunch of warnings
r611 Q_UNUSED(parent)
Q_UNUSED(end)
Marek Rosa
Added support for adding and removing data with model. Updated the example
r545 emit pointRemoved(start);
}
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;
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;
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)
{
connect(m_model,SIGNAL(dataChanged(QModelIndex,QModelIndex)), this, SLOT(modelUpdated(QModelIndex, QModelIndex)));
connect(m_model,SIGNAL(rowsInserted(QModelIndex, int, int)), this, SLOT(modelDataAdded(QModelIndex,int,int)));
connect(m_model, SIGNAL(rowsRemoved(QModelIndex, int, int)), this, SLOT(modelDataRemoved(QModelIndex,int,int)));
}
else
{
connect(m_model,SIGNAL(dataChanged(QModelIndex,QModelIndex)), this, SLOT(modelUpdated(QModelIndex, QModelIndex)));
connect(m_model,SIGNAL(columnsInserted(QModelIndex, int, int)), this, SLOT(modelDataAdded(QModelIndex,int,int)));
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 }
//void QXYSeries::setModelMappingY(int modelLineIndex, Qt::Orientation orientation)
//{
// m_mapY = modelLineIndex;
// m_mapYOrientation = orientation;
//}
Michal Klocek
Add missing files from previous commit
r466 #include "moc_qxyseries.cpp"
QTCOMMERCIALCHART_END_NAMESPACE