Forráskód Böngészése

feat(hya): Show debug image by threading

huangrunheng 2 éve
szülő
commit
f05af02325
2 módosított fájl, 55 hozzáadás és 18 törlés
  1. 55 3
      tasks/Hyakkiyakou/debugger.py
  2. 0 15
      tasks/Hyakkiyakou/script_task.py

+ 55 - 3
tasks/Hyakkiyakou/debugger.py

@@ -1,4 +1,5 @@
 import cv2
 import cv2
+import copy
 import shutil
 import shutil
 import time
 import time
 import numpy as np
 import numpy as np
@@ -6,11 +7,13 @@ import numpy as np
 from datetime import datetime
 from datetime import datetime
 from pathlib import Path
 from pathlib import Path
 from numpy import uint8, fromfile
 from numpy import uint8, fromfile
+from threading import Event, Lock, Thread
 from oashya.labels import id2label, CLASSIFY
 from oashya.labels import id2label, CLASSIFY
 from oashya.utils import draw_tracks
 from oashya.utils import draw_tracks
 from oashya.tracker import Tracker
 from oashya.tracker import Tracker
 
 
 from tasks.base_task import BaseTask
 from tasks.base_task import BaseTask
+from module.logger import logger
 
 
 
 
 def test_track(show : bool = False):
 def test_track(show : bool = False):
@@ -45,16 +48,65 @@ def test_track(show : bool = False):
     print(f'平均时间: {(end_time - start_time) / len([folder_image.iterdir()])}')
     print(f'平均时间: {(end_time - start_time) / len([folder_image.iterdir()])}')
 
 
 
 
+glob_image = np.zeros((720, 1280, 3), dtype=np.uint8)
 
 
+def show_track(sync_image, sync_lock, stop_event):
+    global glob_image
+    while True:
+        if stop_event.is_set():
+            logger.info('OAS Track Debugger stopped')
+            break
+        sync_lock.acquire()
+        cv2.imshow('OAS Tracker', glob_image)
+        sync_lock.release()
+        cv2.waitKey(100)
 
 
 
 
-
-class Debugger(BaseTask):
+class Debugger:
+    sync_image = np.zeros((720, 1280, 3), dtype=np.uint8)
+    sync_lock = Lock()
+    stop_event = Event()
+    sync_thread = Thread(target=show_track, daemon=True, name='OAS Track Debugger',
+                         args=(sync_image, sync_lock, stop_event))
+    # sync_event = Event()  # reserved for future use
 
 
     def show(self, results):
     def show(self, results):
         image = draw_tracks(self.device.image, results)
         image = draw_tracks(self.device.image, results)
         cv2.imshow('OAS Tracker', image)
         cv2.imshow('OAS Tracker', image)
 
 
+    def show_start(self):
+        logger.info('OAS Track Debugger started')
+        self.sync_thread.start()
+
+    def show_sync(self, image=None):
+        self.sync_lock.acquire()
+        if image is not None:
+            # deepcopy
+            global glob_image
+            glob_image = copy.deepcopy(image)
+            self.sync_image = copy.deepcopy(image)
+            logger.info('OAS Track Debugger synced image')
+        self.sync_lock.release()
+
+    def show_stop(self):
+        self.stop_event.set()
+        self.sync_thread.join()
+
+
+def test_debugger():
+    debugger = Debugger()
+    debugger.show_start()
+    folder_image = Path('./tasks/Hyakkiyakou/temp/20240526T103931')
+    for index, file in enumerate(folder_image.iterdir()):
+        print(f'{index}-----------------------------------------------------------------------------------------------')
+        if file.suffix != '.png':
+            continue
+        img = cv2.imdecode(fromfile(str(file), dtype=uint8), -1)
+        image = cv2.cvtColor(img, cv2.COLOR_BGR2RGB)
+        debugger.show_sync(image)
+        time.sleep(0.1)
+    debugger.show_stop()
+
 
 
 if __name__ == '__main__':
 if __name__ == '__main__':
-    pass
+    test_debugger()

+ 0 - 15
tasks/Hyakkiyakou/script_task.py

@@ -37,21 +37,6 @@ def plot_save(image, boxes):
     save_file = './tasks/Hyakkiyakou/temp/image.png'
     save_file = './tasks/Hyakkiyakou/temp/image.png'
     cv2.imwrite(save_file, image)
     cv2.imwrite(save_file, image)
 
 
-def test_():
-    tracker = Tracker()
-    # --------------------------------
-    file_img = './tasks/Hyakkiyakou/temp/20240526T103931/all1716691228563.png'
-    img = cv2.imdecode(fromfile(str(file_img), dtype=uint8), -1)
-    img = cv2.cvtColor(img, cv2.COLOR_BGR2RGB)
-    resutl = tracker.detect(img)
-    start_time = datetime.now()
-    resutl = tracker.detect(img)
-    end_time = datetime.now()
-    print(f'Cost time: {(end_time - start_time).total_seconds() * 1000} ms')
-    for one in resutl:
-        print(one)
-    plot_save(img, resutl)
-
 
 
 class ScriptTask(GameUi, HyaSlave):
 class ScriptTask(GameUi, HyaSlave):