realAscot/qelectrotech-source-mirror
realAscot/qelectrotech-source-mirror
1
0
Fork 0
mirror of https://github.com/qelectrotech/qelectrotech-source-mirror.git synced 2025-09-13 20:23:04 +02:00
Code Packages Releases 1 Activity

Minor Fix : undo command for unbridge strip don't work

Browse Source
This commit is contained in:
joshua 2022-01-27 19:45:33 +01:00
parent 993eb58d46
commit d114b097bf
2 changed files with 22 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
sources/TerminalStrip/terminalstrip.cpp
View File

@ -469,6 +469,26 @@ bool TerminalStrip::isBridgeable(const QVector<QSharedPointer<RealTerminal>> &re
return no_bridged; return no_bridged;
} }
/**
* @brief TerminalStrip::isBridgeable
* Check if all RealTerminal of @a real_terminals can be bridged to
* the bridge @a bridge.
* @param real_terminals
* @return true if can be bridged.
*/
bool TerminalStrip::isBridgeable(QSharedPointer<TerminalStripBridge> bridge, const QVector<QSharedPointer<RealTerminal> > &real_terminals) const
{
if (real_terminals.isEmpty() ||
!m_bridge.contains(bridge)) {
return false;
}
auto vector_ = bridge->realTerminals();
vector_.append(real_terminals);
return isBridgeable(vector_);
}
/** /**
* @brief TerminalStrip::setBridge * @brief TerminalStrip::setBridge
* Set a bridge betwen all real terminal of @a real_terminals * Set a bridge betwen all real terminal of @a real_terminals
@ -508,7 +528,7 @@ bool TerminalStrip::setBridge(const QSharedPointer<TerminalStripBridge> &bridge,
{ {
if (bridge) if (bridge)
{ {
if (!isBridgeable(real_terminals)) { if (!isBridgeable(bridge, real_terminals)) {
return false; return false;
} }

1
sources/TerminalStrip/terminalstrip.h
View File

@ -93,6 +93,7 @@ class TerminalStrip : public QObject
bool setLevel(const QSharedPointer<RealTerminal> &real_terminal, int level); bool setLevel(const QSharedPointer<RealTerminal> &real_terminal, int level);
bool isBridgeable(const QVector<QSharedPointer<RealTerminal>> &real_terminals) const; bool isBridgeable(const QVector<QSharedPointer<RealTerminal>> &real_terminals) const;
bool isBridgeable(QSharedPointer<TerminalStripBridge> bridge, const QVector<QSharedPointer<RealTerminal>> &real_terminals) const;
bool setBridge(const QVector<QSharedPointer<RealTerminal>> &real_terminals); bool setBridge(const QVector<QSharedPointer<RealTerminal>> &real_terminals);
bool setBridge(const QSharedPointer<TerminalStripBridge> &bridge, const QVector<QSharedPointer<RealTerminal>> &real_terminals); bool setBridge(const QSharedPointer<TerminalStripBridge> &bridge, const QVector<QSharedPointer<RealTerminal>> &real_terminals);
void unBridge(const QVector<QSharedPointer<RealTerminal>> &real_terminals); void unBridge(const QVector<QSharedPointer<RealTerminal>> &real_terminals);