kotschak/qelectrotech-source-mirror
0
0
Fork 0
mirror of https://github.com/qelectrotech/qelectrotech-source-mirror.git synced 2025-12-17 20:50:34 +01:00
Code Issues Actions Packages Projects Releases Wiki Activity

Clear code

Browse Source
This commit is contained in:
joshua
2021-10-09 12:08:18 +02:00
parent 089f260d9b
commit c6e3e385ff
2 changed files with 7 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
sources/TerminalStrip/terminalstrip.cpp
View File

@@ -509,7 +509,6 @@ PhysicalTerminalData TerminalStrip::physicalTerminalData(int index) const
if (index < m_physical_terminals.size()) if (index < m_physical_terminals.size())
{ {
auto physical_terminal = m_physical_terminals.at(index); auto physical_terminal = m_physical_terminals.at(index);
ptd.physical_terminal = physical_terminal;
ptd.pos_ = index; ptd.pos_ = index;
for (auto real_terminal : physical_terminal->terminals()) { for (auto real_terminal : physical_terminal->terminals()) {
auto rtd = realTerminalData(real_terminal); auto rtd = realTerminalData(real_terminal);
@@ -541,7 +540,6 @@ PhysicalTerminalData TerminalStrip::physicalTerminalData(const RealTerminalData
return ptd_; return ptd_;
} }
ptd_.physical_terminal = phy_t;
ptd_.pos_ = m_physical_terminals.indexOf(phy_t); ptd_.pos_ = m_physical_terminals.indexOf(phy_t);
for (auto real_terminal : phy_t->terminals()) { for (auto real_terminal : phy_t->terminals()) {
auto rtd = realTerminalData(real_terminal); auto rtd = realTerminalData(real_terminal);
@@ -590,8 +588,13 @@ bool TerminalStrip::setOrderTo(QVector<PhysicalTerminalData> sorted_vector)
QVector<QSharedPointer<PhysicalTerminal>> new_order; QVector<QSharedPointer<PhysicalTerminal>> new_order;
for (auto ptd : sorted_vector) for (auto ptd : sorted_vector)
{ {
if (m_physical_terminals.contains(ptd.physical_terminal)) { const auto physical_t = physicalTerminalForUuid(ptd.uuid_);
new_order.append(ptd.physical_terminal); if (physical_t.isNull()) {
continue;
}
if (m_physical_terminals.contains(physical_t)) {
new_order.append(physical_t);
} else { } else {
return false; return false;
} }
@@ -806,15 +809,6 @@ QSharedPointer<PhysicalTerminal> TerminalStrip::physicalTerminal(QSharedPointer<
return pt; return pt;
} }
/**
* @brief TerminalStrip::elementForRealTerminal
* @param rt
* @return the element associated to \p rt, the returned element can be nullptr;
*/
Element *TerminalStrip::elementForRealTerminal(QSharedPointer<RealTerminal> rt) const {
return rt.data()->element();
}
RealTerminalData TerminalStrip::realTerminalData(QSharedPointer<RealTerminal> real_terminal) const RealTerminalData TerminalStrip::realTerminalData(QSharedPointer<RealTerminal> real_terminal) const
{ {
RealTerminalData rtd; RealTerminalData rtd;

3
sources/TerminalStrip/terminalstrip.h
View File

@@ -58,7 +58,6 @@ struct PhysicalTerminalData
{ {
QVector<RealTerminalData> real_terminals_vector; QVector<RealTerminalData> real_terminals_vector;
int pos_ = -1; int pos_ = -1;
QSharedPointer<PhysicalTerminal> physical_terminal;
QUuid uuid_; QUuid uuid_;
}; };
@@ -120,8 +119,6 @@ class TerminalStrip : public QObject
QDomElement toXml(QDomDocument &parent_document); QDomElement toXml(QDomDocument &parent_document);
bool fromXml(QDomElement &xml_element); bool fromXml(QDomElement &xml_element);
Element *elementForRealTerminal(QSharedPointer<RealTerminal> rt) const;
private: private:
QSharedPointer<RealTerminal> realTerminal(Element *terminal); QSharedPointer<RealTerminal> realTerminal(Element *terminal);
QSharedPointer<PhysicalTerminal> physicalTerminal(QSharedPointer<RealTerminal> terminal) const; QSharedPointer<PhysicalTerminal> physicalTerminal(QSharedPointer<RealTerminal> terminal) const;