mirror of
https://github.com/qelectrotech/qelectrotech-source-mirror.git
synced 2026-10-01 23:54:13 +02:00
ispyisail
c33f250910
MasterElement::isFull() decided whether a coil had room left with
connected_elements.size() >= max_slaves
which counts linked *elements*. A slave stands for as many contacts as
its "number" kind information declares, so a 4 pole contact consumed a
single contact from the coil's budget instead of four. 36 elements in
the standard collection declare a number between 2 and 4, so this is
reachable, not theoretical.
Add ContactUsage, a header-only tally holding the two rules that are
easy to get wrong:
- a slave counts once per contact it declares, not once per element
- a changeover is counted once, as sw, and never as one NO plus one
NC. CrossRefItem::NOElements() and NCElements() both return
changeovers, so a count built by adding those two lists together
reports one changeover as two contacts.
The upcoming per-type displays (the used count in the element's General
tab, and the per-type budget on the cross reference) need exactly this
count, so it lives in one place rather than being written out three
times, and isFull() now reads it too.
The header carries no graphics dependency, so the counting rules are
unit tested on their own in tests/qttest/tst_contactusage.cpp,
following the same pattern as diagramsortkeys.h.
Verified: all 9 unit tests pass, and both rules were mutation checked
(counting elements instead of contacts fails 2 tests, counting a
changeover as both NO and NC fails 3). The 23 example projects still
load and export without crash or hang, and qet-lint reports no
regressions against its baseline.
Co-Authored-By: Claude Opus 5 <noreply@anthropic.com>
86 lines
2.6 KiB
C++
86 lines
2.6 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 CONTACTUSAGE_H
|
|
#define CONTACTUSAGE_H
|
|
|
|
#include <algorithm>
|
|
|
|
/**
|
|
@brief The ContactUsage struct
|
|
How many slave contacts a master element currently uses, broken down
|
|
by contact type.
|
|
|
|
Header-only and free of any graphics dependency so that the counting
|
|
rules can be unit tested on their own. MasterElement::contactUsage()
|
|
is the thin wrapper that feeds it the linked elements.
|
|
|
|
Two rules are easy to get wrong, and both live here so that every
|
|
caller gets them right:
|
|
- a slave stands for as many contacts as its "number" kind
|
|
information says, so a 4 pole contact counts as 4, not as 1
|
|
- a changeover contact is counted once, as sw. CrossRefItem's
|
|
NOElements() and NCElements() both return it, so adding those two
|
|
lists together would count it twice.
|
|
*/
|
|
struct ContactUsage
|
|
{
|
|
/**
|
|
Contact types a slave can declare. Mirrors
|
|
ElementData::SlaveState, which is not used directly so that this
|
|
header stays free of the element data dependencies and can be
|
|
unit tested on its own. MasterElement::contactUsage() maps
|
|
between the two.
|
|
*/
|
|
enum Type
|
|
{
|
|
NO, ///< Normally open
|
|
NC, ///< Normally closed
|
|
SW, ///< Changeover
|
|
Other ///< Neither of the above
|
|
};
|
|
|
|
int no = 0; ///< Normally open
|
|
int nc = 0; ///< Normally closed
|
|
int sw = 0; ///< Changeover
|
|
int other = 0; ///< Neither of the above
|
|
|
|
int total() const { return no + nc + sw + other; }
|
|
|
|
/**
|
|
Add one slave element to the tally.
|
|
@param type the contact type the slave declares
|
|
@param contacts how many contacts it stands for. Values below 1
|
|
are treated as 1: an element which declares no
|
|
contact count is still one contact.
|
|
*/
|
|
void addSlave(Type type, int contacts)
|
|
{
|
|
const int n = std::max(1, contacts);
|
|
|
|
switch (type)
|
|
{
|
|
case NO: no += n; break;
|
|
case NC: nc += n; break;
|
|
case SW: sw += n; break;
|
|
case Other: other += n; break;
|
|
}
|
|
}
|
|
};
|
|
|
|
#endif // CONTACTUSAGE_H
|