Merge remote-tracking branch 'origin/dev'

Author: sanny32

.gitattributes

@@ -0,0 +1,2 @@
+*.sh text eol=lf
+*.ts text eol=lf

README.md

@@ -1,54 +1,57 @@
 # Open ModSim
 Open ModSim is a free implimentation of modbus slave (server) utility for modbus-tcp and modbus-rtu protocols.
 
-![image](https://github.com/user-attachments/assets/cfa669f5-4018-4db4-bc43-ca060d469182)
-
-![image](https://github.com/user-attachments/assets/16653017-d479-466a-8302-5960a2e47fc4)
+<img width="1292" height="759" alt="image" src="https://github.com/user-attachments/assets/993501d6-bb1e-4dee-91c4-6d9b7a53df8b" />
 
+<img width="1292" height="760" alt="image" src="https://github.com/user-attachments/assets/1383d93f-03f2-42f5-abb5-0ee1b5dbd10b" />
 
 
 ## Features
 
 The following Modbus functions are available:
 
-Discrete Coils/Flags
-
+- Discrete Coils/Flags
+```
     0x01 - Read Coils
     0x02 - Read Discrete Inputs
     0x05 - Write Single Coil
     0x0F - Write Multiple Coils
+```
 
-Registers
-
+- Registers
+```
     0x03 - Read Holding Registers
     0x04 - Read Input Registers
     0x06 - Write Single Register
     0x10 - Write Multiple Registers
     0x16 - Mask Write Register
+```
 
 The following simulations are available:
 
-Discrete Coils/Flags
-
+- Discrete Coils/Flags
+```
     Random - simulate flag randomly
     Toggle - simulate flag on/off periodicaly
-    
-Registers
+```
 
+- Registers
+```
     Random - simulate register randomly
     Increment - simulate register from Low Limit to High Limit with a given Step
     Decrement - simulate register from High Limit to Low Limit with a given Step
+```
 
 ## Modbus Logging
 
-![image](https://github.com/user-attachments/assets/f62d721f-dd0b-4db7-a239-2a22045e99cd)
+<img width="1292" height="759" alt="image" src="https://github.com/user-attachments/assets/b097a1b7-ee3f-4cd8-b0f2-c087cea25c00" />
 
 
 ## Extended Featues
 
 - Modbus Message Parser
 
-![image](https://github.com/sanny32/OpenModSim/assets/13627951/7e9744b8-f4b3-439a-a312-79cbdc426dc2)
+<img width="674" height="463" alt="image" src="https://github.com/user-attachments/assets/774e3ff1-1bf2-46a6-a685-e6702e2e7fe5" />
 
 
 ## Scripting

omodsim/CMakeLists.txt

@@ -1,7 +1,8 @@
-cmake_minimum_required(VERSION 3.25)
+cmake_minimum_required(VERSION 3.16)
 
 project(omodsim
-        VERSION 1.8.2
+        VERSION 1.9.0
+        DESCRIPTION "An Open Source Modbus Slave (Server) Utility"
         LANGUAGES CXX)
 
 set(CMAKE_AUTOUIC ON)
@@ -10,13 +11,24 @@ set(CMAKE_AUTORCC ON)
 set(CMAKE_CXX_STANDARD 17)
 set(CMAKE_CXX_STANDARD_REQUIRED ON)
 set(PRODUCT_NAME "Open ModSim")
+set(EXECUTABLE_PATH "${CMAKE_INSTALL_PREFIX}/bin/${PROJECT_NAME}")
+
+# Split version to major, minor, patch
+string(REPLACE "." ";" VERSION_LIST ${PROJECT_VERSION})
+list(GET VERSION_LIST 0 VERSION_MAJOR)
+list(GET VERSION_LIST 1 VERSION_MINOR)
+list(GET VERSION_LIST 2 VERSION_PATCH)
 
 # Find Qt6 or fallback to Qt5
 find_package(Qt6 COMPONENTS Core Gui Widgets Network PrintSupport SerialBus SerialPort Core5Compat Qml Help LinguistTools QUIET)
 if (NOT Qt6_FOUND)
     find_package(Qt5 COMPONENTS Core Gui Widgets Network PrintSupport SerialBus SerialPort Qml Help LinguistTools QUIET)
 endif()
 
+if (NOT Qt6_FOUND AND NOT Qt5_FOUND)
+    message(FATAL_ERROR "One or more Qt development packages not found. Please install Qt5 or Qt6 development packages.")
+endif()
+
 if(Qt6_FOUND)
     get_target_property(QT_BINARY_DIR Qt6::qmake IMPORTED_LOCATION)
     get_filename_component(QT_BINARY_DIR "${QT_BINARY_DIR}" DIRECTORY)
@@ -28,15 +40,30 @@ else()
 endif()
 
 # Define target
-add_executable(omodsim)
+add_executable(${PROJECT_NAME})
+
+find_package(Git QUIET)
+if(GIT_FOUND)
+    execute_process(COMMAND ${GIT_EXECUTABLE} rev-parse --abbrev-ref HEAD
+        WORKING_DIRECTORY ${CMAKE_SOURCE_DIR}/../.git
+        OUTPUT_VARIABLE GIT_BRANCH
+        OUTPUT_STRIP_TRAILING_WHITESPACE
+        ERROR_QUIET)
+
+    if(${GIT_BRANCH} MATCHES dev)
+        set(PROJECT_VERSION ${VERSION_MAJOR}.${VERSION_MINOR}-dev)
+    endif()
+else()
+    message(STATUS "Git not found - skipping branch detection")
+endif()
 
 # Define compile definitions
 add_compile_definitions(APP_NAME="${PRODUCT_NAME}")
 add_compile_definitions(APP_DESCRIPTION="${PROJECT_DESCRIPTION}")
 add_compile_definitions(APP_VERSION="${PROJECT_VERSION}")
 
 # Include directories
-target_include_directories(omodsim PRIVATE
+target_include_directories(${PROJECT_NAME} PRIVATE
     ${CMAKE_CURRENT_SOURCE_DIR}
     ${CMAKE_CURRENT_SOURCE_DIR}/controls
     ${CMAKE_CURRENT_SOURCE_DIR}/dialogs
@@ -70,6 +97,7 @@ set(SOURCES
     controls/scriptcontrol.cpp
     controls/searchlineedit.cpp
     controls/simulationmodecombobox.cpp
+    controls/statisticwidget.cpp
     datasimulator.cpp
     dialogs/dialogautosimulation.cpp
     dialogs/dialogcoilsimulation.cpp
@@ -138,6 +166,7 @@ set(HEADERS
     controls/scriptcontrol.h
     controls/searchlineedit.h
     controls/simulationmodecombobox.h
+    controls/statisticwidget.h
     datasimulator.h
     dialogs/dialogautosimulation.h
     dialogs/dialogcoilsimulation.h
@@ -155,6 +184,7 @@ set(HEADERS
     dialogs/dialogwritecoilregister.h
     dialogs/dialogwriteholdingregister.h
     dialogs/dialogwriteholdingregisterbits.h
+    fontutils.h
     formatutils.h
     htmldelegate.h
     jscompleter.h
@@ -212,6 +242,7 @@ set(HEADERS
 set(UI_FILES
     controls/outputwidget.ui
     controls/scriptcontrol.ui
+    controls/statisticwidget.ui
     dialogs/dialogautosimulation.ui
     dialogs/dialogcoilsimulation.ui
     dialogs/dialogabout.ui
@@ -257,15 +288,19 @@ else()
 endif()
 
 # Link libraries
-target_sources(omodsim PRIVATE resources.qrc ${HEADERS} ${SOURCES} ${UI_FILES} ${TS_FILES})
-target_link_libraries(omodsim PRIVATE Qt::Widgets Qt::Network Qt::PrintSupport Qt::SerialBus Qt::SerialPort Qt::Qml Qt::Help)
+target_sources(${PROJECT_NAME} PRIVATE resources.qrc ${HEADERS} ${SOURCES} ${UI_FILES} ${TS_FILES})
+target_link_libraries(${PROJECT_NAME} PRIVATE Qt::Widgets Qt::Network Qt::PrintSupport Qt::SerialBus Qt::SerialPort Qt::Qml Qt::Help)
+
+if(TARGET update_translations)
+    add_dependencies(${PROJECT_NAME} update_translations)
+endif()
 
 if(Qt6_FOUND)
-    qt_add_lupdate(omodsim
+    qt_add_lupdate(${PROJECT_NAME}
         TS_FILES ${TS_FILES}
         SOURCES ${SOURCES} ${HEADERS} ${UI_FILES}
     )
-    target_link_libraries(omodsim PRIVATE Qt::Core5Compat)
+    target_link_libraries(${PROJECT_NAME} PRIVATE Qt::Core5Compat)
 else()
     add_custom_command(
         OUTPUT ${TS_FILES}
@@ -277,24 +312,19 @@ else()
         COMMENT "Updating translation files..."
     )
     add_custom_target(update_translations ALL DEPENDS ${TS_FILES})
-
 endif()
 
 if(WIN32)
-    string(REPLACE "." ";" VERSION_LIST ${PROJECT_VERSION})
-    list(GET VERSION_LIST 0 VERSION_MAJOR)
-    list(GET VERSION_LIST 1 VERSION_MINOR)
-    list(GET VERSION_LIST 2 VERSION_PATCH)
-
-    set(EXECUTABLE_NAME "omodsim")
     set(ICON_FILE "${CMAKE_CURRENT_SOURCE_DIR}/res/omodsim.ico")
-    set(RC_TEMPLATE "${CMAKE_CURRENT_SOURCE_DIR}/omodsim.rc.in")
-    set(GENERATED_RC "${CMAKE_BINARY_DIR}/omodsim.rc")
 
-    configure_file(${RC_TEMPLATE} ${GENERATED_RC} @ONLY)
+    configure_file(
+            "${CMAKE_CURRENT_SOURCE_DIR}/omodsim.rc.in"
+            "${CMAKE_BINARY_DIR}/omodsim.rc"
+            @ONLY
+        )
 
-    target_sources(omodsim PRIVATE ${ICON_PATH} ${GENERATED_RC})
-    set_target_properties(omodsim PROPERTIES WIN32_EXECUTABLE ON)
+    target_sources(${PROJECT_NAME} PRIVATE ${ICON_PATH} "${CMAKE_BINARY_DIR}/omodsim.rc")
+    set_target_properties(${PROJECT_NAME} PROPERTIES WIN32_EXECUTABLE ON)
 endif()
 
 add_custom_command(
@@ -310,5 +340,4 @@ add_custom_command(
 )
 
 add_custom_target(helpgenerator ALL DEPENDS ${JSHELP_QCH} ${JSHELP_QHC})
-add_dependencies(omodsim helpgenerator)
-add_dependencies(omodsim update_translations)
+add_dependencies(${PROJECT_NAME} helpgenerator)

omodsim/controls/bytelisttextedit.cpp

@@ -1,8 +1,27 @@
 #include <QRegularExpressionValidator>
 #include <QMimeData>
+#include "fontutils.h"
 #include "formatutils.h"
 #include "bytelisttextedit.h"
 
+///
+/// \brief splitBySep
+/// \param str
+/// \param sep
+/// \return
+///
+QString splitBySep(const QString& str, QChar sep)
+{
+    QString s;
+    for(int i = 0; i < str.length() - 1; i+=2)
+    {
+        s.append(str[i]);
+        s.append(str[i+1]);
+        if(i + 3 < str.length()) s.append(sep);
+    }
+    return s;
+}
+
 ///
 /// \brief ByteListTextEdit::ByteListTextEdit
 /// \param parent
@@ -13,6 +32,7 @@ ByteListTextEdit::ByteListTextEdit(QWidget* parent)
     ,_validator(nullptr)
 {
     setInputMode(DecMode);
+    setFont(defaultMonospaceFont());
     connect(this, &QPlainTextEdit::textChanged, this, &ByteListTextEdit::on_textChanged);
 }
 
@@ -27,6 +47,7 @@ ByteListTextEdit::ByteListTextEdit(InputMode mode, QWidget *parent)
     ,_validator(nullptr)
 {
     setInputMode(mode);
+    setFont(defaultMonospaceFont());
     connect(this, &QPlainTextEdit::textChanged, this, &ByteListTextEdit::on_textChanged);
 }
 
@@ -182,8 +203,11 @@ void ByteListTextEdit::keyPressEvent(QKeyEvent *e)
 ///
 bool ByteListTextEdit::canInsertFromMimeData(const QMimeData* source) const
 {
+    if (!source->hasText())
+        return false;
+
     int pos = 0;
-    auto text = source->text().trimmed();
+    auto text = source->text().remove("0x").trimmed();
     const auto state = _validator->validate(text, pos);
 
     return state == QValidator::Acceptable;
@@ -195,13 +219,18 @@ bool ByteListTextEdit::canInsertFromMimeData(const QMimeData* source) const
 ///
 void ByteListTextEdit::insertFromMimeData(const QMimeData* source)
 {
+    if (!source->hasText())
+        return;
+
     int pos = 0;
-    auto text = source->text().trimmed();
-    const auto state = _validator->validate(text, pos);
+    auto text = source->text().remove("0x").trimmed();
+    if(text.length() > 2 && !text.contains(_separator))
+        text = splitBySep(text, _separator);
 
+    const auto state = _validator->validate(text, pos);
     if(state == QValidator::Acceptable)
     {
-        QPlainTextEdit::insertFromMimeData(source);
+        textCursor().insertText(text);
         updateValue();
     }
 }