HG_REPOSITORIES/LPP/INSTRUMENTATION/USERS/JEANDET/qtcharts Commit - r734:cfecc74c9bfa

XYSeries: added support for limited mapping area

Marek Rosa -

r734:cfecc74c9bfa

parent child

Context file:

r734:cfecc74c9bfa

Collapse all files

examples/tablemodelchart/customtablemodel.cpp +24 -14

             #include "customtablemodel.h"
             #include <QVector>
+            #include <QTime>
             CustomTableModel::CustomTableModel(QObject *parent) :
                 QAbstractTableModel(parent)
             {
-            //    m_points.append(QPointF(10, 50));
+                //    m_points.append(QPointF(10, 50));
-            //    m_labels.append("Apples");
+                //    m_labels.append("Apples");
-            //    m_points.append(QPointF(60, 70));
+                //    m_points.append(QPointF(60, 70));
-            //    m_labels.append("Oranges");
+                //    m_labels.append("Oranges");
-            //    m_points.append(QPointF(110, 50));
+                //    m_points.append(QPointF(110, 50));
-            //    m_labels.append("Bananas");
+                //    m_labels.append("Bananas");
-            //    m_points.append(QPointF(140, 40));
+                //    m_points.append(QPointF(140, 40));
-            //    m_labels.append("Lemons");
+                //    m_labels.append("Lemons");
-            //    m_points.append(QPointF(200, 150));
+                //    m_points.append(QPointF(200, 150));
-            //    m_labels.append("Plums");
+                //    m_labels.append("Plums");
-            //    m_points.append(QPointF(225, 75));
+                //    m_points.append(QPointF(225, 75));
                 //    m_labels.append("Pearls");
+                qsrand(QTime(0,0,0).secsTo(QTime::currentTime()));
                 // m_data
                 for (int i = 0; i < 6; i++)
                 {
                                     dataVec->replace(k, m_data[row - 1]->at(k) + qrand()%qMax(1, difference));
                                 }
                                 else
-                                    dataVec->replace(k, qrand()%20);
+                                    dataVec->replace(k, qrand()%40 + 10);
                             }
                             else
-                                dataVec->replace(k, m_data[row - 1]->at(k) + qrand()%20);
+                                if (row - 1 >= 0)
+                                {
+                                    dataVec->replace(k, m_data[row - 1]->at(k) + qrand()%40 + 10);
+                                }
+                                else
+                                {
+                                    dataVec->replace(k, qrand()%40 + 10);
+                                }
                         }
                         else
                             dataVec->replace(k, qrand()%100);
                 beginRemoveRows(parent, row, row + count - 1);
                 for (int i = row; i < row + count; i++)
                 {
-            //        m_points.removeAt(row);
+                    //        m_points.removeAt(row);
                     QVector<qreal>* item = m_data.at(row);
                     m_data.removeAt(row);
                     delete item;

examples/tablemodelchart/tablewidget.cpp +10 -8

                     series = new QLineSeries;
                     series->setModel(m_model);
                     series->setModelMapping(0,1, Qt::Vertical);
+                    series->setModelMappingShift(1, 4);
             //        series->setModelMapping(0,1, Qt::Horizontal);
                     chartView->addSeries(series);
             //        series->setModelMapping(2,3, Qt::Horizontal);
                     chartView->addSeries(series);
-                    // series 3
+            //        // series 3
-                    series = new QLineSeries;
+            //        series = new QLineSeries;
-                    series->setModel(m_model);
+            //        series->setModel(m_model);
-                    series->setModelMapping(4,5, Qt::Vertical);
+            //        series->setModelMapping(4,5, Qt::Vertical);
-            //        series->setModelMapping(4,5, Qt::Horizontal);
+            ////        series->setModelMapping(4,5, Qt::Horizontal);
-                    chartView->addSeries(series);
+            //        chartView->addSeries(series);
                 }
                 else if (splineRadioButton->isChecked())
                 {
                     // series 1
                     series = new QSplineSeries;
                     series->setModel(m_model);
                     series->setModelMapping(0,1, Qt::Vertical);
+                    series->setModelMappingShift(1, 4);
             //        series->setModelMapping(0,1, Qt::Horizontal);
                     chartView->addSeries(series);

src/barchart/qbarseries.cpp +29 -18

                 m_mapCategories = -1;
                 m_mapBarBottom = -1;
                 m_mapBarTop = -1;
+                m_mapFirst = 0;
+                m_mapCount = 0;
                 m_mapOrientation = Qt::Vertical;
             }
                     m_mapCategories = -1;
                     m_mapBarBottom = -1;
                     m_mapBarTop = -1;
