Skip to content

Commit e32c431

Browse files
JE-ChenJE-Chen
authored
Merge pull request #64 from JE-Chen/dev
Dev
2 parents 42fbea4 + e900b65 commit e32c431

File tree

7 files changed

+364
-93
lines changed

7 files changed

+364
-93
lines changed

‎.idea/workspace.xml‎

Lines changed: 54 additions & 51 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎dev_setup.py‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55

66
setuptools.setup(
77
name="je_auto_control_dev",
8-
version="0.0.48",
8+
version="0.0.51",
99
author="JE-Chen",
1010
author_email="[email protected]",
1111
description="auto testing",

‎je_auto_control/wrapper/auto_control_image.py‎

Lines changed: 8 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,7 @@
11
import sys
22
from typing import List, Union
33

4+
45
from je_auto_control.utils.exception.exception_tag import cant_find_image
56
from je_auto_control.utils.exception.exception_tag import find_image_error_variable
67
from je_auto_control.utils.exception.exceptions import ImageNotFoundException
@@ -24,12 +25,12 @@ def locate_all_image(image, detect_threshold: [float, int] = 1,
2425
try:
2526
image_data_array = template_detection.find_image_multi(image, detect_threshold, draw_image)
2627
except ImageNotFoundException as error:
27-
raise ImageNotFoundException(find_image_error_variable + " " + repr(error))
28+
raise ImageNotFoundException(find_image_error_variable + " " + repr(error) + " " + str(image))
2829
if image_data_array[0] is True:
2930
record_action_to_list("locate_all_image", param)
3031
return image_data_array[1]
3132
else:
32-
raise ImageNotFoundException(cant_find_image)
33+
raise ImageNotFoundException(cant_find_image + " / " + repr(image))
3334
except Exception as error:
3435
record_action_to_list("locate_all_image", param, repr(error))
3536
print(repr(error), file=sys.stderr)
@@ -47,15 +48,15 @@ def locate_image_center(image, detect_threshold: [float, int] = 1, draw_image: b
4748
try:
4849
image_data_array = template_detection.find_image(image, detect_threshold, draw_image)
4950
except ImageNotFoundException as error:
50-
raise ImageNotFoundException(find_image_error_variable + " " + repr(error))
51+
raise ImageNotFoundException(find_image_error_variable + " " + repr(error) + " " + str(image))
5152
if image_data_array[0] is True:
5253
height = image_data_array[1][2] - image_data_array[1][0]
5354
width = image_data_array[1][3] - image_data_array[1][1]
5455
center = [int(height / 2), int(width / 2)]
5556
record_action_to_list("locate_image_center", param)
56-
return [image_data_array[1][0] + center[0], image_data_array[1][1] + center[1]]
57+
return [int(image_data_array[1][0] + center[0]), int(image_data_array[1][1] + center[1])]
5758
else:
58-
raise ImageNotFoundException(cant_find_image)
59+
raise ImageNotFoundException(cant_find_image + " / " + repr(image))
5960
except Exception as error:
6061
record_action_to_list("locate_image_center", param, repr(error))
6162
print(repr(error), file=sys.stderr)
@@ -87,9 +88,9 @@ def locate_and_click(
8788
set_position(int(image_center_x), int(image_center_y))
8889
click_mouse(mouse_keycode)
8990
record_action_to_list("locate_and_click", param)
90-
return [image_center_x, image_center_y]
91+
return [int(image_center_x), int(image_center_y)]
9192
else:
92-
raise ImageNotFoundException(cant_find_image)
93+
raise ImageNotFoundException(cant_find_image + " / " + repr(image))
9394
except Exception as error:
9495
record_action_to_list("locate_and_click", param, repr(error))
9596
print(repr(error), file=sys.stderr)

‎setup.py‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55

66
setuptools.setup(
77
name="je_auto_control",
8-
version="0.0.114",
8+
version="0.0.117",
99
author="JE-Chen",
1010
author_email="[email protected]",
1111
description="auto testing",

‎test/test_source/1.png‎

-20 Bytes
Loading

‎test/unit_test/execute_action/test.json‎

Lines changed: 5 additions & 33 deletions
Original file line numberDiff line numberDiff line change
@@ -1,35 +1,7 @@
11
[
2-
[
3-
"type_key",
4-
{
5-
"keycode": 0
6-
}
7-
],
8-
[
9-
"mouse_left",
10-
{
11-
"mouse_keycode": "mouse_left",
12-
"x": 500,
13-
"y": 500
14-
}
15-
],
16-
[
17-
"position"
18-
],
19-
[
20-
"press_mouse",
21-
{
22-
"mouse_keycode": "mouse_left",
23-
"x": 500,
24-
"y": 500
25-
}
26-
],
27-
[
28-
"release_mouse",
29-
{
30-
"mouse_keycode": "mouse_left",
31-
"x": 500,
32-
"y": 500
33-
}
34-
]
2+
["type_key", {"keycode": 0}],
3+
["mouse_left", {"mouse_keycode": "mouse_left", "x": 500, "y": 500}],
4+
["position"],
5+
["press_mouse", {"mouse_keycode": "mouse_left", "x": 500, "y": 500}],
6+
["release_mouse", {"mouse_keycode": "mouse_left", "x": 500, "y": 500}]
357
]

0 commit comments

Comments
 (0)