fix serial ports sorting

Author: sanny32

omodsim/menuconnect.cpp

@@ -1,5 +1,5 @@
 #include <QEvent>
-#include <QSerialPortInfo>
+#include "serialportutils.h"
 #include "menuconnect.h"
 
 ///
@@ -15,10 +15,10 @@ MenuConnect::MenuConnect(MenuType type, ModbusMultiServer& server, QWidget *pare
 {
     addAction(tr("Modbus/TCP Srv"), ConnectionType::Tcp, QString());
 
-    for(auto&& port: QSerialPortInfo::availablePorts())
+    for(auto&& port: getAvailableSerialPorts())
     {
-        const auto text = QString(tr("Port %1")).arg(port.portName());
-        addAction(text, ConnectionType::Serial, port.portName());
+        const auto text = QString(tr("Port %1")).arg(port);
+        addAction(text, ConnectionType::Serial, port);
     }
 
     connect(&_mbMultiServer, &ModbusMultiServer::connected, this, [&](const ConnectionDetails&)

omodsim/omodsim.pro

@@ -178,6 +178,7 @@ HEADERS += \
     quintvalidator.h \
     recentfileactionlist.h \
     scriptsettings.h \
+    serialportutils.h \
     windowactionlist.h
 
 FORMS += \

omodsim/serialportutils.h

@@ -0,0 +1,26 @@
+#ifndef SERIALPORTUTILS_H
+#define SERIALPORTUTILS_H
+
+#include <QSerialPortInfo>
+#include <QRegularExpression>
+
+///
+/// \brief getAvailableSerialPorts
+/// \return
+///
+inline QStringList getAvailableSerialPorts()
+{
+    QStringList ports;
+    for(auto&& port: QSerialPortInfo::availablePorts())
+        ports << port.portName();
+
+    static QRegularExpression re( "[^\\d]");
+    std::sort(ports.begin(), ports.end(), [](QString p1, QString p2)
+              {
+                  return p1.remove(re).toInt() < p2.remove(re).toInt();
+              });
+
+    return ports;
+}
+
+#endif // SERIALPORTUTILS_H