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

Give each end of the wiring export its terminal index and uuid

Browse Source 
Most shipped symbols leave their terminals unnamed, so --export-wiring
wrote both terminal columns empty and a reader had to work each end out
from the .qet: terminal uuid, then its place in the definition, then the
index. The terminal table now keeps the index the scripting API's
addConductor() takes, from both fills of the database (the document and
the folios give the same value: Element::parseTerminal()'s sort, top to
bottom then left to right), and wiring_list_view and the CSV gain
from/to_terminal_index and from/to_terminal_uuid as their last columns.

The index is left empty for two terminals at one point, where the sort
is not stable and the index is not defined; the uuid tells them apart.
The wiring list dialog reads named columns and is unaffected.

Co-Authored-By: Claude Opus 5.5 (1M context) <noreply@anthropic.com>
This commit is contained in:
ispyisail
2026-10-02 22:30:49 +13:00
parent 808d6a3c5b
commit e345d4e5d0
5 changed files with 127 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files
sources/dataBase/projectdatabase.cpp
+70 -6
View File
@@ -180,8 +180,37 @@ struct DocumentTerminal
QString uuid;
QString name;
bool master_label = false;
QVariant index;
};
//The index each of @p points has in Element::terminals() -- the index
//the scripting API's addConductor() and conductor calls take -- or a
//null QVariant for a point another terminal shares. Element::
//parseTerminal() sorts the list top to bottom, then left to right, on
//each terminal's position in its definition, and the sort is not
//stable, so which of two terminals at the same point comes first is
//not defined: no index is given rather than one that can change.
QList<QVariant> terminalIndexes(const QList<QPointF> &points)
{
QList<int> order;
for (int i = 0 ; i < points.size() ; ++i) {
order << i;
}
std::stable_sort(order.begin(), order.end(), [&points](int a, int b) {
if (points.at(a).y() == points.at(b).y()) {
return points.at(a).x() < points.at(b).x();
}
return points.at(a).y() < points.at(b).y();
});
QList<QVariant> indexes(points.size());
for (int i = 0 ; i < order.size() ; ++i) {
if (points.count(points.at(order.at(i))) == 1) {
indexes[order.at(i)] = i;
}
}
return indexes;
}
struct DocumentDefinition
{
QString type;
@@ -391,6 +420,25 @@ bool projectDataBase::populateFromDocument(const QDomDocument &document, QString
data.fromXml(definition);
read.type = data.typeToString();
read.sub_type = data.masterTypeToString();
//Every terminal the element is built with counts towards
//the indexes, as Element::parseTerminal() keeps every one
//whose position reads, in every <description>.
QList<QDomElement> parsed;
QList<QPointF> points;
for (QDomElement d = definition.firstChildElement(QStringLiteral("description")) ;
!d.isNull() ; d = d.nextSiblingElement(QStringLiteral("description"))) {
for (QDomElement t = d.firstChildElement(QStringLiteral("terminal")) ;
!t.isNull() ; t = t.nextSiblingElement(QStringLiteral("terminal")))
{
qreal x, y;
if (QET::attributeIsAReal(t, QStringLiteral("x"), &x)
&& QET::attributeIsAReal(t, QStringLiteral("y"), &y)) {
parsed << t;
points << QPointF(x, y);
}
}
}
const QList<QVariant> indexes = terminalIndexes(points);
const QDomElement description = definition.firstChildElement(QStringLiteral("description"));
for (QDomElement t = description.firstChildElement(QStringLiteral("terminal")) ;
!t.isNull() ; t = t.nextSiblingElement(QStringLiteral("terminal")))
@@ -403,6 +451,10 @@ bool projectDataBase::populateFromDocument(const QDomDocument &document, QString
terminal.uuid = terminal_uuid.toString();
terminal.name = t.attribute(QStringLiteral("name"));
terminal.master_label = t.attribute(QStringLiteral("use_master_label")) == QLatin1String("true");
const int place = parsed.indexOf(t);
if (place >= 0) {
terminal.index = indexes.at(place);
}
read.terminals.insert(terminal_uuid, terminal);
}
known = definitions.insert(type, read);
@@ -582,8 +634,8 @@ bool projectDataBase::populateFromDocument(const QDomDocument &document, QString
for (const auto &end : {std::make_pair(conductor.element1, conductor.terminal1),
std::make_pair(conductor.element2, conductor.terminal2)}) {
const DocumentElement &owner = elements.at(element_index.value(end.first));
insertTerminal(end.second, end.first,
owner.terminals.value(QUuid(end.second)).name);
const DocumentTerminal &terminal = owner.terminals.value(QUuid(end.second));
insertTerminal(end.second, end.first, terminal.name, terminal.index);
}
m_insert_conductor_query.bindValue(QStringLiteral(":uuid"), conductor.uuid);
m_insert_conductor_query.bindValue(QStringLiteral(":diagram_uuid"), conductor.diagram_uuid);
@@ -1560,6 +1612,7 @@ bool projectDataBase::createDataBase()
"uuid VARCHAR(50) NOT NULL, "
"element_uuid VARCHAR(50) NOT NULL,"
"name VARCHAR(50),"
"terminal_index INTEGER,"
"PRIMARY KEY (uuid, element_uuid),"
"FOREIGN KEY (element_uuid) REFERENCES element (uuid)"
")");
@@ -1812,7 +1865,11 @@ void projectDataBase::createWiringListView()
"t2.element_uuid AS to_element_uuid,"
"ei2.label AS to_element_label,"
"t2.name AS to_terminal,"
"d.pos AS diagram_position"
"d.pos AS diagram_position,"
"t1.uuid AS from_terminal_uuid,"
"t1.terminal_index AS from_terminal_index,"
"t2.uuid AS to_terminal_uuid,"
"t2.terminal_index AS to_terminal_index"
" FROM conductor c"
" JOIN terminal t1 ON c.terminal1_uuid = t1.uuid AND c.terminal1_element_uuid = t1.element_uuid"
" JOIN terminal t2 ON c.terminal2_uuid = t2.uuid AND c.terminal2_element_uuid = t2.element_uuid"
@@ -1999,9 +2056,15 @@ void projectDataBase::populateConductorTable()
*/
void projectDataBase::insertTerminal(Terminal *terminal)
{
const QList<Terminal *> terminals = terminal->parentElement()->terminals();
QList<QPointF> points;
for (const Terminal *t : terminals) {
points << terminal->parentElement()->mapFromScene(t->dockConductor());
}
insertTerminal(terminal->stableUuid().toString(),
terminal->parentElement()->uuid().toString(),
terminal->name());
terminal->name(),
terminalIndexes(points).value(terminals.indexOf(terminal)));
}
/**
@@ -2009,11 +2072,12 @@ void projectDataBase::insertTerminal(Terminal *terminal)
insertTerminal(Terminal *) from values rather than a live terminal.
*/
void projectDataBase::insertTerminal(const QString &uuid, const QString &element_uuid,
const QString &name)
const QString &name, const QVariant &index)
{
m_insert_terminal_query.bindValue(":uuid", uuid);
m_insert_terminal_query.bindValue(":element_uuid", element_uuid);
m_insert_terminal_query.bindValue(":name", name);
m_insert_terminal_query.bindValue(":terminal_index", index);
if (!m_insert_terminal_query.exec()) {
qDebug() << "projectDataBase::insertTerminal insert error : " << m_insert_terminal_query.lastError();
}
@@ -2146,7 +2210,7 @@ void projectDataBase::prepareQuery()
//INSERT TERMINAL
m_insert_terminal_query = QSqlQuery(m_data_base);
m_insert_terminal_query.prepare("INSERT OR IGNORE INTO terminal (uuid, element_uuid, name) VALUES (:uuid, :element_uuid, :name)");
m_insert_terminal_query.prepare("INSERT OR IGNORE INTO terminal (uuid, element_uuid, name, terminal_index) VALUES (:uuid, :element_uuid, :name, :terminal_index)");
//INSERT CONDUCTOR
m_insert_conductor_query = QSqlQuery(m_data_base);
sources/dataBase/projectdatabase.h
+1 -1
View File
@@ -150,7 +150,7 @@ class projectDataBase : public QObject
void watchConductor(Conductor *conductor);
void insertTerminal(Terminal *terminal);
void insertTerminal(const QString &uuid, const QString &element_uuid,
const QString &name);
const QString &name, const QVariant &index);
void prepareQuery();
static QHash<QString, QString> elementInfoToString(
Element *elmt);