refactor treeview

treeview.py
 - add single widget CanvasTreeview
 - replace function folder_treeview and other implementations

peak_fit_analysis.py
 - further improvements, added ScanFitModel

Author: DanPorter

mmg_toolbox/__init__.py

@@ -13,9 +13,9 @@
 __all__ = ['start_gui', 'version_info', 'title', 'module_info', 'data_file_reader', 'Experiment']
 
 
-def start_gui(beamline: str | None = None):
-    from mmg_toolbox.tkguis import create_title_window
-    create_title_window(beamline)
+def start_gui(*args: str):
+    from mmg_toolbox.tkguis import run
+    run(*args)
 
 
 def version_info():

mmg_toolbox/tkguis/__init__.py

@@ -2,13 +2,14 @@
 from .apps.data_viewer import create_data_viewer
 from .apps.nexus import create_nexus_viewer
 from .apps.file_browser import create_nexus_file_browser
-from .cli import cli_run
+from .cli import cli_run, run
 
 __all__ = [
     'create_nexus_file_browser',
     'create_nexus_viewer',
     'create_data_viewer',
     'create_title_window',
-    'cli_run'
+    'cli_run',
+    'run'
 ]
 

mmg_toolbox/tkguis/apps/data_viewer.py

@@ -88,7 +88,6 @@ def start_multi_scan_plot():
     topmenu(root, menu, add_themes=True, add_about=True)
 
     root.update()
-    print(f"Window size (wxh): {root.winfo_reqwidth()}x{root.winfo_reqheight()}")
 
     if parent is None:
         root.mainloop()

mmg_toolbox/tkguis/cli.py

@@ -5,6 +5,7 @@
 import sys
 import os
 
+from .misc.config import BEAMLINE_CONFIG
 from .apps.experiment import create_title_window
 from .apps.data_viewer import create_data_viewer
 from .apps.nexus import create_nexus_viewer
@@ -30,6 +31,9 @@ def run(*args):
         elif os.path.isfile(arg):
             create_nexus_viewer(arg)
             return
+        elif arg in BEAMLINE_CONFIG:
+            create_title_window(arg)
+            return
     create_title_window()
     return
 

mmg_toolbox/tkguis/widgets/folder_treeview.py

@@ -11,14 +11,15 @@
 from mmg_toolbox.utils.file_functions import list_files, list_path_time, display_timestamp, get_hdf_string, folder_summary
 from mmg_toolbox.utils.env_functions import open_terminal
 from ..misc.styles import create_hover
-from ..misc.functions import folder_treeview, post_right_click_menu, select_folder
+from ..misc.functions import select_folder, post_right_click_menu
 from ..misc.jupyter import launch_jupyter_notebook
 from ..misc.logging import create_logger
+from .treeview import CanvasTreeview
 
 logger = create_logger(__file__)
 
 
-class FolderTreeViewFrame:
+class FolderTreeViewFrame(CanvasTreeview):
     """Frame with TreeView and entry for Folders"""
 
     def __init__(self, extension: str, root: tk.Misc, initial_directory: str | None = None):
