kotschak/qelectrotech-source-mirror
0
0
Fork 0
mirror of https://github.com/qelectrotech/qelectrotech-source-mirror.git synced 2026-03-03 20:19:59 +01:00
Code Issues Actions Packages Projects Releases Wiki Activity

Revamp terminalStrip feature code

Browse Source 
Move RealTerminal class in a new file
Move PhysicalTerminal class in a new file.
Remove the use of QWeakPointer and use instead QSharedPointer
in a big part of the revamp.
This commit is contained in:
joshua
2021-12-26 17:26:00 +01:00
parent 2ea9f8a2c6
commit 5709f469fc
13 changed files with 844 additions and 799 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
sources/TerminalStrip/UndoCommand/bridgeterminalscommand.cpp
View File

@@ -18,7 +18,7 @@
#include "bridgeterminalscommand.h"
BridgeTerminalsCommand::BridgeTerminalsCommand(TerminalStrip *strip,
QVector<QWeakPointer<RealTerminal>> real_terminal,
QVector<QSharedPointer<RealTerminal>> real_terminal,
QUndoCommand *parent):
QUndoCommand(parent),
m_strip(strip),
@@ -42,7 +42,7 @@ void BridgeTerminalsCommand::redo()
}
UnBridgeTerminalsCommand::UnBridgeTerminalsCommand(TerminalStrip *strip,
QVector<QWeakPointer<RealTerminal>> real_terminal,
QVector<QSharedPointer<RealTerminal>> real_terminal,
QUndoCommand *parent):
QUndoCommand(parent),
m_strip(strip)
@@ -52,14 +52,14 @@ UnBridgeTerminalsCommand::UnBridgeTerminalsCommand(TerminalStrip *strip,
if (strip->canUnBridge(real_terminal))
{
m_terminals = real_terminal;
m_bridge = strip->bridgeFor(real_terminal.first());
m_bridge = strip->isBridged(real_terminal.first());
}
}
void UnBridgeTerminalsCommand::undo()
{
if (m_strip && m_bridge) {
m_strip->setBridge(m_bridge.toStrongRef(), m_terminals);
m_strip->setBridge(m_bridge, m_terminals);
}
}

10
sources/TerminalStrip/UndoCommand/bridgeterminalscommand.h
View File

@@ -33,7 +33,7 @@
class BridgeTerminalsCommand : public QUndoCommand
{
public:
BridgeTerminalsCommand(TerminalStrip *strip, QVector<QWeakPointer<RealTerminal>> real_terminal, QUndoCommand *parent = nullptr);
BridgeTerminalsCommand(TerminalStrip *strip, QVector<QSharedPointer<RealTerminal>> real_terminal, QUndoCommand *parent = nullptr);
~BridgeTerminalsCommand() override {}
void undo() override;
@@ -41,7 +41,7 @@ class BridgeTerminalsCommand : public QUndoCommand
private:
QPointer<TerminalStrip> m_strip;
QVector<QWeakPointer<RealTerminal>> m_real_terminal_vector;
QVector<QSharedPointer<RealTerminal>> m_real_terminal_vector;
};
@@ -53,7 +53,7 @@ class BridgeTerminalsCommand : public QUndoCommand
class UnBridgeTerminalsCommand : public QUndoCommand
{
public:
UnBridgeTerminalsCommand(TerminalStrip *strip, QVector<QWeakPointer<RealTerminal>> real_terminal, QUndoCommand *parent = nullptr);
UnBridgeTerminalsCommand(TerminalStrip *strip, QVector<QSharedPointer<RealTerminal>> real_terminal, QUndoCommand *parent = nullptr);
~UnBridgeTerminalsCommand() override{}
void undo() override;
@@ -61,8 +61,8 @@ class UnBridgeTerminalsCommand : public QUndoCommand
private:
QPointer<TerminalStrip> m_strip;
QWeakPointer<TerminalStripBridge> m_bridge;
QVector<QWeakPointer<RealTerminal>> m_terminals;
QSharedPointer<TerminalStripBridge> m_bridge;
QVector<QSharedPointer<RealTerminal>> m_terminals;
};
#endif // BRIDGETERMINALSCOMMAND_H

1
sources/TerminalStrip/UndoCommand/changeterminallevel.cpp
View File

