mirror of
https://github.com/qelectrotech/qelectrotech-source-mirror.git
synced 2026-10-03 17:34:12 +02:00
ispyisail
6f2c66afef
Second half of #819: where a coil declares what contacts it provides, the General tab now reports each type as used against declared rather than as a bare count. NO : 3/4, NC : 1/2, inverseurs : 0/1, autres : 0/0 MasterElement::contactCapacity() sums contactCount over the element's SlaveContactGroup list, per type, reusing the same ContactUsage tally the used count is built on. The mapping from ElementData::SlaveState onto the tally's own type is factored into one helper so the used count and the declared capacity cannot classify a contact differently. Falls back to the plain count from the previous commit when an element declares no groups, which is every element in the standard collection today -- nothing in the corpus declares slaveContactGroups, so this changes no existing display. A type used beyond what is declared reads as e.g. "1/0". That is deliberate: it says this contact does not fit the part. Display only. Whether a declared capacity should also feed MasterElement::isFull() is the open question in #819 and is not touched here. Verified end to end against a purpose-built fixture, since no existing element exercises this path: a coil declaring two NO groups of two, one NC group of two and one changeover group of one parses and reports NO=4 NC=2 SW=1 other=0 total=7, matching the declaration exactly. tst_contactusage gains a case covering capacity summed across groups (10 cases, all passing). Co-Authored-By: Claude Opus 5 <noreply@anthropic.com>
74 lines
2.1 KiB
C++
74 lines
2.1 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 MASTERELEMENT_H
|
|
#define MASTERELEMENT_H
|
|
|
|
#include "element.h"
|
|
#include "../contactusage.h"
|
|
#include <QHash>
|
|
#include <QMetaObject>
|
|
|
|
class CrossRefItem;
|
|
|
|
/**
|
|
@brief The MasterElement class
|
|
This class is a custom element, with extended behavior
|
|
to be a master element. Master element can be linked with slave element
|
|
and display a cross ref item for know with what other element he is linked
|
|
*/
|
|
class MasterElement : public Element
|
|
{
|
|
Q_OBJECT
|
|
|
|
public:
|
|
explicit MasterElement(
|
|
const ElementsLocation &,
|
|
QGraphicsItem * = nullptr,
|
|
int * = nullptr);
|
|
~MasterElement() override;
|
|
|
|
void linkToElement (Element *elmt) override;
|
|
void unlinkAllElements () override;
|
|
void unlinkElement (Element *elmt) override;
|
|
void initLink (QETProject *project) override;
|
|
QRectF XrefBoundingRect() const;
|
|
|
|
ContactUsage contactUsage() const;
|
|
ContactUsage contactCapacity() const;
|
|
bool isFull() const; // Check Slave-Limit
|
|
|
|
protected:
|
|
QVariant itemChange(
|
|
GraphicsItemChange change,
|
|
const QVariant &value) override;
|
|
|
|
private:
|
|
void xrefPropertiesChanged();
|
|
void aboutDeleteXref ();
|
|
void connectSlavePositionUpdates(Element *slave);
|
|
void disconnectSlavePositionUpdates(Element *slave);
|
|
|
|
private:
|
|
CrossRefItem *m_Xref_item = nullptr;
|
|
bool m_first_scene_change = true;
|
|
QHash<Element*, QMetaObject::Connection> m_slave_x_conn;
|
|
QHash<Element*, QMetaObject::Connection> m_slave_y_conn;
|
|
};
|
|
|
|
#endif // MASTERELEMENT_H
|