mirror of
https://github.com/qelectrotech/qelectrotech-source-mirror.git
synced 2026-10-14 17:44:13 +02:00
408ef5114d
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.
144 lines
4.8 KiB
C++
144 lines
4.8 KiB
C++
/*
|
|
Copyright 2006-2026 The QElectroTech Team
|
|
This file is part of QElectroTech.
|
|
|
|
QElectroTech is free software: you can redistribute it and/or modify
|
|
it under the terms of the GNU General Public License as published by
|
|
the Free Software Foundation, either version 2 of the License, or
|
|
(at your option) any later version.
|
|
|
|
QElectroTech is distributed in the hope that it will be useful,
|
|
but WITHOUT ANY WARRANTY; without even the implied warranty of
|
|
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
|
GNU General Public License for more details.
|
|
|
|
You should have received a copy of the GNU General Public License
|
|
along with QElectroTech. If not, see <http://www.gnu.org/licenses/>.
|
|
*/
|
|
|
|
#include "conductorpropertiesdialog.h"
|
|
|
|
#include "../QPropertyUndoCommand/qpropertyundocommand.h"
|
|
#include "../diagram.h"
|
|
#include "../qetgraphicsitem/conductor.h"
|
|
#include "conductorpropertieswidget.h"
|
|
#include "ui_conductorpropertiesdialog.h"
|
|
|
|
#include "../qet.h"
|
|
/**
|
|
@brief ConductorPropertiesDialog::ConductorPropertiesDialog
|
|
Constructor
|
|
@param conductor : conductor to edit properties
|
|
@param parent : parent widget
|
|
*/
|
|
ConductorPropertiesDialog::ConductorPropertiesDialog(
|
|
Conductor *conductor, QWidget *parent) :
|
|
QDialog(parent),
|
|
ui(new Ui::ConductorPropertiesDialog)
|
|
{
|
|
ui->setupUi(this);
|
|
QET::trackDialogGeometry(this);
|
|
m_cpw = new ConductorPropertiesWidget(conductor->properties());
|
|
m_cpw -> setHiddenOneTextPerFolio(true);
|
|
m_cpw->setHiddenAvailableAutonum(true);
|
|
if (conductor -> diagram() -> defaultConductorProperties.m_one_text_per_folio == true &&
|
|
conductor -> relatedPotentialConductors().size()) {
|
|
m_cpw->setDisabledShowText();
|
|
}
|
|
ui -> main_layout -> insertWidget(0, m_cpw);
|
|
}
|
|
|
|
/**
|
|
@brief ConductorPropertiesDialog::~ConductorPropertiesDialog
|
|
*/
|
|
ConductorPropertiesDialog::~ConductorPropertiesDialog()
|
|
{
|
|
delete ui;
|
|
}
|
|
|
|
/**
|
|
@brief ConductorPropertiesDialog::PropertiesDialog
|
|
Static method for open and apply properties.
|
|
@param conductor : conductor to edit properties
|
|
@param parent : parent widget
|
|
*/
|
|
void ConductorPropertiesDialog::PropertiesDialog(Conductor *conductor,
|
|
QWidget *parent)
|
|
{
|
|
ConductorPropertiesDialog cpd (conductor, parent);
|
|
|
|
if (cpd.exec() == QDialog::Rejected
|
|
|| cpd.properties() == conductor->properties()) return;
|
|
|
|
QVariant old_value, new_value;
|
|
old_value.setValue(conductor->properties());
|
|
new_value.setValue(cpd.properties());
|
|
|
|
QPropertyUndoCommand *undo = new QPropertyUndoCommand(conductor, "properties", old_value, new_value);
|
|
undo->setText(tr("Edit conductor properties", "undo caption"));
|
|
|
|
if (!conductor->relatedPotentialConductors().isEmpty() && cpd.applyAll())
|
|
{
|
|
undo->setText(tr("Edit the properties of several conductors", "undo caption"));
|
|
|
|
foreach (Conductor *potential_conductor, conductor->relatedPotentialConductors())
|
|
{
|
|
old_value.setValue(potential_conductor->properties());
|
|
new QPropertyUndoCommand (potential_conductor, "properties", old_value, new_value, undo);
|
|
}
|
|
}
|
|
|
|
//A function separated terminal element (element information
|
|
//potential_isolating) keeps the two sides of the terminal apart:
|
|
//every property but one stays local to the side it was edited on.
|
|
//The voltage / protocol still crosses, because it describes the
|
|
//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(
|
|
shown,
|
|
cpd.properties());
|
|
if (separated_properties == separated_conductor->properties())
|
|
continue;
|
|
|
|
QVariant separated_old_value, separated_new_value;
|
|
separated_old_value.setValue(separated_conductor->properties());
|
|
separated_new_value.setValue(separated_properties);
|
|
new QPropertyUndoCommand (separated_conductor, "properties",
|
|
separated_old_value, separated_new_value, undo);
|
|
}
|
|
}
|
|
|
|
conductor->diagram()->undoStack().push(undo);
|
|
}
|
|
|
|
/**
|
|
@brief ConductorPropertiesDialog::properties
|
|
@return the edited properties
|
|
*/
|
|
ConductorProperties ConductorPropertiesDialog::properties() const
|
|
{
|
|
return m_cpw -> properties();
|
|
}
|
|
|
|
/**
|
|
@brief ConductorPropertiesDialog::applyAll
|
|
@return
|
|
true -> must apply properties to all conductors at the same potential
|
|
false -> must apply properties only for the edited conductor
|
|
*/
|
|
bool ConductorPropertiesDialog::applyAll() const
|
|
{
|
|
return ui -> m_apply_all_cb -> isChecked();
|
|
}
|