kotschak/qelectrotech-source-mirror
0
0
Fork 0
mirror of https://github.com/qelectrotech/qelectrotech-source-mirror.git synced 2026-01-06 13:40:52 +01:00
Code Issues Actions 1 Packages Projects Releases Wiki Activity

Revamp PhysicalTerminal class

Browse Source
This commit is contained in:
joshua
2021-12-23 22:17:37 +01:00
parent a2e5989f3b
commit 2ea9f8a2c6
9 changed files with 303 additions and 315 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -16,6 +16,7 @@
along with QElectroTech. If not, see <http://www.gnu.org/licenses/>.
*/
#include "groupterminalscommand.h"
#include "../../utils/qetutils.h"
/**
* @brief GroupTerminalsCommand::GroupTerminalsCommand
@@ -24,8 +25,8 @@
* @param to_group : Terminals to group
*/
GroupTerminalsCommand::GroupTerminalsCommand(TerminalStrip *strip,
const PhysicalTerminalData &receiver_,
const QVector<QWeakPointer<RealTerminal>> &to_group,
const QSharedPointer<PhysicalTerminal> &receiver_,
const QVector<QSharedPointer<RealTerminal>> &to_group,
QUndoCommand *parent):
QUndoCommand(parent),
m_terminal_strip(strip),
@@ -37,18 +38,18 @@ GroupTerminalsCommand::GroupTerminalsCommand(TerminalStrip *strip,
void GroupTerminalsCommand::undo() {
if (m_terminal_strip) {
m_terminal_strip->unGroupTerminals(m_to_group);
m_terminal_strip->unGroupTerminals(QETUtils::sharedVectorToWeak(m_to_group));
}
}
void GroupTerminalsCommand::redo() {
if (m_terminal_strip) {
m_terminal_strip->groupTerminals(m_receiver, m_to_group);
m_terminal_strip->groupTerminals(m_receiver, QETUtils::sharedVectorToWeak(m_to_group));
}
}
UnGroupTerminalsCommand::UnGroupTerminalsCommand(TerminalStrip *strip,
const QVector<QWeakPointer<RealTerminal>> &to_ungroup,
const QVector<QSharedPointer<RealTerminal>> &to_ungroup,
QUndoCommand *parent) :
QUndoCommand(parent),
m_terminal_strip(strip)
@@ -62,7 +63,7 @@ void UnGroupTerminalsCommand::undo()
if (m_terminal_strip)
{
for (const auto &key : m_physical_real_H.keys()) {
m_terminal_strip->groupTerminals(key, m_physical_real_H.value(key));
m_terminal_strip->groupTerminals(key, QETUtils::sharedVectorToWeak(m_physical_real_H.value(key)));
}
}
}
@@ -72,24 +73,26 @@ void UnGroupTerminalsCommand::redo()
if (m_terminal_strip)
{
for (const auto &value : qAsConst(m_physical_real_H)) {
m_terminal_strip->unGroupTerminals(value);
m_terminal_strip->unGroupTerminals(QETUtils::sharedVectorToWeak(value));
}
}
}
void UnGroupTerminalsCommand::setUp(const QVector<QWeakPointer<RealTerminal>> &to_ungroup)
void UnGroupTerminalsCommand::setUp(const QVector<QSharedPointer<RealTerminal>> &to_ungroup)
{
for (const auto &rt_ : to_ungroup)
{
auto ptd_ = m_terminal_strip->physicalTerminalData(rt_);
auto phy_t = m_terminal_strip->physicalTerminal(rt_.toWeakRef());
if (phy_t)
{
//Physical have only one real terminal, no need to ungroup it
if (phy_t.toStrongRef()->realTerminalCount() <= 1) {
continue;
}
//Physical have only one real terminal, no need to ungroup it
if (ptd_.realTerminalCount() <= 1) {
continue;
auto vector_ = m_physical_real_H.value(phy_t);
vector_.append(rt_);
m_physical_real_H.insert(phy_t, vector_);
}
auto vector_ = m_physical_real_H.value(ptd_);
vector_.append(rt_);
m_physical_real_H.insert(ptd_, vector_);
}
}

14
sources/TerminalStrip/UndoCommand/groupterminalscommand.h
View File

@@ -31,8 +31,8 @@ class GroupTerminalsCommand : public QUndoCommand
{
public:
GroupTerminalsCommand(TerminalStrip *strip,
const PhysicalTerminalData &receiver_,
const QVector<QWeakPointer<RealTerminal>> &to_group,
const QSharedPointer<PhysicalTerminal> &receiver_,
const QVector<QSharedPointer<RealTerminal>> &to_group,
QUndoCommand *parent = nullptr);
void undo() override;
@@ -40,8 +40,8 @@ class GroupTerminalsCommand : public QUndoCommand
private:
QPointer<TerminalStrip> m_terminal_strip;
PhysicalTerminalData m_receiver;
QVector<QWeakPointer<RealTerminal>> m_to_group;
QSharedPointer<PhysicalTerminal> m_receiver;
QVector<QSharedPointer<RealTerminal>> m_to_group;
};
/**
@@ -52,18 +52,18 @@ class UnGroupTerminalsCommand : public QUndoCommand
{
public:
UnGroupTerminalsCommand(TerminalStrip *strip,
const QVector<QWeakPointer<RealTerminal>> &to_ungroup,
const QVector<QSharedPointer<RealTerminal>> &to_ungroup,
QUndoCommand *parent = nullptr);
void undo() override;
void redo() override;
private:
void setUp(const QVector<QWeakPointer<RealTerminal>> &to_ungroup);
void setUp(const QVector<QSharedPointer<RealTerminal>> &to_ungroup);
private:
QPointer<TerminalStrip> m_terminal_strip;
QHash <PhysicalTerminalData, QVector<QWeakPointer<RealTerminal>>> m_physical_real_H;
QHash <QSharedPointer<PhysicalTerminal>, QVector<QSharedPointer<RealTerminal>>> m_physical_real_H;
};
#endif // GROUPTERMINALSCOMMAND_H

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

@@ -17,33 +17,35 @@
*/
#include "sortterminalstripcommand.h"
#include "../terminalstrip.h"
#include "../../utils/qetutils.h"
SortTerminalStripCommand::SortTerminalStripCommand(TerminalStrip *strip, QUndoCommand *parent) :
QUndoCommand(parent),
m_strip(strip)
{
setText(QObject::tr("Trier le bornier %1").arg(m_strip->name()));
m_old_order = m_new_order = m_strip->physicalTerminalData();
m_old_order = QETUtils::weakVectorToShared(m_strip->physicalTerminal());
m_new_order = QETUtils::weakVectorToShared(m_strip->physicalTerminal());
sort();
}
void SortTerminalStripCommand::undo()
{
if (m_strip) {
m_strip->setOrderTo(m_old_order);
m_strip->setOrderTo(QETUtils::sharedVectorToWeak(m_old_order));
}
}
void SortTerminalStripCommand::redo()
{
if (m_strip) {
m_strip->setOrderTo(m_new_order);
m_strip->setOrderTo(QETUtils::sharedVectorToWeak(m_new_order));
}
}
void SortTerminalStripCommand::sort()
{
std::sort(m_new_order.begin(), m_new_order.end(), [](PhysicalTerminalData arg1, PhysicalTerminalData arg2)
std::sort(m_new_order.begin(), m_new_order.end(), [](QSharedPointer<PhysicalTerminal> arg1, QSharedPointer<PhysicalTerminal> arg2)
{
const QRegularExpression rx(QStringLiteral("^\\d+"));
@@ -52,9 +54,9 @@ void SortTerminalStripCommand::sort()
int int1 =-1;
int int2 =-1;
if (arg1.realTerminalCount())
if (arg1->realTerminalCount())
{
str1 = arg1.realTerminals().constLast().toStrongRef()->label();
str1 = arg1->realTerminals().constLast().toStrongRef()->label();
auto match = rx.match(str1);
if (match.hasMatch()) {
@@ -62,9 +64,9 @@ void SortTerminalStripCommand::sort()
}
}
if (arg2.realTerminalCount())
if (arg2->realTerminalCount())
{
str2 = arg2.realTerminals().constLast().toStrongRef()->label();
str2 = arg2->realTerminals().constLast().toStrongRef()->label();
auto match = rx.match(str2);
if (match.hasMatch()) {

6
sources/TerminalStrip/UndoCommand/sortterminalstripcommand.h
View File

@@ -23,7 +23,7 @@
#include <QVector>
class TerminalStrip;
class PhysicalTerminalData;
class PhysicalTerminal;
/**
* @brief The SortTerminalStripCommand class
@@ -43,8 +43,8 @@ class SortTerminalStripCommand : public QUndoCommand
private:
QPointer<TerminalStrip> m_strip;
QVector<PhysicalTerminalData> m_old_order,
m_new_order;
QVector<QSharedPointer<PhysicalTerminal>> m_old_order,
m_new_order;
};
#endif // SORTTERMINALSTRIPCOMMAND_H