Worked on configuration

test/cv_helper.py

@@ -5,60 +5,14 @@ import io
 import json
 import dataclasses
 
-import numpy as np  # type: ignore
-import cv2  # type: ignore
+import numpy as np
+import cv2
 
 from .context import shenzhen_solitaire
 from shenzhen_solitaire.cv import adjustment
 from shenzhen_solitaire.cv import card_finder
 from shenzhen_solitaire import board
-
-
-def pixelcount(image: np.ndarray) -> List[Tuple[Tuple[int, int, int], int]]:
-    p: Dict[Tuple[int, int, int], int] = {(0, 0, 0): 0}
-    for pixel in itertools.chain.from_iterable(image):
-        x = tuple(pixel)
-        if x in p:
-            p[x] += 1
-        else:
-            p[x] = 1
-    B = sorted(p.items(), key=lambda x: x[1])
-    return B
-
-
-def simplify(image: np.ndarray) -> None:
-    cv2.imshow("Window", image)
-    cv2.waitKey(0)
-    cv2.destroyWindow("Window")
-    print(*card_finder.simplify(image)[1].items(), sep='\n')
-    cv2.imshow("Window", image)
-    cv2.waitKey(0)
-    cv2.destroyWindow("Window")
-
-def calibrate(image: np.ndarray) -> None:
-    adj = adjustment.adjust_field(image)
-    squares = card_finder.get_field_squares(image, adj)
-    catalogue = card_finder.catalague_cards(squares[:2])
-
-    zip_stream = io.BytesIO()
-    with zipfile.ZipFile(zip_stream, "w") as zip_file:
-        zip_file.writestr('adjustment.json', json.dumps(dataclasses.asdict(adj)))
-        counter = 0
-        for square, card in catalogue:
-            counter += 1
-            file_stream = io.BytesIO()
-            np.save(file_stream, square, 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}-{card.number}-{counter}.npy'
-            else:
-                raise AssertionError()
-            zip_file.writestr(f"templates/{file_name}", file_stream.getvalue())
-
-    with open('myzip.zip', 'wb') as fd:
-        fd.write(zip_stream.getvalue())
+from shenzhen_solitaire.cv.configuration import Configuration
 
 
 def main() -> None:
@@ -67,17 +21,7 @@ def main() -> None:
     nparr = np.frombuffer(img_str, np.uint8)
     image = cv2.imdecode(nparr, cv2.IMREAD_COLOR)
 
-    calibrate(image)
-
-
-
-def main2() -> None:
-    file_stream = None
-    with zipfile.ZipFile('myzip.zip', "r") as zip_file:
-        file_stream = io.BytesIO(zip_file.read('0.dat'))
-
-    A = np.load(file_stream)
-    print(A)
+    Configuration.generate(image)
 
 
 if __name__ == "__main__":