mirror of
https://github.com/qelectrotech/qelectrotech-source-mirror.git
synced 2025-12-18 22:00:35 +01:00
Change the way how multi-level terminals are sorted
This commit is contained in:
@@ -45,7 +45,7 @@ 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(), [](PhysicalTerminalData arg1, PhysicalTerminalData arg2)
|
||||||
{
|
{
|
||||||
QRegularExpression rx(QStringLiteral("^\\d+"));
|
const QRegularExpression rx(QStringLiteral("^\\d+"));
|
||||||
|
|
||||||
QString str1;
|
QString str1;
|
||||||
QString str2;
|
QString str2;
|
||||||
@@ -54,7 +54,7 @@ void SortTerminalStripCommand::sort()
|
|||||||
|
|
||||||
if (arg1.real_terminals_vector.count())
|
if (arg1.real_terminals_vector.count())
|
||||||
{
|
{
|
||||||
str1 = arg1.real_terminals_vector.first().label_;
|
str1 = arg1.real_terminals_vector.constLast().label_;
|
||||||
|
|
||||||
auto match = rx.match(str1);
|
auto match = rx.match(str1);
|
||||||
if (match.hasMatch()) {
|
if (match.hasMatch()) {
|
||||||
@@ -64,7 +64,7 @@ void SortTerminalStripCommand::sort()
|
|||||||
|
|
||||||
if (arg2.real_terminals_vector.count())
|
if (arg2.real_terminals_vector.count())
|
||||||
{
|
{
|
||||||
str2 = arg2.real_terminals_vector.first().label_;
|
str2 = arg2.real_terminals_vector.constLast().label_;
|
||||||
|
|
||||||
auto match = rx.match(str2);
|
auto match = rx.match(str2);
|
||||||
if (match.hasMatch()) {
|
if (match.hasMatch()) {
|
||||||
|
|||||||
Reference in New Issue
Block a user