From 19a5fe9b7f240af28b365e2235baf079443bcf1e Mon Sep 17 00:00:00 2001 From: Adam Saudagar Date: Tue, 7 Mar 2023 15:46:06 +0530 Subject: [PATCH] removed some useless code --- fishy/engine/common/IEngine.py | 2 +- fishy/engine/common/window.py | 10 ++++------ 2 files changed, 5 insertions(+), 7 deletions(-) diff --git a/fishy/engine/common/IEngine.py b/fishy/engine/common/IEngine.py index b101d4d..2ad93d0 100644 --- a/fishy/engine/common/IEngine.py +++ b/fishy/engine/common/IEngine.py @@ -65,7 +65,7 @@ class IEngine: # noinspection PyBroadException def _crash_safe(self): logging.debug(f"starting {self.name} engine thread") - self.window = WindowClient(color=cv2.COLOR_RGB2GRAY, show_name=f"{self.name} debug") + self.window = WindowClient() self.gui.bot_started(True) try: self.run() diff --git a/fishy/engine/common/window.py b/fishy/engine/common/window.py index 44b84b3..213d1e9 100644 --- a/fishy/engine/common/window.py +++ b/fishy/engine/common/window.py @@ -14,16 +14,15 @@ from fishy.helper.config import config class WindowClient: clients: List['WindowClient'] = [] - def __init__(self, crop=None, color=None, scale=None, show_name=None): + def __init__(self): """ create a window instance with these pre process :param crop: [x1,y1,x2,y2] array defining the boundaries to crop :param color: color to use example cv2.COLOR_RGB2HSV :param scale: scaling the window """ - self.color = color - self.crop = crop - self.scale = scale + self.crop = None + self.scale = None self.show_name = f"window client {len(WindowClient.clients)}" WindowClient.clients.append(self) @@ -80,8 +79,7 @@ class WindowClient: if temp_img is None or temp_img.size == 0: return None - if self.color is not None: - temp_img = cv2.cvtColor(temp_img, self.color) + temp_img = cv2.cvtColor(temp_img, cv2.COLOR_RGB2GRAY) if self.crop is not None: temp_img = temp_img[self.crop[1]:self.crop[3], self.crop[0]:self.crop[2]]