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

fix bug 2

Browse Source
This commit is contained in:
Kellermorph
2026-08-03 21:48:34 +02:00
parent d850241f91
commit 5ec49eedda
1 changed files with 22 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files
sources/diagramevent/diagrameventaddelement.cpp
+22 -17
View File
@@ -361,22 +361,27 @@ void DiagramEventAddElement::addElement()
if (all_matches.isEmpty()) if (all_matches.isEmpty())
continue; continue;
//Find the best match (closest connect_to endpoint). //Group matches by their "other" endpoint and find the largest group.
const ConductorMatch &best = *std::min_element(all_matches.constBegin(), all_matches.constEnd(), //This ensures that when multiple independent circuits cross at the
[&](const ConductorMatch &a, const ConductorMatch &b) { //same dock point, the group with the most conductors gets priority,
return QLineF(t_dock, a.connect_to->dockConductor()).length() //not whichever happens to have the nearest connect_to endpoint.
< QLineF(t_dock, b.connect_to->dockConductor()).length(); QMap<Terminal *, QList<ConductorMatch>> groups;
});
//Only break conductors that share the same "other" endpoint as the best match.
//This prevents bridging independent nets: if two unrelated conductors
//cross at a dock point, only the one belonging to the same circuit
//(same other endpoint) gets broken. The other is left untouched.
QList<ConductorMatch> matches;
for (const auto &m : all_matches) { for (const auto &m : all_matches) {
if (m.other == best.other) groups[m.other].append(m);
matches.append(m);
} }
Terminal *best_other = nullptr;
int best_count = 0;
for (auto it = groups.constBegin(); it != groups.constEnd(); ++it) {
if (it.value().size() > best_count) {
best_count = it.value().size();
best_other = it.key();
}
}
//Only break conductors in the largest group (same "other" endpoint).
//This prevents bridging independent nets: if two unrelated conductors
//cross at a dock point, only the larger group gets broken.
const QList<ConductorMatch> &matches = groups[best_other];
//Mark terminal as used //Mark terminal as used
used_terminals.insert(t); used_terminals.insert(t);
@@ -406,7 +411,7 @@ void DiagramEventAddElement::addElement()
//Connect the shared "other" endpoint to the nearest free terminal //Connect the shared "other" endpoint to the nearest free terminal
//with matching orientation. //with matching orientation.
QPointF other_dock = best.other->dockConductor(); QPointF other_dock = best_other->dockConductor();
Terminal *other_terminal = nullptr; Terminal *other_terminal = nullptr;
qreal best_dist = std::numeric_limits<qreal>::max(); qreal best_dist = std::numeric_limits<qreal>::max();
foreach (Terminal *ot, element->terminals()) foreach (Terminal *ot, element->terminals())
@@ -435,14 +440,14 @@ void DiagramEventAddElement::addElement()
} }
if (other_terminal) { if (other_terminal) {
Conductor *new_c2 = new Conductor(best.other, other_terminal); Conductor *new_c2 = new Conductor(best_other, other_terminal);
new AddGraphicsObjectCommand(new_c2, m_diagram, QPointF(), undo_object); new AddGraphicsObjectCommand(new_c2, m_diagram, QPointF(), undo_object);
ConductorAutoNumerotation can2(new_c2, m_diagram, undo_object); ConductorAutoNumerotation can2(new_c2, m_diagram, undo_object);
can2.numerate(); can2.numerate();
if (m_diagram->freezeNewConductors() || m_diagram->project()->isFreezeNewConductors()) if (m_diagram->freezeNewConductors() || m_diagram->project()->isFreezeNewConductors())
new_c2->setFreezeLabel(true); new_c2->setFreezeLabel(true);
broken_endpoints.insert(best.other); broken_endpoints.insert(best_other);
used_terminals.insert(other_terminal); used_terminals.insert(other_terminal);
} }
} }