+                    m_mapFirst = 0;
+                    m_mapCount = 0;
                     m_mapOrientation = Qt::Vertical;
                 }
                 m_mapCategories = categories;
                 m_mapBarBottom = bottomBoundry;
                 m_mapBarTop = topBoundry;
+                m_mapFirst = 1;
                 m_mapOrientation = orientation;
                 // connect the signals
                 if (m_mapOrientation == Qt::Vertical)
                 {
+                    m_mapCount = m_model->rowCount();
                     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
                 {
+                    m_mapCount = m_model->columnCount();
                     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)));
                 if (m_mapOrientation == Qt::Vertical)
                 {
                     QStringList categories;
-                    for (int k = 0; k < m_model->rowCount(); k++)
+                    for (int k = m_mapFirst; k < m_mapFirst + m_mapCount; k++)
                         categories << m_model->data(m_model->index(k, m_mapCategories), Qt::DisplayRole).toString();
                     mModel = new BarChartModel(categories, this);
                     for (int i = m_mapBarBottom; i <= m_mapBarTop; i++)
                     {
                         QBarSet* barSet = new QBarSet(QString("Column: %1").arg(i + 1));
-                        for(int m = 0; m < m_model->rowCount(); m++)
+                        for(int m = m_mapFirst; m < m_mapFirst + m_mapCount; m++)
                             *barSet << m_model->data(m_model->index(m, i), Qt::DisplayRole).toDouble();
                         addBarSet(barSet);
                     }
                 else
                 {
                     QStringList categories;
-                    for (int k = 0; k < m_model->columnCount(); k++)
+                    for (int k = m_mapFirst; k < m_mapFirst + m_mapCount; k++)
                         categories << m_model->data(m_model->index(m_mapCategories, k), Qt::DisplayRole).toString();
                     mModel = new BarChartModel(categories, this);
                     for (int i = m_mapBarBottom; i <= m_mapBarTop; i++)
                     {
                         QBarSet* barSet = new QBarSet(QString("Row: %1").arg(i + 1));
-                        for(int m = 0; m < m_model->columnCount(); m++)
+                        for(int m = m_mapFirst; m < m_mapFirst + m_mapCount; m++)
                             *barSet << m_model->data(m_model->index(i, m), Qt::DisplayRole).toDouble();
                         addBarSet(barSet);
                     }
                 }
             }
