ardupilot-methodic-configurator 2.1.3__py3-none-any.whl → 2.3.0__py3-none-any.whl

ardupilot_methodic_configurator/frontend_tkinter_parameter_editor_table.py

@@ -53,7 +53,7 @@ class ParameterEditorTable(ScrollFrame):  # pylint: disable=too-many-ancestors,
 
     def __init__(self, master, local_filesystem: LocalFilesystem, parameter_editor) -> None:  # noqa: ANN001
         super().__init__(master)
-        self.root = master
+        self.main_frame = master
         self.local_filesystem = local_filesystem
         self.parameter_editor = parameter_editor  # the parent window that contains this table
         self.current_file = ""
@@ -295,7 +295,7 @@ class ParameterEditorTable(ScrollFrame):  # pylint: disable=too-many-ancestors,
             if param.is_readonly
             else "yellow"
             if param.is_calibration
-            else ttk.Style(self.root).lookup("TFrame", "background"),
+            else ttk.Style(self.main_frame).lookup("TFrame", "background"),
         )
 
         tooltip_parameter_name = param.tooltip_new_value
@@ -586,9 +586,9 @@ class ParameterEditorTable(ScrollFrame):  # pylint: disable=too-many-ancestors,
             # Destroy the window
             window.destroy()
             # Issue a FocusIn event on something else than new_value_entry to prevent endless looping
-            self.root.focus_set()
+            self.main_frame.focus_set()
             # Run the Tk event loop once to process the event
-            self.root.update_idletasks()
+            self.main_frame.update_idletasks()
             # Re-bind the FocusIn event to new_value_entry
             event.widget.bind(
                 "<Double-Button-1>",
@@ -613,7 +613,8 @@ class ParameterEditorTable(ScrollFrame):  # pylint: disable=too-many-ancestors,
 
         # Temporarily unbind the FocusIn event to prevent triggering the window again
         event.widget.unbind("<Double-Button-1>")
-        window = tk.Toplevel(self.root)
+        window = tk.Toplevel(self.main_frame.master)
+        window.withdraw()  # Hide the window until it's fully set up
         title = _("Select {param.name} Bitmask Options")
         window.title(title.format(**locals()))
         checkbox_vars = {}
@@ -656,8 +657,11 @@ class ParameterEditorTable(ScrollFrame):  # pylint: disable=too-many-ancestors,
 
         # Make sure the window is visible before disabling the parent window
         window.deiconify()
-        self.root.update_idletasks()
-        window.grab_set()
+
+        # Center the window on the parent window using the utility function
+        BaseWindow.center_window(window, self.main_frame.master)
+
+        window.grab_set()  # Make the window modal, disable the parent window
 
         window.wait_window()  # Wait for the window to be closed
 
@@ -743,7 +747,7 @@ class ParameterEditorTable(ScrollFrame):  # pylint: disable=too-many-ancestors,
 
     def _on_parameter_add(self, fc_parameters: dict[str, float]) -> None:
         """Handle parameter addition."""
-        add_parameter_window = BaseWindow(self.root)
+        add_parameter_window = BaseWindow(self.main_frame.master)
         add_parameter_window.root.title(_("Add Parameter to ") + self.current_file)
         add_parameter_window.root.geometry("450x300")
 
@@ -779,7 +783,7 @@ class ParameterEditorTable(ScrollFrame):  # pylint: disable=too-many-ancestors,
             width=28,
         )
         parameter_name_combobox.pack(padx=5, pady=5)
-        BaseWindow.center_window(add_parameter_window.root, self.root)
+        BaseWindow.center_window(add_parameter_window.root, self.main_frame.master)
         parameter_name_combobox.focus()
 
         def custom_selection_handler(event: tk.Event) -> None:

ardupilot_methodic_configurator/frontend_tkinter_progress_window.py

