mirror of
https://github.com/qelectrotech/qelectrotech-source-mirror.git
synced 2026-10-15 01:54:14 +02:00
Terminal: pass the voltage across a separation only when it was edited
The three code paths that copied the voltage / protocol to the far side of a function separated terminal -- the conductor properties dialog, search/replace and the script API -- compared it against the far wire's own properties instead of against the edit itself. The two sides differ on that field just as often as not, so the comparison held no matter what was edited and every change overwrote the far side's voltage: setting a colour on a 24 V side dragged the 0 V one along, where master left it alone. Compare the edit -- what the dialog was filled with against what the user made of it -- so that a change of the voltage / protocol is what crosses, which is what the selection panel multi-edit already did. The values are read before the undo commands are pushed, since QPropertyUndoCommand applies on push. An explicitly selected wire is never the far side of anything: picking one wire on each side of a separation and editing them edits them both, in full, however the selection happens to be walked. Nor is a wire that belongs to a potential on any path, so reaching it once normally and once across a separation gives it the full edit.
This commit is contained in:
@@ -95,11 +95,18 @@ void ConductorPropertiesDialog::PropertiesDialog(Conductor *conductor,
|
||||
//electrical node and not one side of it.
|
||||
if (cpd.applyAll())
|
||||
{
|
||||
//Only an edit that really changed the voltage / protocol passes
|
||||
//it on, so the comparison is the edit itself -- what the dialog
|
||||
//was filled with, against what the user left in it -- and never
|
||||
//the far wire's own value, which differs from it just as often
|
||||
//as not (a 24 V side against a 0 V one, say) and would then be
|
||||
//overwritten by every edit, voltage included.
|
||||
const ConductorProperties shown = conductor->properties();
|
||||
foreach (Conductor *separated_conductor, conductor->functionSeparatedConductors())
|
||||
{
|
||||
ConductorProperties separated_properties = separated_conductor->properties();
|
||||
separated_properties.applyTensionProtocolChange(
|
||||
separated_conductor->properties(),
|
||||
shown,
|
||||
cpd.properties());
|
||||
if (separated_properties == separated_conductor->properties())
|
||||
continue;
|
||||
|
||||
Reference in New Issue
Block a user