##// END OF EJS Templates
Fixed isVisible implementation in XY series
Fixed isVisible implementation in XY series

File last commit:

r1331:c415cc6dbfb2
r1346:4fe424a18505
Show More
qbarmodelmapper.cpp
429 lines | 13.6 KiB | text/x-c | CppLexer
/ src / barchart / qbarmodelmapper.cpp
Marek Rosa
BarSeries Model mapper added
r1170 #include "qbarmodelmapper.h"
Marek Rosa
BarModel mapper refactored.
r1293 #include "qbarmodelmapper_p.h"
#include "qbarseries.h"
#include "qbarset.h"
Marek Rosa
Added placeholders for mappers documentation
r1331 #include "qchart.h"
#include "qaxis.h"
Marek Rosa
BarModel mapper refactored.
r1293 #include <QAbstractItemModel>
Marek Rosa
BarSeries Model mapper added
r1170
QTCOMMERCIALCHART_BEGIN_NAMESPACE
QBarModelMapper::QBarModelMapper(QObject *parent) :
QObject(parent),
Marek Rosa
BarModel mapper refactored.
r1293 d_ptr(new QBarModelMapperPrivate(this))
{
}
QAbstractItemModel* QBarModelMapper::model() const
{
Q_D(const QBarModelMapper);
return d->m_model;
}
void QBarModelMapper::setModel(QAbstractItemModel *model)
{
if (model == 0)
return;
Q_D(QBarModelMapper);
if (d->m_model) {
disconnect(d->m_model, 0, d, 0);
}
d->m_model = model;
d->initializeBarFromModel();
// connect signals from the model
connect(d->m_model, SIGNAL(dataChanged(QModelIndex,QModelIndex)), d, SLOT(modelUpdated(QModelIndex,QModelIndex)));
connect(d->m_model, SIGNAL(rowsInserted(QModelIndex,int,int)), d, SLOT(modelRowsAdded(QModelIndex,int,int)));
connect(d->m_model, SIGNAL(rowsRemoved(QModelIndex,int,int)), d, SLOT(modelRowsRemoved(QModelIndex,int,int)));
connect(d->m_model, SIGNAL(columnsInserted(QModelIndex,int,int)), d, SLOT(modelColumnsAdded(QModelIndex,int,int)));
connect(d->m_model, SIGNAL(columnsRemoved(QModelIndex,int,int)), d, SLOT(modelColumnsRemoved(QModelIndex,int,int)));
}
QBarSeries* QBarModelMapper::series() const
{
Q_D(const QBarModelMapper);
return d->m_series;
}
void QBarModelMapper::setSeries(QBarSeries *series)
Marek Rosa
BarSeries Model mapper added
r1170 {
Marek Rosa
BarModel mapper refactored.
r1293 Q_D(QBarModelMapper);
if (d->m_series) {
disconnect(d->m_series, 0, d, 0);
}
if (series == 0)
return;
d->m_series = series;
d->initializeBarFromModel();
// connect the signals from the series
// connect(d->m_series, SIGNAL(pointAdded(int)), d, SLOT(handlePointAdded(int)));
// connect(d->m_series, SIGNAL(pointRemoved(int)), d, SLOT(handlePointRemoved(int)));
// connect(d->m_series, SIGNAL(pointReplaced(int)), d, SLOT(handlePointReplaced(int)));
Marek Rosa
BarSeries Model mapper added
r1170 }
int QBarModelMapper::first() const
{
Marek Rosa
BarModel mapper refactored.
r1293 Q_D(const QBarModelMapper);
return d->m_first;
Marek Rosa
BarSeries Model mapper added
r1170 }
void QBarModelMapper::setFirst(int first)
{
Marek Rosa
BarModel mapper refactored.
r1293 Q_D(QBarModelMapper);
d->m_first = qMax(first, 0);
d->initializeBarFromModel();
Marek Rosa
BarSeries Model mapper added
r1170 }
int QBarModelMapper::count() const
{
Marek Rosa
BarModel mapper refactored.
r1293 Q_D(const QBarModelMapper);
return d->m_count;
Marek Rosa
BarSeries Model mapper added
r1170 }
void QBarModelMapper::setCount(int count)
{
Marek Rosa
BarModel mapper refactored.
r1293 Q_D(QBarModelMapper);
d->m_count = qMax(count, -1);
d->initializeBarFromModel();
Marek Rosa
BarSeries Model mapper added
r1170 }
Qt::Orientation QBarModelMapper::orientation() const
{
Marek Rosa
BarModel mapper refactored.
r1293 Q_D(const QBarModelMapper);
return d->m_orientation;
Marek Rosa
BarSeries Model mapper added
r1170 }
void QBarModelMapper::setOrientation(Qt::Orientation orientation)
{
Marek Rosa
BarModel mapper refactored.
r1293 Q_D(QBarModelMapper);
d->m_orientation = orientation;
d->initializeBarFromModel();
Marek Rosa
BarSeries Model mapper added
r1170 }
Marek Rosa
Replaced 'Bar' with 'BarSet' in BarModelMapper functions and member variables
r1312 int QBarModelMapper::firstBarSetSection() const
Marek Rosa
BarSeries Model mapper added
r1170 {
Marek Rosa
BarModel mapper refactored.
r1293 Q_D(const QBarModelMapper);
Marek Rosa
Replaced 'Bar' with 'BarSet' in BarModelMapper functions and member variables
r1312 return d->m_firstBarSetSection;
Marek Rosa
BarSeries Model mapper added
r1170 }
Marek Rosa
Replaced 'Bar' with 'BarSet' in BarModelMapper functions and member variables
r1312 void QBarModelMapper::setFirstBarSetSection(int firstBarSetSection)
Marek Rosa
BarSeries Model mapper added
r1170 {
Marek Rosa
BarModel mapper refactored.
r1293 Q_D(QBarModelMapper);
Marek Rosa
Replaced 'Bar' with 'BarSet' in BarModelMapper functions and member variables
r1312 d->m_firstBarSetSection = firstBarSetSection;
Marek Rosa
BarModel mapper refactored.
r1293 d->initializeBarFromModel();
Marek Rosa
BarSeries Model mapper added
r1170 }
Marek Rosa
Replaced 'Bar' with 'BarSet' in BarModelMapper functions and member variables
r1312 int QBarModelMapper::lastBarSetSection() const
Marek Rosa
BarSeries Model mapper added
r1170 {
Marek Rosa
BarModel mapper refactored.
r1293 Q_D(const QBarModelMapper);
Marek Rosa
Replaced 'Bar' with 'BarSet' in BarModelMapper functions and member variables
r1312 return d->m_lastBarSetSection;
Marek Rosa
BarSeries Model mapper added
r1170 }
Marek Rosa
Replaced 'Bar' with 'BarSet' in BarModelMapper functions and member variables
r1312 void QBarModelMapper::setLastBarSetSection(int lastBarSetSection)
Marek Rosa
BarSeries Model mapper added
r1170 {
Marek Rosa
BarModel mapper refactored.
r1293 Q_D(QBarModelMapper);
Marek Rosa
Replaced 'Bar' with 'BarSet' in BarModelMapper functions and member variables
r1312 d->m_lastBarSetSection = lastBarSetSection;
Marek Rosa
BarModel mapper refactored.
r1293 d->initializeBarFromModel();
Marek Rosa
BarSeries Model mapper added
r1170 }
Marek Rosa
BarModel mapper refactored.
r1293 int QBarModelMapper::categoriesSection() const
Marek Rosa
BarSeries Model mapper added
r1170 {
Marek Rosa
BarModel mapper refactored.
r1293 Q_D(const QBarModelMapper);
return d->m_categoriesSection;
Marek Rosa
BarSeries Model mapper added
r1170 }
Marek Rosa
BarModel mapper refactored.
r1293 void QBarModelMapper::setCategoriesSection(int categoriesSection)
Marek Rosa
BarSeries Model mapper added
r1170 {
Marek Rosa
BarModel mapper refactored.
r1293 Q_D(QBarModelMapper);
d->m_categoriesSection = categoriesSection;
d->initializeBarFromModel();
Marek Rosa
BarSeries Model mapper added
r1170 }
void QBarModelMapper::reset()
{
Marek Rosa
BarModel mapper refactored.
r1293 Q_D(QBarModelMapper);
d->m_first = 0;
d->m_count = -1;
Marek Rosa
Replaced 'Bar' with 'BarSet' in BarModelMapper functions and member variables
r1312 d->m_firstBarSetSection = -1;
d->m_lastBarSetSection = -1;
Marek Rosa
BarModel mapper refactored.
r1293 d->m_categoriesSection = -1;
d->initializeBarFromModel();
}
///////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////
QBarModelMapperPrivate::QBarModelMapperPrivate(QBarModelMapper *q) :
m_series(0),
m_model(0),
m_first(0),
m_count(-1),
m_orientation(Qt::Vertical),
Marek Rosa
Replaced 'Bar' with 'BarSet' in BarModelMapper functions and member variables
r1312 m_firstBarSetSection(-1),
m_lastBarSetSection(-1),
Marek Rosa
BarModel mapper refactored.
r1293 m_categoriesSection(-1),
m_seriesSignalsBlock(false),
m_modelSignalsBlock(false),
q_ptr(q)
{
}
void QBarModelMapperPrivate::blockModelSignals(bool block)
{
m_modelSignalsBlock = block;
}
void QBarModelMapperPrivate::blockSeriesSignals(bool block)
{
m_seriesSignalsBlock = block;
}
Marek Rosa
BarModelMapper: implemented model updated slots. Some more work needed with categories
r1295 QBarSet* QBarModelMapperPrivate::barSet(QModelIndex index)
{
if (!index.isValid())
return 0;
Marek Rosa
Replaced 'Bar' with 'BarSet' in BarModelMapper functions and member variables
r1312 if (m_orientation == Qt::Vertical && index.column() >= m_firstBarSetSection && index.column() <= m_lastBarSetSection) {
Marek Rosa
Added placeholders for mappers documentation
r1331 if (index.row() >= m_first && (m_count == - 1 || index.row() < m_first + m_count)) {
// if (m_model->index(index.row(), m_valuesSection).isValid() && m_model->index(index.row(), m_labelsSection).isValid())
return m_series->barSets().at(index.column() - m_firstBarSetSection);
// else
// return 0;
}
Marek Rosa
Replaced 'Bar' with 'BarSet' in BarModelMapper functions and member variables
r1312 } else if (m_orientation == Qt::Horizontal && index.row() >= m_firstBarSetSection && index.row() <= m_lastBarSetSection) {
Marek Rosa
BarModelMapper: implemented model updated slots. Some more work needed with categories
r1295 if (index.column() >= m_first && (m_count == - 1 || index.column() < m_first + m_count))
Marek Rosa
Replaced 'Bar' with 'BarSet' in BarModelMapper functions and member variables
r1312 return m_series->barSets().at(index.row() - m_firstBarSetSection);
Marek Rosa
BarModelMapper: implemented model updated slots. Some more work needed with categories
r1295 }
return 0; // This part of model has not been mapped to any slice
}
Marek Rosa
BarModel mapper refactored.
r1293 QModelIndex QBarModelMapperPrivate::barModelIndex(int barSection, int posInBar)
{
if (m_count != -1 && posInBar >= m_count)
return QModelIndex(); // invalid
Marek Rosa
Replaced 'Bar' with 'BarSet' in BarModelMapper functions and member variables
r1312 if (barSection < m_firstBarSetSection || barSection > m_lastBarSetSection)
Marek Rosa
BarModel mapper refactored.
r1293 return QModelIndex(); // invalid
if (m_orientation == Qt::Vertical)
return m_model->index(posInBar + m_first, barSection);
else
return m_model->index(barSection, posInBar + m_first);
}
QModelIndex QBarModelMapperPrivate::categoriesModelIndex(int posInCategories)
{
if (m_count != -1 && posInCategories >= m_count)
return QModelIndex(); // invalid
if (m_orientation == Qt::Vertical)
return m_model->index(posInCategories + m_first, m_categoriesSection);
else
return m_model->index(m_categoriesSection, posInCategories + m_first);
}
void QBarModelMapperPrivate::modelUpdated(QModelIndex topLeft, QModelIndex bottomRight)
{
Q_UNUSED(topLeft)
Q_UNUSED(bottomRight)
Marek Rosa
Added Vertical and Horizontal BarModelMappers
r1294
if (m_model == 0 || m_series == 0)
return;
Marek Rosa
BarModel mapper refactored.
r1293 if (m_modelSignalsBlock)
return;
Marek Rosa
BarModelMapper: implemented model updated slots. Some more work needed with categories
r1295 blockSeriesSignals();
QModelIndex index;
Marek Rosa
BarModel mapper refactored.
r1293 // QPointF oldPoint;
// QPointF newPoint;
Marek Rosa
BarModelMapper: implemented model updated slots. Some more work needed with categories
r1295 for (int row = topLeft.row(); row <= bottomRight.row(); row++) {
for (int column = topLeft.column(); column <= bottomRight.column(); column++) {
index = topLeft.sibling(row, column);
QBarSet* bar = barSet(index);
if (bar) {
if (m_orientation == Qt::Vertical)
bar->replace(row - m_first, m_model->data(index).toReal());
else
bar->replace(column - m_first, m_model->data(index).toReal());
}
}
}
blockSeriesSignals(false);
Marek Rosa
BarModel mapper refactored.
r1293 }
void QBarModelMapperPrivate::modelRowsAdded(QModelIndex parent, int start, int end)
{
Q_UNUSED(parent);
Marek Rosa
BarModelMapper: implemented model updated slots. Some more work needed with categories
r1295 Q_UNUSED(end)
Marek Rosa
BarModel mapper refactored.
r1293 if (m_modelSignalsBlock)
return;
blockSeriesSignals();
if (m_orientation == Qt::Vertical)
Marek Rosa
BarModelMapper: implemented model updated slots. Some more work needed with categories
r1295 // insertData(start, end);
initializeBarFromModel();
Marek Rosa
Replaced 'Bar' with 'BarSet' in BarModelMapper functions and member variables
r1312 else if (start <= m_firstBarSetSection || start <= m_lastBarSetSection || start <= m_categoriesSection) // if the changes affect the map - reinitialize
Marek Rosa
BarModel mapper refactored.
r1293 initializeBarFromModel();
blockSeriesSignals(false);
}
void QBarModelMapperPrivate::modelRowsRemoved(QModelIndex parent, int start, int end)
{
Q_UNUSED(parent);
Marek Rosa
BarModelMapper: implemented model updated slots. Some more work needed with categories
r1295 Q_UNUSED(end)
Marek Rosa
BarModel mapper refactored.
r1293 if (m_modelSignalsBlock)
return;
blockSeriesSignals();
if (m_orientation == Qt::Vertical)
Marek Rosa
BarModelMapper: implemented model updated slots. Some more work needed with categories
r1295 // removeData(start, end);
initializeBarFromModel();
Marek Rosa
Replaced 'Bar' with 'BarSet' in BarModelMapper functions and member variables
r1312 else if (start <= m_firstBarSetSection || start <= m_lastBarSetSection || start <= m_categoriesSection) // if the changes affect the map - reinitialize
Marek Rosa
BarModel mapper refactored.
r1293 initializeBarFromModel();
blockSeriesSignals(false);
}
void QBarModelMapperPrivate::modelColumnsAdded(QModelIndex parent, int start, int end)
{
Q_UNUSED(parent);
Marek Rosa
BarModelMapper: implemented model updated slots. Some more work needed with categories
r1295 Q_UNUSED(end)
Marek Rosa
BarModel mapper refactored.
r1293 if (m_modelSignalsBlock)
return;
blockSeriesSignals();
if (m_orientation == Qt::Horizontal)
Marek Rosa
BarModelMapper: implemented model updated slots. Some more work needed with categories
r1295 // insertData(start, end);
initializeBarFromModel();
Marek Rosa
Replaced 'Bar' with 'BarSet' in BarModelMapper functions and member variables
r1312 else if (start <= m_firstBarSetSection || start <= m_lastBarSetSection || start <= m_categoriesSection) // if the changes affect the map - reinitialize
Marek Rosa
BarModel mapper refactored.
r1293 initializeBarFromModel();
blockSeriesSignals(false);
}
void QBarModelMapperPrivate::modelColumnsRemoved(QModelIndex parent, int start, int end)
{
Q_UNUSED(parent);
Marek Rosa
BarModelMapper: implemented model updated slots. Some more work needed with categories
r1295 Q_UNUSED(end)
Marek Rosa
BarModel mapper refactored.
r1293 if (m_modelSignalsBlock)
return;
blockSeriesSignals();
if (m_orientation == Qt::Horizontal)
Marek Rosa
BarModelMapper: implemented model updated slots. Some more work needed with categories
r1295 // removeData(start, end);
initializeBarFromModel();
Marek Rosa
Replaced 'Bar' with 'BarSet' in BarModelMapper functions and member variables
r1312 else if (start <= m_firstBarSetSection || start <= m_lastBarSetSection || start <= m_categoriesSection) // if the changes affect the map - reinitialize
Marek Rosa
BarModel mapper refactored.
r1293 initializeBarFromModel();
blockSeriesSignals(false);
}
void QBarModelMapperPrivate::insertData(int start, int end)
{
Q_UNUSED(end)
if (m_model == 0 || m_series == 0)
return;
if (m_count != -1 && start >= m_first + m_count) {
return;
} /*else {
int addedCount = end - start + 1;
if (m_count != -1 && addedCount > m_count)
addedCount = m_count;
int first = qMax(start, m_first);
int last = qMin(first + addedCount - 1, m_orientation == Qt::Vertical ? m_model->rowCount() - 1 : m_model->columnCount() - 1);
Marek Rosa
BarModelMapper: implemented model updated slots. Some more work needed with categories
r1295 for (int k = 0; k < m_series->barSets().count(); k++) {
for (int i = first; i <= last; i++) {
QBar point;
point.setX(m_model->data(xModelIndex(i - m_first), Qt::DisplayRole).toDouble());
point.setY(m_model->data(yModelIndex(i - m_first), Qt::DisplayRole).toDouble());
m_series->insert(i - m_first, point);
}
Marek Rosa
Added placeholders for mappers documentation
r1331 >>>>>>> Stashed changes
Marek Rosa
BarModel mapper refactored.
r1293 }
// remove excess of slices (abouve m_count)
if (m_count != -1 && m_series->points().size() > m_count)
for (int i = m_series->points().size() - 1; i >= m_count; i--) {
m_series->remove(m_series->points().at(i));
}
}*/
}
void QBarModelMapperPrivate::removeData(int start, int end)
{
Q_UNUSED(end)
if (m_model == 0 || m_series == 0)
return;
// int removedCount = end - start + 1;
if (m_count != -1 && start >= m_first + m_count) {
return;
} /*else {
int toRemove = qMin(m_series->count(), removedCount); // first find how many items can actually be removed
int first = qMax(start, m_first); // get the index of the first item that will be removed.
int last = qMin(first + toRemove - 1, m_series->count() + m_first - 1); // get the index of the last item that will be removed.
for (int i = last; i >= first; i--) {
m_series->remove(m_series->points().at(i - m_first));
}
if (m_count != -1) {
int itemsAvailable; // check how many are available to be added
if (m_orientation == Qt::Vertical)
itemsAvailable = m_model->rowCount() - m_first - m_series->count();
else
itemsAvailable = m_model->columnCount() - m_first - m_series->count();
int toBeAdded = qMin(itemsAvailable, m_count - m_series->count()); // add not more items than there is space left to be filled.
int currentSize = m_series->count();
if (toBeAdded > 0)
for (int i = m_series->count(); i < currentSize + toBeAdded; i++) {
QPointF point;
point.setX(m_model->data(xModelIndex(i), Qt::DisplayRole).toDouble());
point.setY(m_model->data(yModelIndex(i), Qt::DisplayRole).toDouble());
m_series->insert(i, point);
}
}
}*/
}
void QBarModelMapperPrivate::initializeBarFromModel()
{
if (m_model == 0 || m_series == 0)
return;
blockSeriesSignals();
// clear current content
Marek Rosa
BarModelMapper: implemented model updated slots. Some more work needed with categories
r1295 m_series->clear();
Marek Rosa
BarModel mapper refactored.
r1293
// create the initial bar sets
Marek Rosa
Replaced 'Bar' with 'BarSet' in BarModelMapper functions and member variables
r1312 for (int i = m_firstBarSetSection; i <= m_lastBarSetSection; i++) {
Marek Rosa
BarModel mapper refactored.
r1293 int posInBar = 0;
QModelIndex barIndex = barModelIndex(i, posInBar);
QBarSet *barSet = new QBarSet(m_model->headerData(i, Qt::Horizontal).toString());
// QModelIndex yIndex = yModelIndex(pointPos);
while (barIndex.isValid()) {
barSet->append(m_model->data(barIndex, Qt::DisplayRole).toDouble());
posInBar++;
barIndex = barModelIndex(i, posInBar);
}
m_series->append(barSet);
}
Marek Rosa
Added placeholders for mappers documentation
r1331 if (m_series->chart() && m_categoriesSection != -1) {
Marek Rosa
BarModel mapper refactored.
r1293 int posInCategories = 0;
QStringList categories;
QModelIndex categoriesIndex = categoriesModelIndex(posInCategories);
while (categoriesIndex.isValid()) {
categories.append(m_model->data(categoriesIndex, Qt::DisplayRole).toString());
posInCategories++;
categoriesIndex = categoriesModelIndex(posInCategories);
}
Marek Rosa
Added placeholders for mappers documentation
r1331 m_series->chart()->axisX()->categories()->insert(categories);
Marek Rosa
BarModel mapper refactored.
r1293 }
blockSeriesSignals(false);
Marek Rosa
BarSeries Model mapper added
r1170 }
#include "moc_qbarmodelmapper.cpp"
Marek Rosa
BarModel mapper refactored.
r1293 #include "moc_qbarmodelmapper_p.cpp"
Marek Rosa
BarSeries Model mapper added
r1170
QTCOMMERCIALCHART_END_NAMESPACE