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

Merge master into feat/qetz-db-truth-v2

Browse Source 
The .qetz files take this branch's side: it already holds #1473, and
adds the folio parts to join().

qetscriptapi.cpp: #1456 gave setConductorProperty() the voltage that
crosses a function separated terminal element; here that function hands
its work to applyConductorProperties(), so the change goes there, with
the properties captured before the pushes. The database path for folios
not built already gives up at such a terminal, so it builds the folio and
takes the same route.

Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com>
This commit is contained in:
ispyisail
2026-10-14 18:57:29 +13:00
parent bf465f9245 af142aba90
commit c0a5084bc4
28 changed files with 708 additions and 44 deletions
Download Patch File Download Diff File Expand all files Collapse all files
sources/qetgraphicsitem/conductor.cpp
+42 -3
View File
@@ -2010,9 +2010,16 @@ void Conductor::displayedTextChanged()
@param all_diagram : if true search in all diagram of the project,
false search only in the parent diagram of this conductor
@param t_list : a list of terminal already found for this potential.
@param ignore_function_separation : if true, a terminal element whose
function separation is enabled does not stop the search, and the
conductors of both its sides are returned as one potential. Only
functionSeparatedConductors() passes true.
@sa functionSeparatedConductors
@return a QSet of conductor at the same potential.
*/
QSet<Conductor *> Conductor::relatedPotentialConductors(const bool all_diagram, QList <Terminal *> *t_list)
QSet<Conductor *> Conductor::relatedPotentialConductors(const bool all_diagram,
QList <Terminal *> *t_list,
const bool ignore_function_separation)
{
bool declar_t_list = false;
if (t_list == nullptr)
@@ -2035,7 +2042,8 @@ QSet<Conductor *> Conductor::relatedPotentialConductors(const bool all_diagram,
//Get the other terminals of the parent element of @terminal, who share the same potential
//This is use for element type "folio report" and "terminal element"
for (Terminal *t : relatedPotentialTerminal(terminal, all_diagram))
for (Terminal *t : relatedPotentialTerminal(terminal, all_diagram,
ignore_function_separation))
{
if (!t_list->contains(t))
{
@@ -2047,7 +2055,8 @@ QSet<Conductor *> Conductor::relatedPotentialConductors(const bool all_diagram,
other_conductors_list_t.removeAll(this);
//Get the conductors at the same potential for each conductors of other_conductors_list_t
for (Conductor *c : other_conductors_list_t) {
other_conductors += c->relatedPotentialConductors(all_diagram, t_list);
other_conductors += c->relatedPotentialConductors(all_diagram, t_list,
ignore_function_separation);
}
other_conductors += QSet<Conductor*>(other_conductors_list_t.begin(),other_conductors_list_t.end());
@@ -2060,6 +2069,36 @@ QSet<Conductor *> Conductor::relatedPotentialConductors(const bool all_diagram,
return(other_conductors);
}
/**
@brief Conductor::functionSeparatedConductors
Return the conductors that belong to this conductor's potential only
by crossing a function separated terminal element -- a terminal
element whose function separation checkbox (element information
potential_isolating) is enabled, the checkbox the user ticks to stop
sharing a terminal's properties with the other side of the terminal.
Those conductors are deliberately not part of
relatedPotentialConductors(): no property may be copied over them
by default. One does cross that separation, though: the voltage /
protocol, which describes the electrical node itself. Callers that
push it over the whole potential use this method to reach the other
side (@see ConductorProperties::applyTensionProtocolChange).
It is simply the potential computed with the separations ignored,
minus the potential that respects them.
@param all_diagram : if true search in all diagram of the project,
false search only in the parent diagram of this conductor
@return a QSet of conductor, this conductor excluded
*/
QSet<Conductor *> Conductor::functionSeparatedConductors(const bool all_diagram)
{
QSet<Conductor *> separated = relatedPotentialConductors(all_diagram, nullptr, true);
separated.subtract(relatedPotentialConductors(all_diagram));
separated.remove(this);
return separated;
}
/**
@brief Conductor::diagramEditor
@return The parent diagram editor or nullptr;