v0.1.1

Author: obfusk

README.md

@@ -2,10 +2,10 @@
 
     File        : README.md
     Maintainer  : Felix C. Stegerman <[email protected]>
-    Date        : 2021-05-09
+    Date        : 2021-05-10
 
     Copyright   : Copyright (C) 2021  Felix C. Stegerman
-    Version     : v0.1.0
+    Version     : v0.1.1
     License     : AGPLv3+
 
 }}}1 -->

kanjidraw/gui.py

@@ -5,7 +5,7 @@
 #
 # File        : kanjidraw/gui.py
 # Maintainer  : Felix C. Stegerman <[email protected]>
-# Date        : 2021-05-09
+# Date        : 2021-05-10
 #
 # Copyright   : Copyright (C) 2021  Felix C. Stegerman
 # Version     : v0.0.1
@@ -16,7 +16,7 @@
                                                                 # {{{1
 r"""
 
-Tkinter GUI.
+Handwritten kanji recognition: tkinter GUI.
 
 """                                                             # }}}1
 
@@ -26,7 +26,7 @@
 import tkinter.font as tk_font
 from tkinter import Tk, Button, Canvas, Frame, Label
 
-from . import load_json, matches
+from .lib import kanji_data, matches
 
 NAME, TITLE = "kanjidraw", "Kanji Draw"
 HEIGHT, WIDTH, BACKGROUND = 400, 400, "#ccc"
@@ -39,10 +39,9 @@ def gui():                                                      # {{{1
   win.title(TITLE)
   win.columnconfigure(0, weight = 1)
   win.rowconfigure(0, weight = 1)
-  font = tk_font.Font(size = FONTSIZE)
 
-  data = load_json()
-  max_strokes = max(data.keys())
+  font = tk_font.Font(size = FONTSIZE)
+  max_strokes = max(kanji_data().keys())
   drawing, x, y, strokes, lines = False, 0, 0, [], []
 
   def on_mousedown(event):
@@ -54,27 +53,22 @@ def on_mousedown(event):
       enable_buttons()
 
   def on_mousemove(event):
-    nonlocal x, y
-    if drawing:
-      draw_line(x, y, event.x, event.y)
-      x, y = event.x, event.y
+    if drawing: draw_line(event.x, event.y)
 
   def on_mouseup(event):
-    nonlocal drawing, x, y
+    nonlocal drawing
     if drawing:
-      draw_line(x, y, event.x, event.y)
-      drawing, x, y = False, event.x, event.y
+      draw_line(event.x, event.y)
+      drawing = False
       strokes[-1] += [x * 255.0 / HEIGHT, y * 255.0 / WIDTH]
       update_strokes()
 
   def on_undo():
     if strokes:
       strokes.pop()
-      for l in lines.pop():
-        canvas.delete(l)
+      for l in lines.pop(): canvas.delete(l)
       update_strokes()
-      if not strokes:
-        disable_buttons()
+      if not strokes: disable_buttons()
 
   def on_clear():
     strokes.clear()
@@ -83,35 +77,49 @@ def on_clear():
     disable_buttons()
 
   def on_done():
-    results_frame = Frame(win)
-    for i, (_, kanji) in enumerate(matches(strokes, data)):
+    res_frame = Frame(win)
+    res_btns  = Frame(res_frame)
+    btn_back  = Button(res_btns, text = "Go Back", command = on_back(res_frame))
+    lbl_info  = Label(res_btns, text = "Click to copy to clipboard")
+    res_grid  = Frame(res_frame)
+    for i, (_, kanji) in enumerate(matches(strokes)):
       col, row = i % ROWS, i // ROWS
