mirror of
https://github.com/qelectrotech/qelectrotech-source-mirror.git
synced 2026-01-04 19:40:53 +01:00
Use RealTerminalData struct instead of TerminalStripIndex class
This commit is contained in:
@@ -44,12 +44,16 @@ struct RealTerminalData
|
||||
cable_wire_,
|
||||
conductor_;
|
||||
|
||||
QUuid uuid_;
|
||||
|
||||
ElementData::TerminalType type_;
|
||||
ElementData::TerminalFunction function_;
|
||||
|
||||
bool led_ = false,
|
||||
is_element = false;
|
||||
|
||||
TerminalElement *element_ = nullptr;
|
||||
|
||||
};
|
||||
|
||||
struct PhysicalTerminalData
|
||||
@@ -99,7 +103,6 @@ class TerminalStrip : public QObject
|
||||
bool haveTerminal (Element *terminal);
|
||||
|
||||
int physicalTerminalCount() const;
|
||||
TerminalStripIndex index(int index = 0);
|
||||
|
||||
PhysicalTerminalData physicalTerminalData(int index);
|
||||
|
||||
@@ -124,27 +127,4 @@ class TerminalStrip : public QObject
|
||||
QVector<QSharedPointer<PhysicalTerminal>> m_physical_terminals;
|
||||
};
|
||||
|
||||
class TerminalStripIndex
|
||||
{
|
||||
friend class TerminalStrip;
|
||||
|
||||
private :
|
||||
TerminalStripIndex () {}
|
||||
TerminalStripIndex (TerminalStripIndex *) {}
|
||||
|
||||
public:
|
||||
bool isValid() const;
|
||||
QString label(int level = 0) const;
|
||||
QUuid uuid(int level = 0) const;
|
||||
bool isElement(int level = 0) const;
|
||||
TerminalElement *element(int level = 0) const;
|
||||
|
||||
private:
|
||||
QVector<QString> m_label;
|
||||
QVector<QUuid> m_uuid;
|
||||
bool m_valid = false;
|
||||
QVector<bool> m_is_element;
|
||||
QVector<TerminalElement *> m_element;
|
||||
};
|
||||
|
||||
#endif // TERMINALSTRIP_H
|
||||
|
||||
Reference in New Issue
Block a user