+            void QBarSeries::setModelMappingShift(int first, int count)
+            {
+                m_mapFirst = first;
+                m_mapCount = count;
+            }
             void QBarSeries::modelUpdated(QModelIndex topLeft, QModelIndex bottomRight)
             {
                 Q_UNUSED(bottomRight)
                 if (m_mapOrientation == Qt::Vertical)
                 {
-                    if (topLeft.column() >= m_mapBarBottom && topLeft.column() <= m_mapBarTop)
+                    // model update is relevant to BarSeries if the change was made to the part of the model that was mapped to BarSeries
-                        barsetAt(topLeft.column() - m_mapBarBottom)->setValue(topLeft.row(), m_model->data(topLeft, Qt::DisplayRole).toDouble());
+                    if (topLeft.column() >= m_mapBarBottom && topLeft.column() <= m_mapBarTop && topLeft.row() >= m_mapFirst && topLeft.row() < m_mapFirst + m_mapCount)
-                    //        else if (topLeft.column() == m_mapCategories)
+                        barsetAt(topLeft.column() - m_mapBarBottom)->setValue(topLeft.row() - m_mapFirst, m_model->data(topLeft, Qt::DisplayRole).toDouble());
-                    //            slices().at(topLeft.row())->setLabel(m_model->data(topLeft, Qt::DisplayRole).toString());
                 }
                 else
                 {
-                    if (topLeft.row() >= m_mapBarBottom && topLeft.row() <= m_mapBarTop)
+                    // model update is relevant to BarSeries if the change was made to the part of the model that was mapped to BarSeries
-                        barsetAt(topLeft.row() - m_mapBarBottom)->setValue(topLeft.column(), m_model->data(topLeft, Qt::DisplayRole).toDouble());
+                    if (topLeft.row() >= m_mapBarBottom && topLeft.row() <= m_mapBarTop && topLeft.column() >= m_mapFirst && topLeft.column() < m_mapFirst + m_mapCount)
-                    //        else if (topLeft.row() == m_mapCategories)
+                        barsetAt(topLeft.row() - m_mapBarBottom)->setValue(topLeft.column() - m_mapFirst, m_model->data(topLeft, Qt::DisplayRole).toDouble());
-                    //            slices().at(topLeft.column())->setLabel(m_model->data(topLeft, Qt::DisplayRole).toString());
                 }
             }
             {
                 if (m_mapOrientation == Qt::Vertical)
                 {
-                    insertCategory(start, QString("Row: %1").arg(start + 1));
+                    insertCategory(start - m_mapFirst, QString("Row: %1").arg(start + 1));
                     for (int i = 0; i <= m_mapBarTop - m_mapBarBottom; i++)
                     {
-                        barsetAt(i)->insertValue(start, m_model->data(m_model->index(start, i), Qt::DisplayRole).toDouble());
+                        barsetAt(i)->insertValue(start - m_mapFirst, m_model->data(m_model->index(start, i), Qt::DisplayRole).toDouble());
                     }
                 }
                 else
                 {
-                    insertCategory(start, QString("Column: %1").arg(start + 1));
+                    insertCategory(start - m_mapFirst, QString("Column: %1").arg(start + 1));
                     for (int i = 0; i <= m_mapBarTop - m_mapBarBottom; i++)
                     {
-                        barsetAt(i)->insertValue(start, m_model->data(m_model->index(i, start), Qt::DisplayRole).toDouble());
+                        barsetAt(i)->insertValue(start - m_mapFirst, m_model->data(m_model->index(i, start), Qt::DisplayRole).toDouble());
                     }
                 }
                 emit restructuredBar(1);
             void QBarSeries::modelDataRemoved(QModelIndex /*parent*/, int start, int /*end*/)
             {
-                removeCategory(start);
+                removeCategory(start - m_mapFirst);
                 for (int i = 0; i <= m_mapBarTop - m_mapBarBottom; i++)
                 {
-                    barsetAt(i)->removeValue(start);
+                    barsetAt(i)->removeValue(start - m_mapFirst);
                 }
                 emit restructuredBar(1);
             }

src/barchart/qbarseries.h +3 0

                 bool setModel(QAbstractItemModel* model);
                 QAbstractItemModel* modelExt() {return m_model;}
                 void setModelMapping(int categories, int bottomBoundry, int topBoundry, Qt::Orientation orientation = Qt::Vertical);
+                void setModelMappingShift(int first, int count);
             public:
                 // TODO: Functions below this are not part of api and will be moved
                 int m_mapCategories;
                 int m_mapBarBottom;
                 int m_mapBarTop;
+                int m_mapFirst;
+                int m_mapCount;
                 Qt::Orientation m_mapOrientation;
             };

src/splinechart/qsplineseries.cpp +6 0

             void QSplineSeries::setModelMapping(int modelX, int modelY, Qt::Orientation orientation)
             {
                 QLineSeries::setModelMapping(modelX, modelY, orientation);
+            //    calculateControlPoints();
+            }
+            void QSplineSeries::setModelMappingShift(int first, int count)
+            {
+                QLineSeries::setModelMappingShift(first, count);
                 calculateControlPoints();
             }

src/splinechart/qsplineseries.h +1 0

                 bool setModel(QAbstractItemModel* model);
                 void setModelMapping(int modelX, int modelY, Qt::Orientation orientation = Qt::Vertical);
+                void setModelMappingShift(int first, int count);
                 // TODO: allow the user to set custom control points
             //    void setCustomControlPoints(QList<QPointsF> controlPoints);

src/xychart/qxyseries.cpp +174 -18

