Add count of Tx/Rx packets statistic in status bar

Author: serhmarch

src/client/gui/client_ui.cpp

@@ -54,8 +54,6 @@ mbClientUi::mbClientUi(mbClient *core, QWidget *parent) :
 {
     ui->setupUi(this);
 
-    m_lbSystemName  = nullptr;
-    m_lbSystemStatus= nullptr;
     m_projectFileFilter = "Client Project (*.pjc);;" + m_projectFileFilter;
     m_helpFile = QStringLiteral("/help/ModbusClient.qhc");
 }
@@ -67,8 +65,6 @@ mbClientUi::~mbClientUi()
 
 void mbClientUi::initialize()
 {
-    mbCoreUi::initialize();
-
     // LogView
     ui->dockLogView->setWidget(logView());
 
@@ -186,20 +182,12 @@ void mbClientUi::initialize()
     connect(ui->actionHelpAboutQt , &QAction::triggered, this, &mbClientUi::menuSlotHelpAboutQt );
     connect(ui->actionHelpContents, &QAction::triggered, this, &mbClientUi::menuSlotHelpContents);
 
-    // status bar
-    m_lbSystemName = new QLabel("Status", ui->statusbar);
-    m_lbSystemStatus = new QLabel(ui->statusbar);
-    m_lbSystemStatus->setFrameShape(QFrame::Panel);
-    m_lbSystemStatus->setFrameStyle(QFrame::Sunken);
-    m_lbSystemStatus->setAutoFillBackground(true);
-    statusChange(m_core->status());
-    ui->statusbar->addPermanentWidget(m_lbSystemName);
-    ui->statusbar->addPermanentWidget(m_lbSystemStatus, 1);
-
-    connect(m_core, &mbClient::statusChanged, this, &mbClientUi::statusChange);
-
     m_sendMessageUi = new mbClientSendMessageUi(this);
     m_scannerUi     = new mbClientScannerUi(this);
+
+    m_ui.statusbar              = ui->statusbar             ;
+    m_ui.actionRuntimeStartStop = ui->actionRuntimeStartStop;
+    mbCoreUi::initialize();
 }
 
 MBSETTINGS mbClientUi::cachedSettings() const
@@ -525,49 +513,6 @@ void mbClientUi::menuSlotToolsScanner()
     m_scannerUi->show();
 }
 
-void mbClientUi::statusChange(int status)
-{
-    switch (status)
-    {
-    case mbClient::Running:
-        //break; no need break
-    case mbClient::Stopping:
-    {
-        //QPalette palette = m_lbSystemStatus->palette();
-        QPalette palette = this->palette();
-        palette.setColor(m_lbSystemStatus->backgroundRole(), Qt::green);
-        //palette.setColor(m_lbSystemStatus->foregroundRole(), Qt::green);
-        m_lbSystemStatus->setPalette(palette);
-        ui->actionRuntimeStartStop->setText("Stop");
-        ui->actionRuntimeStartStop->setIcon(QIcon(":/core/icons/stop.png"));
-    }
-        break;
-    case mbClient::Stopped:
-    {
-        //QPalette palette = m_lbSystemStatus->palette();
-        QPalette palette = this->palette();
-        palette.setColor(m_lbSystemStatus->backgroundRole(), Qt::gray);
-        //palette.setColor(m_lbSystemStatus->foregroundRole(), Qt::yellow);
-        m_lbSystemStatus->setPalette(palette);
-        ui->actionRuntimeStartStop->setText("Start");
-        ui->actionRuntimeStartStop->setIcon(QIcon(":/core/icons/play.png"));
-    }
-        break;
-    case mbClient::NoProject:
-    {
-        //QPalette palette = m_lbSystemStatus->palette();
-        QPalette palette = this->palette();
-        palette.setColor(m_lbSystemStatus->backgroundRole(), Qt::yellow);
-        //palette.setColor(m_lbSystemStatus->foregroundRole(), Qt::yellow);
-        m_lbSystemStatus->setPalette(palette);
-        ui->actionRuntimeStartStop->setText("Start");
-        ui->actionRuntimeStartStop->setIcon(QIcon(":/core/icons/play.png"));
-    }
-        break;
-    }
-    m_lbSystemStatus->setText(mb::enumKeyTypeStr<mbClient::Status>(status));
-}
-
 void mbClientUi::contextMenuPort(mbCorePort */*port*/)
 {
     QMenu mn(m_projectUi);

src/client/gui/client_ui.h

@@ -118,11 +118,6 @@ private Q_SLOTS:
     // ----------------------------
     void menuSlotToolsSendMessage();
     void menuSlotToolsScanner();
-    // ----------------------------
-    // -----------RUNTIME----------
-    // ----------------------------
-    //------------------------------
-    void statusChange(int status);
 
 private Q_SLOTS:
     void contextMenuPort(mbCorePort *port);
@@ -136,8 +131,6 @@ private Q_SLOTS:
 private:
     Ui::mbClientUi *ui;
     // status bar labels
-    QLabel* m_lbSystemName;
-    QLabel* m_lbSystemStatus;
     mbClientSendMessageUi *m_sendMessageUi;
     mbClientScannerUi *m_scannerUi;
 };