@@ -26,10 +26,22 @@ class ProgressWindow:
     a task. It includes a progress bar and a label to display the progress message.
     """
 
-    def __init__(self, master, title: str, message: str = "", width: int = 300, height: int = 80) -> None:  # noqa: ANN001, pylint: disable=too-many-arguments, too-many-positional-arguments
+    def __init__(  # pylint: disable=too-many-arguments, too-many-positional-arguments
+        self,
+        master,  # noqa: ANN001
+        title: str,
+        message: str = "",
+        width: int = 300,
+        height: int = 80,
+        only_show_when_update_progress_called: bool = False,
+    ) -> None:
         self.parent = master
         self.message = message
+        self.only_show_when_update_progress_called = only_show_when_update_progress_called
+        self._shown = False
         self.progress_window = tk.Toplevel(self.parent)
+        # Withdraw immediately to prevent flicker while setting up
+        self.progress_window.withdraw()
         self.progress_window.title(title)
         self.progress_window.geometry(f"{width}x{height}")
 
@@ -44,12 +56,20 @@ class ProgressWindow:
         self.progress_label = ttk.Label(main_frame, text=message.format(0, 0))
         self.progress_label.pack(side=tk.TOP, fill=tk.X, expand=False, pady=(10, 10))
 
-        self.progress_window.lift()
+        if not isinstance(master, tk.Tk):
+            logging_error("ProgressWindow: master is not a tk.Tk instance, window centering will fail")
 
-        # Center the progress window on the parent window
+        if not self.only_show_when_update_progress_called:
+            self.progress_window.deiconify()  # needs to be done before centering, but it does flicker :(
+
+        # Center the progress window on the parent window while still withdrawn
         BaseWindow.center_window(self.progress_window, self.parent)
 
-        self.progress_bar.update()
+        if not self.only_show_when_update_progress_called:
+            # Show the window now that it's properly positioned
+            self.progress_window.lift()
+            self._shown = True
+            self.progress_bar.update()
 
     def update_progress_bar_300_pct(self, percent: int) -> None:
         self.message = _("Please be patient, {:.1f}% of {}% complete")
@@ -65,25 +85,44 @@ class ProgressWindow:
 
         """
         try:
-            if hasattr(self, "progress_window") is False or self.progress_window is None:
+            # Double check that the window still exists before updating
+            if (
+                hasattr(self, "progress_window") is False
+                or self.progress_window is None
+                or not self.progress_window.winfo_exists()
+            ):
                 return
-            self.progress_window.lift()
+
+            if self.only_show_when_update_progress_called and not self._shown:
+                self.progress_window.deiconify()
+                # Re-center the window when it's first shown
+                BaseWindow.center_window(self.progress_window, self.parent)
+                self.progress_window.lift()
+                self._shown = True
+            elif not self.only_show_when_update_progress_called:
+                self.progress_window.lift()
+
+            # Additional safety checks before updating widgets
+            if (
+                hasattr(self, "progress_bar")
+                and self.progress_bar is not None
+                and hasattr(self, "progress_label")
+                and self.progress_label is not None
+            ):
+                self.progress_bar["value"] = current_value
+                self.progress_bar["maximum"] = max_value
+
+                # Update the progress message
+                self.progress_label.config(text=self.message.format(current_value, max_value))
+
+                self.progress_bar.update()
+
+                # Close the progress window when the process is complete
+                if current_value == max_value:
+                    self.progress_window.destroy()
         except tk.TclError as _e:
-            msg = _("Lifting window: {_e}")
+            msg = _("Updating progress widgets: {_e}")
             logging_error(msg.format(**locals()))
-            return
-
-        self.progress_bar["value"] = current_value
-        self.progress_bar["maximum"] = max_value
-
-        # Update the progress message
-        self.progress_label.config(text=self.message.format(current_value, max_value))
-
-        self.progress_bar.update()
-
-        # Close the progress window when the process is complete
-        if current_value == max_value:
-            self.progress_window.destroy()
 
     def destroy(self) -> None:
         self.progress_window.destroy()

ardupilot_methodic_configurator/frontend_tkinter_rich_text.py

@@ -11,10 +11,11 @@ SPDX-License-Identifier: GPL-3.0-or-later
 # https://wiki.tcl-lang.org/page/Changing+Widget+Colors
 
 import tkinter as tk
-from platform import system as platform_system
 from tkinter import font as tkFont  # noqa: N812
 from tkinter import ttk
 