-      results_frame.columnconfigure(col, weight = 1)
-      results_frame.rowconfigure(row, weight = 1)
-      btn = Button(results_frame, text = kanji, font = font,
-                   command = on_select_kanji(results_frame, kanji))
+      res_grid.columnconfigure(col, weight = 1)
+      res_grid.rowconfigure(row, weight = 1)
+      btn = Button(res_grid, text = kanji, font = font,
+                   command = on_select_kanji(res_frame, kanji))
       btn.grid(column = col, row = row, sticky = "nsew")
-    results_frame.grid(row = 0, column = 0, sticky = "nsew")
-
-  def on_select_kanji(results_frame, kanji):
-    def handler():
+    btn_back.pack(side = tk.LEFT, padx = 5, pady = 5)
+    lbl_info.pack(side = tk.LEFT, padx = 5, pady = 5)
+    res_btns.pack()
+    res_grid.pack()
+    res_frame.grid(row = 0, column = 0, sticky = "nsew")
+    win.bind("<Escape>", on_back(res_frame))
+
+  def on_back(res_frame):
+    def f(event = None):
+      win.unbind("<Escape>")
+      res_frame.destroy()
+    return f
+
+  def on_select_kanji(res_frame, kanji):
+    def f():
       copy_to_clipboard(kanji)
-      results_frame.destroy()
+      res_frame.destroy()
       on_clear()
-    return handler
+    return f
 
-  def draw_line(x1, y1, x2, y2):
-    l = canvas.create_line(x1, y1, x2, y2, width = LINEWIDTH,
-                           capstyle = tk.ROUND)
+  def draw_line(x2, y2):
+    nonlocal x, y
+    l = canvas.create_line(x, y, x2, y2, width = LINEWIDTH, capstyle = tk.ROUND)
     lines[-1].append(l)
+    x, y = x2, y2
 
   def disable_buttons():
-    for w in [btn_undo, btn_clear, btn_done]:
-      w.config(state = tk.DISABLED)
+    for w in [btn_undo, btn_clear, btn_done]: w.config(state = tk.DISABLED)
 
   def enable_buttons():
-    for w in [btn_undo, btn_clear, btn_done]:
-      w.config(state = tk.NORMAL)
+    for w in [btn_undo, btn_clear, btn_done]: w.config(state = tk.NORMAL)
 
   def update_strokes():
     lbl_strokes.config(text = "Strokes: {}".format(len(strokes)))

kanjidraw/lib.py

@@ -5,28 +5,75 @@
 #
 # File        : kanjidraw/lib.py
 # Maintainer  : Felix C. Stegerman <[email protected]>
-# Date        : 2021-05-09
+# Date        : 2021-05-10
 #
 # Copyright   : Copyright (C) 2021  Felix C. Stegerman
-# Version     : v0.1.0
+# Version     : v0.1.1
 # License     : AGPLv3+
 #
 # --                                                            ; }}}1
 
                                                                 # {{{1
 r"""
 
-Handwritten kanji recognition library.
+Handwritten kanji recognition: library.
+
+>>> strokes = [[125.5875, 28.6875, 48.45, 196.35], [104.55, 93.7125, 195.7125, 223.125]]
+>>> for s, k in matches(strokes): print(int(s), k)
+99 人
+96 九
+96 乂
+93 八
+93 入
+90 儿
+89 勹
+88 乃
+87 又
+87 几
+87 冂
+85 匕
+82 亻
+81 卜
+78 亠
+75 冖
+
+>>> strokes = [[17.85, 102.0, 83.5125, 51.0], [45.9, 26.775, 49.0875, 210.375], [33.7875, 152.3625, 61.8375, 133.875], [103.9125, 54.825, 211.0125, 58.65], [139.6125, 31.2375, 142.8, 64.3875], [178.5, 42.075, 179.1375, 66.3], [108.375, 121.125, 106.4625, 182.325], [113.475, 114.1125, 205.275, 189.975], [163.2, 116.025, 164.475, 181.05], [126.225, 148.5375, 198.2625, 158.7375], [109.0125, 200.8125, 205.9125, 191.25]]
+>>> for s, k in matches(strokes): print(int(s), k)
+91 描
+89 猫
+86 桷
+85 淌
+84 猟
+83 掩
+83 培
+82 猛
+82 控
+82 清
+82 捨
+81 陪
+81 措
+81 袷
+81 掠
+81 淹
+80 桶
+80 掘
+80 舳
+80 猪
+80 掃
+79 情
+79 捺
+79 陷
+79 探
 
 """                                                             # }}}1
 
