kotschak/qelectrotech-source-mirror
0
0
Fork 0
mirror of https://github.com/qelectrotech/qelectrotech-source-mirror.git synced 2026-10-05 10:34:13 +02:00
Code Issues Actions Packages Projects Releases Wiki Activity

Never derive a uuid the file already carries

Browse Source 
A symbol keeps its derived uuid once saved, even when it is moved. A
symbol saved without a uuid that later turns up on the spot it left -- a
hand edit, an older version, another tool writing the file -- derived the
same uuid, and the project had two symbols with one identity.

readDiagramsXml() now collects every symbol and wire uuid the file
carries, on any folio, before a folio loads; derivedItemUuid() moves to
the next counter value while a candidate is among them. The result still
depends on the file alone. Renamed from derivedUuid(), which QETProject
already has for the project's own uuid.

tst_derivedsymboluuid: newcomerOnAMovedSymbolsSpotGetsAnotherUuid fails
with the check switched off.

Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com>
This commit is contained in:
ispyisail
2026-09-28 20:46:01 +13:00
parent 0721b42e21
commit e12410e439
4 changed files with 58 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files
sources/qetproject.cpp
+32 -5
View File
@@ -276,7 +276,7 @@ QUuid QETProject::uuid() const
}
/**
@brief QETProject::derivedUuid
@brief QETProject::derivedItemUuid
A uuid for an item of this project that was saved without one, the same
on every load of the same file.
@p key describes the item by what it is, never by its place in the file
@@ -284,16 +284,31 @@ QUuid QETProject::uuid() const
Items with the same @p kind and @p key anywhere in the project (a copied
folio, two identical symbols stacked on one spot) are told apart by a
counter, in load order among those items alone.
A derived uuid is never one the file already carries: an item saved with
a derived uuid and then moved or re-connected keeps it, so a newcomer
later taking its old place or ends would otherwise derive the same one.
The file's saved uuids are collected before any folio loads
(readDiagramsXml()), so the result still depends on the file alone.
uuids are unique within one project; copies of a project share them, as
they share every saved uuid. Anything bringing items in from another
project must renew them, as paste does.
@return a UUID v5, which cannot collide with the v4 uuids given to new
items
*/
QUuid QETProject::derivedUuid(const QString &kind, const QString &key)
QUuid QETProject::derivedItemUuid(const QString &kind, const QString &key)
{
static const QUuid derived_ns(QStringLiteral("{7d1e9c3a-5b2f-4e8a-9c61-2f4b8d0e6a17}"));
const QString full = kind + QLatin1Char('\n') + key;
const int n = m_derived_uuid_keys[full]++;
return QUuid::createUuidV5(derived_ns,
n ? full + QLatin1Char('\n') + QString::number(n) : full);
int &n = m_derived_uuid_keys[full];
QUuid uuid;
do {
uuid = QUuid::createUuidV5(derived_ns,
n ? full + QLatin1Char('\n') + QString::number(n) : full);
++n;
} while (m_saved_item_uuids.contains(uuid));
return uuid;
}
/**
@@ -1909,6 +1924,18 @@ void QETProject::readDiagramsXml(QDomDocument &xml_project)
//Search the diagrams in the project
QDomNodeList diagram_nodes = xml_project.elementsByTagName(QStringLiteral("diagram"));
//Every symbol and wire uuid the file already carries, on any folio,
//before a folio derives one for an item saved without: see
//derivedItemUuid().
for (const QString &tag : {QStringLiteral("element"), QStringLiteral("conductor")}) {
const QDomNodeList nodes = xml_project.elementsByTagName(tag);
for (int i = 0; i < nodes.size(); ++i) {
const QUuid saved(nodes.at(i).toElement().attribute(QStringLiteral("uuid")));
if (!saved.isNull())
m_saved_item_uuids.insert(saved);
}
}
if(dlgWaiting)
dlgWaiting->setProgressBarRange(0, diagram_nodes.length()*3);