@@ -52,6 +52,9 QXYSeries::QXYSeries(QObject* parent):QSeries(parent)
52	{	52	{
53	m_mapX = -1;	53	m_mapX = -1;
54	m_mapY = -1;	54	m_mapY = -1;
		55	m_mapFirst = 0;
		56	m_mapCount = 0;
		57	m_mapLimited = false;
55	m_mapOrientation = Qt::Vertical;	58	m_mapOrientation = Qt::Vertical;
56	// m_mapYOrientation = Qt::Vertical;	59	// m_mapYOrientation = Qt::Vertical;
57	}	60	}
@@ -171,10 +174,10 qreal QXYSeries::x(int pos) const
171	if (m_model)	174	if (m_model)
172	if (m_mapOrientation == Qt::Vertical)	175	if (m_mapOrientation == Qt::Vertical)
173	// consecutive data is read from model's column	176	// consecutive data is read from model's column
174	return m_model->data(m_model->index(pos, m_mapX), Qt::DisplayRole).toDouble();	177	return m_model->data(m_model->index(pos + m_mapFirst, m_mapX), Qt::DisplayRole).toDouble();
175	else	178	else
176	// consecutive data is read from model's row	179	// consecutive data is read from model's row
177	return m_model->data(m_model->index(m_mapX, pos), Qt::DisplayRole).toDouble();	180	return m_model->data(m_model->index(m_mapX, pos + m_mapFirst), Qt::DisplayRole).toDouble();
178	else	181	else
179	// model is not specified, return the data from series' internal data store	182	// model is not specified, return the data from series' internal data store
180	return m_x.at(pos);	183	return m_x.at(pos);
@@ -188,10 +191,10 qreal QXYSeries::y(int pos) const
188	if (m_model)	191	if (m_model)
189	if (m_mapOrientation == Qt::Vertical)	192	if (m_mapOrientation == Qt::Vertical)
190	// consecutive data is read from model's column	193	// consecutive data is read from model's column
191	return m_model->data(m_model->index(pos, m_mapY), Qt::DisplayRole).toDouble();	194	return m_model->data(m_model->index(pos + m_mapFirst, m_mapY), Qt::DisplayRole).toDouble();
192	else	195	else
193	// consecutive data is read from model's row	196	// consecutive data is read from model's row
194	return m_model->data(m_model->index(m_mapY, pos), Qt::DisplayRole).toDouble();	197	return m_model->data(m_model->index(m_mapY, pos + m_mapFirst), Qt::DisplayRole).toDouble();
195	else	198	else
196	// model is not specified, return the data from series' internal data store	199	// model is not specified, return the data from series' internal data store
197	return m_y.at(pos);	200	return m_y.at(pos);
@@ -206,11 +209,23 int QXYSeries::count() const
206		209
207	if (m_model) {	210	if (m_model) {
208	if (m_mapOrientation == Qt::Vertical)	211	if (m_mapOrientation == Qt::Vertical)
209	// data is in a column, so return the number of items in single column	212	{
210	return m_model->rowCount();	213	// data is in a column. Return the number of mapped items if the model's column have enough items
		214	// or the number of items that can be mapped
		215	if (m_mapLimited)
		216	return qMin(m_mapCount, qMax(m_model->rowCount() - m_mapFirst, 0));
		217	else
		218	return qMax(m_model->rowCount() - m_mapFirst, 0);
		219	}
211	else	220	else
212	// data is in a row, so return the number of items in single row	221	{
213	return m_model->columnCount();	222	// data is in a row. Return the number of mapped items if the model's row have enough items
		223	// or the number of items that can be mapped
		224	if (m_mapLimited)
		225	return qMin(m_mapCount, qMax(m_model->columnCount() - m_mapFirst, 0));
		226	else
		227	return qMax(m_model->columnCount() - m_mapFirst, 0);
		228	}
