HG_REPOSITORIES/LPP/INSTRUMENTATION/USERS/JEANDET/qtcharts Commit - r1379:e28c452cfa1d

Removed commented out code and unnecessary lines from model mapper classes

Marek Rosa -

r1379:e28c452cfa1d

parent child

Context file:

r1379:e28c452cfa1d

Collapse all files

src/barchart/qbarmodelmapper.cpp +7 -61

@@ -120,9 +120,7 void QBarModelMapper::setSeries(QBarSeries *series)
120	d->m_series = series;	120	d->m_series = series;
121	d->initializeBarFromModel();	121	d->initializeBarFromModel();
122	// connect the signals from the series	122	// connect the signals from the series
123	// connect(d->m_series, SIGNAL(pointAdded(int)), d, SLOT(handlePointAdded(int)));	123	// TODO: TO be implemented
124	// connect(d->m_series, SIGNAL(pointRemoved(int)), d, SLOT(handlePointRemoved(int)));
125	// connect(d->m_series, SIGNAL(pointReplaced(int)), d, SLOT(handlePointReplaced(int)));
126	}	124	}
127		125
128	int QBarModelMapper::first() const	126	int QBarModelMapper::first() const
@@ -382,69 +380,17 void QBarModelMapperPrivate::modelColumnsRemoved(QModelIndex parent, int start,
382	void QBarModelMapperPrivate::insertData(int start, int end)	380	void QBarModelMapperPrivate::insertData(int start, int end)
383	{	381	{
384	Q_UNUSED(end)	382	Q_UNUSED(end)
385	if (m_model == 0 \|\| m_series == 0)	383	Q_UNUSED(start)
386	return;	384	Q_UNUSED(end)
387		385	// To be implemented
388	if (m_count != -1 && start >= m_first + m_count) {
389	return;
390	} /*else {
391	int addedCount = end - start + 1;
392	if (m_count != -1 && addedCount > m_count)
393	addedCount = m_count;
394	int first = qMax(start, m_first);
395	int last = qMin(first + addedCount - 1, m_orientation == Qt::Vertical ? m_model->rowCount() - 1 : m_model->columnCount() - 1);
396	for (int k = 0; k < m_series->barSets().count(); k++) {
397	for (int i = first; i <= last; i++) {
398	QBar point;
399	point.setX(m_model->data(xModelIndex(i - m_first), Qt::DisplayRole).toDouble());
400	point.setY(m_model->data(yModelIndex(i - m_first), Qt::DisplayRole).toDouble());
401	m_series->insert(i - m_first, point);
402	}
403	>>>>>>> Stashed changes
404	}
405
406	// remove excess of slices (abouve m_count)
407	if (m_count != -1 && m_series->points().size() > m_count)
408	for (int i = m_series->points().size() - 1; i >= m_count; i--) {
409	m_series->remove(m_series->points().at(i));
410	}
411	}*/
412	}	386	}
413		387
414	void QBarModelMapperPrivate::removeData(int start, int end)	388	void QBarModelMapperPrivate::removeData(int start, int end)
415	{	389	{
416	Q_UNUSED(end)	390	Q_UNUSED(end)
417	if (m_model == 0 \|\| m_series == 0)	391	Q_UNUSED(start)
418	return;	392	Q_UNUSED(end)
419		393	// To be implemented
420	// int removedCount = end - start + 1;
421	if (m_count != -1 && start >= m_first + m_count) {
422	return;
423	} /*else {
424	int toRemove = qMin(m_series->count(), removedCount); // first find how many items can actually be removed
425	int first = qMax(start, m_first); // get the index of the first item that will be removed.
426	int last = qMin(first + toRemove - 1, m_series->count() + m_first - 1); // get the index of the last item that will be removed.
427	for (int i = last; i >= first; i--) {
428	m_series->remove(m_series->points().at(i - m_first));
429	}
430
431	if (m_count != -1) {
432	int itemsAvailable; // check how many are available to be added
433	if (m_orientation == Qt::Vertical)
434	itemsAvailable = m_model->rowCount() - m_first - m_series->count();
435	else
436	itemsAvailable = m_model->columnCount() - m_first - m_series->count();
437	int toBeAdded = qMin(itemsAvailable, m_count - m_series->count()); // add not more items than there is space left to be filled.
438	int currentSize = m_series->count();
439	if (toBeAdded > 0)
440	for (int i = m_series->count(); i < currentSize + toBeAdded; i++) {
441	QPointF point;
442	point.setX(m_model->data(xModelIndex(i), Qt::DisplayRole).toDouble());
443	point.setY(m_model->data(yModelIndex(i), Qt::DisplayRole).toDouble());
444	m_series->insert(i, point);
445	}
446	}
447	}*/
448	}	394	}
449		395
450	void QBarModelMapperPrivate::initializeBarFromModel()	396	void QBarModelMapperPrivate::initializeBarFromModel()

src/barchart/qbarmodelmapper_p.h 0 -5

                 void modelColumnsAdded(QModelIndex parent, int start, int end);
                 void modelColumnsRemoved(QModelIndex parent, int start, int end);
-            //    // for the series
-            //    void handlePointAdded(int pointPos);
-            //    void handlePointRemoved(int pointPos);
-            //    void handlePointReplaced(int pointPos);
                 void initializeBarFromModel();
             private:

src/piechart/qhpiemodelmapper.h 0 -1

                 int labelsRow() const;
                 void setLabelsRow(int labelsRow);
             };
             QTCOMMERCIALCHART_END_NAMESPACE

