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

Merge pull request #1122 from ispyisail/feat/editor-derived-terminal-uuids

Browse Source 
Give old symbols' terminals their lasting uuid in the symbol editor
This commit is contained in:
Laurent Trinques
2026-09-28 23:30:27 +02:00
committed by GitHub
parent 3df6d450fe 22f1455868
commit d3ca8483cf
5 changed files with 70 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files
sources/ElementsCollection/terminaluuids.cpp
+28 -8
View File
@@ -28,12 +28,12 @@ namespace {
@return the <terminal> of the definition held by the embedded
collection element @p collection_element
*/
QList<QDomElement> terminalsOf(const QDomElement &collection_element)
//The <terminal> of the <definition> @p definition
QList<QDomElement> definitionTerminals(const QDomElement &definition)
{
QList<QDomElement> terminals;
const QDomElement description = collection_element
.firstChildElement(QStringLiteral("definition"))
.firstChildElement(QStringLiteral("description"));
const QDomElement description =
definition.firstChildElement(QStringLiteral("description"));
for (QDomElement t = description.firstChildElement(QStringLiteral("terminal"));
!t.isNull();
t = t.nextSiblingElement(QStringLiteral("terminal"))) {
@@ -42,6 +42,12 @@ QList<QDomElement> terminalsOf(const QDomElement &collection_element)
return terminals;
}
QList<QDomElement> terminalsOf(const QDomElement &collection_element)
{
return definitionTerminals(
collection_element.firstChildElement(QStringLiteral("definition")));
}
//Place and orientation, "10" and "10.0" being the same place
QString terminalPlace(const QDomElement &terminal)
{
@@ -61,10 +67,10 @@ int orientationOf(const QDomElement &terminal)
return 0;
}
//The <terminal> of one element definition get a uuid where missing
int fillDefinition(const QDomElement &collection_element)
//The <terminal> of one <definition> get a uuid where missing
int fillDefinition(const QDomElement &definition)
{
const QList<QDomElement> terminals = terminalsOf(collection_element);
const QList<QDomElement> terminals = definitionTerminals(definition);
QSet<QUuid> taken;
for (const QDomElement &t : terminals) {
const QUuid uuid(t.attribute(QStringLiteral("uuid")));
@@ -105,7 +111,8 @@ int fillDirectory(const QDomElement &directory)
if (child.tagName() == QLatin1String("category")) {
filled += fillDirectory(child);
} else if (child.tagName() == QLatin1String("element")) {
filled += fillDefinition(child);
filled += fillDefinition(
child.firstChildElement(QStringLiteral("definition")));
}
}
return filled;
@@ -252,3 +259,16 @@ int TerminalUuids::fillMissing(const QDomElement &collection_root)
{
return fillDirectory(collection_root);
}
/**
@brief TerminalUuids::fillMissingInDefinition
fillMissing() for a single element definition (@p definition is its
<definition>), as the element editor reads it from a file: an old
symbol opened and saved there gets the uuids a project gives the same
terminals, not random ones that would make every copy of it differ.
@return the number of terminals given a uuid
*/
int TerminalUuids::fillMissingInDefinition(const QDomElement &definition)
{
return fillDefinition(definition);
}
sources/ElementsCollection/terminaluuids.h
+1
View File
@@ -26,6 +26,7 @@ namespace TerminalUuids
{
QUuid derived(qreal x, qreal y, int orientation, int occurrence = 0);
int fillMissing(const QDomElement &collection_root);
int fillMissingInDefinition(const QDomElement &definition);
void keep(const QDomElement &old_element, QDomElement &new_element);
void keepInDirectory(const QDomElement &old_directory,
QDomElement &new_directory);