Merge branch 'main' into release

Author: NikolasK-source

setup.py

@@ -1,20 +1,27 @@
 from setuptools import setup
-import sys,os
+import sys, os
 
 setup(
-    name = 'shm-modbus-gui',
-    version = '1.0.1',
-    description = 'gui for shm-modbus',
+    name='shm-modbus-gui',
+    version='1.0.2',
+    description='gui for shm-modbus',
     license='GPLv3',
-    author = 'Nikolas Koesling',
-    packages = ['src'],
+    author='Nikolas Koesling',
+    packages=[
+        'src',
+        'src.py_ui'
+    ],
     package_data={},
-    install_requires=['pyside6'],
-    entry_points = {
-        'console_scripts': [
-            'shm-modbus-gui=src.main:main']
-            },
-    classifiers = ['Programming Language :: Python :: 3.10',
-            'Operating System :: POSIX',
-            'License :: GPLv3'],
+    install_requires=['PySide6==6.2.4'],
+    entry_points={
+        'console_scripts':
+            [
+                'shm-modbus-gui=src.main:main'
+            ]
+    },
+    classifiers=[
+        'Programming Language :: Python :: 3.10',
+        'Operating System :: POSIX',
+        'License :: GPLv3'
+    ],
 )

snap/snapcraft.yaml

@@ -0,0 +1,31 @@
+name: shm-modbus-gui
+summary: gui for shm-modbus
+description: |
+  QT6 (PySide6) gui for shm-modbus
+version: test
+base: core22
+confinement: devmode
+
+parts:
+  shm-modbus-gui:
+    plugin: python
+    source: .
+    stage-packages:
+      - libgl1
+      - libxkbcommon0
+      - libegl1
+      - libfontconfig1
+      - libpulse0
+      - libxcb-cursor0
+      - qt6-base-dev
+
+
+apps:
+  shm-modbus-gui:
+    command: bin/shm-modbus-gui
+    plugs:
+      - desktop
+      - wayland
+      - x11
+    environment:
+      QT_PLUGIN_PATH: "$SNAP/usr/lib/$CRAFT_ARCH_TRIPLET/qt6/plugins"

src/MBConfig.py

@@ -1,7 +1,7 @@
 import re
 from abc import ABC, abstractmethod
 
-import constants
+from . import constants
 
 JSON_KEYS = (("modbus.byte_timeout", float),
              ("modbus.edit_byte_timeout", bool),

src/MBxxOutput.py

@@ -3,7 +3,7 @@
 from PySide6.QtGui import QFontDatabase, QTextCursor
 from PySide6.QtWidgets import QFileDialog, QMessageBox
 
-from py_ui import Ui_MBxxxOutput
+from .py_ui import Ui_MBxxxOutput
 
 
 class MBxxOutput(QtWidgets.QMainWindow, Ui_MBxxxOutput):

src/MainWindow.py

@@ -4,13 +4,13 @@
 from PySide6.QtGui import QRegularExpressionValidator
 from PySide6.QtWidgets import QFileDialog, QMessageBox
 
-import MBConfig
-import SHMTools
-from py_ui import Ui_MainWindow
-from mbtcp_config import MBTCPConfig
-from mbrtu_config import MBRTUConfig
-from MBxxOutput import MBxxOutput
-import constants
+from . import MBConfig
+from . import SHMTools
+from .py_ui import Ui_MainWindow
+from .mbtcp_config import MBTCPConfig
+from .mbrtu_config import MBRTUConfig
+from .MBxxOutput import MBxxOutput
+from . import constants
 
 
 class MainWindow(QtWidgets.QMainWindow, Ui_MainWindow):

src/SHMHexdump.py

@@ -3,7 +3,7 @@
 from PySide6.QtGui import QFontDatabase, QTextCursor
 from PySide6.QtWidgets import QMessageBox, QFileDialog
 
-from py_ui import Ui_ShmHexdump
+from .py_ui import Ui_ShmHexdump
 
 
 class SHMHexdump(QtWidgets.QMainWindow, Ui_ShmHexdump):

src/SHMRandom.py

@@ -1,7 +1,7 @@
 from PySide6 import QtWidgets, QtCore
 from PySide6.QtWidgets import QMessageBox
 
-from py_ui import Ui_RandomizeShm
+from .py_ui import Ui_RandomizeShm
 
 
 class SHMRandom(QtWidgets.QWidget, Ui_RandomizeShm):
@@ -129,7 +129,8 @@ def on_process_finished(self, exit_code) -> None:
         self.active = False
         if exit_code != 0:
             stderr = bytes(self.process.readAllStandardError()).decode("utf-8")
-            QMessageBox.warning(self, "Command Failed", f"Execution of command shared-mem-random failed: {stderr}")
+            QMessageBox.warning(self, "Command Failed",
+                                f"Execution of command shared-mem-random failed (exit code: {exit_code}):\n {stderr}")
 
     def closeEvent(self, event):
         super(SHMRandom, self).closeEvent(event)

src/SHMTools.py

@@ -1,7 +1,7 @@
 from PySide6.QtCore import QProcess
 
-from SHMHexdump import SHMHexdump
-from SHMRandom import SHMRandom
+from .SHMHexdump import SHMHexdump
+from .SHMRandom import SHMRandom
 
 
 class SHMTools:

src/__init__.py

@@ -1 +1 @@
-__version__ = '1.0.1'
+__version__ = '1.0.1'

src/constants.py

@@ -1,5 +1,5 @@
 APP_NAME = "shm-modbus-gui"
-VERSION = "1.0.1"
+VERSION = "1.0.2"
 
 NAME_REGEX = r"^(\d|[a-z]|[A-Z]|\.|:|-|_)*$"
 BYTE_REGEX = (r"(([0-9])|([1-9][0-9])|(1[0-9][0-9])|(2[0-4][0-9])|(25[0-5]))((,{1,2}(([0-9])|([1-9][0-9])|(1[0-9]["

src/main.py

@@ -4,8 +4,8 @@
 from PySide6 import QtWidgets
 import argparse
 
-from MainWindow import MainWindow
-import constants
+from .MainWindow import MainWindow
+from . import constants
 
 
 def main() -> None:

src/mbrtu_config.py

@@ -1,8 +1,8 @@
 import json
 import re
 
-import MBConfig
-import constants
+from . import MBConfig
+from . import constants
 
 JSON_KEYS = (("serial.device", str),
              ("serial.parity", int),

src/mbtcp_config.py

@@ -1,8 +1,8 @@
 import json
 import re
 
-import constants
-import MBConfig
+from . import constants
+from . import MBConfig
 
 JSON_KEYS = (("network.connections", int),
              ("network.host", str),