Fix match template

bots/fishing/FishingAgent.py

@@ -53,7 +53,8 @@ class FishingAgent:
     while True:
       time.sleep(1)
       self.logger.log("###")
-      self.monitor.findMatch(self.fishingBobberImg)
+      point = self.monitor.findMatch(self.fishingBobberImg)
+      pyautogui.moveTo(point[0], point[1])
 
   def run(self):
     if self.monitor.screenshot is None:

core/MainAgent.py

@@ -8,6 +8,6 @@ class MainAgent:
 
   def startFishBot(self):
     self.monitor.startScreenCaptureThread()
-    self.fishingBot.test()
+    self.fishingBot.run()
 
 

core/Monitor.py

@@ -1,11 +1,9 @@
 import time
-import os
 from threading import Thread
 from screeninfo import get_monitors
 import pyautogui
 import numpy as np
 import cv2 as cv
-from matplotlib import pyplot as plt
 from core.Logger import Logger
 
 FPS_REPORT_DELAY = 3
@@ -32,11 +30,9 @@ class Monitor:
     fpsPrintTime = time.time()
     while True:
       newScreenshot = pyautogui.screenshot()
-      newScreenshot = cv.cvtColor(np.array(newScreenshot), cv.COLOR_RGB2BGR)
+      newScreenshot = cv.cvtColor(np.array(newScreenshot), cv.IMREAD_GRAYSCALE)
-
-      cv.imwrite("in_memory_to_disk.png", newScreenshot)
       self.screenshot = newScreenshot
-
+      cv.imwrite("assets/screenshot.jpg", self.screenshot)
       currTime = time.time()
       if currTime - fpsPrintTime >= FPS_REPORT_DELAY:
         self.fps = 1 / (currTime - loopTime)
@@ -48,13 +44,11 @@ class Monitor:
     self.screenThread.start()
     self.logger.log("Main Agent: Thread started")
 
-  def findMatch(self, img, method = "TM_CCOEFF_NORMED"):
+  def findMatch(self, template, method = "TM_CCOEFF_NORMED"):
     methodInt = getattr(cv, method)
-
+    screen = cv.imread("assets/screenshot.jpg", cv.IMREAD_GRAYSCALE)
-    herePath = os.path.dirname(os.path.realpath(__file__))
+    assert template is not None, "file could not be read, check with os.path.exists()"
-    template = cv.imread(os.path.join(herePath, "assets", "FishTest3.png"), cv.IMREAD_GRAYSCALE)
+    res = cv.matchTemplate(screen, template, methodInt)
-
-    res = cv.matchTemplate(img, template, methodInt)
     w, h = template.shape[::-1]
     min_val, max_val, min_loc, max_loc = cv.minMaxLoc(res)
 
@@ -64,21 +58,8 @@ class Monitor:
     else:
       top_left = max_loc
     bottom_right = (top_left[0] + w, top_left[1] + h)
- 
+
-    cv.rectangle(img,top_left, bottom_right, 255, 2)
+    return (top_left[0] + bottom_right[0]) / 2, (top_left[1] + bottom_right[1]) / 2
- 
-    plt.subplot(121)
-    plt.imshow(res,cmap = 'gray')
-    plt.title('Matching Result')
-    plt.xticks([])
-    plt.yticks([])
-    plt.subplot(122)
-    plt.imshow(img,cmap = 'gray')
-    plt.title('Detected Point')
-    plt.xticks([])
-    plt.yticks([])
-    plt.suptitle(method)
-    plt.show()
 
   def stopScreenCaptureThread(self):
     if (self.screenThread):

tests/templateMatching.py

@@ -1,14 +1,11 @@
-import os
 import cv2 as cv
+import numpy as np
 from matplotlib import pyplot as plt
  
-# interpolate here_path to get the path to the fishing target image      
+img = cv.imread('screen.jpg', cv.IMREAD_GRAYSCALE)
-herePath = os.path.dirname(os.path.realpath(__file__))
-
-img = cv.imread(os.path.join(herePath, "assets", "Bobber2.png"), cv.IMREAD_GRAYSCALE)
 assert img is not None, "file could not be read, check with os.path.exists()"
 img2 = img.copy()
-template = cv.imread(os.path.join(herePath, "assets", "FishTest3.png"), cv.IMREAD_GRAYSCALE)
+template = cv.imread('bobber.jpg', cv.IMREAD_GRAYSCALE)
 assert template is not None, "file could not be read, check with os.path.exists()"
 w, h = template.shape[::-1]
  
@@ -33,16 +30,10 @@ for meth in methods:
  
     cv.rectangle(img,top_left, bottom_right, 255, 2)
  
-    plt.subplot(121)
+    plt.subplot(121),plt.imshow(res,cmap = 'gray')
-    plt.imshow(res,cmap = 'gray')
+    plt.title('Matching Result'), plt.xticks([]), plt.yticks([])
-    plt.title('Matching Result')
+    plt.subplot(122),plt.imshow(img,cmap = 'gray')
-    plt.xticks([])
+    plt.title('Detected Point'), plt.xticks([]), plt.yticks([])
-    plt.yticks([])
-    plt.subplot(122)
-    plt.imshow(img,cmap = 'gray')
-    plt.title('Detected Point')
-    plt.xticks([])
-    plt.yticks([])
     plt.suptitle(meth)
  
     plt.show()