From 6c69fdc9848a0e732df855f4866e20d489950322 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Lukas=20W=C3=B6lfer?= Date: Thu, 2 May 2019 22:44:20 +0200 Subject: [PATCH] Minor changes --- shenzhen_solitaire/cv/configuration.py | 6 +++--- test/cv_helper.py | 3 ++- 2 files changed, 5 insertions(+), 4 deletions(-) diff --git a/shenzhen_solitaire/cv/configuration.py b/shenzhen_solitaire/cv/configuration.py index 4daffee..c5f7bbd 100644 --- a/shenzhen_solitaire/cv/configuration.py +++ b/shenzhen_solitaire/cv/configuration.py @@ -22,7 +22,7 @@ class Configuration: board.Card]], meta: Dict[str, str]) -> None: - self.adjustment = adj + self.field_adjustment = adj self.catalogue = catalogue self.meta = meta @@ -33,12 +33,12 @@ class Configuration: zip_file.writestr( self.ADJUSTMENT_FILE_NAME, json.dumps( dataclasses.asdict( - self.adjustment))) + self.field_adjustment))) counter = 0 for square, card in self.catalogue: counter += 1 file_stream = io.BytesIO() - np.save(file_stream, square, 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' diff --git a/test/cv_helper.py b/test/cv_helper.py index af73c31..4eb90f8 100644 --- a/test/cv_helper.py +++ b/test/cv_helper.py @@ -21,7 +21,8 @@ def main() -> None: nparr = np.frombuffer(img_str, np.uint8) image = cv2.imdecode(nparr, cv2.IMREAD_COLOR) - Configuration.generate(image) + a = Configuration.generate(image) + a.save('test_config.zip') if __name__ == "__main__":