Merge remote-tracking branch 'origin/dev'

Author: sanny32

LICENSE LICENSE.mdLICENSE renamed to LICENSE.md

@@ -1,6 +1,6 @@
 MIT License
 
-Copyright (c) 2023 Alexandr Ananev [mail@ananev.org]
+Copyright (c) 2024 Alexandr Ananev [mail@ananev.org]
 
 Permission is hereby granted, free of charge, to any person obtaining a copy
 of this software and associated documentation files (the "Software"), to deal

README.md

@@ -1,10 +1,11 @@
 # Open ModSim
 Open ModSim is a free implimentation of modbus slave (server) utility for modbus-tcp and modbus-rtu protocols.
 
-![image](https://github.com/sanny32/OpenModSim/assets/13627951/3912005f-df9b-41b4-b6f5-33ebc76a908c)
+![image](https://github.com/sanny32/OpenModSim/assets/13627951/3788824d-cf3f-4e98-9f5f-856e99106f6c)
 
 
-![image](https://github.com/sanny32/OpenModSim/assets/13627951/b40eca28-7a34-46dc-9a50-9b16dc1becf1)
+
+![image](https://github.com/sanny32/OpenModSim/assets/13627951/f5dd90b6-2301-495b-ae86-409b2afd4eaf)
 
 
 ## Features
@@ -41,7 +42,8 @@ Registers
 
 Modbus Logging
 
-![image](https://github.com/sanny32/OpenModSim/assets/13627951/23ae888d-4722-4065-a394-64e28f68ea62)
+![image](https://github.com/sanny32/OpenModSim/assets/13627951/72cb3860-b672-41fd-8ec6-3399170a28df)
+
 
 
 ## Extended Featues
@@ -54,7 +56,7 @@ Modbus Message Parser
 ## Scripting
   From version 1.2.0 Open ModSim supports scripting. Qt runtime implements the [ECMAScript Language Specification](http://www.ecma-international.org/publications/standards/Ecma-262.htm) standard, so Javascript is used to write code.
 
-![image](https://github.com/sanny32/OpenModSim/assets/13627951/c03a7d23-3c69-43aa-a1d3-ae5096da4f54)
+![image](https://github.com/sanny32/OpenModSim/assets/13627951/ab115064-877f-4f6f-a1b9-4ac6c2feb042)
 
   Scripts can be launched in two modes: Once or Periodically. If you run script in Once mode the script will stop after it finishes executing. In Periodically mode, the script will start after a certain period of time until the user stops it or the method is called
   ```javascript
@@ -104,7 +106,7 @@ Script.onInit(init);
   Now building is available with Qt/qmake (version 5.15 and above) or Qt Creator. Supports both OS Microsoft Windows and Linux.
 
 ## MIT License
-Copyright 2023 Alexandr Ananev [mail@ananev.org]
+Copyright 2024 Alexandr Ananev [mail@ananev.org]
 
 Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the "Software"), to deal in the Software without restriction, including without limitation the rights to use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of the Software, and to permit persons to whom the Software is furnished to do so, subject to the following conditions:
 

omodsim/controls/bytelisttextedit.cpp

@@ -49,17 +49,17 @@ void ByteListTextEdit::setValue(const QByteArray& value)
     {
         case DecMode:
         {
-            const auto text = formatByteArray(DataDisplayMode::Decimal, value);
+            const auto text = formatUInt8Array(DataDisplayMode::Decimal, value);
             if(text != toPlainText())
-                setPlainText(formatByteArray(DataDisplayMode::Decimal, value));
+                setPlainText(formatUInt8Array(DataDisplayMode::Decimal, value));
         }
         break;
 
         case HexMode:
         {
-            const auto text = formatByteArray(DataDisplayMode::Hex, value);
+            const auto text = formatUInt8Array(DataDisplayMode::Hex, value);
             if(text != toPlainText())
-                setPlainText(formatByteArray(DataDisplayMode::Hex, value));
+                setPlainText(formatUInt8Array(DataDisplayMode::Hex, value));
         }
         break;
     }

omodsim/controls/modbusmessagewidget.cpp

@@ -3,6 +3,7 @@
 #include <QIntValidator>
 #include "qhexvalidator.h"
 #include "quintvalidator.h"
+#include "qint64validator.h"
 #include "numericlineedit.h"
 
 ///
@@ -14,7 +15,7 @@ NumericLineEdit::NumericLineEdit(QWidget* parent)
     ,_paddingZeroes(false)
     ,_paddingZeroWidth(0)
 {
-    setInputMode(DecMode);
+    setInputMode(Int32Mode);
     setValue(0);
 
     connect(this, &QLineEdit::editingFinished, this, &NumericLineEdit::on_editingFinished);
@@ -78,14 +79,14 @@ void NumericLineEdit::setInputMode(InputMode mode)
     {
         switch(mode)
         {
-            case DecMode:
+            case Int32Mode:
             case HexMode:
                 _minValue = INT_MIN;
                 _maxValue = INT_MAX;
             break;
 
-            case UnsignedMode:
-                _minValue = 0U;
+            case UInt32Mode:
+                _minValue = 0;
                 _maxValue = UINT_MAX;
             break;
 
@@ -98,6 +99,16 @@ void NumericLineEdit::setInputMode(InputMode mode)
                 _minValue = -DBL_MAX;
                 _maxValue = DBL_MAX;
             break;
+
+            case Int64Mode:
+                _minValue = QVariant::fromValue(INT64_MIN);
+                _maxValue = QVariant::fromValue(INT64_MAX);
+            break;
+
+            case UInt64Mode:
+                _minValue = 0;
+                _maxValue = QVariant::fromValue(UINT64_MAX);
+            break;
         }
     }
     emit rangeChanged(_minValue, _maxValue);
@@ -121,7 +132,7 @@ void NumericLineEdit::internalSetValue(QVariant value)
 {
     switch(_inputMode)
     {
-        case DecMode:
+        case Int32Mode:
             value = qBound(_minValue.toInt(), value.toInt(), _maxValue.toInt());
             if(_paddingZeroes)
             {
@@ -135,9 +146,9 @@ void NumericLineEdit::internalSetValue(QVariant value)
                 if(text != QLineEdit::text())
                     QLineEdit::setText(text);
             }
-        break;
+            break;
 
-        case UnsignedMode:
+        case UInt32Mode:
             value = qBound(_minValue.toUInt(), value.toUInt(), _maxValue.toUInt());
             if(_paddingZeroes)
             {
@@ -151,7 +162,7 @@ void NumericLineEdit::internalSetValue(QVariant value)
                 if(text != QLineEdit::text())
                     QLineEdit::setText(text);
             }
-        break;
+            break;
 
         case HexMode:
         {
@@ -189,6 +200,42 @@ void NumericLineEdit::internalSetValue(QVariant value)
                 QLineEdit::setText(text);
         }
         break;
+
+        case Int64Mode:
+        {
+            value = qBound(_minValue.toLongLong(), value.toLongLong(), _maxValue.toLongLong());
+            if(_paddingZeroes)
+            {
+                const auto text = QStringLiteral("%1").arg(value.toLongLong(), _paddingZeroWidth, 10, QLatin1Char('0'));
+                if(text != QLineEdit::text())
+                    QLineEdit::setText(text);
+            }
+            else
+            {
+                const auto text = QString::number(value.toLongLong());
+                if(text != QLineEdit::text())
+                    QLineEdit::setText(text);
+            }
+        }
+        break;
+
+        case UInt64Mode:
+        {
+            value = qBound(_minValue.toULongLong(), value.toULongLong(), _maxValue.toULongLong());
+            if(_paddingZeroes)
+            {
+                const auto text = QStringLiteral("%1").arg(value.toULongLong(), _paddingZeroWidth, 10, QLatin1Char('0'));
+                if(text != QLineEdit::text())
+                    QLineEdit::setText(text);
+            }
+            else
+            {
+                const auto text = QString::number(value.toULongLong());
+                if(text != QLineEdit::text())
+                    QLineEdit::setText(text);
+            }
+        }
+        break;
     }
 
     if(value != _value)
@@ -205,7 +252,7 @@ void NumericLineEdit::updateValue()
 {
     switch(_inputMode)
     {
-        case DecMode:
+        case Int32Mode:
         {
             bool ok;
             const auto value = text().toInt(&ok);
@@ -214,7 +261,7 @@ void NumericLineEdit::updateValue()
         }
         break;
 
-        case UnsignedMode:
+        case UInt32Mode:
         {
             bool ok;
             const auto value = text().toUInt(&ok);
@@ -249,6 +296,24 @@ void NumericLineEdit::updateValue()
             else internalSetValue(_value);
         }
         break;
+
+        case Int64Mode:
+        {
+            bool ok;
+            const auto value = text().toLongLong(&ok);
+            if(ok) internalSetValue(value);
+            else internalSetValue(_value);
+        }
+        break;
+
+        case UInt64Mode:
+        {
+            bool ok;
+            const auto value = text().toULongLong(&ok);
+            if(ok) internalSetValue(value);
+            else internalSetValue(_value);
+        }
+        break;
     }
 }
 
@@ -297,19 +362,19 @@ void NumericLineEdit::on_textChanged(const QString& text)
     QVariant value;
     switch(_inputMode)
     {
-        case DecMode:
+        case Int32Mode:
         {
             bool ok;
             const auto valueInt = text.toInt(&ok);
             if(ok) value = qBound(_minValue.toInt(), valueInt, _maxValue.toInt());
         }
         break;
 
-        case UnsignedMode:
+        case UInt32Mode:
         {
             bool ok;
-            const auto valueInt = text.toUInt(&ok);
-            if(ok) value = qBound(_minValue.toUInt(), valueInt, _maxValue.toUInt());
+            const auto valueUInt = text.toUInt(&ok);
+            if(ok) value = qBound(_minValue.toUInt(), valueUInt, _maxValue.toUInt());
         }
         break;
 
@@ -336,6 +401,22 @@ void NumericLineEdit::on_textChanged(const QString& text)
             if(ok) value = qBound(_minValue.toDouble(), valueDouble, _maxValue.toDouble());
         }
         break;
+
+        case Int64Mode:
+        {
+            bool ok;
+            const auto valueLongLong = text.toLongLong(&ok);
+            if(ok) value = qBound(_minValue.toLongLong(), valueLongLong, _maxValue.toLongLong());
+        }
+        break;
+
+        case UInt64Mode:
+        {
+            bool ok;
+            const auto valueULongLong = text.toULongLong(&ok);
+            if(ok) value = qBound(_minValue.toULongLong(), valueULongLong, _maxValue.toULongLong());
+        }
+        break;
     }
 
     if(value.isValid() && value != _value)
@@ -356,7 +437,7 @@ void NumericLineEdit::on_rangeChanged(const QVariant& bottom, const QVariant& to
     setValidator(nullptr);
     switch(_inputMode)
     {
-        case DecMode:
+        case Int32Mode:
         {
             const int nums = QString::number(top.toInt()).length();
             _paddingZeroWidth = qMax(1, nums);
@@ -366,7 +447,7 @@ void NumericLineEdit::on_rangeChanged(const QVariant& bottom, const QVariant& to
         }
         break;
 
-        case UnsignedMode:
+        case UInt32Mode:
         {
             const int nums = QString::number(top.toUInt()).length();
             _paddingZeroWidth = qMax(1, nums);
@@ -388,6 +469,24 @@ void NumericLineEdit::on_rangeChanged(const QVariant& bottom, const QVariant& to
         case DoubleMode:
             setMaxLength(INT16_MAX);
             setValidator(new QDoubleValidator(bottom.toDouble(), top.toDouble(), 6, this));
+            break;
+
+        case Int64Mode:
+        {
+            const int nums = QString::number(top.toLongLong()).length();
+            _paddingZeroWidth = qMax(1, nums);
+            setMaxLength(qMax(1, nums));
+            setValidator(new QInt64Validator(bottom.toLongLong(), top.toLongLong(), this));
+        }
+        break;
+
+        case UInt64Mode:
+        {
+            const int nums = QString::number(top.toULongLong()).length();
+            _paddingZeroWidth = qMax(1, nums);
+            setMaxLength(qMax(1, nums));
+            setValidator(new QUIntValidator(bottom.toULongLong(), top.toULongLong(), this));
+        }
         break;
     }
     internalSetValue(_value);

omodsim/controls/numericlineedit.cpp

@@ -13,11 +13,13 @@ class NumericLineEdit : public QLineEdit
 public:
     enum InputMode
     {
-        DecMode = 0,
-        UnsignedMode,
+        Int32Mode = 0,
+        UInt32Mode,
         HexMode,
         FloatMode,
-        DoubleMode
+        DoubleMode,
+        Int64Mode,
+        UInt64Mode
     };
 
     explicit NumericLineEdit(QWidget* parent = nullptr);