214	}	229	}
215		230
216	// model is not specified, return the number of points in the series internal data store	231	// model is not specified, return the number of points in the series internal data store
@@ -286,23 +301,148 void QXYSeries::modelUpdated(QModelIndex topLeft, QModelIndex bottomRight)
286	Q_UNUSED(bottomRight)	301	Q_UNUSED(bottomRight)
287		302
288	if (m_mapOrientation == Qt::Vertical)	303	if (m_mapOrientation == Qt::Vertical)
289	emit pointReplaced(topLeft.row());	304	{
		305	if (topLeft.row() >= m_mapFirst && (!m_mapLimited \|\| topLeft.row() < m_mapFirst + m_mapCount))
		306	emit pointReplaced(topLeft.row() - m_mapFirst);
		307	}
		308	else
		309	{
		310	if (topLeft.column() >= m_mapFirst && (!m_mapLimited \|\| topLeft.column() < m_mapFirst + m_mapCount))
		311	emit pointReplaced(topLeft.column() - m_mapFirst);
		312	}
		313	}
		314
		315	void QXYSeries::modelDataAboutToBeAdded(QModelIndex parent, int start, int end)
		316	{
		317	Q_UNUSED(parent)
		318	// Q_UNUSED(end)
		319
		320	if (m_mapLimited)
		321	{
		322	if (start >= m_mapFirst + m_mapCount)
		323	// the added data is below mapped area
		324	// therefore it has no relevance
		325	return;
		326	else
		327	{
		328	// the added data is in the mapped area or before it and update is needed
		329
		330	// check how many mapped items there is currently (before new items are added)
		331	// if the number of items currently is equal the m_mapCount then some needs to be removed from xychartitem
		332	// internal storage before new ones can be added
		333	if (m_mapCount == count())
		334	for (int i = 0; i < qMin(count(), end - start + 1); i++)
		335	emit pointRemoved(count() - 1 - i);
		336	}
		337	}
290	else	338	else
291	emit pointReplaced(topLeft.column());	339	{
		340	// map is not limited (it includes all the items starting from m_mapFirst till the end of model)
		341	// nothing to do
		342	// emit pointAdded(qMax(start - m_mapFirst, 0));
		343	}
292	}	344	}
293		345
294	void QXYSeries::modelDataAdded(QModelIndex parent, int start, int end)	346	void QXYSeries::modelDataAdded(QModelIndex parent, int start, int end)
295	{	347	{
296	Q_UNUSED(parent)	348	Q_UNUSED(parent)
297	Q_UNUSED(end)	349	// Q_UNUSED(end)
298	emit pointAdded(start);	350
		351	if (m_mapLimited)
		352	{
		353	if (start >= m_mapFirst + m_mapCount)
		354	// the added data is below mapped area
		355	// therefore it has no relevance
		356	return;
		357	else
		358	{
		359	// the added data is in the mapped area or before it
		360	// update needed
		361	if (count() > 0)
		362	for (int i = 0; i < qMin(m_mapCount, end - start + 1); i++)
		363	emit pointAdded(qMax(start + i - m_mapFirst, 0));
		364	}
		365	}
		366	else
		367	{
		368	// map is not limited (it included all the items starting from m_mapFirst till the end of model)
		369	for (int i = 0; i < end - start + 1; i++)
		370	emit pointAdded(qMax(start + i - m_mapFirst, 0));
		371	}
		372	}
		373
		374	void QXYSeries::modelDataAboutToBeRemoved(QModelIndex parent, int start, int end)
		375	{
		376	Q_UNUSED(parent)
		377	// Q_UNUSED(end)
		378
		379	if (m_mapLimited)
		380	{
		381	if (start >= m_mapFirst + m_mapCount)
		382	// the removed data is below mapped area
		383	// therefore it has no relevance
		384	return;
		385	else
		386	{
		387	// the removed data is in the mapped area or before it
		388	// update needed
		389	int itemsToRemove = qMin(count(), end - start + 1);
		390	tempItemsRemoved = itemsToRemove;
		391	int z = count();
		392	z = z;
		393	// if (itemsToRemove > 0)
		394	// {
		395	for (int i = 0; i < itemsToRemove; i++)
		396	emit pointRemoved(qMax(start - m_mapFirst, 0));
		397	}
		398	}
		399	else
		400	{
		401	// map is not limited (it included all the items starting from m_mapFirst till the end of model)
		402	for (int i = 0; i < end - start + 1; i++)
		403	emit pointRemoved(qMax(start - m_mapFirst, 0));
		404	}
299	}	405	}
300		406
301	void QXYSeries::modelDataRemoved(QModelIndex parent, int start, int end)	407	void QXYSeries::modelDataRemoved(QModelIndex parent, int start, int end)
302	{	408	{
303	Q_UNUSED(parent)	409	Q_UNUSED(parent)
304	Q_UNUSED(end)	410	Q_UNUSED(end)
305	emit pointRemoved(start);	411
		412	// how many items there were before data was removed
		413	// int oldCount = count() - 1;
		414
		415	if (m_mapLimited)
		416	{
		417	if (start >= m_mapFirst + m_mapCount)
		418	// the removed data is below mapped area
		419	// therefore it has no relevance
		420	return;
		421	else
		422	{
		423	// if there are excess items available (below the map) use them to repopulate mapped area
		424	int extraItemsAvailable = 0;
		425	if (m_mapOrientation == Qt::Vertical)
		426	{
		427	extraItemsAvailable = qMax(m_model->rowCount() - m_mapFirst, 0);
		428	}
		429	else
		430	{
		431	extraItemsAvailable = qMax(m_model->columnCount() - m_mapFirst, 0);
		432	}
		433
		434	// int extraItemsNeeded = qMin(extraItemsAvailable, tempItemsRemoved);
		435	for (int k = 0; k < tempItemsRemoved; k++)
		436	if (start - m_mapFirst + k < extraItemsAvailable)
		437	{
		438	emit pointAdded(count() - m_mapFirst + k);
		439	}
		440	}
		441	}
		442	else
		443	{
		444	// emit pointRemoved(qMax(start - m_mapFirst, 0));
		445	}
306	}	446	}
307		447
308	bool QXYSeries::setModel(QAbstractItemModel* model) {	448	bool QXYSeries::setModel(QAbstractItemModel* model) {
@@ -313,6 +453,9 bool QXYSeries::setModel(QAbstractItemModel* model) {
313	disconnect(m_model, 0, this, 0);	453	disconnect(m_model, 0, this, 0);
314	m_mapX = -1;	454	m_mapX = -1;
315	m_mapY = -1;	455	m_mapY = -1;
		456	m_mapFirst = 0;
		457	m_mapCount = 0;
		458	m_mapLimited = false;
316	m_mapOrientation = Qt::Vertical;	459	m_mapOrientation = Qt::Vertical;
317	}	460	}
318		461
@@ -335,26 +478,39 void QXYSeries::setModelMapping(int modelX, int modelY, Qt::Orientation orientat
335	return;	478	return;
336	m_mapX = modelX;	479	m_mapX = modelX;
337	m_mapY = modelY;	480	m_mapY = modelY;
		481	m_mapFirst = 0;
338	m_mapOrientation = orientation;	482	m_mapOrientation = orientation;
339	if (m_mapOrientation == Qt::Vertical)	483	if (m_mapOrientation == Qt::Vertical)
340	{	484	{
		485	// m_mapCount = m_model->rowCount();
341	connect(m_model,SIGNAL(dataChanged(QModelIndex,QModelIndex)), this, SLOT(modelUpdated(QModelIndex, QModelIndex)));	486	connect(m_model,SIGNAL(dataChanged(QModelIndex,QModelIndex)), this, SLOT(modelUpdated(QModelIndex, QModelIndex)));
		487	connect(m_model,SIGNAL(rowsAboutToBeInserted(QModelIndex, int, int)), this, SLOT(modelDataAboutToBeAdded(QModelIndex,int,int)));
342	connect(m_model,SIGNAL(rowsInserted(QModelIndex, int, int)), this, SLOT(modelDataAdded(QModelIndex,int,int)));	488	connect(m_model,SIGNAL(rowsInserted(QModelIndex, int, int)), this, SLOT(modelDataAdded(QModelIndex,int,int)));
		489	connect(m_model, SIGNAL(rowsAboutToBeRemoved(QModelIndex, int, int)), this, SLOT(modelDataAboutToBeRemoved(QModelIndex,int,int)));
343	connect(m_model, SIGNAL(rowsRemoved(QModelIndex, int, int)), this, SLOT(modelDataRemoved(QModelIndex,int,int)));	490	connect(m_model, SIGNAL(rowsRemoved(QModelIndex, int, int)), this, SLOT(modelDataRemoved(QModelIndex,int,int)));
344	}	491	}
345	else	492	else
346	{	493	{
		494	// m_mapCount = m_model->columnCount();
347	connect(m_model,SIGNAL(dataChanged(QModelIndex,QModelIndex)), this, SLOT(modelUpdated(QModelIndex, QModelIndex)));	495	connect(m_model,SIGNAL(dataChanged(QModelIndex,QModelIndex)), this, SLOT(modelUpdated(QModelIndex, QModelIndex)));
		496	connect(m_model,SIGNAL(columnsAboutToBeInserted(QModelIndex, int, int)), this, SLOT(modelDataAboutToBeAdded(QModelIndex,int,int)));
348	connect(m_model,SIGNAL(columnsInserted(QModelIndex, int, int)), this, SLOT(modelDataAdded(QModelIndex,int,int)));	497	connect(m_model,SIGNAL(columnsInserted(QModelIndex, int, int)), this, SLOT(modelDataAdded(QModelIndex,int,int)));
		498	connect(m_model, SIGNAL(columnsAboutToBeRemoved(QModelIndex, int, int)), this, SLOT(modelDataAboutToBeRemoved(QModelIndex,int,int)));
349	connect(m_model, SIGNAL(columnsRemoved(QModelIndex, int, int)), this, SLOT(modelDataRemoved(QModelIndex,int,int)));	499	connect(m_model, SIGNAL(columnsRemoved(QModelIndex, int, int)), this, SLOT(modelDataRemoved(QModelIndex,int,int)));
350	}	500	}
351	}	501	}
352		502
353	//void QXYSeries::setModelMappingY(int modelLineIndex, Qt::Orientation orientation)	503	void QXYSeries::setModelMappingShift(int first, int count)
354	//{	504	{
355	// m_mapY = modelLineIndex;	505	m_mapFirst = first;
356	// m_mapYOrientation = orientation;	506	if (count == 0)
357	//}	507	m_mapLimited = false;
		508	else
		509	{
		510	m_mapCount = count;
		511	m_mapLimited = true;
		512	}
		513	}
