bug fix

Author: wenliangyeoh

image_processing_widget/main_widget.py

@@ -2,6 +2,7 @@
 import sys
 from configparser import ConfigParser
 from pathlib import Path
+from time import sleep
 
 import cv2 as cv
 from yapsy.PluginManager import PluginManager
@@ -307,8 +308,12 @@ def gui_restore(self, settings):
 
     def closeEvent(self, event):
         """save before closing"""
+        self.process_worker.stop()
+        self.process_thread.quit()
         settings = QtCore.QSettings(str(self.settings_file), QtCore.QSettings.IniFormat)
         self.gui_save(settings)
+        while self.process_thread.isRunning():
+            sleep(0.5)
         event.accept()
 
     def error_dialog(self, error):

image_processing_widget/splashscreen/splashscreen.py

@@ -26,10 +26,10 @@ def __init__(self, length=100):
         self.frame = QtWidgets.QFrame(self)
         self.frame.setObjectName("Frame")
         self.frame.setAttribute(QtCore.Qt.WA_StyledBackground)
-        self.main_layout.addWidget(self.frame)
         self.frame_layout = QtWidgets.QVBoxLayout(self.frame)
+        self.main_layout.addWidget(self.frame)
 
-        title_row = QtWidgets.QHBoxLayout(self.frame)
+        title_row = QtWidgets.QHBoxLayout()
         self.frame_layout.addLayout(title_row)
 
         icon_size = 200

image_processing_widget/workers/process_worker.py

@@ -13,11 +13,14 @@ def __init__(self, dock, *args, **kwargs):
         self.dock = dock
         self.queue = Queue()
 
+        self._stop_flag = False
+
     def run(self):
-        while True:
+        while not self._stop_flag:
             img = self.queue.get()
-            processed_image = self.process_img(img)
-            self.finished.emit(processed_image)
+            if img is not None:
+                processed_image = self.process_img(img)
+                self.finished.emit(processed_image)
 
     def process_img(self, img):
         try:
@@ -27,3 +30,7 @@ def process_img(self, img):
         except Exception as e:
             self.process_failed.emit(str(e))
             return
+
+    def stop(self):
+        self._stop_flag = True
+        self.queue.put(None)

pyproject.toml

@@ -1,8 +1,23 @@
 [tool.poetry]
 name = "image-processing-widget"
-version = "0.2.1"
+version = "0.2.2"
 description = "GUI to explore OpenCV image processing functions"
 authors = ["wenliangyeoh <wlyeoh@cc.saga-u.ac.jp>"]
+readme = "README.md"
+repository = "https://github.com/fukuda-lab-saga/image-processing-widget"
+keywords = ["opencv", "gui", "pyside6"]
+classifiers = [
+    "License :: OSI Approved :: MIT License",
+    "Operating System :: OS Independent",
+    "Intended Audience :: Education",
+]
+include = [
+    "image_processing_config.ini",
+    "image_processing_widget/resource/*",
+    "plugins/*",
+    "plugins/**/*",
+]
+
 
 [tool.poetry.dependencies]
 python = ">3.10, <3.11"

requirements.txt

@@ -0,0 +1,30 @@
+numpy==1.23.2; python_version >= "3.8"
+opencv-python==4.5.5.64; python_version >= "3.6"
+packaging==21.3; python_version >= "3.7" \
+    --hash=sha256:ef103e05f519cdc783ae24ea4e2e0f508a9c99b2d4969652eed6a2e1ea5bd522 \
+    --hash=sha256:dd47c42927d89ab911e606518907cc2d3a1f38bbd026385970643f9c5b8ecfeb
+pyparsing==3.0.9; python_full_version >= "3.6.8" and python_version >= "3.7" \
+    --hash=sha256:5026bae9a10eeaefb61dab2f09052b9f4307d44aee4eda64b309723d8d206bbc \
+    --hash=sha256:2b020ecf7d21b687f219b71ecad3631f644a47f01403fa1d1036b0c6416d70fb
+pyqtgraph==0.12.4; python_version >= "3.7" \
+    --hash=sha256:d98c6e26e9eda6d1d1bba92d6df381ef77fca18b701f9e136759ce31a17c6217 \
+    --hash=sha256:c2c8f2b7e1d7f97a710f370acff6368d686c9d6cdc560f2d83dcf59185dfa19d
+pyside6-addons==6.3.1; python_version >= "3.6" and python_version < "3.11" \
+    --hash=sha256:7a6bb180e41a4c599aa0e93d11e60570d0ebc79c197afccd9c227566dad5d5ef \
+    --hash=sha256:14f4171b15dbdd7d120dc125c84f2eca53bc197182295bfdfdb3bb95b58a46c7 \
+    --hash=sha256:9a933fac75c85bea3a9e31b24926e06b1afebae23cd164f10f2001999ea2692c
+pyside6-essentials==6.3.1; python_version >= "3.6" and python_version < "3.11" \
+    --hash=sha256:55696693325a2de7bf5b56274b534f191032d218d61a948baa95933f6e642e59 \
+    --hash=sha256:e27962beb2cc45fe13a1a1c24a454c3c3c3c3082c4a84bc5dcf6b306979ba013 \
+    --hash=sha256:fa825c5396a5dfedf59635e904239187e2f2225c7f65917d4e973062c9a6b916
+pyside6==6.3.1; python_version >= "3.6" and python_version < "3.11" \
+    --hash=sha256:58b824cb41d549a149a17786326f79a2fa46a1ce94e06397e78ea5707757b052 \
+    --hash=sha256:bc749968d641af1c516b6b0e00264bffea9cfc2d56dc04766f36e1a313e93a3a \
+    --hash=sha256:947185379c181d5e51b7b6bf2df8d8127c675ea57604d41265c67444d226db26
+qtawesome==1.1.1; python_version >= "3.6"
+qtpy==2.2.0; python_version >= "3.7"
+shiboken6==6.3.1; python_version >= "3.6" and python_version < "3.11" \
+    --hash=sha256:6393aa330101b098631a88dfb99b6b46794046c7f63b5c1ac93ae2fcef4773ff \
+    --hash=sha256:aad9aa8e7ecd3c889cc789e41abf3990101126b5b02edfcf87f1ef331c9dc45a \
+    --hash=sha256:cb9cf4ad858e59237642bf6b8be1fe6f19cb090799ff00e4c2643768d73e8ebe
+yapsy==1.12.2