@@ -38,7 +39,7 @@ def __init__(self, extension: str, root: tk.Misc, initial_directory: str | None
         self.search_label = tk.StringVar(root, '')
 
         # Columns
-        self.columns = [
+        columns = [
             # (name, text, width, reverse, sort_col)
             ("#0", 'Folder', 200, False, None),
             ("modified", 'Modified', 150, True, "modified_time"),
@@ -50,8 +51,7 @@ def __init__(self, extension: str, root: tk.Misc, initial_directory: str | None
 
         # Build widgets
         self.ini_folderpath()
-        self.tree = folder_treeview(self.root, self.columns)
-        self.tree.configure(displaycolumns=('modified', 'files', 'data'))  # hide columns
+        super().__init__(root, *columns)
         self.tree.bind("<<TreeviewOpen>>", self.populate_files)
         self.tree.bind("<Double-1>", self.on_double_click)
         self.tree.bind("<Return>", self.on_double_click)

mmg_toolbox/tkguis/widgets/nexus_treeview.py

@@ -5,97 +5,29 @@
 import os
 import h5py
 import tkinter as tk
-from tkinter import ttk
 
 import hdfmap
 from hdfmap.eval_functions import generate_identifier
 
-from ..misc.functions import post_right_click_menu
+from .treeview import CanvasTreeview
 from ..misc.logging import create_logger
 
 logger = create_logger(__file__)
 
-#TODO: merge this with misc.functions.folder_treeview
-class _Treeview:
-    """
-    Treeview  widget for NeXus file viewer
 
-    params
-     root: tk frame
-    """
-    def __init__(self, root: tk.Misc, *columns: str):
-        frm = ttk.Frame(root)
-        frm.pack(side=tk.LEFT, expand=tk.YES, fill=tk.BOTH)
-
-        tree = ttk.Treeview(frm, columns=columns, selectmode='browse')
-        tree.pack(side=tk.LEFT, expand=tk.YES, fill=tk.BOTH)
-
-        var = ttk.Scrollbar(frm, orient="vertical", command=tree.yview)
-        var.pack(side=tk.LEFT, fill=tk.Y)
-        tree.configure(yscrollcommand=var.set)
-
-        self.columns = columns
-        self._tree_frame = frm
-        self.tree = tree
-        # tree.bind("<<TreeviewSelect>>", self.tree_select)
-        # tree.bind("<Double-1>", self.on_double_click)
-        tree.bind("<Button-3>", self.right_click_menu())
-
-    def populate(self, **kwargs):
-        pass
-
-    def delete(self):
-        self.tree.delete(*self.tree.get_children())
-
-    def bind_select(self, function):
-        self.tree.bind('<<TreeviewSelect>>', function)
-
-    def right_click_menu(self):
-        """
-        Create right-click context menu for hdf_tree objects
-        :return: menu_popup function
-        """
-
-        def copy_fun(tree_getter):
-            def fun():
-                for iid in self.tree.selection():
-                    self._tree_frame.master.clipboard_clear()
-                    self._tree_frame.master.clipboard_append(tree_getter(iid))
-            return fun
-
-        m = tk.Menu(self._tree_frame, tearoff=0)
-        header_name = self.tree.heading('#0', 'text')
-        header_getter = lambda iid: self.tree.item(iid)['text']
-        m.add_command(label="Copy " + header_name, command=copy_fun(header_getter))
-        for column in self.columns:
-            getter = lambda iid: self.tree.set(iid, column)
-            m.add_command(label="Copy " + column, command=copy_fun(getter))
-
-        def menu_popup(event):
-            # select item
-            iid = self.tree.identify_row(event.y)
-            if iid:
-                self.tree.selection_set(iid)
-                post_right_click_menu(m, event.x_root, event.y_root)
-
-        return menu_popup
-
-
-class HdfTreeview(_Treeview):
+class HdfTreeview(CanvasTreeview):
     """
     HDF Treeview object
     """
-    def __init__(self, root: tk.Misc):
-        super().__init__(root, 'type', 'name', 'value')
-        # Populate tree
-        self.tree.heading("#0", text="HDF Address")
-        self.tree.column("#0", minwidth=50, width=400)
-        self.tree.column("type", width=100, anchor='c')
-        self.tree.column("name", width=100, anchor='c')
-        self.tree.column("value", width=200, anchor='c')
-        self.tree.heading("type", text="Type")
-        self.tree.heading("name", text="Name")
-        self.tree.heading("value", text="Value")
+    def __init__(self, root: tk.Misc, width: int | None = None, height: int | None = None):
+        columns = [
+            ('#0', 'HDF Address', 400, False, None),
+            ('type', 'Type', 100, False, None),
+            ('name', 'Name', 100, False, None),
+            ('value', 'Value', 200, False, None),
+        ]
+        super().__init__(root, *columns, width=width, height=height)
+
 
     def populate(self, hdf_obj: h5py.File, openstate=True):
         """Load HDF file, populate ttk.treeview object"""
@@ -144,21 +76,18 @@ def recur_func(hdf_group, tree_group="", top_address='/'):
         recur_func(hdf_obj, "")
 
 
-class HdfNameSpace(_Treeview):
+class HdfNameSpace(CanvasTreeview):
     """
     HDF Namespace object
     """
 
-    def __init__(self, root: tk.Misc):
-        super().__init__(root, 'path', 'value')
-
-        # Populate tree
-        self.tree.heading("#0", text="Name")
-        self.tree.column("#0", minwidth=50, width=100)
-        self.tree.column("path", width=300, anchor='c')
-        self.tree.column("value", width=200, anchor='c')
-        self.tree.heading("path", text="Path")
-        self.tree.heading("value", text="Value")
+    def __init__(self, root: tk.Misc, width: int | None = None, height: int | None = None):
+        columns = [
+            ('#0', 'Name', 100, False, None),
+            ('path', 'Path', 300, False, None),
+            ('value', 'Value', 200, False, None),
+        ]
+        super().__init__(root, *columns, width=width, height=height)
 
     def populate(self, hdf_obj: h5py.File, hdf_map: hdfmap.NexusMap,
                  all: bool = True, group: bool = False, combined: bool = False, values: bool = False,