src/piechart/qpiemodelmapper.cpp +10 -11

             QTCOMMERCIALCHART_BEGIN_NAMESPACE
             /*!
+                \class QPieModelMapper
+                \brief part of QtCommercial chart API.
+                \mainclass
+                The instance of this class cannot be created directly. QHPieModelMapper of QVPieModelMapper should be used instead. This class is used to create a connection between QPieSeries and QAbstractItemModel derived model object.
+                It is possible to use both QAbstractItemModel and QPieSeries model API. QPieModelMapper makes sure that Pie and the model are kept in sync.
+                NOTE: used model has to support adding/removing rows/columns and modifying the data of the cells.
+            */
+            /*!
                 \property QPieModelMapper::series
                 \brief Defines the QPieSeries object that is used by the mapper.
             */
             /*!
-                \class QPieModelMapper
-                \brief part of QtCommercial chart API.
-                \mainclass
-                The instance of this class cannot be created directly. QHPieModelMapper of QVPieModelMapper should be used instead. This class is used to create a connection between QPieSeries and QAbstractItemModel derived model object.
-                It is possible to use both QAbstractItemModel and QPieSeries model API. QPieModelMapper makes sure that Pie and the model are kept in sync.
-                NOTE: used model has to support adding/removing rows/columns and modifying the data of the cells.
-            */
-            /*!
                 Constructs a mapper object which is a child of \a parent.
             */
             QPieModelMapper::QPieModelMapper(QObject *parent) :
                     connect(slice, SIGNAL(valueChanged()), this, SLOT(sliceValueChanged()));
                     m_series->append(slice);
                     m_slices.append(slice);
-                    //        m_series->append(m_model->data(labelIndex, Qt::DisplayRole).toString(), m_model->data(valueIndex, Qt::DisplayRole).toDouble());
                     slicePos++;
                     valueIndex = valueModelIndex(slicePos);
                     labelIndex = labelModelIndex(slicePos);

src/xychart/qhxymodelmapper.h +1 -2

                 void setXRow(int xRow);
                 int yRow() const;
                 void setYRow(int yRow);
             };
             QTCOMMERCIALCHART_END_NAMESPACE

src/xychart/qvxymodelmapper.cpp +3 -1

                 \brief part of QtCommercial chart API.
                 \mainclass
-                Nothing here yet
+                Vertical model mapper is used to create a connection between QXYSeries and QAbstractItemModel derived model object.
+                It is possible to use both QAbstractItemModel and QXYSeries model API. QXYModelMapper makes sure that QXYSeries and the model are kept in sync.
+                NOTE: used model has to support adding/removing rows/columns and modifying the data of the cells.
             */
             /*!

src/xychart/qvxymodelmapper.h +1 -2

                 void setXColumn(int xColumn);
                 int yColumn() const;
                 void setYColumn(int yColumn);
             };
             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