-import gzip, json, os, re, sys
+import gzip, itertools, json, os, re, sys
 import xml.etree.ElementTree as ET
 
 from collections import namedtuple
 from enum import Enum
 
-__version__ = "0.1.0"
+__version__ = "0.1.1"
 
 DATAFILE = os.path.join(os.path.dirname(__file__), "data.json")
 
@@ -41,7 +88,7 @@
 STROKE_LOCATION_WEIGHT  = 0.6
 CLOSE_WEIGHT            = 0.7
 
-DirAndLoc = namedtuple("DirAndLoc", "starts ends dirs moves".split())
+SEDM = namedtuple("SEDM", "starts ends dirs moves".split())
 
 class Direction(Enum):                                          # {{{1
   X, N, NE, E, SE, S, SW, W, NW = range(-1, 8)
@@ -131,15 +178,32 @@ def strict_match(a, b):                                         # {{{1
                                                                 # }}}1
 
 def _directions_and_locations(lines):
-  return DirAndLoc(
+  return SEDM(
     tuple( Location.of_point(*l[:2]) for l in lines ),
     tuple( Location.of_point(*l[2:]) for l in lines ),
     tuple(map(Direction.of_line, lines)),
     tuple(map(Direction.of_move, lines[1:], lines[:-1]))
   )
 
+def matches(lines, data = None, match = strict_match,
+            max_results = 25, cutoff = 0.75):
+  """
+  Find best matches; yields a (score, kanji) pair for the first
+  max_results matches that have a score >= max_score * cutoff.
+  """
+  if data is None: data = kanji_data()
+  it = data[len(lines)].items()
+  ms = sorted(( (match(lines, l), k) for k, l in it ), reverse = True)
+  mm = ms[0][0] * cutoff
+  return itertools.takewhile(lambda m: m[0] >= mm, ms[:max_results])
+
+def kanji_data():
+  if kanji_data._data is None: kanji_data._data = _load_json()
+  return kanji_data._data
+kanji_data._data = None
+
 # FIXME: better kanji unicode ranges
-def parse_kanjivg(file):                                        # {{{1
+def _parse_kanjivg(file):                                       # {{{1
   data = {}
   with gzip.open(file) as f:
     for e in ET.parse(f).getroot():
@@ -179,29 +243,16 @@ def _path_to_line(path):                                        # {{{1
   return tuple( int(v * 255 / 109) for v in [x1, y1, x2, y2] )
                                                                 # }}}1
 
-def load_json(file = DATAFILE):
+def _load_json(file = DATAFILE):
   """Load data from JSON file."""
   with open(file) as fh:
     return { int(k): v for k, v in json.load(fh).items() }
 
-def save_json(file, data):
+def _save_json(file, data):
   """Save data to JSON file."""
   with open(file, "w") as fh:
     json.dump(data, fh, sort_keys = True)
 
-def matches(lines, data, match = strict_match, max_results = 25,
-            cutoff = 0.75):
-  """
-  Find best matches; yields a (score, kanji) pair for the first
-  max_results matches that have a score >= max_score * cutoff.
-  """
-  it = data[len(lines)].items()
-  ms = sorted(( (match(lines, l), k) for k, l in it ), reverse = True)
-  max_score = ms[0][0]
-  for m in ms[:max_results]:
-    if m[0] < max_score * cutoff: break
-    yield m
-
 if __name__ == "__main__":
   if "--doctest" in sys.argv:
     verbose = "--verbose" in sys.argv