mirror of
https://github.com/qelectrotech/qelectrotech-source-mirror.git
synced 2026-08-01 09:04:13 +02:00
Shane Ringrose
756cfd98c0
The previous grouping compared `connectionDesignation` values (e.g. "1", "2", "3") to detect group boundaries. Those values are pin position numbers within a terminal block, not functional group identifiers, so devices like the ABB ACS880 produced 11+ tiny single-pin "groups" instead of the ~8 functional blocks (AC-IN, Motor-OUT, DC-Bus, Brake-Resistor, Analog-I/O, Digital-I/O, ...) the reviewer identified. Fix: - Add `group` field to EdzPin, populated from the `functiondefinition` attribute on <functiontemplate> (newer EPLAN) or its parent <function> element (older EPLAN). - Sort pins by group first (preserving XML appearance order per group), then by designation within each group using natural sort. - Use `groupKey()` — group when present, designation as fallback — for the group-break detection that drives separator lines and Y-gaps. Parts without any functiondefinition data retain the previous designation-based behaviour unchanged. Co-Authored-By: Claude Sonnet 4.6 <noreply@anthropic.com>
70 lines
2.4 KiB
C++
70 lines
2.4 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 EDZPART_H
|
|
#define EDZPART_H
|
|
|
|
#include <QString>
|
|
#include <QList>
|
|
#include <QMap>
|
|
|
|
/** One physical connection of an EPLAN part (a pin/terminal). */
|
|
struct EdzPin {
|
|
QString designation; ///< terminal id, e.g. "1", "PE"
|
|
QString description; ///< function label, e.g. "L+"
|
|
QString group; ///< functiondefinition block, e.g. "FINP", "MOUT"
|
|
};
|
|
|
|
/**
|
|
@brief The portable data of an EPLAN part, read from its part.xml.
|
|
|
|
Mirrors the fields the standalone edz2qet.py prototype maps: identity and
|
|
metadata, localized names (2-letter language -> text) and the connection
|
|
list. Geometry from the EPLAN macro is intentionally ignored — the importer
|
|
generates a generic symbol from the pin list instead.
|
|
*/
|
|
class EdzPart
|
|
{
|
|
public:
|
|
bool parse(const QString &part_xml_path);
|
|
QString errorString() const { return m_error; }
|
|
|
|
QString partNumber() const { return m_part_number; }
|
|
QString manufacturer() const { return m_manufacturer; }
|
|
QString orderNumber() const { return m_order_number; }
|
|
QString typeNumber() const { return m_type_number; }
|
|
QString description() const { return m_description; }
|
|
QString comment() const { return m_comment; }
|
|
QString picture() const { return m_picture; }
|
|
QMap<QString, QString> names() const { return m_names; }
|
|
QList<EdzPin> pins() const { return m_pins; }
|
|
|
|
private:
|
|
QString m_error;
|
|
QString m_part_number;
|
|
QString m_manufacturer;
|
|
QString m_order_number;
|
|
QString m_type_number;
|
|
QString m_description; ///< DESCR1, preferred English (for element-info)
|
|
QString m_comment; ///< DESCR2, preferred English
|
|
QString m_picture; ///< picture file name, if any
|
|
QMap<QString, QString> m_names; ///< 2-letter lang -> localized name
|
|
QList<EdzPin> m_pins;
|
|
};
|
|
|
|
#endif // EDZPART_H
|