Use RealTerminalData struct instead of TerminalStripIndex class

This commit is contained in:
joshua
2021-09-12 12:49:12 +02:00
parent 8c554e875d
commit 37e74b397e
3 changed files with 16 additions and 107 deletions

View File

@@ -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