Thaloria/Litcraft_Python_B
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

threading update

Browse Source
This commit is contained in:
Thaloria
2023-07-26 11:33:46 +02:00
parent 1b9711a851
commit 5713422f49
3 changed files with 4 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
combined_bot_main.py
View File

@@ -34,7 +34,6 @@ def run():
overlay.run_mode = 'init' overlay.run_mode = 'init'
continue continue
elif overlay.run_mode == 'quit': elif overlay.run_mode == 'quit':
overlay.destroy()
return return
else: else:
break break
@@ -69,6 +68,7 @@ def run():
elif overlay.rb_int.get() == 10: elif overlay.rb_int.get() == 10:
ltris = Litris(overlay) ltris = Litris(overlay)
ltris.execute_main_loop() ltris.execute_main_loop()
ltris.stone_id_thread.run_mode = 'stop'
if __name__ == "__main__": if __name__ == "__main__":
run() run()

1
combined_user_interface.py
View File

@@ -178,6 +178,7 @@ class PrimaryOverlay(threading.Thread):
def destroy(self): def destroy(self):
self.hide_mining_overlay() self.hide_mining_overlay()
del self.MiningOverlay
self.root.destroy() self.root.destroy()
def start_button_callback(self): def start_button_callback(self):

4
litris_stone_id_thread.py
View File

@@ -30,14 +30,14 @@ class NewStoneID(threading.Thread):
self.needles = {1: cv.imread("litris/blue_needle.jpg", cv.IMREAD_UNCHANGED)} self.needles = {1: cv.imread("litris/blue_needle.jpg", cv.IMREAD_UNCHANGED)}
self.run_mode = 'init' self.run_mode = 'run'
self.actual_letter = "" self.actual_letter = ""
self.to_pick_up = False self.to_pick_up = False
self.start() self.start()
def run(self): def run(self):
while True: while self.run_mode == 'run':
current_stone = self.new_stone_detection() current_stone = self.new_stone_detection()
if current_stone is None: if current_stone is None:
cv.waitKey(50) cv.waitKey(50)