Merge remote-tracking branch 'origin/dev'

Author: sanny32

omodscan/CMakeLists.txt

@@ -1,7 +1,7 @@
 cmake_minimum_required(VERSION 3.16)
 
 project(omodscan
-    VERSION 1.12.0
+    VERSION 1.12.1
     DESCRIPTION "An Open Source Modbus Master (Client) Utility"
     LANGUAGES CXX)
 

omodscan/controls/modbuslogwidget.cpp

@@ -54,11 +54,12 @@ QVariant ModbusLogModel::data(const QModelIndex& index, int role) const
             return QString(R"(
                     <span style="color:#444444">%1</span>
                     <b style="color:%2">%3</b>
-                    <span>%4</span>
+                    <span style="color:%4">%5</span>
                 )")
                 .arg(item->timestamp().toString(Qt::ISODateWithMs),
                      item->isRequest() ? "#0066cc" : "#009933",
                      item->isRequest() ? "[Tx] ←" : "[Rx] →",
+                     (item->isException() || !item->isValid()) ? "#cc0000" : "#000000",
                      item->toString(_parentWidget->dataDisplayMode(), _parentWidget->showLeadingZeros()));
 
         case Qt::UserRole:

omodscan/controls/statisticwidget.cpp

@@ -5,13 +5,15 @@
 /// \brief StatisticWidget::StatisticWidget
 /// \param parent
 ///
-StatisticWidget::StatisticWidget(QWidget *parent) :
-      QWidget(parent)
+StatisticWidget::StatisticWidget(QWidget *parent)
+    : QWidget(parent)
     , ui(new Ui::StatisticWidget)
     ,_numberOfPolls(0)
     ,_validSlaveResponses(0)
+    ,_pollState(static_cast<PollState>(-1))
 {
     ui->setupUi(this);
+    setPollState(PollState::Off);
 }
 
 ///
@@ -88,6 +90,9 @@ PollState StatisticWidget::pollState() const
 ///
 void StatisticWidget::setPollState(PollState state)
 {
+    if(_pollState == state)
+        return;
+
     _pollState = state;
     switch (state)
     {
@@ -104,6 +109,7 @@ void StatisticWidget::setPollState(PollState state)
             ui->pushButtonPause->setText(tr("Resume Polling"));
         break;
     }
+    emit pollStateChanged(pollState());
 }
 
 ///

omodscan/dialogs/dialogprintsettings.cpp

@@ -197,10 +197,6 @@ QList<PapeSource> DialogPrintSettings::supportedPaperSources(const QPrinter* pri
                 name = tr("Cassette");
             break;
 
-            case QPrinter::MaxPageSource:
-                name = tr("Max Page Source");
-            break;
-
             case QPrinter::CustomSource:
                 name = tr("Custom Source");
             break;

omodscan/dialogs/dialogusermsg.cpp

@@ -227,11 +227,16 @@ void DialogUserMsg::on_modbusReply(const ModbusReply* const reply)
         return;
     }
 
-    if(reply->error() != ModbusDevice::NoError &&
-        reply->error() != ModbusDevice::ProtocolError)
+    switch(reply->error())
     {
-        QMessageBox::warning(this, windowTitle(), reply->errorString());
-        return;
+        case ModbusDevice::NoError:
+        case ModbusDevice::ProtocolError:
+        case ModbusDevice::InvalidResponseError:
+        break;
+
+        default:
+            QMessageBox::warning(this, windowTitle(), reply->errorString());
+        break;
     }
 
     ui->pushButtonSend->setEnabled(true);

omodscan/fontutils.h

@@ -1,8 +1,6 @@
 #ifndef FONTUTILS_H
 #define FONTUTILS_H
 
-#pragma once
-
 #include <QFont>
 #include <QList>
 #include <QFontDatabase>

omodscan/formmodsca.cpp

@@ -1,3 +1,4 @@
+#include <QMouseEvent>
 #include <QPainter>
 #include <QPalette>
 #include <QDateTime>
