Differential D18249 Diff 49630 src/declarativeimports/core/datamodel.cpp

Changeset View

Standalone View

src/declarativeimports/core/datamodel.cpp

Context not available.
52	}	52		}
53		53
54	m_roleIds.clear();	54		m_roleIds.clear();
55	const QHash<int, QByteArray> rNames = roleNames();	55		const QHash<int, QByteArray> roles = sourceModel()->roleNames();
56	m_roleIds.reserve(rNames.count());	56		m_roleIds.reserve(roles.count());
57	for (auto i = rNames.constBegin(); i != rNames.constEnd(); ++i) {	57		for (auto i = roles.constBegin(); i != roles.constEnd(); ++i) {
58	m_roleIds[QString::fromUtf8(i.value())] = i.key();	58		m_roleIds[QString::fromUtf8(i.value())] = i.key();
59	}	59		}
60		60
61	setRoleNames(sourceModel()->roleNames());	61		setRoleNames(roles);
			davidedmundsonUnsubmitted Not Done This part, ship it! but I don't think it'll make a huge difference to anything davidedmundson: This part, ship it! but I don't think it'll make a huge difference to anything
62	setFilterRole(m_filterRole);	62		setFilterRole(m_filterRole);
63	setSortRole(m_sortRole);	63		setSortRole(m_sortRole);
64	}	64		}
			davidedmundsonUnsubmitted Not Done This shouldn't be needed setSourceModel will will do a reset internally davidedmundson: This shouldn't be needed setSourceModel will will do a reset internally
Context not available.
362	void DataModel::setItems(const QString &sourceName, const QVariantList &list)	362		void DataModel::setItems(const QString &sourceName, const QVariantList &list)
363	{	363		{
364	const int oldLength = m_items.value(sourceName).count();	364		const int oldLength = m_items.value(sourceName).count();
365	const int delta = list.length() - oldLength;
366	const bool firstRun = m_items.isEmpty();
367		365
368	//At what row number the first item associated to this source starts	366		//At what row number the first item associated to this source starts
369	int sourceIndex = 0;	367		int sourceIndex = 0;
Context not available.
374	}	372		}
375	sourceIndex += i.value().count();	373		sourceIndex += i.value().count();
376	}	374		}
377	//signal as inserted the rows at the end, all the other rows will signal a dataupdated.	375
378	//better than a model reset because doesn't cause deletion and re-creation of every list item on a qml ListView, repeaters etc.	376		if (oldLength > 0) {
379	//the first run it gets reset because otherwise setRoleNames gets broken	377		beginRemoveRows(QModelIndex(), sourceIndex, sourceIndex + oldLength - 1);
380	if (firstRun) {	378		m_items[sourceName].clear();
381	beginResetModel();	379		endRemoveRows();
			davidedmundsonUnsubmitted Not Done I don't understand what you're changing here, can you provide a bit more detail on the exact problem. davidedmundson: I don't understand what you're changing here, can you provide a bit more detail on the exact…
			anthonyfieroniAuthorUnsubmitted Not Done Optimization is you have [5, 6, 8] then [5, 6, 8, 9] so it make only beginInsertRows({}, 3, 3); full replace (m_items[sourceName] = list.toVector();) endInsertRows() Same if you [5, 6] beginRemoveRows full replace (m_items[sourceName] = list.toVector();) endRemoveRows It does not touch either m_roleNames size, which are changed. I try to remove all first, then re-add with m_roleNames changes. anthonyfieroni: Optimization is you have [5, 6, 8] then [5, 6, 8, 9] so it make only beginInsertRows({}, 3, 3)…
			anthonyfieroniAuthorUnsubmitted Not Done The worst case is when you have different values [5, 6, 8] and [5, 8, 9, 10] it will add only 10 and internally replace other, is QML model expect that? So why i first make full remove, then full insert. anthonyfieroni: The worst case is when you have different values [5, 6, 8] and [5, 8, 9, 10] it will add only…
382	} else if (delta > 0) {
383	beginInsertRows(QModelIndex(), sourceIndex + oldLength, sourceIndex + list.length() - 1);
384	} else if (delta < 0) {
385	beginRemoveRows(QModelIndex(), sourceIndex + list.length(), sourceIndex + oldLength - 1);
386	}	380		}
387	//convert to vector, so data() will be O(1)	381
388	m_items[sourceName] = list.toVector();	382		m_roleNames.clear();
389		383
390	if (!list.isEmpty()) {	384		if (!list.isEmpty()) {
391	if (list.first().canConvert<QVariantMap>()) {	385		beginInsertRows(QModelIndex(), sourceIndex, sourceIndex + list.length() - 1);
392	foreach (const QVariant &item, list) {	386		//convert to vector, so data() will be O(1)
393	const QVariantMap &vh = item.value<QVariantMap>();	387		m_items[sourceName] = list.toVector();
394	QMapIterator<QString, QVariant> it(vh);	388		endInsertRows();
395	while (it.hasNext()) {	389
396	it.next();	390		foreach (const QVariant &item, list) {
397	const QString &roleName = it.key();	391		const QVariantMap &vh = item.value<QVariantMap>();
398	if (!m_roleIds.contains(roleName)) {	392		QMapIterator<QString, QVariant> it(vh);
399	++m_maxRoleId;	393		while (it.hasNext()) {
400	m_roleNames[m_maxRoleId] = roleName.toLatin1();	394		it.next();
401	m_roleIds[roleName] = m_maxRoleId;	395		const QString &roleName = it.key();
402	}	396		auto itRole = m_roleIds.find(roleName);
403	}	397		if (itRole == m_roleIds.end()) {
404	}	398		itRole = m_roleIds.insert(roleName, ++m_maxRoleId);
405	} else {
406	foreach (const QVariant &item, list) {
407	const QVariantMap &vh = item.value<QVariantMap>();
408	QMapIterator<QString, QVariant> it(vh);
409	while (it.hasNext()) {
410	it.next();
411	const QString &roleName = it.key();
412	if (!m_roleIds.contains(roleName)) {
413	++m_maxRoleId;
414	m_roleNames[m_maxRoleId] = roleName.toLatin1();
415	m_roleIds[roleName] = m_maxRoleId;
416	}
417	}	399		}
		400		m_roleNames[itRole.value()] = roleName.toLatin1();
418	}	401		}
419	}	402		}
420	}	403		}
421		404
422	setRoleNames(m_roleNames);	405		setRoleNames(m_roleNames);
423		406
424	if (firstRun) {
425	endResetModel();
426	} else if (delta > 0) {
427	endInsertRows();
428	} else if (delta < 0) {
429	endRemoveRows();
430	}
431	emit dataChanged(createIndex(sourceIndex, 0),	407		emit dataChanged(createIndex(sourceIndex, 0),
432	createIndex(sourceIndex + qMin(list.length(), oldLength), 0));	408		createIndex(sourceIndex + qMin(list.length(), oldLength), 0));
433	}	409		}
Context not available.
			davidedmundsonUnsubmitted Not Done this isn't equivalent. I could have an entry with an empty count Now this gets left behind davidedmundson: this isn't equivalent. I could have an entry with an empty count Now this gets left behind
			anthonyfieroniAuthorUnsubmitted Not Done Got'cha anthonyfieroni: Got'cha