Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Will now detect the screen scaling ratio and adjust #63

Open
wants to merge 1 commit into
base: master
Choose a base branch
from
Open

Will now detect the screen scaling ratio and adjust #63

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
13 changes: 10 additions & 3 deletions src/ImageHorizonLibrary/recognition/_recognize_images.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,6 +12,11 @@

class _RecognizeImages(object):

pixel_ratio = 0.0

def __get_pixel_ratio(self):
self.pixel_ratio = ag.screenshot().size[0]/ag.size().width

def __normalize(self, path):
if (not self.reference_folder or
not isinstance(self.reference_folder, str) or
Expand Down Expand Up @@ -203,9 +208,11 @@ def try_locate(ref_image):
center_point = ag.center(location)
x = center_point.x
y = center_point.y
if self.has_retina:
x = x / 2
y = y / 2
if self.pixel_ratio == 0.0:
self.__get_pixel_ratio()
if self.pixel_ratio>1:
Copy link

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

If this were changed to if not isclose(self.pixel_ratio, 1.0, abs_tol=1e-3):, would this allow it to work for large (>1) or small (<1) scaling ratios?

Also, from math import isclose would be needed above.

Copy link
Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

If this were changed to if not isclose(self.pixel_ratio, 1.0, abs_tol=1e-3):, would this allow it to work for large (>1) or small (<1) scaling ratios?

Actually I could simply do:

if self.pixel_ratio>0 and self.pixel_ratio != 1.0:

To cover the same case, then there would be no need to import isclose.

I have no idea how we could test it though? Windows only allows scaling from 100% to 500% so would never have a scaling ratio below 1 and MacOS only had 100% for non retina displays and 200% for retina displays no other scaling ratios, I'm not aware of any linux distro that supports scaling below 100% either.

I could actually just use too

if self.pixel_ratio>0:

as any number divided by 1 will give the same number, but it seems a waste of processing power to do divide by 1 twice, but it might make the code easier to read?

let me know the preferred option and i'll update the PR.

Dave.

x = x / self.pixel_ratio
y = y / self.pixel_ratio
return (x, y)

def does_exist(self, reference_image):
Expand Down