diff --git a/Solitaire.png b/Solitaire.png deleted file mode 100644 index 7042563..0000000 Binary files a/Solitaire.png and /dev/null differ diff --git a/Solitaire2.png b/Solitaire2.png deleted file mode 100644 index 06e62da..0000000 Binary files a/Solitaire2.png and /dev/null differ diff --git a/pictures/20190809172206_1.jpg b/pictures/20190809172206_1.jpg new file mode 100755 index 0000000..641923a Binary files /dev/null and b/pictures/20190809172206_1.jpg differ diff --git a/pictures/20190809172213_1.jpg b/pictures/20190809172213_1.jpg new file mode 100755 index 0000000..578bd92 Binary files /dev/null and b/pictures/20190809172213_1.jpg differ diff --git a/pictures/20190809172219_1.jpg b/pictures/20190809172219_1.jpg new file mode 100755 index 0000000..b294d20 Binary files /dev/null and b/pictures/20190809172219_1.jpg differ diff --git a/pictures/20190809172225_1.jpg b/pictures/20190809172225_1.jpg new file mode 100755 index 0000000..c5e35b9 Binary files /dev/null and b/pictures/20190809172225_1.jpg differ diff --git a/pictures/20190809172232_1.jpg b/pictures/20190809172232_1.jpg new file mode 100755 index 0000000..4ce5267 Binary files /dev/null and b/pictures/20190809172232_1.jpg differ diff --git a/pictures/20190809172238_1.jpg b/pictures/20190809172238_1.jpg new file mode 100755 index 0000000..8892485 Binary files /dev/null and b/pictures/20190809172238_1.jpg differ diff --git a/shenzhen_solitaire/cv/configuration.py b/shenzhen_solitaire/cv/configuration.py index 358858c..b42e143 100644 --- a/shenzhen_solitaire/cv/configuration.py +++ b/shenzhen_solitaire/cv/configuration.py @@ -38,12 +38,16 @@ class Configuration: for square, card in self.catalogue: counter += 1 file_stream = io.BytesIO() - np.save(file_stream, card_finder.simplify(square)[0], allow_pickle=False) + np.save( + file_stream, + card_finder.simplify(square)[0], + allow_pickle=False) file_name = "" if isinstance(card, board.SpecialCard): file_name = f's{card.value}-{card.name}-{counter}.npy' elif isinstance(card, board.NumberCard): - file_name = f'n{card.suit.value}{card.number}-{card.suit.name}-{counter}.npy' + file_name = f'n{card.suit.value}{card.number}'\ + f'-{card.suit.name}-{counter}.npy' else: raise AssertionError() zip_file.writestr( @@ -72,7 +76,8 @@ class Configuration: catalogue: List[Tuple[np.ndarray, board.Card]] = [] with zipfile.ZipFile(filename, 'r') as zip_file: adj = adjustment.Adjustment( - **json.loads(zip_file.read(Configuration.ADJUSTMENT_FILE_NAME))) + **json.loads( + zip_file.read(Configuration.ADJUSTMENT_FILE_NAME))) for template_filename in ( x for x in zip_file.namelist() if x.startswith(Configuration.TEMPLATES_DIRECTORY + '/')): diff --git a/test/cv_helper.py b/test/cv_helper.py index 0ab941f..192718b 100644 --- a/test/cv_helper.py +++ b/test/cv_helper.py @@ -11,7 +11,7 @@ from shenzhen_solitaire.cv.configuration import Configuration def generate() -> None: """Generate a configuration""" - with open("Solitaire.png", 'rb') as png_file: + with open("pictures/20190809172213_1.jpg", 'rb') as png_file: img_str = png_file.read() nparr = np.frombuffer(img_str, np.uint8) image = cv2.imdecode(nparr, cv2.IMREAD_COLOR) @@ -19,13 +19,14 @@ def generate() -> None: generated_config = Configuration.generate(image) generated_config.save('test_config.zip') + def parse() -> board.Board: """Parse a configuration""" - with open("Solitaire2.png", 'rb') as png_file: + with open("pictures/20190809172213_1.jpg", 'rb') as png_file: img_str = png_file.read() nparr = np.frombuffer(img_str, np.uint8) image = cv2.imdecode(nparr, cv2.IMREAD_COLOR) - image = cv2.resize(image, (1000, 629)) + # image = cv2.resize(image, (1000, 629)) loaded_config = Configuration.load('test_config.zip') loaded_config.field_adjustment = adjustment.adjust_field(image) @@ -33,5 +34,5 @@ def parse() -> board.Board: if __name__ == "__main__": - #generate() + # generate() parse() diff --git a/test_config.zip b/test_config.zip index 4b1eee8..91b2d87 100644 Binary files a/test_config.zip and b/test_config.zip differ