Merge pull request #7 from SHMModbus/main

2.1.1

Author: NikolasK-source

setup.py

@@ -3,7 +3,7 @@
 
 setup(
     name='shm-modbus-gui',
-    version='2.1.0',
+    version='2.1.1',
     description='gui for shm-modbus',
     license='GPLv3',
     author='Nikolas Koesling',

src/InspectSHM.py

@@ -341,11 +341,13 @@ def delete_row(self, row_widget: QTableWidgetItem):
         self.exec_mutex.unlock()
 
     def closeEvent(self, event):
+        self.exec_mutex.lock()
         super(InspectSHM, self).closeEvent(event)
         self.timer.stop()
         if self.add_window:
             self.add_window.close()
         self.closed.emit()
+        self.exec_mutex.unlock()
 
     def save_config(self):
         file_name, _ = QFileDialog.getSaveFileName(self, caption="Save config")

src/MBConfig.py

@@ -76,7 +76,8 @@ def __init_tcp(self, main_window: any) -> None:
         self.separate = main_window.mbtcp_separate.isChecked()
         self.separate_all = main_window.mbtcp_separate_all.isChecked()
         if len(main_window.mbtcp_separate_list.text().strip()):
-            self.separate_list = set([int(x) for x in main_window.mbtcp_separate_list.text().strip().split(',')])
+            self.separate_list = set(
+                [int(x) for x in main_window.mbtcp_separate_list.text().strip().rstrip(',').split(',')])
         else:
             self.separate_list = set()
 

src/SHMHexdump.py

@@ -116,9 +116,11 @@ def execute(self):
         self.exec_mutex.unlock()
 
     def closeEvent(self, event):
+        self.exec_mutex.lock()
         super(SHMHexdump, self).closeEvent(event)
         self.timer.stop()
         self.closed.emit()
+        self.exec_mutex.unlock()
 
 
 if __name__ == "__main__":

src/SHMRandom.py

@@ -141,6 +141,7 @@ def closeEvent(self, event):
         super(SHMRandom, self).closeEvent(event)
         if self.process:
             self.process.terminate()
+        self.process.waitForFinished(500)
         self.closed.emit()
 
 

src/__init__.py

@@ -1 +1 @@
-__version__ = '2.1.0'
+__version__ = '2.1.1'

src/constants.py

@@ -1,8 +1,8 @@
 APP_NAME = "shm-modbus-gui"
-VERSION = "2.1.0"
+VERSION = "2.1.1"
 
 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]["
-              r"0-9])|(2[0-4][0-9])|(25[0-5])))*)|(,))?$")
+BYTE_REGEX = (r"^((([0-9])|([1-9][0-9])|(1[0-9][0-9])|(2[0-4][0-9])|(25[0-5]))((,(([0-9])|([1-9][0-9])|(1[0-9][0-9])|("
+              r"2[0-4][0-9])|(25[0-5])))*))?$")
 DEVICE_REGEX = r"^((/?\w+)+)?$"
 BAUD_REGEX = r"^(0|([1-9]\d{0,8}))?$"