mirror of
https://github.com/qelectrotech/qelectrotech-source-mirror.git
synced 2026-10-05 18:54:14 +02:00
ispyisail
b8eb5c90a1
The stacking added in #1287 tested the crosses' bounding rects, so crosses whose frames or empty margins touched were raised although no text was hidden (the list display case found in review). The texts each cross really draws are now recorded while its geometry is built, and a cross is raised only when one of its texts would be drawn over a text of another one. A new "Empiler les références dont les textes se chevauchent" checkbox in the cross reference properties, per type, turns the stacking off; the crosses of that type are then only centred, as before #1287. It is saved in the project (xref attribute "stackoverlapping") and in the settings, and is on when absent. Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com>
270 lines
11 KiB
C++
270 lines
11 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.setStackOverlapping(ui->m_stack_overlapping_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());
|
|
//The boxes cannot show a value below their minimum (the offset's
|
|
//minimum is its "Default" entry, standing for the stored 0): keep
|
|
//the stored value unless the box shows something else.
|
|
if (ui->m_offset_sb->value() != qBound(ui->m_offset_sb->minimum(), xrp.offset(),
|
|
ui->m_offset_sb->maximum()))
|
|
xrp.setOffset(ui->m_offset_sb->value());
|
|
if (ui->m_slave_offset_sb->value() != qBound(ui->m_slave_offset_sb->minimum(), xrp.slaveOffset(),
|
|
ui->m_slave_offset_sb->maximum()))
|
|
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);
|
|
}
|
|
ui->m_stack_overlapping_cb->setChecked(xrp.stackOverlapping());
|
|
ui->m_stack_overlapping_cb->setEnabled(ui->m_offset_sb->isEnabled());
|
|
|
|
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_stack_overlapping_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);
|
|
ui->m_stack_overlapping_cb->setEnabled(ui->m_offset_sb->isEnabled());
|
|
}
|