mirror of
https://github.com/qelectrotech/qelectrotech-source-mirror.git
synced 2026-09-28 04:54:13 +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.
108 lines
3.3 KiB
C++
108 lines
3.3 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/>.
|
|
*/
|
|
#ifndef XREFPROPERTIES_H
|
|
#define XREFPROPERTIES_H
|
|
|
|
#include <QStringList>
|
|
#include <QHash>
|
|
|
|
#include "propertiesinterface.h"
|
|
|
|
/**
|
|
@brief The XRefProperties class
|
|
this class store properties used by XrefItem
|
|
*/
|
|
class XRefProperties : public PropertiesInterface
|
|
{
|
|
public:
|
|
XRefProperties();
|
|
|
|
enum DisplayHas {
|
|
Cross,
|
|
Contacts
|
|
};
|
|
|
|
enum SnapTo {
|
|
Bottom,
|
|
Label
|
|
};
|
|
|
|
void toSettings (QSettings &settings,
|
|
const QString = QString()) const override;
|
|
void fromSettings (const QSettings &settings,
|
|
const QString = QString()) override;
|
|
QDomElement toXml (QDomDocument &xml_document) const override;
|
|
bool fromXml(const QDomElement &xml_element) override;
|
|
|
|
static QHash<QString, XRefProperties> defaultProperties();
|
|
|
|
bool operator == (const XRefProperties &xrp) const;
|
|
bool operator != (const XRefProperties &xrp) const;
|
|
|
|
void setShowPowerContac (const bool a) {m_show_power_ctc = a;}
|
|
bool showPowerContact () const {return m_show_power_ctc;}
|
|
|
|
void setShowTerminalName (const bool a) {m_show_terminal_name = a;}
|
|
bool showTerminalName () const {return m_show_terminal_name;}
|
|
|
|
void setShowAllConfiguredSlaves (const bool a) {m_show_all_configured_slaves = a;}
|
|
bool showAllConfiguredSlaves () const {return m_show_all_configured_slaves;}
|
|
|
|
void setDisplayHas (const DisplayHas dh) {m_display = dh;}
|
|
DisplayHas displayHas () const {return m_display;}
|
|
|
|
void setSnapTo (const SnapTo st) {m_snap_to = st;}
|
|
SnapTo snapTo () const {return m_snap_to;}
|
|
|
|
void setXrefPos(const Qt::AlignmentFlag xref) {m_xref_pos = xref;}
|
|
Qt::AlignmentFlag getXrefPos() const {return m_xref_pos;}
|
|
void setPrefix (const QString &key, const QString &value) {m_prefix.insert(key, value);}
|
|
QString prefix (const QString &key) const {return m_prefix.value(key);}
|
|
|
|
void setMasterLabel (const QString master) {m_master_label = master;}
|
|
QString masterLabel () const {return m_master_label;}
|
|
|
|
void setSlaveLabel(const QString slave) {m_slave_label = slave;}
|
|
QString slaveLabel () const {return m_slave_label;}
|
|
|
|
void setOffset(const int offset) {m_offset = offset;}
|
|
int offset() const {return m_offset;}
|
|
|
|
void setSlaveOffset(const int offset) {m_slave_offset = offset;}
|
|
int slaveOffset() const {return m_slave_offset;}
|
|
|
|
void setKey(QString& key) {m_key = key;}
|
|
|
|
private:
|
|
bool m_show_power_ctc;
|
|
bool m_show_terminal_name;
|
|
bool m_show_all_configured_slaves;
|
|
DisplayHas m_display;
|
|
SnapTo m_snap_to;
|
|
Qt::AlignmentFlag m_xref_pos;
|
|
QHash <QString, QString> m_prefix;
|
|
QStringList m_prefix_keys;
|
|
QString m_master_label;
|
|
QString m_slave_label;
|
|
int m_offset;
|
|
int m_slave_offset;
|
|
QString m_key;
|
|
};
|
|
|
|
#endif // XREFPROPERTIES_H
|