kotschak/qelectrotech-source-mirror
0
0
Fork 0
mirror of https://github.com/qelectrotech/qelectrotech-source-mirror.git synced 2025-12-24 03:10:52 +01:00
Code Issues Actions Packages Projects Releases Wiki Activity

Code refactoring

Browse Source
This commit is contained in:
joshua
2021-08-23 20:44:53 +02:00
parent 80601a415a
commit 4dd2dc259f
5 changed files with 156 additions and 88 deletions
Download Patch File Download Diff File Expand all files Collapse all files

81
sources/TerminalStrip/terminalstrip.cpp
View File

@@ -468,16 +468,6 @@ int TerminalStrip::physicalTerminalCount() const {
return m_physical_terminals.size();
}
/**
* @brief TerminalStrip::realTerminalCount
* @return the number of real terminal.
* A real terminal is a part of a physical terminal.
*/
int TerminalStrip::realTerminalCount() const
{
return m_real_terminals.size();
}
TerminalStripIndex TerminalStrip::index(int index)
{
TerminalStripIndex tsi_;
@@ -500,6 +490,29 @@ TerminalStripIndex TerminalStrip::index(int index)
return tsi_;
}
/**
* @brief TerminalStrip::physicalTerminalData
* @param index
* @return The data of the physical terminal at index \p index
*/
PhysicalTerminalData TerminalStrip::physicalTerminalData(int index)
{
PhysicalTerminalData ptd;
if (index < m_physical_terminals.size())
{
auto physical_terminal = m_physical_terminals.at(index);
ptd.physical_terminal = physical_terminal;
ptd.pos_ = index;
for (auto real_terminal : physical_terminal->terminals()) {
auto rtd = realTerminalData(real_terminal);
ptd.real_terminals_vector.append(rtd);
}
}
return ptd;
}
/**
* @brief TerminalStrip::terminalElement
* @return A vector of all terminal element owned by this strip
@@ -582,33 +595,6 @@ bool TerminalStrip::fromXml(QDomElement &xml_element)
return true;
}
RealTerminalData TerminalStrip::realTerminalData(int real_terminal_index)
{
RealTerminalData rtd;
if (m_real_terminals.isEmpty() ||
real_terminal_index >= m_real_terminals.size()) {
return rtd;
}
auto real_terminal = m_real_terminals.at(real_terminal_index);
auto physical_terminal = physicalTerminal(real_terminal);
rtd.m_real_terminal = m_real_terminals.at(real_terminal_index);
rtd.pos_ = m_physical_terminals.indexOf(physical_terminal);
rtd.level_ = physical_terminal->levelOf(real_terminal);
rtd.label_ = real_terminal->label();
if (real_terminal->isElement()) {
rtd.Xref_ = autonum::AssignVariables::genericXref(real_terminal->element());
}
rtd.type_ = real_terminal->type();
rtd.function_ = real_terminal->function();
rtd.led_ = real_terminal->led();
rtd.is_element = real_terminal->isElement();
return rtd;
}
/**
* @brief TerminalStrip::realTerminal
* @param terminal
@@ -659,6 +645,27 @@ Element *TerminalStrip::elementForRealTerminal(QSharedPointer<RealTerminal> rt)
return rt.data()->element();
}
RealTerminalData TerminalStrip::realTerminalData(QSharedPointer<RealTerminal> real_terminal)
{
RealTerminalData rtd;
auto physical_terminal = physicalTerminal(real_terminal);
rtd.m_real_terminal = real_terminal;
rtd.level_ = physical_terminal->levelOf(real_terminal);
rtd.label_ = real_terminal->label();
if (real_terminal->isElement()) {
rtd.Xref_ = autonum::AssignVariables::genericXref(real_terminal->element());
}
rtd.type_ = real_terminal->type();
rtd.function_ = real_terminal->function();
rtd.led_ = real_terminal->led();
rtd.is_element = real_terminal->isElement();
return rtd;
}
/************************************************************************************/
/************************************************************************************/
/************************************************************************************/