358		514
359	#include "moc_qxyseries.cpp"	515	#include "moc_qxyseries.cpp"
360		516

src/xychart/qxyseries.h +9 -5

                 QAbstractItemModel* model() {return m_model;}
                 virtual void setModelMapping(int modelX, int modelY, Qt::Orientation orientation = Qt::Vertical);
-            //    void setModelMappingY(int modelLineIndex, Qt::Orientation orientation = Qt::Vertical);
+                virtual void setModelMappingShift(int first, int count = 0);
                 private slots:
                     void modelUpdated(QModelIndex topLeft, QModelIndex bottomRight);
+                    void modelDataAboutToBeAdded(QModelIndex parent, int start, int end);
                     void modelDataAdded(QModelIndex parent, int start, int end);
+                    void modelDataAboutToBeRemoved(QModelIndex parent, int start, int end);
                     void modelDataRemoved(QModelIndex parent, int start, int end);
             signals:
                 QPen m_pen;
                 QBrush m_brush;
-            //    QAbstractItemModel* m_model;
+                int m_mapX;
-                int m_mapX;
-                Qt::Orientation m_mapOrientation;
                 int m_mapY;
-            //    Qt::Orientation m_mapYOrientation;
+                int m_mapFirst;
+                int m_mapCount;
+                bool m_mapLimited;
+                Qt::Orientation m_mapOrientation;
+                int tempItemsRemoved;
             };
             QTCOMMERCIALCHART_END_NAMESPACE

General Comments 0

Write
Preview

You need to be logged in to leave comments. Login now

No TODOs yet

	Site-wide shortcuts
/	Use quick search box
g h	Goto home page
g g	Goto my private gists page
g G	Goto my public gists page
g 0-9	Goto bookmarked items from 0-9
n r	New repository page
n g	New gist page

	Repositories
g s	Goto summary page
g c	Goto changelog page
g f	Goto files page
g F	Goto files page with file search activated
g p	Goto pull requests page
g o	Goto repository settings
g O	Goto repository access permissions settings
t s	Toggle sidebar on some pages