diff --git a/main.py b/main.py index dea6d97..8385d88 100755 --- a/main.py +++ b/main.py @@ -176,6 +176,7 @@ def main(): print("\n程序被用户中断") except Exception as e: import traceback + import sys exc_type, exc_value, exc_tb = sys.exc_info() tb = traceback.extract_tb(exc_tb) if tb: @@ -310,14 +311,7 @@ class Robot_Ctrl(object): self.runing = 0 self.rec_thread.join() self.send_thread.join() -<<<<<<< HEAD self.image_processor.destroy() -======= - try: - self.image_processor.destroy() - except Exception as e: - print(f"销毁图像处理器失败: {e}") ->>>>>>> 4449dc62d19438a10391a305f4362fec92eb56ad # 销毁 MarkerRunner if hasattr(self, 'marker_runner') and self.marker_runner is not None: try: diff --git a/saved_images/first0.jpg b/saved_images/first0.jpg new file mode 100644 index 0000000..e238ab0 Binary files /dev/null and b/saved_images/first0.jpg differ diff --git a/saved_images/first1.jpg b/saved_images/first1.jpg new file mode 100644 index 0000000..291fc11 Binary files /dev/null and b/saved_images/first1.jpg differ diff --git a/saved_images/first2.jpg b/saved_images/first2.jpg new file mode 100644 index 0000000..1f3cc47 Binary files /dev/null and b/saved_images/first2.jpg differ diff --git a/saved_images/first3.jpg b/saved_images/first3.jpg new file mode 100644 index 0000000..70c6a1d Binary files /dev/null and b/saved_images/first3.jpg differ diff --git a/saved_images/first4.jpg b/saved_images/first4.jpg new file mode 100644 index 0000000..b428504 Binary files /dev/null and b/saved_images/first4.jpg differ diff --git a/saved_images/first5.jpg b/saved_images/first5.jpg new file mode 100644 index 0000000..7e051f8 Binary files /dev/null and b/saved_images/first5.jpg differ diff --git a/saved_images/first6.jpg b/saved_images/first6.jpg new file mode 100644 index 0000000..7e6beb9 Binary files /dev/null and b/saved_images/first6.jpg differ diff --git a/saved_images/first7.jpg b/saved_images/first7.jpg new file mode 100644 index 0000000..172cd49 Binary files /dev/null and b/saved_images/first7.jpg differ diff --git a/saved_images/first8.jpg b/saved_images/first8.jpg new file mode 100644 index 0000000..98ebb2f Binary files /dev/null and b/saved_images/first8.jpg differ diff --git a/saved_images/first9.jpg b/saved_images/first9.jpg new file mode 100644 index 0000000..85501e6 Binary files /dev/null and b/saved_images/first9.jpg differ