Merge remote-tracking branch 'origin/dev'

Author: sanny32

.gitignore

@@ -55,3 +55,4 @@ CMakeLists.txt.user*
 *.idx
 *.rc
 *.qtds
+*.ts text eol=lf

README.md

@@ -1,9 +1,10 @@
 # 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/b57d329f-02c9-42c2-957c-295a67efcf67)
+![image](https://github.com/user-attachments/assets/cfa669f5-4018-4db4-bc43-ca060d469182)
+
+![image](https://github.com/user-attachments/assets/16653017-d479-466a-8302-5960a2e47fc4)
 
-![image](https://github.com/user-attachments/assets/730900fb-c8b4-4675-ba8b-cee5d7e9dd9e)
 
 
 ## Features
@@ -40,8 +41,7 @@ Registers
 
 ## Modbus Logging
 
-
-![image](https://github.com/user-attachments/assets/d8dc67fc-efce-4d40-81df-5ed54a958952)
+![image](https://github.com/user-attachments/assets/f62d721f-dd0b-4db7-a239-2a22045e99cd)
 
 
 ## Extended Featues
@@ -54,7 +54,7 @@ Registers
 ## 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/user-attachments/assets/e8d31089-345a-4c26-bb0c-fe2ea92f85d4)
+![image](https://github.com/user-attachments/assets/5b448fcd-1ca7-4cfc-af0f-175fbb660f80)
 
 
   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
@@ -105,7 +105,7 @@ Script.onInit(init);
 ```
 
 ## Building
-  Now building is available with Qt/qmake (version 5.15 and above) or Qt Creator. Supports both OS Microsoft Windows and Linux.
+  Now building is available via cmake (with installed Qt version 5.15 and above) or Qt Creator. Supports both OS Microsoft Windows and Linux.
 
 ## MIT License
 Copyright 2024 Alexandr Ananev [mail@ananev.org]

omodsim/CMakeLists.txt

@@ -0,0 +1,313 @@
+cmake_minimum_required(VERSION 3.25)
+
+project(OpenModSim 
+        VERSION 1.8.0
+        LANGUAGES CXX)
+
+set(CMAKE_AUTOUIC ON)
+set(CMAKE_AUTOMOC ON)
+set(CMAKE_AUTORCC ON)
+set(CMAKE_CXX_STANDARD 17)
+set(CMAKE_CXX_STANDARD_REQUIRED ON)
+set(PRODUCT_NAME "Open ModSim")
+
+# 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(Qt6_FOUND)
+    get_target_property(QT_BINARY_DIR Qt6::qmake IMPORTED_LOCATION)
+    get_filename_component(QT_BINARY_DIR "${QT_BINARY_DIR}" DIRECTORY)
+    get_filename_component(QT_LIBEXEC_DIR "${QT_BINARY_DIR}/../libexec" REALPATH)
+else()
+    get_target_property(QT_BINARY_DIR Qt5::qmake IMPORTED_LOCATION)
+    get_filename_component(QT_BINARY_DIR "${QT_BINARY_DIR}" DIRECTORY)
+    set(QT_LIBEXEC_DIR "${QT_BINARY_DIR}")
+endif()
+
+# Define target
+add_executable(omodsim)
+
+# 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
+    ${CMAKE_CURRENT_SOURCE_DIR}
+    ${CMAKE_CURRENT_SOURCE_DIR}/controls
+    ${CMAKE_CURRENT_SOURCE_DIR}/dialogs
+    ${CMAKE_CURRENT_SOURCE_DIR}/jsobjects
+    ${CMAKE_CURRENT_SOURCE_DIR}/modbusmessages
+)
+
+# Source files
+set(SOURCES
+    ansimenu.cpp
+    cmdlineparser.cpp
+    controls/addressbasecombobox.cpp
+    controls/booleancombobox.cpp
+    controls/bytelisttextedit.cpp
+    controls/clickablelabel.cpp
+    controls/consoleoutput.cpp
+    controls/customframe.cpp
+    controls/customlineedit.cpp
+    controls/flowcontroltypecombobox.cpp
+    controls/helpwidget.cpp
+    controls/jscodeeditor.cpp
+    controls/mainstatusbar.cpp
+    controls/modbuslogwidget.cpp
+    controls/modbusmessagewidget.cpp
+    controls/numericcombobox.cpp
+    controls/numericlineedit.cpp
+    controls/outputwidget.cpp
+    controls/paritytypecombobox.cpp
+    controls/pointtypecombobox.cpp
+    controls/runmodecombobox.cpp
+    controls/scriptcontrol.cpp
+    controls/searchlineedit.cpp
+    controls/simulationmodecombobox.cpp
+    datasimulator.cpp
+    dialogs/dialogautosimulation.cpp
+    dialogs/dialogcoilsimulation.cpp
+    dialogs/dialogabout.cpp
+    dialogs/dialogdisplaydefinition.cpp
+    dialogs/dialogforcemultiplecoils.cpp
+    dialogs/dialogforcemultipleregisters.cpp
+    dialogs/dialogmsgparser.cpp
+    dialogs/dialogprintsettings.cpp
+    dialogs/dialogscriptsettings.cpp
+    dialogs/dialogselectserviceport.cpp
+    dialogs/dialogsetuppresetdata.cpp
+    dialogs/dialogsetupserialport.cpp
+    dialogs/dialogwindowsmanager.cpp
+    dialogs/dialogwritecoilregister.cpp
+    dialogs/dialogwriteholdingregister.cpp
+    dialogs/dialogwriteholdingregisterbits.cpp
+    htmldelegate.cpp
+    jscompleter.cpp
+    jsobjects/console.cpp
+    jsobjects/script.cpp
+    jsobjects/server.cpp
+    formmodsim.cpp
+    jshighlighter.cpp
+    jsobjects/storage.cpp
+    main.cpp
+    mainwindow.cpp
+    menuconnect.cpp
+    modbusdataunitmap.cpp
+    modbusmessages/modbusmessage.cpp
+    modbusmultiserver.cpp
+    qfixedsizedialog.cpp
+    qhexvalidator.cpp
+    qint64validator.cpp
+    quintvalidator.cpp
+    recentfileactionlist.cpp
+    windowactionlist.cpp
+)
+
+# Header files
+set(HEADERS
+    ansimenu.h
+    ansiutils.h
+    byteorderutils.h
+    cmdlineparser.h
+    connectiondetails.h
+    controls/addressbasecombobox.h
+    controls/booleancombobox.h
+    controls/bytelisttextedit.h
+    controls/clickablelabel.h
+    controls/consoleoutput.h
+    controls/customframe.h
+    controls/customlineedit.h
+    controls/flowcontroltypecombobox.h
+    controls/helpwidget.h
+    controls/jscodeeditor.h
+    controls/mainstatusbar.h
+    controls/modbuslogwidget.h
+    controls/modbusmessagewidget.h
+    controls/numericcombobox.h
+    controls/numericlineedit.h
+    controls/outputwidget.h
+    controls/paritytypecombobox.h
+    controls/pointtypecombobox.h
+    controls/runmodecombobox.h
+    controls/scriptcontrol.h
+    controls/searchlineedit.h
+    controls/simulationmodecombobox.h
+    datasimulator.h
+    dialogs/dialogautosimulation.h
+    dialogs/dialogcoilsimulation.h
+    dialogs/dialogabout.h
+    dialogs/dialogdisplaydefinition.h
+    dialogs/dialogforcemultiplecoils.h
+    dialogs/dialogforcemultipleregisters.h
+    dialogs/dialogmsgparser.h
+    dialogs/dialogprintsettings.h
+    dialogs/dialogscriptsettings.h
+    dialogs/dialogselectserviceport.h
+    dialogs/dialogsetuppresetdata.h
+    dialogs/dialogsetupserialport.h
+    dialogs/dialogwindowsmanager.h
+    dialogs/dialogwritecoilregister.h
+    dialogs/dialogwriteholdingregister.h
+    dialogs/dialogwriteholdingregisterbits.h
+    formatutils.h
+    htmldelegate.h
+    jscompleter.h
+    jsobjects/console.h
+    jsobjects/script.h
+    jsobjects/server.h
+    displaydefinition.h
+    enums.h
+    formmodsim.h
+    jshighlighter.h
+    jsobjects/storage.h
+    mainwindow.h
+    menuconnect.h
+    modbusdataunitmap.h
+    modbuslimits.h
+    modbusmessages/diagnostics.h
+    modbusmessages/getcommeventcounter.h
+    modbusmessages/getcommeventlog.h
+    modbusmessages/maskwriteregister.h
+    modbusmessages/modbusmessage.h
+    modbusmessages/modbusmessages.h
+    modbusmessages/readcoils.h
+    modbusmessages/readdiscreteinputs.h
+    modbusmessages/readexceptionstatus.h
+    modbusmessages/readfifoqueue.h
+    modbusmessages/readfilerecord.h
+    modbusmessages/readholdingregisters.h
+    modbusmessages/readinputregisters.h
+    modbusmessages/readwritemultipleregisters.h
+    modbusmessages/reportserverid.h
+    modbusmessages/writefilerecord.h
+    modbusmessages/writemultiplecoils.h
+    modbusmessages/writemultipleregisters.h
+    modbusmessages/writesinglecoil.h
+    modbusmessages/writesingleregister.h
+    modbusmultiserver.h
+    modbussimulationparams.h
+    modbuswriteparams.h
+    numericutils.h
+    qfixedsizedialog.h
+    qhexvalidator.h
+    qint64validator.h
+    qmodbusadu.h
+    qmodbusadurtu.h
+    qmodbusadutcp.h
+    qrange.h
+    quintvalidator.h
+    recentfileactionlist.h
+    scriptsettings.h
+    serialportutils.h
+    windowactionlist.h
+)
+
+# UI Forms
+set(UI_FILES
+    controls/outputwidget.ui
+    controls/scriptcontrol.ui
+    dialogs/dialogautosimulation.ui
+    dialogs/dialogcoilsimulation.ui
+    dialogs/dialogabout.ui
+    dialogs/dialogdisplaydefinition.ui
+    dialogs/dialogforcemultiplecoils.ui
+    dialogs/dialogforcemultipleregisters.ui
+    dialogs/dialogmsgparser.ui
+    dialogs/dialogprintsettings.ui
+    dialogs/dialogscriptsettings.ui
+    dialogs/dialogselectserviceport.ui
+    dialogs/dialogsetuppresetdata.ui
+    dialogs/dialogsetupserialport.ui
+    dialogs/dialogwindowsmanager.ui
+    dialogs/dialogwritecoilregister.ui
+    dialogs/dialogwriteholdingregister.ui
+    dialogs/dialogwriteholdingregisterbits.ui
+    formmodsim.ui
+    mainwindow.ui
+)
+
+set(TS_FILES
+    translations/omodsim_ru.ts
+)
+
+set(JSHELP_INPUT "${CMAKE_SOURCE_DIR}/docs/jshelp.qhcp")
+set(JSHELP_QCH "${CMAKE_BINARY_DIR}/docs/jshelp.qch")
+set(JSHELP_QHC "${CMAKE_BINARY_DIR}/docs/jshelp.qhc")
+
+file(MAKE_DIRECTORY ${CMAKE_BINARY_DIR}/docs)
+
+find_program(QHELP_GENERATOR_EXECUTABLE qhelpgenerator
+             HINTS "${QT_BINARY_DIR}" "${QT_LIBEXEC_DIR}"
+             NO_DEFAULT_PATH)
+if(NOT QHELP_GENERATOR_EXECUTABLE)
+    find_program(QHELP_GENERATOR_EXECUTABLE qhelpgenerator)
+endif()
+
+if(QHELP_GENERATOR_EXECUTABLE)
+    message(STATUS "qhelpgenerator found at: ${QHELP_GENERATOR_EXECUTABLE}")
+else()
+    message(FATAL_ERROR "qhelpgenerator not found")
+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)
+
+if(Qt6_FOUND)
+    qt_add_lupdate(omodsim
+        TS_FILES ${TS_FILES}
+        SOURCES ${SOURCES} ${HEADERS} ${UI_FILES}
+    )
+    target_link_libraries(omodsim PRIVATE Qt::Core5Compat)
+else()
+    add_custom_command(
+        OUTPUT ${TS_FILES}
+        COMMAND ${Qt5_LUPDATE_EXECUTABLE}
+                ${SOURCES} ${HEADERS} ${UI_FILES}
+                -ts ${TS_FILES}
+        DEPENDS ${SOURCES} ${HEADERS} ${UI_FILES}
+        WORKING_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}
+        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)
+
+    target_sources(omodsim PRIVATE ${ICON_PATH} ${GENERATED_RC})
+    set_target_properties(omodsim PROPERTIES WIN32_EXECUTABLE ON)
+endif()
+
+add_custom_command(
+    OUTPUT ${JSHELP_QCH} ${JSHELP_QHC}
+    COMMAND ${QHELP_GENERATOR_EXECUTABLE} ${JSHELP_INPUT}
+    WORKING_DIRECTORY ${CMAKE_BINARY_DIR}/docs
+    COMMAND ${CMAKE_COMMAND} -E rename
+            ${CMAKE_SOURCE_DIR}/docs/jshelp.qch ${JSHELP_QCH}
+    COMMAND ${CMAKE_COMMAND} -E rename
+            ${CMAKE_SOURCE_DIR}/docs/jshelp.qhc ${JSHELP_QHC}
+    COMMENT "Generating and moving help files..."
+    VERBATIM
+)
+
+add_custom_target(helpgenerator ALL DEPENDS ${JSHELP_QCH} ${JSHELP_QHC})
+add_dependencies(omodsim helpgenerator)
+add_dependencies(omodsim update_translations)