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

Worked on configuration

Browse Source
This commit is contained in:
Lukas Wölfer
2019-05-02 01:54:11 +02:00
parent 88ea8c7c0b
commit 0941634776
3 changed files with 96 additions and 61 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
shenzhen_solitaire/cv/card_finder.py
View File

@@ -107,7 +107,7 @@ def find_square(search_square: np.ndarray,
return (best_square, best_count)
def catalague_cards(squares: List[np.ndarray]) -> List[Tuple[np.ndarray, Card]]:
def catalogue_cards(squares: List[np.ndarray]) -> List[Tuple[np.ndarray, Card]]:
cv2.namedWindow("Catalogue", cv2.WINDOW_NORMAL)
cv2.waitKey(1)
result: List[Tuple[np.ndarray, Card]] = []

91
shenzhen_solitaire/cv/configuration.py Normal file
View File

@@ -0,0 +1,91 @@
"""Contains configuration class"""
import zipfile
import json
from typing import List, Tuple, Dict
import io
import dataclasses
import numpy as np
from . import adjustment
from . import card_finder
from .. import board
class Configuration:
"""Configuration for solitaire cv"""
ADJUSTMENT_FILE_NAME = 'adjustment.json'
TEMPLATES_DIRECTORY = 'templates'
def __init__(self,
adj: adjustment.Adjustment,
catalogue: List[Tuple[np.ndarray,
board.Card]],
meta: Dict[str,
str]) -> None:
self.adjustment = adj
self.catalogue = catalogue
self.meta = meta
def save(self, filename: str) -> None:
"""Save configuration to zip archive"""
zip_stream = io.BytesIO()
with zipfile.ZipFile(zip_stream, "w") as zip_file:
zip_file.writestr(
self.ADJUSTMENT_FILE_NAME, json.dumps(
dataclasses.asdict(
self.adjustment)))
counter = 0
for square, card in self.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}-{counter}.npy'
else:
raise AssertionError()
zip_file.writestr(
self.TEMPLATES_DIRECTORY + f"/{file_name}",
file_stream.getvalue())
with open(filename, 'wb') as zip_archive:
zip_archive.write(zip_stream.getvalue())
@staticmethod
def load(filename: str) -> 'Configuration':
"""Load configuration from zip archive"""
def _parse_file_name(card_filename: str) -> board.Card:
assert card_filename.startswith(
Configuration.TEMPLATES_DIRECTORY + '/')
pure_name = card_filename[
len(Configuration.TEMPLATES_DIRECTORY + '/'):]
if pure_name[0] == 's':
return board.SpecialCard(int(pure_name[1]))
if pure_name[0] == 'n':
return board.NumberCard(
suit=board.NumberCard.Suit(
int(pure_name[1])), number=int(pure_name[2]))
raise AssertionError()
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)))
for template_filename in (
x for x in zip_file.namelist() if
x.startswith(Configuration.TEMPLATES_DIRECTORY + '/')):
catalogue.append(
(np.load(io.BytesIO(zip_file.read(template_filename))),
_parse_file_name(template_filename)))
assert catalogue[-1][0] is not None
return Configuration(adj=adj, catalogue=catalogue, meta={})
@staticmethod
def generate(image: np.ndarray) -> 'Configuration':
"""Generate a configuration with user input"""
adj = adjustment.adjust_field(image)
squares = card_finder.get_field_squares(image, adj)
catalogue = card_finder.catalogue_cards(squares[:2])
return Configuration(adj=adj, catalogue=catalogue, meta={})

64
test/cv_helper.py
View File

@@ -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__":