+from ardupilot_methodic_configurator.frontend_tkinter_font import get_safe_font_config, safe_font_nametofont
+
 
 class RichText(tk.Text):  # pylint: disable=too-many-ancestors
     """
@@ -44,12 +45,21 @@ class RichText(tk.Text):  # pylint: disable=too-many-ancestors
     def __init__(self, *args, **kwargs) -> None:
         super().__init__(*args, **kwargs)
 
-        default_font = tkFont.nametofont("TkDefaultFont")
-        default_size = default_font.cget("size")
-
-        bold_font = tkFont.Font(**default_font.configure())  # type: ignore[arg-type]
-        italic_font = tkFont.Font(**default_font.configure())  # type: ignore[arg-type]
-        h1_font = tkFont.Font(**default_font.configure())  # type: ignore[arg-type]
+        default_font = safe_font_nametofont()
+        if default_font:
+            # Use the actual font configuration if available
+            bold_font = tkFont.Font(**default_font.configure())  # type: ignore[arg-type]
+            italic_font = tkFont.Font(**default_font.configure())  # type: ignore[arg-type]
+            h1_font = tkFont.Font(**default_font.configure())  # type: ignore[arg-type]
+            default_size = default_font.cget("size")
+        else:
+            # Get safe default font configuration
+            default_config = get_safe_font_config()
+            # Create fonts with safe config
+            bold_font = tkFont.Font(**default_config)  # type: ignore[arg-type]
+            italic_font = tkFont.Font(**default_config)  # type: ignore[arg-type]
+            h1_font = tkFont.Font(**default_config)  # type: ignore[arg-type]
+            default_size = int(default_config.get("size", 0))
 
         bold_font.configure(weight="bold")
         italic_font.configure(slant="italic")
@@ -76,11 +86,9 @@ def get_widget_font_family_and_size(widget: tk.Widget) -> tuple[str, int]:
     style = ttk.Style()
     widget_style = widget.cget("style")  # Get the style used by the widget
     font_name = style.lookup(widget_style, "font")
-    font_dict = tkFont.nametofont(font_name).config()
-
-    default_font_family = "Segoe UI" if platform_system() == "Windows" else "Helvetica"
-    default_font_size = 9 if platform_system() == "Windows" else -12
 
-    if font_dict is None:
-        return default_font_family, default_font_size
-    return font_dict.get("family", default_font_family), font_dict.get("size", default_font_size)
+    # Safely get platform-specific font configuration
+    font_dict = get_safe_font_config(font_name)
+    family = font_dict.get("family", "")
+    size = font_dict.get("size", 0)
+    return str(family), int(size)

{ardupilot_methodic_configurator-2.1.3.dist-info → ardupilot_methodic_configurator-2.3.0.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: ardupilot_methodic_configurator
-Version: 2.1.3
+Version: 2.3.0
 Summary: A clear configuration sequence for ArduPilot vehicles
 Author-email: Amilcar do Carmo Lucas <amilcar.lucas@iav.de>
 Maintainer-email: Amilcar do Carmo Lucas <amilcar.lucas@iav.de>
@@ -62,18 +62,18 @@ Requires-Dist: pymavlink==2.4.49
 Requires-Dist: pyserial==3.5
 Requires-Dist: requests==2.32.5
 Provides-Extra: dev
-Requires-Dist: coverage==7.10.6; extra == "dev"
+Requires-Dist: coverage==7.10.7; extra == "dev"
 Requires-Dist: mock==5.2.0; extra == "dev"
-Requires-Dist: mypy==1.18.1; extra == "dev"
+Requires-Dist: mypy==1.18.2; extra == "dev"
 Requires-Dist: pre-commit==4.3.0; extra == "dev"
 Requires-Dist: pylint==3.3.8; extra == "dev"
 Requires-Dist: pyright==1.1.405; extra == "dev"
 Requires-Dist: pytest==8.4.2; extra == "dev"
 Requires-Dist: pytest-cov==7.0.0; extra == "dev"
 Requires-Dist: pytest-md==0.2.0; extra == "dev"
-Requires-Dist: pytest-mock==3.15.0; extra == "dev"
+Requires-Dist: pytest-mock==3.15.1; extra == "dev"
 Requires-Dist: python-gettext==5.0; extra == "dev"
-Requires-Dist: ruff==0.13.0; extra == "dev"
+Requires-Dist: ruff==0.13.1; extra == "dev"
 Requires-Dist: types-requests==2.32.4.20250913; extra == "dev"
 Provides-Extra: scripts
 Requires-Dist: bs4; extra == "scripts"