mirror of
https://github.com/qelectrotech/qelectrotech-source-mirror.git
synced 2026-09-28 21:34:12 +02:00
4e754cfac1
The dock editor snapshotted the conductor once and never refreshed, so a change made via the modal Edit-conductor dialog left the dock holding stale values; on deselection apply() wrote that stale snapshot back, overwriting the dialog's change. Subscribe to Conductor::propertiesChange and refresh via updateUi() so the dock mirrors external edits and apply() becomes a no-op when nothing changed in the dock.
288 lines
10 KiB
C++
288 lines
10 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 "conductorpropertieseditorwidget.h"
|
|
|
|
#include "../QPropertyUndoCommand/qpropertyundocommand.h"
|
|
#include "../diagram.h"
|
|
#include "../qetgraphicsitem/conductor.h"
|
|
#include "conductorpropertieswidget.h"
|
|
#include "../qtextorientationspinboxwidget.h"
|
|
|
|
#include <KColorButton>
|
|
|
|
#include <QAbstractButton>
|
|
#include <QAbstractSpinBox>
|
|
#include <QCheckBox>
|
|
#include <QComboBox>
|
|
#include <QGroupBox>
|
|
#include <QLineEdit>
|
|
#include <QScrollArea>
|
|
#include <QSettings>
|
|
#include <QSizePolicy>
|
|
#include <QSlider>
|
|
#include <QVBoxLayout>
|
|
|
|
/**
|
|
@brief ConductorPropertiesEditorWidget::ConductorPropertiesEditorWidget
|
|
@param conductor : conductor to edit
|
|
@param parent : parent widget
|
|
*/
|
|
ConductorPropertiesEditorWidget::ConductorPropertiesEditorWidget(
|
|
Conductor *conductor, QWidget *parent) :
|
|
PropertiesEditorWidget(parent),
|
|
m_cpw(new ConductorPropertiesWidget(this))
|
|
{
|
|
// The conductor widget is dialog-sized (min width ~600px), far too wide for
|
|
// a dock. Host it in a scroll area with a small minimum width so the dock
|
|
// can be dragged to any width (a scrollbar appears when narrower than the
|
|
// content). QET already persists dock geometry across restarts via
|
|
// QETDiagramEditor save/restoreState, so the chosen width is remembered.
|
|
// "Apply to all conductors of the potential": same semantics as the modal
|
|
// dialog's checkbox (ConductorPropertiesDialog::applyAll), pinned at the top
|
|
// of the panel so it stays visible above the scrolling tabs (#500). Unlike
|
|
// the dialog the choice is persisted, so a user who always wants it on (or
|
|
// off) sets it once. It is a child of this editor, not of m_cpw, so it is
|
|
// deliberately outside the live-edit signal wiring in connectChangeSignals()
|
|
// (toggling it must not push an edit, only change how the next edit applies).
|
|
// Reuse the modal dialog's exact wording for consistency (and so the
|
|
// existing translation applies).
|
|
m_apply_all_cb = new QCheckBox(
|
|
tr("Appliquer les propriétés à l'ensemble des conducteurs de ce potentiel"),
|
|
this);
|
|
m_apply_all_cb->setChecked(QSettings().value(
|
|
QStringLiteral("diagrameditor/conductor_apply_all"), true).toBool());
|
|
connect(m_apply_all_cb, &QCheckBox::toggled, this, [](bool on) {
|
|
QSettings().setValue(
|
|
QStringLiteral("diagrameditor/conductor_apply_all"), on);
|
|
});
|
|
|
|
auto *scroll = new QScrollArea(this);
|
|
scroll->setWidgetResizable(true);
|
|
scroll->setFrameShape(QFrame::NoFrame);
|
|
scroll->setWidget(m_cpw);
|
|
auto *layout = new QVBoxLayout(this);
|
|
layout->setContentsMargins(0, 0, 0, 0);
|
|
layout->addWidget(m_apply_all_cb);
|
|
layout->addWidget(scroll);
|
|
setMinimumWidth(120);
|
|
// Expand vertically to fill the dock like the other editors do (otherwise
|
|
// the panel sits at its small size hint with empty space below it, #500),
|
|
// while keeping a minimum height so it stays usable when the dock is short.
|
|
setSizePolicy(QSizePolicy::Preferred, QSizePolicy::Expanding);
|
|
setMinimumHeight(200);
|
|
setDisabled(true);
|
|
setConductor(conductor);
|
|
}
|
|
|
|
ConductorPropertiesEditorWidget::~ConductorPropertiesEditorWidget()
|
|
{}
|
|
|
|
/**
|
|
@brief ConductorPropertiesEditorWidget::setConductor
|
|
Set (or change) the conductor whose properties are edited.
|
|
@param conductor
|
|
*/
|
|
void ConductorPropertiesEditorWidget::setConductor(Conductor *conductor)
|
|
{
|
|
if (!conductor) return;
|
|
if (m_conductor && m_conductor != conductor)
|
|
disconnect(m_conductor, &Conductor::propertiesChange,
|
|
this, &ConductorPropertiesEditorWidget::updateUi);
|
|
m_conductor = conductor;
|
|
//Keep the dock in sync when the conductor is edited elsewhere (e.g. the
|
|
//modal "Edit conductor" dialog); otherwise a stale snapshot would be
|
|
//written back on the next apply() and overwrite that change (issue #500).
|
|
connect(m_conductor, &Conductor::propertiesChange,
|
|
this, &ConductorPropertiesEditorWidget::updateUi, Qt::UniqueConnection);
|
|
setEnabled(true);
|
|
updateUi();
|
|
}
|
|
|
|
/**
|
|
@brief ConductorPropertiesEditorWidget::apply
|
|
Push the edit onto the diagram's undo stack.
|
|
*/
|
|
void ConductorPropertiesEditorWidget::apply()
|
|
{
|
|
// Ignore the field-change signals emitted while the widget is being loaded
|
|
// programmatically (updateUi/reset): mid-load the widget holds a partial
|
|
// state that must not be committed onto the conductor.
|
|
if (m_updating) return;
|
|
if (!m_conductor || !m_conductor->diagram()) return;
|
|
if (QUndoCommand *undo = associatedUndo())
|
|
m_conductor->diagram()->undoStack().push(undo);
|
|
m_initial = m_conductor->properties();
|
|
}
|
|
|
|
/**
|
|
@brief ConductorPropertiesEditorWidget::setLiveEdit
|
|
In live-edit mode (how the dock uses every editor), each field change is
|
|
applied immediately instead of via an explicit apply() call. Without this
|
|
override the base class is a no-op and edits in the dock were never applied
|
|
(issue #500).
|
|
@param live_edit true to enable live edit
|
|
@return always true
|
|
*/
|
|
bool ConductorPropertiesEditorWidget::setLiveEdit(bool live_edit)
|
|
{
|
|
if (m_live_edit == live_edit) return true;
|
|
m_live_edit = live_edit;
|
|
|
|
if (m_live_edit) connectChangeSignals();
|
|
else disconnectChangeSignals();
|
|
|
|
return true;
|
|
}
|
|
|
|
/**
|
|
@brief ConductorPropertiesEditorWidget::connectChangeSignals
|
|
Wire every editable control of the hosted ConductorPropertiesWidget to
|
|
apply(). Commit-style signals (editingFinished / activated / toggled /
|
|
sliderReleased) are used rather than per-keystroke ones so each edit yields
|
|
a single, clean undo step. Loading the widget programmatically (updateUi)
|
|
also fires some of these, but apply() is a no-op then because
|
|
associatedUndo() returns nullptr when the properties are unchanged.
|
|
*/
|
|
void ConductorPropertiesEditorWidget::connectChangeSignals()
|
|
{
|
|
if (!m_cpw) return;
|
|
|
|
const auto add = [this](QMetaObject::Connection c) {
|
|
m_live_connections << c;
|
|
};
|
|
|
|
for (auto *w : m_cpw->findChildren<QLineEdit *>())
|
|
add(connect(w, &QLineEdit::editingFinished,
|
|
this, &ConductorPropertiesEditorWidget::apply));
|
|
for (auto *w : m_cpw->findChildren<QAbstractSpinBox *>())
|
|
add(connect(w, &QAbstractSpinBox::editingFinished,
|
|
this, &ConductorPropertiesEditorWidget::apply));
|
|
for (auto *w : m_cpw->findChildren<QComboBox *>())
|
|
add(connect(w, QOverload<int>::of(&QComboBox::activated),
|
|
this, &ConductorPropertiesEditorWidget::apply));
|
|
for (auto *w : m_cpw->findChildren<QSlider *>())
|
|
add(connect(w, &QSlider::sliderReleased,
|
|
this, &ConductorPropertiesEditorWidget::apply));
|
|
for (auto *w : m_cpw->findChildren<KColorButton *>())
|
|
add(connect(w, &KColorButton::changed,
|
|
this, &ConductorPropertiesEditorWidget::apply));
|
|
for (auto *w : m_cpw->findChildren<QTextOrientationSpinBoxWidget *>())
|
|
add(connect(w, QOverload<>::of(&QTextOrientationSpinBoxWidget::editingFinished),
|
|
this, &ConductorPropertiesEditorWidget::apply));
|
|
// Checkboxes and the checkable group boxes (single/multi wire, bicolor…).
|
|
for (auto *w : m_cpw->findChildren<QAbstractButton *>())
|
|
if (w->isCheckable())
|
|
add(connect(w, &QAbstractButton::toggled,
|
|
this, &ConductorPropertiesEditorWidget::apply));
|
|
for (auto *w : m_cpw->findChildren<QGroupBox *>())
|
|
if (w->isCheckable())
|
|
add(connect(w, &QGroupBox::toggled,
|
|
this, &ConductorPropertiesEditorWidget::apply));
|
|
}
|
|
|
|
/**
|
|
@brief ConductorPropertiesEditorWidget::disconnectChangeSignals
|
|
Tear down the live-edit connections made by connectChangeSignals().
|
|
*/
|
|
void ConductorPropertiesEditorWidget::disconnectChangeSignals()
|
|
{
|
|
for (const QMetaObject::Connection &c : m_live_connections)
|
|
disconnect(c);
|
|
m_live_connections.clear();
|
|
}
|
|
|
|
/**
|
|
@brief ConductorPropertiesEditorWidget::reset
|
|
Discard the in-progress edit, restoring the conductor's current properties.
|
|
*/
|
|
void ConductorPropertiesEditorWidget::reset()
|
|
{
|
|
if (!m_conductor) return;
|
|
m_updating = true;
|
|
m_cpw->setProperties(m_initial);
|
|
m_updating = false;
|
|
}
|
|
|
|
/**
|
|
@brief ConductorPropertiesEditorWidget::updateUi
|
|
Reload the widget from the conductor (e.g. when the selection changes).
|
|
*/
|
|
void ConductorPropertiesEditorWidget::updateUi()
|
|
{
|
|
if (!m_conductor) return;
|
|
m_updating = true;
|
|
m_initial = m_conductor->properties();
|
|
m_cpw->setProperties(m_initial);
|
|
m_updating = false;
|
|
}
|
|
|
|
/**
|
|
@brief ConductorPropertiesEditorWidget::associatedUndo
|
|
@return the edit as a QPropertyUndoCommand, or nullptr if unchanged.
|
|
|
|
When "apply to all" is ticked, every conductor on the same potential is
|
|
updated in the same undo step (one undo reverts them all), exactly as the
|
|
modal dialog does (ConductorPropertiesDialog::PropertiesDialog). Otherwise
|
|
only the selected conductor is changed.
|
|
*/
|
|
QUndoCommand *ConductorPropertiesEditorWidget::associatedUndo() const
|
|
{
|
|
if (!m_conductor) return nullptr;
|
|
|
|
const ConductorProperties new_properties = m_cpw->properties();
|
|
if (new_properties == m_conductor->properties()) return nullptr;
|
|
|
|
QVariant old_value, new_value;
|
|
old_value.setValue(m_conductor->properties());
|
|
new_value.setValue(new_properties);
|
|
|
|
auto *undo = new QPropertyUndoCommand(
|
|
m_conductor, "properties", old_value, new_value);
|
|
undo->setText(tr("Modifier les propriétés d'un conducteur", "undo caption"));
|
|
|
|
// Propagate to every conductor on the same potential, as the modal dialog
|
|
// does: each related conductor becomes a child command of the same undo
|
|
// step, set to the same target properties.
|
|
if (m_apply_all_cb && m_apply_all_cb->isChecked())
|
|
{
|
|
const auto potential = m_conductor->relatedPotentialConductors();
|
|
if (!potential.isEmpty())
|
|
{
|
|
undo->setText(tr("Modifier les propriétés de plusieurs conducteurs",
|
|
"undo caption"));
|
|
for (Conductor *potential_conductor : potential)
|
|
{
|
|
QVariant old_v;
|
|
old_v.setValue(potential_conductor->properties());
|
|
new QPropertyUndoCommand(
|
|
potential_conductor, "properties", old_v, new_value, undo);
|
|
}
|
|
}
|
|
}
|
|
return undo;
|
|
}
|
|
|
|
/**
|
|
@brief ConductorPropertiesEditorWidget::title
|
|
@return the panel title.
|
|
*/
|
|
QString ConductorPropertiesEditorWidget::title() const
|
|
{
|
|
return tr("Conducteur");
|
|
}
|