src/client/gui/project/client_projectmodel.cpp

@@ -85,6 +85,17 @@ QVariant mbClientProjectModel::data(const QModelIndex &index, int role) const
     return QVariant();
 }
 
+mbCorePort *mbClientProjectModel::getPortByIndex(const QModelIndex &index) const
+{
+    mbClientPort *port = this->port(index);
+    if (port)
+        return port;
+    mbClientDevice *device = this->device(index);
+    if (device)
+        return device->port();
+    return nullptr;
+}
+
 QModelIndex mbClientProjectModel::deviceIndex(mbClientDevice *device) const
 {
     mbClientPort *port = device->port();
@@ -99,22 +110,6 @@ mbClientDevice *mbClientProjectModel::device(const QModelIndex &index) const
     return nullptr;
 }
 
-QString mbClientProjectModel::portName(const mbClientPort *port) const
-{
-    if (useNameWithSettings())
-    {
-        switch (port->type())
-        {
-        case Modbus::TCP:
-            return QString("%1[%2:%3:%4]").arg(port->name(), Modbus::toString(port->type()), port->host(), QString::number(port->port()));
-        case Modbus::RTU:
-        case Modbus::ASC:
-            return QString("%1[%2:%3]").arg(port->name(), Modbus::toString(port->type()), port->serialPortName());
-        }
-    }
-    return port->name();
-}
-
 QString mbClientProjectModel::deviceName(const mbClientDevice *device) const
 {
     if (useNameWithSettings())

src/client/gui/project/client_projectmodel.h

@@ -48,13 +48,13 @@ class mbClientProjectModel : public mbCoreProjectModel
 public:
     inline QModelIndex portIndex(mbClientPort *port) const { return mbCoreProjectModel::portIndex(reinterpret_cast<mbCorePort*>(port)); }
     inline mbClientPort *port(const QModelIndex &index) const { return reinterpret_cast<mbClientPort*>(portCore(index)); }
+    mbCorePort *getPortByIndex(const QModelIndex &index) const override;
 
 public:
     QModelIndex deviceIndex(mbClientDevice *device) const;
     mbClientDevice *device(const QModelIndex &index) const;
 
 protected:
-    QString portName(const mbClientPort *port) const;
     QString deviceName(const mbClientDevice *device) const;
 
 protected Q_SLOTS:

src/client/gui/project/client_projectui.cpp

@@ -36,22 +36,6 @@ mbClientProjectUi::mbClientProjectUi(QWidget *parent) :
 {
 }
 
-mbCorePort *mbClientProjectUi::currentPortCore() const
-{
-    QModelIndexList ls = m_view->selectionModel()->selectedIndexes();
-    if (!ls.isEmpty())
-    {
-        const QModelIndex index = ls.first();
-        mbClientPort *port = static_cast<mbClientProjectModel*>(m_model)->port(index);
-        if (port)
-            return port;
-        mbClientDevice *device = static_cast<mbClientProjectModel*>(m_model)->device(index);
-        if (device)
-            return device->port();
-    }
-    return nullptr;
-}
-
 mbClientDevice *mbClientProjectUi::currentDevice() const
 {
     QModelIndexList ls = m_view->selectionModel()->selectedIndexes();

src/client/gui/project/client_projectui.h

@@ -35,8 +35,8 @@ class mbClientProjectUi : public mbCoreProjectUi
     explicit mbClientProjectUi(QWidget *parent = nullptr);
 
 public:
-    mbCorePort *currentPortCore() const override;
-    mbClientPort *currentPort() const { return reinterpret_cast<mbClientPort*>(currentPortCore()); }
+    mbClientPort *currentPort () const { return reinterpret_cast<mbClientPort*>(currentPortCore ()); }
+    mbClientPort *selectedPort() const { return reinterpret_cast<mbClientPort*>(selectedPortCore()); }
     mbClientDevice *currentDevice() const;
 
 Q_SIGNALS:

src/client/project/client_port.cpp

@@ -37,6 +37,19 @@ mbClientPort::~mbClientPort()
 {
 }
 
+QString mbClientPort::extendedName() const
+{
+    switch (type())
+    {
+    case Modbus::TCP:
+        return QString("%1[%2:%3:%4]").arg(name(), Modbus::toString(type()), host(), QString::number(port()));
+    case Modbus::RTU:
+    case Modbus::ASC:
+        return QString("%1[%2:%3]").arg(name(), Modbus::toString(type()), serialPortName());
+    }
+    return name();
+}
+
 mbClientDevice *mbClientPort::device(const QString &name) const
 {
     Q_FOREACH(mbClientDevice *d, m_devices)

src/client/project/client_port.h

@@ -41,6 +41,7 @@ class mbClientPort : public mbCorePort
     virtual ~mbClientPort();
 
 public:
+    QString extendedName() const override;
     inline mbClientProject* project() const { return reinterpret_cast<mbClientProject*>(mbCorePort::projectCore()); }
     inline void setProject(mbClientProject* project) { mbCorePort::setProjectCore(reinterpret_cast<mbCoreProject*>(project)); }
 

src/client/runtime/client_portrunnable.cpp

@@ -35,26 +35,28 @@
 #include "client_devicerunnable.h"
 #include "client_runmessage.h"
 
-mbClientPortRunnable::mbClientPortRunnable(const Modbus::Settings &settings, const QList<mbClientRunDevice*> &devices, QObject *parent)
+mbClientPortRunnable::mbClientPortRunnable(mbClientPort *clientPort, const Modbus::Settings &settings, const QList<mbClientRunDevice*> &devices, QObject *parent)
     : QObject(parent)
 {
+    m_clientPort = clientPort;
+    m_stat = m_clientPort->statistic();
     m_devices = devices;
-    m_port = Modbus::createClientPort(settings);
-    // Note: m_port can NOT be nullptr
-    if (m_port->type() == Modbus::ASC)
+    m_modbusPort = Modbus::createClientPort(settings);
+    // Note: m_modbusPort can NOT be nullptr
+    if (m_modbusPort->type() == Modbus::ASC)
     {
-        m_port->connect(&ModbusClientPort::signalTx, this, &mbClientPortRunnable::slotAsciiTx);
-        m_port->connect(&ModbusClientPort::signalRx, this, &mbClientPortRunnable::slotAsciiRx);
+        m_modbusPort->connect(&ModbusClientPort::signalTx, this, &mbClientPortRunnable::slotAsciiTx);
+        m_modbusPort->connect(&ModbusClientPort::signalRx, this, &mbClientPortRunnable::slotAsciiRx);
     }
     else
     {
-        m_port->connect(&ModbusClientPort::signalTx, this, &mbClientPortRunnable::slotBytesTx);
-        m_port->connect(&ModbusClientPort::signalRx, this, &mbClientPortRunnable::slotBytesRx);
+        m_modbusPort->connect(&ModbusClientPort::signalTx, this, &mbClientPortRunnable::slotBytesTx);
+        m_modbusPort->connect(&ModbusClientPort::signalRx, this, &mbClientPortRunnable::slotBytesRx);
     }
 
     Q_FOREACH (mbClientRunDevice *device, m_devices)
     {
-        mbClientDeviceRunnable *d = new mbClientDeviceRunnable(device, m_port);
+        mbClientDeviceRunnable *d = new mbClientDeviceRunnable(device, m_modbusPort);
         m_runnables.append(d);
         m_hashRunnables.insert(d->modbusClient(), d);
     }
@@ -66,7 +68,7 @@ mbClientPortRunnable::~mbClientPortRunnable()
     m_hashRunnables.clear();
     qDeleteAll(m_runnables);
     m_runnables.clear();
-    delete m_port;
+    delete m_modbusPort;
 }
 
 void mbClientPortRunnable::run()
@@ -77,12 +79,12 @@ void mbClientPortRunnable::run()
 
 void mbClientPortRunnable::close()
 {
-    m_port->close();
+    m_modbusPort->close();
 }
 
 void mbClientPortRunnable::slotBytesTx(const Modbus::Char */*source*/, const uint8_t* buff, uint16_t size)
 {
-    const ModbusClient *c = reinterpret_cast<const ModbusClient*>(m_port->currentClient());
+    const ModbusClient *c = reinterpret_cast<const ModbusClient*>(m_modbusPort->currentClient());
     mbClientDeviceRunnable *r = deviceRunnable(c);
     QByteArray bytes(reinterpret_cast<const char*>(buff), size);
     if (r)
@@ -92,11 +94,13 @@ void mbClientPortRunnable::slotBytesTx(const Modbus::Char */*source*/, const uin
     }
     else
         mbClient::LogTxRx(name(), QStringLiteral("Tx: ") + Modbus::bytesToString(buff, size).data());
+    m_stat.countTx++;
+    m_clientPort->setStatCountTx(m_stat.countTx);
 }
 
 void mbClientPortRunnable::slotBytesRx(const Modbus::Char */*source*/, const uint8_t* buff, uint16_t size)
 {
-    const ModbusClient *c = reinterpret_cast<const ModbusClient*>(m_port->currentClient());
+    const ModbusClient *c = reinterpret_cast<const ModbusClient*>(m_modbusPort->currentClient());
     mbClientDeviceRunnable *r = deviceRunnable(c);
     QByteArray bytes(reinterpret_cast<const char*>(buff), size);
     if (r)
@@ -106,11 +110,13 @@ void mbClientPortRunnable::slotBytesRx(const Modbus::Char */*source*/, const uin
     }
     else
         mbClient::LogTxRx(name(), QStringLiteral("Rx: ") + Modbus::bytesToString(buff, size).data());
+    m_stat.countRx++;
+    m_clientPort->setStatCountRx(m_stat.countRx);
 }
 
 void mbClientPortRunnable::slotAsciiTx(const Modbus::Char */*source*/, const uint8_t* buff, uint16_t size)
 {
-    const ModbusClient *c = reinterpret_cast<const ModbusClient*>(m_port->currentClient());
+    const ModbusClient *c = reinterpret_cast<const ModbusClient*>(m_modbusPort->currentClient());
     mbClientDeviceRunnable *r = deviceRunnable(c);
     QByteArray bytes(reinterpret_cast<const char*>(buff), size);
     if (r)
@@ -120,11 +126,13 @@ void mbClientPortRunnable::slotAsciiTx(const Modbus::Char */*source*/, const uin
     }
     else
         mbClient::LogTxRx(name(), QStringLiteral("Tx: ") + Modbus::asciiToString(buff, size).data());
+    m_stat.countTx++;
+    m_clientPort->setStatCountTx(m_stat.countTx);
 }
 
 void mbClientPortRunnable::slotAsciiRx(const Modbus::Char */*source*/, const uint8_t* buff, uint16_t size)
 {
-    const ModbusClient *c = reinterpret_cast<const ModbusClient*>(m_port->currentClient());
+    const ModbusClient *c = reinterpret_cast<const ModbusClient*>(m_modbusPort->currentClient());
     mbClientDeviceRunnable *r = deviceRunnable(c);
     QByteArray bytes(reinterpret_cast<const char*>(buff), size);
     if (r)
@@ -134,4 +142,6 @@ void mbClientPortRunnable::slotAsciiRx(const Modbus::Char */*source*/, const uin
     }
     else
         mbClient::LogTxRx(name(), QStringLiteral("Rx: ") + Modbus::asciiToString(buff, size).data());
+    m_stat.countRx++;
+    m_clientPort->setStatCountRx(m_stat.countRx);
 }

src/client/runtime/client_portrunnable.h

@@ -27,6 +27,7 @@
 
 #include <client_global.h>
 
+#include <project/client_port.h>
 
 class ModbusClient;
 class ModbusClientPort;
@@ -38,7 +39,7 @@ class mbClientPortRunnable : public QObject
 {
     Q_OBJECT
 public:
-    explicit mbClientPortRunnable(const Modbus::Settings &settings, const QList<mbClientRunDevice*> &devices, QObject *parent = nullptr);
+    explicit mbClientPortRunnable(mbClientPort *clientPort, const Modbus::Settings &settings, const QList<mbClientRunDevice*> &devices, QObject *parent = nullptr);
     ~mbClientPortRunnable();
 
 public:
@@ -59,10 +60,10 @@ private Q_SLOTS:
     void slotAsciiRx(const Modbus::Char *source, const uint8_t* buff, uint16_t size);
 
 private:
-    ModbusClientPort *m_port;
-
-private:
+    mbClientPort *m_clientPort;
+    ModbusClientPort *m_modbusPort;
     QList<mbClientRunDevice*> m_devices;
+    mbClientPort::Statistic m_stat;
 
 private:
     typedef QList<mbClientDeviceRunnable*> Runnables_t;