HG_REPOSITORIES/LPP/INSTRUMENTATION/USERS/JEANDET/qtcharts Commit - r1060:9efd7b220dc4

Fixes to model support

Marek Rosa -

r1060:9efd7b220dc4

parent child

Context file:

r1060:9efd7b220dc4

Collapse all files

src/piechart/qpieseries.cpp +12 -5

                 Q_UNUSED(parent);
                 Q_Q(QPieSeries);
                 // series uses model as a data sourceupda
-                int addedCount = end - start + 1;
                 if (m_mapCount != -1 && start >= m_mapFirst + m_mapCount) {
                     return;
                 } else {
+                    int addedCount = end - start + 1;
+                    if (m_mapCount != -1 && addedCount > m_mapCount)
+                        addedCount = m_mapCount;
                     int first = qMax(start, m_mapFirst);
-                    int last = qMin(first + addedCount - 1, end);
+                    int last = qMin(first + addedCount - 1, m_mapOrientation == Qt::Vertical ? m_model->rowCount() - 1 : m_model->columnCount() - 1);
                     for (int i = first; i <= last; i++) {
                         QPieSlice *slice = new QPieSlice;
                         if (m_mapOrientation == Qt::Vertical) {
                 }
             //    else if (m_mapCount == -1) {
+            //        // first find how many items can actually be removed
+            //        int toRemove = qMin(m_slices.size(), removedCount);
+            //        // get the index of the first item that will be removed.
             //        int first = qMax(start, m_mapFirst);
-            //        int last = qMax(end, m_mapFirst + removedCount - 1);
+            //        // get the index of the last item that will be removed.
-            //        for (int i = last; i >= first; i--)
+            //        int last = first + toRemove;
+            //        for (int i = last - 1; i >= first; i--)
             //            q->remove(q->slices().at(i - m_mapFirst));
             //    }
                 //    else {
                     //            handlePointRemoved(i - m_mapFirst);
                 } else if (m_mapCount == - 1 && start < m_mapFirst) {
                     // not all removed items
-                    for (int i = m_mapFirst + removedCount - 1; i >= m_mapFirst; i--)
+                    int lastExisting = qMin(m_mapFirst + m_slices.size() - 1, m_mapFirst + removedCount - 1);
+                    for (int i = lastExisting; i >= m_mapFirst; i--)
                         q->remove(q->slices().at(i - m_mapFirst));
                     //            handlePointRemoved(i - m_mapFirst);
                 }

src/xychart/qxyseries.cpp +1 0

             */
             QList<QPointF> QXYSeries::points() const
             {
+            //    Q_ASSERT(false);
                 Q_D(const QXYSeries);
                 if (d->m_model) {
                     QList<QPointF> result;

src/xychart/xychartitem.cpp +58 -41

@@ -129,52 +129,68 void XYChartItem::handlePointsAdded(int start, int end)
129	if (m_series->model() == 0) {	129	if (m_series->model() == 0) {
130	for (int i = start; i <= end; i++)	130	for (int i = start; i <= end; i++)
131	handlePointAdded(i);	131	handlePointAdded(i);
		132	} else if (m_series->mapCount() != -1 && start >= m_series->mapFirst() + m_series->mapCount()) {
		133	return;
132	} else {	134	} else {
133	// series uses model as a data source
134	int first = m_series->mapFirst();
135	int count = m_series->mapCount();
136	int addedCount = end - start + 1;	135	int addedCount = end - start + 1;
137	if (count != -1 && start >= first + count) {	136	if (m_series->mapCount() != -1 && addedCount > m_series->mapCount())
138	return;	137	addedCount = m_series->mapCount();
		138	int first = qMax(start, m_series->mapFirst());
		139	int last = qMin(first + addedCount - 1, m_series->mapOrientation() == Qt::Vertical ? m_series->model()->rowCount() - 1 : m_series->model()->columnCount() - 1);
		140	for (int i = first; i <= last; i++) {
		141	handlePointAdded(i - m_series->mapFirst());
139	}	142	}
140		143	if (m_series->mapCount() != -1 && m_points.size() > m_series->mapCount())
141	// adding items to unlimited map	144	for (int i = m_points.size() - 1; i >= m_series->mapCount(); i--)
142	else if (count == -1 && start >= first) {	145	handlePointRemoved(i);
143	for (int i = start; i <= end; i++)
144	handlePointAdded(i - first);
145	} else if (count == - 1 && start < first) {
146	// not all newly added items
147	for (int i = first; i < first + addedCount; i++)
148	handlePointAdded(i - first);
149	}	146	}
150	// commented out code below does the same thing, but its more confusing.	147
151	// } else if (count == -1) {	148	// else {
152	// int begin = qMax(start, first);	149	// // series uses model as a data source
153	// for (int i = begin; i < begin + (end - start + 1); i++)	150	// int first = m_series->mapFirst();
154	// handlePointAdded(i - first);	151	// int count = m_series->mapCount();
		152	// int addedCount = end - start + 1;
		153	// if (count != -1 && start >= first + count) {
		154	// return;
155	// }	155	// }
156		156
157	// adding items to limited map	157	// // adding items to unlimited map
158	else if (start >= first) {	158	// else if (count == -1 && start >= first) {
159	// remove the items that will no longer fit into the map	159	// for (int i = start; i <= end; i++)
160	// int toRemove = addedCount - (count - points().size());	160	// handlePointAdded(i - first);
161	for (int i = start; i <= end; i++) {	161	// } else if (count == - 1 && start < first) {
162	handlePointAdded(i - first);	162	// // not all newly added items
163	}	163	// for (int i = first; i < first + addedCount; i++)
164	if (m_points.size() > count)	164	// handlePointAdded(i - first);
165	for (int i = m_points.size() - 1; i >= count; i--)	165	// }
166	handlePointRemoved(i);	166	// // commented out code below does the same thing, but its more confusing.
167	// ~~update();~~	167	// // } else if (count == -1) {
168	} else {	168	// // int begin = qMax(start, first);
169	//	169	// // for (int i = begin; i < begin + (end - start + 1); i++)
170	for (int i = first; i < first + addedCount; i++) {	170	// // handlePointAdded(i - first);
171	handlePointAdded(i - first);	171	// // }
172	}	172
173	if (m_points.size() > count)	173	// // adding items to limited map
174	for (int i = m_points.size() - 1; i >= count; i--)	174	// else if (start >= first) {
175	handlePointRemoved(i);	175	// // remove the items that will no longer fit into the map
176	}	176	// // int toRemove = addedCount - (count - points().size());
177	}	177	// for (int i = start; i <= end; i++) {
		178	// handlePointAdded(i - first);
		179	// }
		180	// if (m_points.size() > count)
		181	// for (int i = m_points.size() - 1; i >= count; i--)
		182	// handlePointRemoved(i);
		183	// // update();
		184	// } else {
		185	// //
		186	// for (int i = first; i < first + addedCount; i++) {
		187	// handlePointAdded(i - first);
		188	// }
		189	// if (m_points.size() > count)
		190	// for (int i = m_points.size() - 1; i >= count; i--)
		191	// handlePointRemoved(i);
		192	// }
		193	// }
178	}	194	}
179		195
180	void XYChartItem::handlePointRemoved(int index)	196	void XYChartItem::handlePointRemoved(int index)
@@ -211,7 +227,8 void XYChartItem::handlePointsRemoved(int start, int end)
211	handlePointRemoved(i - first);	227	handlePointRemoved(i - first);
212	} else if (count == - 1 && start < first) {	228	} else if (count == - 1 && start < first) {
213	// not all removed items	229	// not all removed items
214	for (int i = first + removedCount - 1; i >= first; i--)	230	int lastExisting = qMin(first + m_points.size() - 1, first + removedCount - 1);
		231	for (int i = lastExisting; i >= first; i--)
215	handlePointRemoved(i - first);	232	handlePointRemoved(i - first);
216	}	233	}
217		234

test/tablemodelchart/tablewidget.cpp +1 -1

                 //    tableView->setItemDelegate(new QStyledItemDelegate);
                 m_chart = new QChart;
                 m_chart->legend()->setVisible(true);
-                m_chart->setAnimationOptions(QChart::SeriesAnimations);
+            //    m_chart->setAnimationOptions(QChart::SeriesAnimations);
                 m_chartView = new QChartView(m_chart);
                 m_chartView->setRenderHint(QPainter::Antialiasing);
                 m_chartView->setMinimumSize(640, 480);

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