Merge branch 'feature-23' into main

Author: kihiyuki

CHANGELOG.md

@@ -1,5 +1,9 @@
 # Change Log
 
+## v1.5
+
+- GUI追加(Tkinter)
+
 ## v1.4
 
 - 設定ファイルのデフォルトセクション名変更: `DEFAULT` -> `annotation`

README.md

@@ -31,6 +31,13 @@ python -m annotation -d
 python -m annotation -r
 ```
 
+または
+
+```sh
+# ウインドウ(GUI)を開く
+python -m annotation -g
+```
+
 ### Optional arguments
 
 ```
@@ -39,6 +46,7 @@ optional arguments:
   --deploy, -d
   --register, -r
   --verbose, -v
+  --gui, -g
   --file FILE, -f FILE  Pickled pandas.Dataframe file path
   --workdir WORKDIR, -w WORKDIR
                         Working directory path

annotation/__init__.py

@@ -1,9 +1,10 @@
 from argparse import ArgumentParser
 
+from . import gui
 from .lib import config as configlib
 from .data import Data, CONFIG_DEFAULT
 
-__version__ = "1.4.2"
+__version__ = "1.5.0"
 
 
 class Arguments(ArgumentParser):
@@ -18,6 +19,9 @@ def __init__(self) -> None:
         self.add_argument(
             "--verbose", "-v",
             action="count", default=0)
+        self.add_argument(
+            "--gui", "-g",
+            action="count", default=0)
         self.add_argument(
             "--file", "-f",
             required=False, default=None,
@@ -55,6 +59,7 @@ def parse_args(self, args=None, namespace=None):
         # cast to bool
         pargs.deploy = bool(pargs.deploy)
         pargs.register = bool(pargs.register)
+        pargs.gui = bool(pargs.gui)
         pargs.deploy_result = bool(pargs.deploy_result)
         pargs.create_config_file = bool(pargs.create_config_file)
         pargs.create_sample_datafile = bool(pargs.create_sample_datafile)
@@ -132,10 +137,11 @@ def main(args=None) -> None:
     # Load pickle datafile
     data.load()
 
-    if args.deploy:
+    if args.gui:
+        gui.main(data=data)
+    elif args.deploy:
         data.deploy()
-
-    if args.register:
+    elif args.register:
         data.register()
 
     return None

annotation/data.py

@@ -61,6 +61,18 @@ def __init__(self, config=dict(), default=CONFIG_DEFAULT) -> None:
             print(config)
         return None
 
+    def __len__(self) -> int:
+        return len(self.df)
+
+    def count(self, type="all") -> int:
+        type = type.lower()
+        if type.lower() == "all":
+            return len(self)
+        elif type.lower() == "annotated":
+            return (self.df[self.col_label]!=self.label_null).sum()
+        else:
+            raise ValueError(f"Type '{type}' is not defined")
+
     def load(self) -> None:
         self.df = pd.read_pickle(self.datafile)
         if self.col_label not in self.df.columns:
@@ -90,8 +102,8 @@ def load(self) -> None:
         return None
 
     def info(self) -> None:
-        print("len(df):", len(self.df))
-        print("annotated:", (self.df[self.col_label]!=self.label_null).sum())
+        print("data:", self.count("all"))
+        print("annotated:", self.count("annotated"))
         return None
 
     def get_labelled(

annotation/gui.py

@@ -0,0 +1,53 @@
+import subprocess
+from tkinter import Tk, ttk, messagebox
+from .data import Data
+
+
+def main(data: Data) -> None:
+    def _deploy(event=None):
+        r = messagebox.askyesno("Deploy", "Deploy data to working directory?")
+        if r:
+            data.deploy()
+
+    def _register(event=None):
+        r = messagebox.askyesno("Register", "Register annotation result to datafile?")
+        if r:
+            data.register()
+
+    def _open(event=None):
+        subprocess.Popen(["explorer",  data.workdir], shell=True)
+
+    root = Tk()
+    frm = ttk.Frame(root, padding=20)
+    frm.grid()
+
+    row = 0
+    ttk.Label(frm, text="Annotation tool").grid(column=0, row=row, columnspan=2)
+
+    for k in ["datafile", "workdir"]:
+        row += 1
+        ttk.Label(frm, text=f"{k}: {data.__getattribute__(k)}").grid(column=0, row=row, columnspan=2)
+
+    row += 1
+    ttk.Label(frm, text=f"data: {data.count('all')}").grid(column=0, row=row, columnspan=3)
+
+    row += 1
+    ttk.Label(frm, text=f"annotated: {data.count('annotated')}").grid(column=0, row=row, columnspan=3)
+
+    row += 1
+    ttk.Button(frm, text="[D]eploy", command=_deploy).grid(column=0, row=row)
+    ttk.Button(frm, text="[R]egister", command=_register).grid(column=1, row=row)
+
+    row += 1
+    ttk.Button(frm, text="[O]pen", command=_open).grid(column=0, row=row)
+
+    row += 1
+    ttk.Button(frm, text="Config", command=None).grid(column=0, row=row)
+    ttk.Button(frm, text="Quit", command=root.destroy).grid(column=1, row=row)
+
+    # keybind
+    root.bind("d", _deploy)
+    root.bind("r", _register)
+    root.bind("o", _open)
+
+    root.mainloop()