mirror of
https://github.com/qelectrotech/qelectrotech-source-mirror.git
synced 2026-09-27 12:34:14 +02:00
c1cc9a5b98
Add a new cross reference setting per xref type (coil, protection, commutator, PLC), labelled "Afficher tous les esclaves definis par le maitre" and persisted as showallconfiguredslaves. When it is enabled, the contacts display is selected and the master declares contact groups, the contact comb draws every contact group of the master in the master's own order, even when no slave is linked to it yet. Masters without declared contact groups and the option turned off keep the previous behaviour exactly: linked slaves only, sorted by position. - XRefProperties: new property stored in the settings and in the project XML (attribute showallconfiguredslaves, absent means false so old files are unaffected), included in operator==. - XRefPropertiesWidget: new checkbox placed after the terminal names one, enabled only while "Afficher en contacts" is selected; its enabled state is now also set explicitly when a type is loaded (a radio button that does not change emits no toggled()). - For the PLC type the contacts/cross radios, the two display checkboxes and the cross options group are hidden: a PLC master is always drawn as its IO table, those settings have no effect there. Positioning and label settings, which the table really uses, stay. - CrossRefItem: free slots draw the symbol of the group plus the terminal names the master defines (pairs swapped for a single pole NO/NC contact, labels of a changeover contact rotated one step counter-clockwise), without position text and without hover/click. Linked slaves keep drawing from their own data at their assigned group position; links without a group are appended at the end in position order. - Xref lifecycle: the item is created and kept without linked slaves for snap-to-bottom (MasterElement::mustShowXrefWithoutSlave) and for snap-to-label (DynamicElementTextItem::updateXref and ElementTextItemGroup::updateXref, which now also run when the element lands on the scene and re-establish their project connection), so a freshly placed master shows its comb immediately instead of only after the next settings change. updateLabel() resets its geometry when the option is turned off again, so no stale ghost stays.
258 lines
10 KiB
C++
258 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 <utility>
|
|
#include <QHash>
|
|
#include <QMetaEnum>
|
|
|
|
#include "xrefpropertieswidget.h"
|
|
#include "ui_xrefpropertieswidget.h"
|
|
#include "qdebug.h"
|
|
|
|
/**
|
|
@brief XRefPropertiesWidget::XRefPropertiesWidget
|
|
Default constructor
|
|
@param properties: properties to use
|
|
@param parent: parent widget
|
|
*/
|
|
XRefPropertiesWidget::XRefPropertiesWidget(QHash <QString, XRefProperties> properties, QWidget *parent) :
|
|
QWidget(parent),
|
|
ui(new Ui::XRefPropertiesWidget),
|
|
m_properties(std::move(properties))
|
|
{
|
|
ui->setupUi(this);
|
|
buildUi();
|
|
connect(ui->m_display_has_cross_rb, &QRadioButton::toggled, ui->m_cross_properties_gb, &QWidget::setEnabled);
|
|
connect(ui->m_display_has_contacts_rb, &QRadioButton::toggled, ui->m_show_all_slaves_cb, &QWidget::setEnabled);
|
|
connect(ui->m_type_cb, qOverload<int>(&QComboBox::currentIndexChanged), this, &XRefPropertiesWidget::typeChanged);
|
|
connect(ui->m_snap_to_cb, qOverload<int>(&QComboBox::currentIndexChanged), this, &XRefPropertiesWidget::enableOffsetSB);
|
|
updateDisplay();
|
|
}
|
|
|
|
/**
|
|
@brief XRefPropertiesWidget::~XRefPropertiesWidget
|
|
Default destructor
|
|
*/
|
|
XRefPropertiesWidget::~XRefPropertiesWidget()
|
|
{
|
|
disconnect(ui->m_display_has_cross_rb, &QRadioButton::toggled, ui->m_cross_properties_gb, &QWidget::setEnabled);
|
|
disconnect(ui->m_display_has_contacts_rb, &QRadioButton::toggled, ui->m_show_all_slaves_cb, &QWidget::setEnabled);
|
|
disconnect(ui->m_type_cb, qOverload<int>(&QComboBox::currentIndexChanged), this, &XRefPropertiesWidget::typeChanged);
|
|
disconnect(ui->m_snap_to_cb, qOverload<int>(&QComboBox::currentIndexChanged), this, &XRefPropertiesWidget::enableOffsetSB);
|
|
delete ui;
|
|
}
|
|
|
|
/**
|
|
@brief XRefPropertiesWidget::setProperties
|
|
set new properties for this widget
|
|
@param properties
|
|
*/
|
|
void XRefPropertiesWidget::setProperties(const QHash <QString,
|
|
XRefProperties> &properties) {
|
|
m_properties = properties;
|
|
updateDisplay();
|
|
m_previous_type_index = ui->m_type_cb->currentIndex();
|
|
}
|
|
|
|
/**
|
|
@brief XRefPropertiesWidget::properties
|
|
@return the properties edited by this widget
|
|
*/
|
|
QHash <QString, XRefProperties> XRefPropertiesWidget::properties()
|
|
{
|
|
saveProperties(ui->m_type_cb->currentIndex());
|
|
return m_properties;
|
|
}
|
|
|
|
/**
|
|
@brief XRefPropertiesWidget::setReadOnly
|
|
Set all of this widget disable if true
|
|
@param ro
|
|
*/
|
|
void XRefPropertiesWidget::setReadOnly(bool ro) {
|
|
ui->m_type_cb->setDisabled(ro);
|
|
ui->m_display_gb->setDisabled(ro);
|
|
ui->m_cross_properties_gb->setDisabled(ro);
|
|
|
|
if (!ro && ui->m_display_has_contacts_rb->isChecked()) {
|
|
ui->m_cross_properties_gb->setDisabled(true);
|
|
}
|
|
}
|
|
|
|
/**
|
|
@brief XRefPropertiesWidget::buildUi
|
|
Build some widget of this ui.
|
|
*/
|
|
void XRefPropertiesWidget::buildUi()
|
|
{
|
|
ui -> m_type_cb -> addItem(tr("Bobine"), "coil");
|
|
ui -> m_type_cb -> addItem(tr("Organe de protection"), "protection");
|
|
ui -> m_type_cb -> addItem(tr("Commutateur / bouton"), "commutator");
|
|
ui -> m_type_cb -> addItem(tr("Automate (PLC)"), "plc");
|
|
|
|
ui -> m_snap_to_cb -> addItem(tr("En bas de page"), "bottom");
|
|
ui -> m_snap_to_cb -> addItem(tr("Sous le label de l'élément"), "label");
|
|
|
|
ui -> m_xrefpos_cb -> addItem(tr("Top"),"top");
|
|
ui -> m_xrefpos_cb -> addItem(tr("Bottom"),"bottom");
|
|
ui -> m_xrefpos_cb -> addItem(tr("Left"),"left");
|
|
ui -> m_xrefpos_cb -> addItem(tr("Right"),"right");
|
|
ui -> m_xrefpos_cb -> addItem(tr("Text alignment"),"alignment");
|
|
ui -> m_xrefpos_cb -> addItem(tr("Champ de texte"),"text_field");
|
|
m_previous_type_index = ui -> m_type_cb -> currentIndex();
|
|
}
|
|
|
|
/**
|
|
@brief XRefPropertiesWidget::saveProperties
|
|
Save the properties of the type define at index of the combo box m_type_cb
|
|
@param index
|
|
*/
|
|
void XRefPropertiesWidget::saveProperties(int index) {
|
|
QString type = ui->m_type_cb->itemData(index).toString();
|
|
XRefProperties xrp = m_properties[type];
|
|
|
|
if (ui->m_display_has_cross_rb->isChecked())
|
|
xrp.setDisplayHas(XRefProperties::Cross);
|
|
else if (ui->m_display_has_contacts_rb->isChecked())
|
|
xrp.setDisplayHas(XRefProperties::Contacts);
|
|
if (ui->m_snap_to_cb->itemData(
|
|
ui->m_snap_to_cb->currentIndex()).toString()
|
|
== "bottom")
|
|
xrp.setSnapTo(XRefProperties::Bottom);
|
|
else
|
|
xrp.setSnapTo(XRefProperties::Label);
|
|
|
|
if(ui->m_xrefpos_cb->itemData(ui->m_xrefpos_cb->currentIndex()).toString() == "bottom") xrp.setXrefPos(Qt::AlignBottom);
|
|
else if(ui->m_xrefpos_cb->itemData(ui->m_xrefpos_cb->currentIndex()).toString() == "top") xrp.setXrefPos(Qt::AlignTop);
|
|
else if(ui->m_xrefpos_cb->itemData(ui->m_xrefpos_cb->currentIndex()).toString() == "left") xrp.setXrefPos(Qt::AlignLeft);
|
|
else if(ui->m_xrefpos_cb->itemData(ui->m_xrefpos_cb->currentIndex()).toString() == "right") xrp.setXrefPos(Qt::AlignRight);
|
|
else if(ui->m_xrefpos_cb->itemData(ui->m_xrefpos_cb->currentIndex()).toString() == "alignment") xrp.setXrefPos(Qt::AlignBaseline);
|
|
else if(ui->m_xrefpos_cb->itemData(ui->m_xrefpos_cb->currentIndex()).toString() == "text_field") xrp.setXrefPos(Qt::AlignHCenter);
|
|
xrp.setShowPowerContac(ui->m_show_power_cb->isChecked());
|
|
xrp.setShowTerminalName(ui->m_show_terminal_name_cb->isChecked());
|
|
xrp.setShowAllConfiguredSlaves(ui->m_show_all_slaves_cb->isChecked());
|
|
xrp.setPrefix("power", ui->m_power_prefix_le->text());
|
|
xrp.setPrefix("delay", ui->m_delay_prefix_le->text());
|
|
xrp.setPrefix("switch", ui->m_switch_prefix_le->text());
|
|
xrp.setMasterLabel(ui->m_master_le->text());
|
|
xrp.setSlaveLabel(ui->m_slave_le->text());
|
|
xrp.setOffset(ui->m_offset_sb->value());
|
|
xrp.setSlaveOffset(ui->m_slave_offset_sb->value());
|
|
|
|
m_properties.insert(type, xrp);
|
|
}
|
|
|
|
/**
|
|
@brief XRefPropertiesWidget::updateDisplay
|
|
Update display with the current displayed type.
|
|
*/
|
|
void XRefPropertiesWidget::updateDisplay()
|
|
{
|
|
QString type = ui->m_type_cb->itemData(ui->m_type_cb->currentIndex()).toString();
|
|
XRefProperties xrp = m_properties[type];
|
|
|
|
XRefProperties::DisplayHas dh = xrp.displayHas();
|
|
if (dh == XRefProperties::Cross) {
|
|
ui->m_display_has_cross_rb->setChecked(true);
|
|
}
|
|
else if (dh == XRefProperties::Contacts) {
|
|
ui->m_display_has_contacts_rb->setChecked(true);
|
|
}
|
|
|
|
QString master = xrp.masterLabel();
|
|
ui->m_master_le->setText(master);
|
|
|
|
QString slave = xrp.slaveLabel();
|
|
ui->m_slave_le->setText(slave);
|
|
|
|
int offset = xrp.offset();
|
|
ui->m_offset_sb->setValue(offset);
|
|
|
|
int slave_offset = xrp.slaveOffset();
|
|
ui->m_slave_offset_sb->setValue(slave_offset);
|
|
|
|
if (xrp.snapTo() == XRefProperties::Bottom){
|
|
ui->m_snap_to_cb->setCurrentIndex(ui->m_snap_to_cb->findData("bottom"));
|
|
ui->m_offset_sb->setEnabled(true);
|
|
}
|
|
else {
|
|
ui->m_snap_to_cb->setCurrentIndex(ui->m_snap_to_cb->findData("label"));
|
|
ui->m_offset_sb->setEnabled(false);
|
|
}
|
|
|
|
if(xrp.getXrefPos() == Qt::AlignTop) ui->m_xrefpos_cb->setCurrentIndex(ui->m_xrefpos_cb->findData("top"));
|
|
else if(xrp.getXrefPos() == Qt::AlignLeft) ui->m_xrefpos_cb->setCurrentIndex(ui->m_xrefpos_cb->findData("left"));
|
|
else if(xrp.getXrefPos() == Qt::AlignRight) ui->m_xrefpos_cb->setCurrentIndex(ui->m_xrefpos_cb->findData("right"));
|
|
else if(xrp.getXrefPos() == Qt::AlignBaseline) ui->m_xrefpos_cb->setCurrentIndex(ui->m_xrefpos_cb->findData("alignment"));
|
|
else if(xrp.getXrefPos() == Qt::AlignBottom) ui->m_xrefpos_cb->setCurrentIndex(ui->m_xrefpos_cb->findData("bottom"));
|
|
else if(xrp.getXrefPos() == Qt::AlignHCenter) ui->m_xrefpos_cb->setCurrentIndex(ui->m_xrefpos_cb->findData("text_field"));
|
|
ui->m_show_power_cb->setChecked(xrp.showPowerContact());
|
|
ui->m_show_terminal_name_cb->setChecked(xrp.showTerminalName());
|
|
ui->m_show_all_slaves_cb->setChecked(xrp.showAllConfiguredSlaves());
|
|
//The radio button only emits toggled() when it really changes: loading
|
|
//a type whose display did not change left the checkbox with the enabled
|
|
//state of the previously displayed type (it stayed clickable although
|
|
//the cross display was selected). Set the state explicitly here.
|
|
ui->m_show_all_slaves_cb->setEnabled(
|
|
ui->m_display_has_contacts_rb->isChecked());
|
|
ui->m_power_prefix_le-> setText(xrp.prefix("power"));
|
|
ui->m_delay_prefix_le-> setText(xrp.prefix("delay"));
|
|
ui->m_switch_prefix_le->setText(xrp.prefix("switch"));
|
|
ui->m_cross_properties_gb->setDisabled(!ui->m_display_has_cross_rb->isChecked());
|
|
|
|
//The cross ref of a PLC master is always drawn as its IO table, and
|
|
//the slaves are referenced directly into that table: the contacts/
|
|
//cross choice, the two display checkboxes and the cross options below
|
|
//have no effect at all for this type, so they are hidden instead of
|
|
//being offered for nothing. The positioning settings and the labels
|
|
//(the table really uses them) stay available.
|
|
const bool is_plc = type == QLatin1String("plc");
|
|
ui->m_display_has_contacts_rb->setVisible(!is_plc);
|
|
ui->m_display_has_cross_rb->setVisible(!is_plc);
|
|
ui->m_show_terminal_name_cb->setVisible(!is_plc);
|
|
ui->m_show_all_slaves_cb->setVisible(!is_plc);
|
|
ui->m_cross_properties_gb->setVisible(!is_plc);
|
|
}
|
|
|
|
/**
|
|
@brief XRefPropertiesWidget::typeChanged
|
|
manage the save of the current properties,
|
|
when the combo box of type change.
|
|
*/
|
|
void XRefPropertiesWidget::typeChanged()
|
|
{
|
|
//save the properties of the previous xref type
|
|
saveProperties(m_previous_type_index);
|
|
//update display with the current xref type
|
|
updateDisplay();
|
|
//everything is done
|
|
//previous index is now the current index
|
|
m_previous_type_index = ui->m_type_cb->currentIndex();
|
|
}
|
|
|
|
/**
|
|
@brief XRefPropertiesWidget::enableOffsetSB
|
|
Enable Offset SB only if Snap to Footer is selected
|
|
*/
|
|
void XRefPropertiesWidget::enableOffsetSB(int i){
|
|
if (i)
|
|
ui->m_offset_sb->setEnabled(false);
|
|
else
|
|
ui->m_offset_sb->setEnabled(true);
|
|
}
|