Multiserver with some modbus tcp servers

Author: sanny32

omodsim/controls/mainstatusbar.cpp

@@ -45,7 +45,7 @@ MainStatusBar::MainStatusBar(const ModbusMultiServer& server, QWidget* parent)
         auto label = new QLabel(this);
         label->setFrameShadow(QFrame::Sunken);
         label->setFrameShape(QFrame::Panel);
-        label->setMinimumWidth(120);
+        label->setMinimumWidth(80);
         label->setProperty("ConnectionDetails", QVariant::fromValue(cd));
 
         updateConnectionInfo(label, cd);
@@ -60,9 +60,8 @@ MainStatusBar::MainStatusBar(const ModbusMultiServer& server, QWidget* parent)
         {
             if(cd == label->property("ConnectionDetails").value<ConnectionDetails>())
             {
-                _labels.removeOne(label);
                 removeWidget(label);
-                delete label;
+                _labels.removeOne(label);
 
                 break;
             }
@@ -107,15 +106,15 @@ void MainStatusBar::updateConnectionInfo(QLabel* label, const ConnectionDetails&
     switch(cd.Type)
     {
         case ConnectionType::Tcp:
-            label->setText(QString(tr("TCP/IP %1:%2")).arg(cd.TcpParams.IPAddress, QString::number(cd.TcpParams.ServicePort)));
+            label->setText(QString(tr("Modbus/TCP Srv %1:%2")).arg(cd.TcpParams.IPAddress, QString::number(cd.TcpParams.ServicePort)));
         break;
 
         case ConnectionType::Serial:
-            label->setText(QString(tr("Port %1:%2:%3:%4:%5  ")).arg(cd.SerialParams.PortName,
-                                                                    QString::number(cd.SerialParams.BaudRate),
-                                                                    QString::number(cd.SerialParams.WordLength),
-                                                                    Parity_toString(cd.SerialParams.Parity),
-                                                                    QString::number(cd.SerialParams.StopBits)));
+            label->setText(QString(tr("Port %1:%2:%3:%4:%5")).arg(cd.SerialParams.PortName,
+                                                                QString::number(cd.SerialParams.BaudRate),
+                                                                QString::number(cd.SerialParams.WordLength),
+                                                                Parity_toString(cd.SerialParams.Parity),
+                                                                QString::number(cd.SerialParams.StopBits)));
         break;
     }
 }

omodsim/menuconnect.cpp

@@ -13,31 +13,66 @@ MenuConnect::MenuConnect(MenuType type, ModbusMultiServer& server, QWidget *pare
     ,_menuType(type)
     ,_mbMultiServer(server)
 {
-    addAction(tr("Modbus/TCP Srv"), ConnectionType::Tcp, QString());
-
-    for(auto&& port: getAvailableSerialPorts())
+    if(type == MenuType::ConnectMenu)
     {
-        const auto text = QString(tr("Port %1")).arg(port);
-        addAction(text, ConnectionType::Serial, port);
+        addAction(tr("Modbus/TCP Srv"), ConnectionType::Tcp, QString());
+        for(auto&& port: getAvailableSerialPorts())
+        {
+            const auto text = QString(tr("Port %1")).arg(port);
+            addAction(text, ConnectionType::Serial, port);
+        }
     }
 
-    connect(&_mbMultiServer, &ModbusMultiServer::connected, this, [&](const ConnectionDetails&)
+    connect(&_mbMultiServer, &ModbusMultiServer::connected, this, [&](const ConnectionDetails& cd)
     {
-        for(auto&& a : actions())
+        if(_menuType == MenuType::DisconnectMenu)
         {
-            const auto data = a->data().value<QPair<ConnectionType, QString>>();
-            const bool isConnected = _mbMultiServer.isConnected(data.first, data.second);
-            a->setEnabled(_menuType == ConnectMenu ? !isConnected : isConnected);
+            switch(cd.Type)
+            {
+                case ConnectionType::Tcp:
+                {
+                    const auto port = QString("%1:%2").arg(cd.TcpParams.IPAddress, QString::number(cd.TcpParams.ServicePort));
+                    addAction(QString(tr("Modbus/TCP Srv %1")).arg(port), ConnectionType::Tcp, port);
+                }
+                break;
+
+                case ConnectionType::Serial:
+                    addAction(QString(tr("Port %1")).arg(cd.SerialParams.PortName), ConnectionType::Serial, cd.SerialParams.PortName);
+                break;
+            }
+        }
+        else
+        {
+            for(auto&& a : actions())
+            {
+                const auto data = a->data().value<QPair<ConnectionType, QString>>();
+                const bool isConnected = _mbMultiServer.isConnected(data.first, data.second);
+                a->setEnabled(_menuType == ConnectMenu ? !isConnected : isConnected);
+            }
         }
     });
 
-    connect(&_mbMultiServer, &ModbusMultiServer::disconnected, this, [&](const ConnectionDetails&)
+    connect(&_mbMultiServer, &ModbusMultiServer::disconnected, this, [&](const ConnectionDetails& cd)
     {
         for(auto&& a : actions())
         {
             const auto data = a->data().value<QPair<ConnectionType, QString>>();
-            const bool isConnected = _mbMultiServer.isConnected(data.first, data.second);
-            a->setEnabled(_menuType == ConnectMenu ? !isConnected : isConnected);
+            if(_menuType == MenuType::DisconnectMenu)
+            {
+                const auto port = (data.first == ConnectionType::Tcp) ?
+                    QString("%1:%2").arg(cd.TcpParams.IPAddress, QString::number(cd.TcpParams.ServicePort)) :
+                    cd.SerialParams.PortName;
+
+                if(data.first == cd.Type && data.second == port)
+                {
+                    removeAction(a);
+                }
+            }
+            else
+            {
+                const bool isConnected = _mbMultiServer.isConnected(data.first, data.second);
+                a->setEnabled(_menuType == ConnectMenu ? !isConnected : isConnected);
+            }
         }
     });
 }
@@ -140,5 +175,4 @@ void MenuConnect::addAction(const QString& text, ConnectionType type, const QStr
 
     const auto data = QPair<ConnectionType, QString>(type, port);
     action->setData(QVariant::fromValue(data));
-    action->setEnabled(_menuType == ConnectMenu);
 }

omodsim/modbusmultiserver.cpp

@@ -94,8 +94,8 @@ QSharedPointer<QModbusServer> ModbusMultiServer::findModbusServer(ConnectionType
     for(auto&& s : _modbusServerList)
     {
         const auto cd = s->property("ConnectionDetails").value<ConnectionDetails>();
-        if((cd.Type == ConnectionType::Tcp && type == ConnectionType::Tcp) ||
-           (cd.Type == ConnectionType::Serial && type == ConnectionType::Serial && cd.SerialParams.PortName == port))
+        if((cd.Type == ConnectionType::Tcp && type == ConnectionType::Tcp && port == QString("%1:%2").arg(cd.TcpParams.IPAddress, QString::number(cd.TcpParams.ServicePort))) ||
+           (cd.Type == ConnectionType::Serial && type == ConnectionType::Serial && port == cd.SerialParams.PortName))
         {
             return s;
         }