Merge pull request #61 from deuteronomy-works/dev

milestone v2.7
deuteronomy-works · Apr 21, 2021 · 45d9c07 · 45d9c07
2 parents d24e062 + db832cc
commit 45d9c07
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 5 deletions.
diff --git a/opencv_t_est.py b/opencv_t_est.py
@@ -57,7 +57,7 @@ def _ok():
 
         frameCount += 1
 
-        if not ret:
+        if not re:
             break
 
         #resized = cv2.resize(frame, (0, 0), fx=0.5, fy=0.5)

diff --git a/soloman/video/__init__.py b/soloman/video/__init__.py
@@ -4,6 +4,7 @@
 from PyQt5.QtQml import QQmlApplicationEngine
 from PyQt5.QtQuick import QQuickItem
 
+
 class Video():
 
 
@@ -21,13 +22,14 @@ def __str__(self):
 
     def get_SVideo(self, obj_name):
         g_thread = threading.Thread(target=self._get_SVideo, args=[obj_name])
-        g_thread.daemon=True
+        g_thread.daemon = True
         g_thread.start()
 
     def show_frame(self, frame):
-        g_thread = threading.Thread(target=self._show_frame, args=[frame])
-        g_thread.daemon=True
-        g_thread.start()
+        if frame is not None:
+            g_thread = threading.Thread(target=self._show_frame, args=[frame])
+            g_thread.daemon = True
+            g_thread.start()
 
     def _show_frame(self, frame):
         self.QVideo.show_cv2_frame(frame)