From 4c01b72b54b6a7c9ff1564d3176b1fa4af3bdc47 Mon Sep 17 00:00:00 2001 From: Doc Date: Tue, 13 Jan 2026 10:08:15 -0500 Subject: [PATCH] Improved the seeking in the grid calibration - Make the seeking of the upper left corner more intelligent/responsive rather than hard coding "left 15 times up 15 times" - Commented out more experimentation code --- src/df_tools/dfwindow.py | 23 ++++++++++++++++------- 1 file changed, 16 insertions(+), 7 deletions(-) diff --git a/src/df_tools/dfwindow.py b/src/df_tools/dfwindow.py index 3bf930f..0806b49 100644 --- a/src/df_tools/dfwindow.py +++ b/src/df_tools/dfwindow.py @@ -247,8 +247,22 @@ class DFWINDOW: time.sleep(self.sleep_after_mouse) self.focusWindow() time.sleep(self.sleep_after_focus) - self.sendKeys("w", 30) - self.sendKeys("a", 30) + + # Improved seeking upper left + self.sendKeys("w", 8) + img = self.capContent() + while not self.TOOLS.isTopBorder(img): + self.sendKeys("w", 4) + img = self.capContent() + self.sendKeys("w", 4) + + self.sendKeys("a", 8) + img = self.capContent() + while not self.TOOLS.isLeftBorder(img): + self.sendKeys("a", 4) + img = self.capContent() + self.sendKeys("a", 4) + img = self.capWindow() self._content_left, self._content_top = self.TOOLS.find_content_origin(img) self._content_right = int(img.shape[1] - self._content_left) @@ -455,11 +469,6 @@ class DFWINDOW: self._map_width = calib_info["map_width"] def getPanoramaMap(self): - # self.test1() - # return - self.calibrateGrid() - # self.test_saveGrids() - # self.test_loadCalib() return None