lukas/shenzhen-solitaire
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Made calibration more ergonomic. Crashes because loading empty 'empty_card' directory

Browse Source
This commit is contained in:
Lukas Wölfer
2020-06-12 17:31:12 +02:00
parent 6565792030
commit f4ac445f61
5 changed files with 79 additions and 29 deletions
Download Patch File Download Diff File Expand all files Collapse all files

25
tools/generate/all_borders.py
View File

@@ -49,25 +49,30 @@ def main() -> None:
image, count_x=8, count_y=13, adjustment=copy.deepcopy(conf.field_adjustment)
)
print("Field borders")
border_adjustment = adjustment.adjust_squares(
conf.border_adjustment = adjustment.adjust_squares(
image, count_x=8, count_y=13, adjustment=copy.deepcopy(conf.field_adjustment)
)
conf.bunker_adjustment.w = conf.field_adjustment.w
conf.bunker_adjustment.h = conf.field_adjustment.h
for adj in (conf.bunker_adjustment, conf.goal_adjustment,conf.hua_adjustment):
adj.w = conf.field_adjustment.w
adj.h = conf.field_adjustment.h
adj.dx = conf.field_adjustment.dx
adj.dy = conf.field_adjustment.dy
conf.bunker_adjustment.x = conf.field_adjustment.x
print("Bunker cards")
bunker_adjustment = adjustment.adjust_squares(
conf.bunker_adjustment = adjustment.adjust_squares(
image, count_x=3, count_y=1, adjustment=copy.deepcopy(conf.bunker_adjustment)
)
conf.goal_adjustment.w = conf.field_adjustment.w
conf.goal_adjustment.h = conf.field_adjustment.h
conf.goal_adjustment.x = conf.field_adjustment.x + 5 * conf.field_adjustment.dx
conf.goal_adjustment.y = conf.bunker_adjustment.y
print("Goal cards")
goal_adjustment = adjustment.adjust_squares(
conf.goal_adjustment = adjustment.adjust_squares(
image, count_x=3, count_y=1, adjustment=copy.deepcopy(conf.goal_adjustment)
)
conf.hua_adjustment.w = conf.field_adjustment.w
conf.hua_adjustment.h = conf.field_adjustment.h
conf.hua_adjustment.y = conf.bunker_adjustment.y
print("Hua card")
hua_adjustment = adjustment.adjust_squares(
conf.hua_adjustment = adjustment.adjust_squares(
image, count_x=1, count_y=1, adjustment=copy.deepcopy(conf.hua_adjustment)
)

5
tools/generate/catalogue.py
View File

@@ -21,7 +21,7 @@ def main() -> None:
help="Path to the screenshot",
)
parser.add_argument(
"--conf",
"--config",
dest="config_path",
type=str,
default="config.zip",
@@ -29,9 +29,8 @@ def main() -> None:
)
args = parser.parse_args()
print(args.screenshot_path)
image = cv2.imread(args.screenshot_path)
conf = configuration.load(args.config)
conf = configuration.load(args.config_path)
squares = card_finder.get_field_squares(image, conf.field_adjustment, 5, 8)
catalogue = card_finder.catalogue_cards(squares)
conf.card_border.extend(