@@ -37,18 +38,26 @@ FormModSca::FormModSca(int id, ModbusClient& client, DataSimulator* simulator, M
 
     _timer.setInterval(1000);
 
+    ui->lineEditAddress->blockSignals(true);
     ui->lineEditAddress->setLeadingZeroes(true);
     ui->lineEditAddress->setInputRange(ModbusLimits::addressRange(true));
-    ui->lineEditAddress->setValue(0);
+    ui->lineEditAddress->setValue(1);
+    ui->lineEditAddress->blockSignals(false);
 
+    ui->lineEditLength->blockSignals(true);
     ui->lineEditLength->setInputRange(ModbusLimits::lengthRange());
     ui->lineEditLength->setValue(50);
+    ui->lineEditLength->blockSignals(false);
 
+    ui->lineEditDeviceId->blockSignals(true);
     ui->lineEditDeviceId->setLeadingZeroes(true);
     ui->lineEditDeviceId->setInputRange(ModbusLimits::slaveRange());
     ui->lineEditDeviceId->setValue(1);
+    ui->lineEditDeviceId->blockSignals(false);
 
+    ui->comboBoxAddressBase->blockSignals(true);
     ui->comboBoxAddressBase->setCurrentAddressBase(AddressBase::Base1);
+    ui->comboBoxAddressBase->blockSignals(false);
 
     const auto dd = displayDefinition();
     const auto protocol = _modbusClient.connectionType() == ConnectionType::Serial ? ModbusMessage::Rtu : ModbusMessage::Tcp;
@@ -83,6 +92,8 @@ FormModSca::FormModSca(int id, ModbusClient& client, DataSimulator* simulator, M
     connect(_dataSimulator, &DataSimulator::simulationStarted, this, &FormModSca::on_simulationStarted);
     connect(_dataSimulator, &DataSimulator::simulationStopped, this, &FormModSca::on_simulationStopped);
     connect(_dataSimulator, &DataSimulator::dataSimulated, this, &FormModSca::on_dataSimulated);
+
+    ui->frameDataDefinition->installEventFilter(this);
 }
 
 ///
@@ -107,6 +118,24 @@ void FormModSca::changeEvent(QEvent* event)
     QWidget::changeEvent(event);
 }
 
+///
+/// \brief FormModSca::eventFilter
+/// \param watched
+/// \param event
+/// \return
+///
+bool FormModSca::eventFilter(QObject* watched, QEvent* event)
+{
+    if (watched == ui->frameDataDefinition && event->type() == QEvent::MouseButtonDblClick) {
+        auto* me = static_cast<QMouseEvent*>(event);
+        if(me->pos().x() > ui->statisticWidget->geometry().right()) {
+            emit doubleClicked();
+            return true;
+        }
+    }
+    return QWidget::eventFilter(watched, event);
+}
+
 ///
 /// \brief FormModSca::filename
 /// \return
@@ -557,6 +586,8 @@ void FormModSca::show()
 {
     QWidget::show();
     emit showed();
+
+    beginUpdate();
 }
 
 ///
@@ -573,11 +604,11 @@ void FormModSca::on_timeout()
     {
         if(_validSlaveResponses == ui->statisticWidget->validSlaveResposes())
         {
-            _noSlaveResponsesCounter++;
             if(_noSlaveResponsesCounter > _modbusClient.numberOfRetries())
             {
                 ui->outputWidget->setStatus(tr("No Responses from Slave Device"));
             }
+            _noSlaveResponsesCounter++;
         }
 
         _modbusClient.sendReadRequest(dd.PointType, addr, dd.Length, dd.DeviceId, _formId);
@@ -602,7 +633,6 @@ void FormModSca::beginUpdate()
         ui->outputWidget->setStatus(tr("No Scan: Invalid Data Length Specified"));
 
     if(pollState() == PollState::Off) {
-        _timer.start();
         setPollState(PollState::Running);
     }
 }
@@ -732,7 +762,10 @@ void FormModSca::on_modbusReply(const ModbusReply* const reply)
         else
         {
             ui->outputWidget->updateData(reply->result());
-            ui->outputWidget->setStatus(QString());
+
+            if(pollState() != PollState::Paused) {
+                ui->outputWidget->setStatus(QString());
+            }
             ui->statisticWidget->increaseValidSlaveResponses();
         }
     }
@@ -769,7 +802,6 @@ void FormModSca::on_modbusConnected(const ConnectionDetails&)
 ///
 void FormModSca::on_modbusDisconnected(const ConnectionDetails&)
 {
-    _timer.stop();
     setPollState(PollState::Off);
     ui->outputWidget->setStatus(tr("Device NOT CONNECTED!"));
 }
@@ -782,6 +814,7 @@ void FormModSca::on_lineEditAddress_valueChanged(const QVariant&)
     const quint8 deviceId = ui->lineEditDeviceId->value<int>();
     const auto protocol = _modbusClient.connectionType() == ConnectionType::Serial ? ModbusMessage::Rtu : ModbusMessage::Tcp;
     ui->outputWidget->setup(displayDefinition(), protocol, _dataSimulator->simulationMap(deviceId));
+
     beginUpdate();
 }
 
@@ -793,6 +826,7 @@ void FormModSca::on_lineEditLength_valueChanged(const QVariant&)
     const quint8 deviceId = ui->lineEditDeviceId->value<int>();
     const auto protocol = _modbusClient.connectionType() == ConnectionType::Serial ? ModbusMessage::Rtu : ModbusMessage::Tcp;
     ui->outputWidget->setup(displayDefinition(), protocol, _dataSimulator->simulationMap(deviceId));