@@ -16,6 +16,7 @@
along with QElectroTech. If not, see <http://www.gnu.org/licenses/>.
*/
#include "changeterminallevel.h"
#include "../realterminal.h"
ChangeTerminalLevel::ChangeTerminalLevel(TerminalStrip *strip,
const QWeakPointer<RealTerminal> &real_terminal,

11
sources/TerminalStrip/UndoCommand/groupterminalscommand.cpp
View File

@@ -17,6 +17,7 @@
*/
#include "groupterminalscommand.h"
#include "../../utils/qetutils.h"
#include "../physicalterminal.h"
/**
* @brief GroupTerminalsCommand::GroupTerminalsCommand
@@ -38,13 +39,13 @@ GroupTerminalsCommand::GroupTerminalsCommand(TerminalStrip *strip,
void GroupTerminalsCommand::undo() {
if (m_terminal_strip) {
m_terminal_strip->unGroupTerminals(QETUtils::sharedVectorToWeak(m_to_group));
m_terminal_strip->unGroupTerminals(m_to_group);
}
}
void GroupTerminalsCommand::redo() {
if (m_terminal_strip) {
m_terminal_strip->groupTerminals(m_receiver, QETUtils::sharedVectorToWeak(m_to_group));
m_terminal_strip->groupTerminals(m_receiver,m_to_group);
}
}
@@ -63,7 +64,7 @@ void UnGroupTerminalsCommand::undo()
if (m_terminal_strip)
{
for (const auto &key : m_physical_real_H.keys()) {
m_terminal_strip->groupTerminals(key, QETUtils::sharedVectorToWeak(m_physical_real_H.value(key)));
m_terminal_strip->groupTerminals(key, m_physical_real_H.value(key));
}
}
}
@@ -73,7 +74,7 @@ void UnGroupTerminalsCommand::redo()
if (m_terminal_strip)
{
for (const auto &value : qAsConst(m_physical_real_H)) {
m_terminal_strip->unGroupTerminals(QETUtils::sharedVectorToWeak(value));
m_terminal_strip->unGroupTerminals(value);
}
}
}
@@ -86,7 +87,7 @@ void UnGroupTerminalsCommand::setUp(const QVector<QSharedPointer<RealTerminal>>
if (phy_t)
{
//Physical have only one real terminal, no need to ungroup it
if (phy_t.toStrongRef()->realTerminalCount() <= 1) {
if (phy_t->realTerminalCount() <= 1) {
continue;
}

14
sources/TerminalStrip/UndoCommand/sortterminalstripcommand.cpp
View File

@@ -17,6 +17,8 @@
*/
#include "sortterminalstripcommand.h"
#include "../terminalstrip.h"
#include "../physicalterminal.h"
#include "../realterminal.h"
#include "../../utils/qetutils.h"
SortTerminalStripCommand::SortTerminalStripCommand(TerminalStrip *strip, QUndoCommand *parent) :
@@ -24,22 +26,22 @@ SortTerminalStripCommand::SortTerminalStripCommand(TerminalStrip *strip, QUndoCo
m_strip(strip)
{
setText(QObject::tr("Trier le bornier %1").arg(m_strip->name()));
m_old_order = QETUtils::weakVectorToShared(m_strip->physicalTerminal());
m_new_order = QETUtils::weakVectorToShared(m_strip->physicalTerminal());
m_old_order = m_strip->physicalTerminal();
m_new_order = m_strip->physicalTerminal();
sort();
}
void SortTerminalStripCommand::undo()
{
if (m_strip) {
m_strip->setOrderTo(QETUtils::sharedVectorToWeak(m_old_order));
m_strip->setOrderTo(m_old_order);
}
}
void SortTerminalStripCommand::redo()
{
if (m_strip) {
m_strip->setOrderTo(QETUtils::sharedVectorToWeak(m_new_order));
m_strip->setOrderTo(m_new_order);
}
}
@@ -56,7 +58,7 @@ void SortTerminalStripCommand::sort()
if (arg1->realTerminalCount())
{
str1 = arg1->realTerminals().constLast().toStrongRef()->label();
str1 = arg1->realTerminals().constLast()->label();
auto match = rx.match(str1);
if (match.hasMatch()) {
@@ -66,7 +68,7 @@ void SortTerminalStripCommand::sort()
if (arg2->realTerminalCount())
{
str2 = arg2->realTerminals().constLast().toStrongRef()->label();
str2 = arg2->realTerminals().constLast()->label();
auto match = rx.match(str2);
if (match.hasMatch()) {