Refactor / simplify CM.py (#82)

Refactor / simplify CM.py

Author: dweindl

src/ccompass/CCMPS.py

@@ -1558,11 +1558,11 @@ def run(self):
                 )
 
             elif event == "-marker_manage-":
-                from .CM import CM_exec
+                from .class_manager_dialog import show_class_manager_dialog
 
                 if check_markers(self.model.marker_sets):
-                    self.model.marker_conv = CM_exec(
-                        self.model.marker_sets, self.model.marker_conv
+                    self.model.marker_conv = show_class_manager_dialog(
+                        self.model.marker_conv
                     )
                 else:
                     messagebox.showerror(

src/ccompass/CM.py renamed to src/ccompass/class_manager_dialog.py

@@ -1,48 +1,45 @@
-"""Class manager."""
+"""Class manager dialog.
+
+Dialog window for selecting and mapping annotations to classes.
+"""
 
 import FreeSimpleGUI as sg
 import numpy as np
 import pandas as pd
 
 
-def refresh_conversion(conversion, values):
+def _refresh_conversion(
+    conversion: dict[str, str | float], values: dict
+) -> dict[str, str | float]:
+    """Refresh the conversion dictionary with the new values from the GUI."""
     for o in conversion:
-        if values["--" + o + "--"] == True:
-            conversion[o] = values["--" + o + "_class--"]
-        elif values["--" + o + "--"] == False:
-            conversion[o] = np.nan
+        conversion[o] = (
+            values[f"--{o}_class--"] if values[f"--{o}--"] else np.nan
+        )
     return conversion
 
 
-def CM_exec(markers, marker_conv):
-    conv_old = marker_conv
-
-    num_names = 0
-    for name in marker_conv:
-        if not pd.isnull(marker_conv[name]):
-            num_names += 1
-
+def _create_class_manager_window(
+    marker_conv: dict[str, str | float], num_names: int
+) -> sg.Window:
+    """Create the class manager window."""
     layout_column = [
         [sg.Text("Annotation", size=(25, 1)), sg.Text("Class", size=(20, 1))],
-        [
-            sg.Text(
-                "--------------------------------------------------------------------------------"
-            )
-        ],
+        [sg.Text("-" * 80)],
         *[
             [
                 sg.Checkbox(
                     o,
                     default=not pd.isnull(marker_conv[o]),
                     enable_events=True,
                     size=(20, 5),
-                    key="--" + o + "--",
+                    key=f"--{o}--",
                 ),
                 sg.InputText(
                     str(marker_conv[o]),
                     visible=not pd.isnull(marker_conv[o]),
                     size=(20, 5),
-                    key="--" + o + "_class--",
+                    key=f"--{o}_class--",
                 ),
             ]
             for o in marker_conv
@@ -68,11 +65,11 @@ def CM_exec(markers, marker_conv):
             sg.Column(
                 layout=[
                     [
-                        sg.Text("initial annotations: "),
+                        sg.Text("Initial annotations: "),
                         sg.Text(str(len(marker_conv))),
                     ],
                     [
-                        sg.Text("used annotations: "),
+                        sg.Text("Used annotations: "),
                         sg.Text(str(num_names), key="-num_anno-"),
                     ],
                     [
@@ -99,30 +96,40 @@ def CM_exec(markers, marker_conv):
         ]
     ]
 
-    window_CM = sg.Window("Classes", layout_CM, size=(600, 400))
+    return sg.Window("Classes", layout_CM, size=(600, 400))
+
+
+def show_class_manager_dialog(
+    marker_conv: dict[str, str | float],
+) -> dict[str, str | float]:
+    """Show the class managar dialog."""
+    conv_old = marker_conv
+    num_names = sum(not pd.isnull(v) for v in marker_conv.values())
+
+    window = _create_class_manager_window(marker_conv, num_names)
 
     while True:
-        event_CM, values_CM = window_CM.read()
+        event, values = window.read()
+
+        if event == sg.WIN_CLOSED or event == "--cancel--":
+            marker_conv = conv_old
+            break
+
         for k in marker_conv:
-            if event_CM == "--" + k + "--":
-                window_CM["--" + k + "_class--"].Update(
-                    visible=values_CM["--" + k + "--"]
-                )
-                if values_CM["--" + k + "--"] == True:
-                    window_CM["--" + k + "_class--"].Update(value=k)
+            # checkbox clicked?
+            if event == f"--{k}--":
+                window[f"--{k}_class--"].Update(visible=values[f"--{k}--"])
+                if values[f"--{k}--"]:
+                    window[f"--{k}_class--"].Update(value=k)
                     num_names += 1
-                    window_CM["-num_anno-"].Update(value=str(num_names))
-                elif values_CM["--" + k + "--"] == False:
-                    window_CM["--" + k + "_class--"].Update(value=False)
+                else:
+                    window[f"--{k}_class--"].Update(value=False)
                     num_names -= 1
-                    window_CM["-num_anno-"].Update(value=str(num_names))
+                window["-num_anno-"].Update(value=str(num_names))
 
-        if event_CM == sg.WIN_CLOSED or event_CM == "--cancel--":
-            marker_conv = conv_old
-            break
-        if event_CM == "--accept--":
-            marker_conv = refresh_conversion(marker_conv, values_CM)
+        if event == "--accept--":
+            marker_conv = _refresh_conversion(marker_conv, values)
             break
 
-    window_CM.close()
+    window.close()
     return marker_conv