+
     beginUpdate();
 }
 
@@ -804,6 +838,7 @@ void FormModSca::on_lineEditDeviceId_valueChanged(const QVariant&)
     const quint8 deviceId = ui->lineEditDeviceId->value<int>();
     const auto protocol = _modbusClient.connectionType() == ConnectionType::Serial ? ModbusMessage::Rtu : ModbusMessage::Tcp;
     ui->outputWidget->setup(displayDefinition(), protocol, _dataSimulator->simulationMap(deviceId));
+
     beginUpdate();
 }
 
@@ -828,9 +863,10 @@ void FormModSca::on_comboBoxModbusPointType_pointTypeChanged(QModbusDataUnit::Re
     const quint8 deviceId = ui->lineEditDeviceId->value<int>();
     const auto protocol = _modbusClient.connectionType() == ConnectionType::Serial ? ModbusMessage::Rtu : ModbusMessage::Tcp;
     ui->outputWidget->setup(displayDefinition(), protocol, _dataSimulator->simulationMap(deviceId));
-    beginUpdate();
 
     emit pointTypeChanged(type);
+
+    beginUpdate();
 }
 
 ///

omodscan/formmodsca.h

@@ -108,9 +108,11 @@ public slots:
     void numberOfPollsChanged(uint value);
     void validSlaveResposesChanged(uint value);
     void captureError(const QString& error);
+    void doubleClicked();
 
 protected:
     void changeEvent(QEvent* event) override;
+    bool eventFilter(QObject* watched, QEvent* event) override;
 
 private slots:
     void on_timeout();
@@ -414,6 +416,10 @@ inline QXmlStreamWriter& operator <<(QXmlStreamWriter& xml, FormModSca* frm)
     xml.writeAttribute("Maximized", boolToString(wnd->isMaximized()));
     xml.writeAttribute("Minimized", boolToString(wnd->isMinimized()));
 
+    const auto windowPos = wnd->pos();
+    xml.writeAttribute("Left", QString::number(windowPos.x()));
+    xml.writeAttribute("Top", QString::number(windowPos.y()));
+
     const auto windowSize = (wnd->isMinimized() || wnd->isMaximized()) ? wnd->sizeHint() : wnd->size();
     xml.writeAttribute("Width", QString::number(windowSize.width()));
     xml.writeAttribute("Height", QString::number(windowSize.height()));
@@ -523,6 +529,15 @@ inline QXmlStreamReader& operator >>(QXmlStreamReader& xml, FormModSca* frm)
 
                 const auto wnd = frm->parentWidget();
                 if (wnd) {
+                    if(windowAttrs.hasAttribute("Left") && windowAttrs.hasAttribute("Top")) {
+                        bool okLeft, okTop;
+                        const int left = windowAttrs.value("Left").toInt(&okLeft);
+                        const int top = windowAttrs.value("Top").toInt(&okTop);
+                        if(okLeft && okTop) {
+                            wnd->move(left, top);
+                        }
+                    }
+
                     if (windowAttrs.hasAttribute("Width") && windowAttrs.hasAttribute("Height")) {
                         bool okWidth, okHeight;
                         const int width = windowAttrs.value("Width").toInt(&okWidth);

omodscan/mainwindow.cpp

@@ -1441,6 +1441,11 @@ FormModSca* MainWindow::createMdiChild(int id)
         QMessageBox::critical(this, windowTitle(), tr("Capture Error:\r\n %1").arg(error));
     });
 
+    connect(frm, &FormModSca::doubleClicked, this, [this]()
+    {
+        ui->actionDataDefinition->trigger();
+    });
+
     _windowActionList->addWindow(wnd);
 
     return frm;

omodscan/modbusclientprivate.cpp

@@ -331,9 +331,12 @@ void ModbusClientPrivate::processQueueElement(const QModbusResponse& pdu, Modbus
     if (element.reply.isNull())
         return;
 
-    const quint16 transactionId = element.reply->transactionId();
-    const auto msg = ModbusMessage::create(pdu, protocolType, serverAddress, transactionId, QDateTime::currentDateTime(), false);
-    emit modbusResponse(element.reply->requestGroupId(), msg);
+    if(pdu.isValid())
+    {
+        const quint16 transactionId = element.reply->transactionId();
+        const auto msg = ModbusMessage::create(pdu, protocolType, serverAddress, transactionId, QDateTime::currentDateTime(), false);
+        emit modbusResponse(element.reply->requestGroupId(), msg);
+    }
 
     element.reply->setRawResult(pdu);