Update screenshot_diff to always return diff and image, adapt wait_for screenHEADmaster

1 files changed, 9 insertions, 9 deletions

diff --git a/qemu.py b/qemu.py
index 6b14ec3..b858b0a 100644
--- a/qemu.py
+++ b/qemu.py
@@ -666,17 +666,16 @@ class vm:
             if box==None:
                 compare_result=True
             diff.close()
+        else:
+            box=None
         saved_image.close()
         masked_current_image.close()
-        if compare_result==True:
-            current_image.close()
-            return None
         if box!=None:
             draw=ImageDraw.Draw(current_image)
             draw.rectangle(box,None,ImageColor.getrgb("#ff0000"))
             if log:
                 self.log.image(current_image)
-        return current_image
+        return box,current_image
 
     def wait_for_screen(self,filename,interval=5,timeout=30,mask=None,callback=None):
         imagelog=[]
@@ -690,16 +689,17 @@ class vm:
         check=0
         active=True
         while check<timeout:
-            result=self.screenshot_diff(filename,mask,log=False)
+            #result=self.screenshot_diff(filename,mask,log=False)
+            diff,screen=self.screenshot_diff(filename,mask,log=False)
             now=datetime.now().timestamp()
-            if result==None:
-                imagelog.append({"name": "Final", "timestamp": now, "image": self.screenshot_image(log=False), "active": active})
+            if diff==None:
+                imagelog.append({"name": "Final", "timestamp": now, "image": screen.copy(), "active": active})
                 print(f"Check {check}: Screen is similar to {filename}")
                 self.log.tabs(imagelog)
                 return True
             print(f"Check {check}: Screen is not similar to {filename}")
-            imagelog.append({"name": f"Check {check}", "timestamp": now, "image": result.copy(), "active": active})
-            result.close()
+            imagelog.append({"name": f"Check {check}", "timestamp": now, "text": f"Diff location: {diff}", "image": screen.copy(), "active": active})
+            screen.close()
             if callback!=None:
                 callback()
             sleep(interval)