ardupilot-methodic-configurator 1.2.3__py3-none-any.whl → 1.3.0__py3-none-any.whl

ardupilot_methodic_configurator/frontend_tkinter_parameter_editor.py

@@ -10,6 +10,7 @@ SPDX-FileCopyrightText: 2024-2025 Amilcar do Carmo Lucas <amilcar.lucas@iav.de>
 SPDX-License-Identifier: GPL-3.0-or-later
 """
 
+import sys
 import tkinter as tk
 from argparse import ArgumentParser, Namespace
 
@@ -20,7 +21,7 @@ from logging import getLevelName as logging_getLevelName
 from logging import info as logging_info
 from logging import warning as logging_warning
 from tkinter import filedialog, messagebox, ttk
-from typing import Union
+from typing import Literal, Union
 
 # from logging import critical as logging_critical
 from webbrowser import open as webbrowser_open  # to open the blog post documentation
@@ -33,7 +34,7 @@ from ardupilot_methodic_configurator.backend_flightcontroller import FlightContr
 from ardupilot_methodic_configurator.backend_internet import download_file_from_url
 from ardupilot_methodic_configurator.common_arguments import add_common_arguments
 from ardupilot_methodic_configurator.frontend_tkinter_autoresize_combobox import AutoResizeCombobox
-from ardupilot_methodic_configurator.frontend_tkinter_base import BaseWindow
+from ardupilot_methodic_configurator.frontend_tkinter_base_window import BaseWindow
 from ardupilot_methodic_configurator.frontend_tkinter_directory_selection import VehicleDirectorySelectionWidgets
 from ardupilot_methodic_configurator.frontend_tkinter_parameter_editor_documentation_frame import DocumentationFrame
 from ardupilot_methodic_configurator.frontend_tkinter_parameter_editor_table import ParameterEditorTable
@@ -359,7 +360,7 @@ class ParameterEditorWindow(BaseWindow):  # pylint: disable=too-many-instance-at
         )
 
     @staticmethod
-    def __display_usage_popup_window(parent: tk.Toplevel) -> None:
+    def __display_usage_popup_window(parent: tk.Tk) -> None:
         usage_popup_window = BaseWindow(parent)
         style = ttk.Style()
 
@@ -447,16 +448,78 @@ class ParameterEditorWindow(BaseWindow):  # pylint: disable=too-many-instance-at
                         raise
                     self.parameter_editor_table.set_at_least_one_param_edited(True)  # force writing doc annotations to file
 
-    def __should_copy_fc_values_to_file(self, selected_file: str) -> None:
+    def __should_copy_fc_values_to_file(self, selected_file: str) -> None:  # pylint: disable=too-many-locals
         auto_changed_by = self.local_filesystem.auto_changed_by(selected_file)
         if auto_changed_by and self.flight_controller.fc_parameters:
             msg = _(
-                "This configuration step should be performed outside this tool by\n"
-                "{auto_changed_by}\n"
-                "and that should have changed the parameters on the FC.\n\n"
-                "Should the FC values now be copied to the {selected_file} file?"
+                "This configuration step requires external changes by: {auto_changed_by}\n\n"
+                "The external tool experiment procedure is described in the tunning guide.\n\n"
+                "Choose an option:\n"
+                "* CLOSE - Close the application and go perform the experiment\n"
+                "* YES - Copy current FC values to {selected_file} (if you've already completed the experiment)\n"
+                "* NO - Continue without copying values (if you haven't performed the experiment yet,"
+                " but know what you are doing)"
             )
-            if messagebox.askyesno(_("Update file with values from FC?"), msg.format(**locals())):
+
+            # Create custom dialog with Yes, No, Close buttons
+            dialog = tk.Toplevel(self.root)
+            dialog.transient(self.root)
+            dialog.title(_("Update file with values from FC?"))
+            dialog.resizable(width=False, height=False)
+            dialog.protocol("WM_DELETE_WINDOW", dialog.destroy)
+
+            # Make dialog modal
+            dialog.grab_set()
+
+            # Message text
+            message_label = tk.Label(dialog, text=msg.format(**locals()), justify=tk.LEFT, padx=20, pady=10)
+            message_label.pack(padx=10, pady=10)
+
+            # Result variable
+            result: list[Literal[None, True, False]] = [None]
+
+            # Button frame
+            button_frame = tk.Frame(dialog)
+            button_frame.pack(pady=10)
+
+            # Close button (default)
+            close_button = tk.Button(
+                button_frame, text=_("Close"), width=10, command=lambda: [result.append(None), dialog.destroy()]
+            )
+            close_button.pack(side=tk.LEFT, padx=5)
+
+            # Yes button
+            yes_button = tk.Button(
+                button_frame, text=_("Yes"), width=10, command=lambda: [result.append(True), dialog.destroy()]
+            )
+            yes_button.pack(side=tk.LEFT, padx=5)
+
+            # No button
+            no_button = tk.Button(
+                button_frame, text=_("No"), width=10, command=lambda: [result.append(False), dialog.destroy()]
+            )
+            no_button.pack(side=tk.LEFT, padx=5)
+
+            close_button.focus_set()  # Give the Close button focus
+            dialog.bind("<Return>", lambda _event: [result.append(None), dialog.destroy()])
+
+            # Center the dialog on the parent window
+            dialog.update_idletasks()
+            dialog_width = dialog.winfo_width()
+            dialog_height = dialog.winfo_height()
+            parent_x = self.root.winfo_rootx()
+            parent_y = self.root.winfo_rooty()
+            parent_width = self.root.winfo_width()
+            parent_height = self.root.winfo_height()
+            x = parent_x + (parent_width - dialog_width) // 2
+            y = parent_y + (parent_height - dialog_height) // 2
+            dialog.geometry(f"+{x}+{y}")
+
+            # Wait until dialog is closed
+            self.root.wait_window(dialog)
+            response = result[-1] if len(result) > 1 else None
+
+            if response is True:  # Yes option
                 relevant_fc_params = {
                     key: value
                     for key, value in self.flight_controller.fc_parameters.items()
@@ -465,6 +528,9 @@ class ParameterEditorWindow(BaseWindow):  # pylint: disable=too-many-instance-at
                 params_copied = self.local_filesystem.copy_fc_values_to_file(selected_file, relevant_fc_params)
                 if params_copied:
                     self.parameter_editor_table.set_at_least_one_param_edited(True)
+            elif response is None:  # Close option
+                sys.exit(0)
+            # If response is False (No option), do nothing and continue
 
     def __should_jump_to_file(self, selected_file: str) -> str:
         jump_possible = self.local_filesystem.jump_possible(selected_file)
@@ -746,7 +812,7 @@ class ParameterEditorWindow(BaseWindow):  # pylint: disable=too-many-instance-at
             self.close_connection_and_quit()
 
     def write_changes_to_intermediate_parameter_file(self) -> None:
-        if self.parameter_editor_table.get_at_least_one_param_edited():
+        if self.parameter_editor_table.get_at_least_one_param_edited() or self.annotate_params_into_files.get():
             msg = _("Do you want to write the changes to the {self.current_file} file?")
             if messagebox.askyesno(_("One or more parameters have been edited"), msg.format(**locals())):
                 self.local_filesystem.export_to_param(
@@ -871,5 +937,7 @@ if __name__ == "__main__":
     logging_basicConfig(level=logging_getLevelName(args.loglevel), format="%(asctime)s - %(levelname)s - %(message)s")
 
     fc = FlightController(args.reboot_time)
-    filesystem = LocalFilesystem(args.vehicle_dir, args.vehicle_type, "", args.allow_editing_template_files)
+    filesystem = LocalFilesystem(
+        args.vehicle_dir, args.vehicle_type, "", args.allow_editing_template_files, args.save_component_to_system_templates
+    )
     ParameterEditorWindow("04_board_orientation.param", fc, filesystem)

ardupilot_methodic_configurator/frontend_tkinter_parameter_editor_table.py

@@ -27,7 +27,7 @@ from ardupilot_methodic_configurator.backend_filesystem import LocalFilesystem,
 
 # from ardupilot_methodic_configurator.backend_flightcontroller import FlightController
 # from ardupilot_methodic_configurator.frontend_tkinter_auto_resize_combobox import AutoResizeCombobox
-from ardupilot_methodic_configurator.frontend_tkinter_base import BaseWindow
+from ardupilot_methodic_configurator.frontend_tkinter_base_window import BaseWindow
 from ardupilot_methodic_configurator.frontend_tkinter_entry_dynamic import EntryWithDynamicalyFilteredListbox
 from ardupilot_methodic_configurator.frontend_tkinter_pair_tuple_combobox import PairTupleCombobox
 from ardupilot_methodic_configurator.frontend_tkinter_rich_text import get_widget_font_family_and_size
@@ -103,11 +103,11 @@ class ParameterEditorTable(ScrollFrame):  # pylint: disable=too-many-ancestors
             )
             if error_msg:
                 messagebox.showerror(_("Error in derived parameters"), error_msg)
-            else:
-                # merge derived parameter values
-                self.local_filesystem.merge_forced_or_derived_parameters(
-                    selected_file, self.local_filesystem.derived_parameters, list(fc_parameters.keys())
-                )
+            # merge derived parameter values
+            elif self.local_filesystem.merge_forced_or_derived_parameters(
+                selected_file, self.local_filesystem.derived_parameters, list(fc_parameters.keys())
+            ):
+                self.at_least_one_param_edited = True
 
             self.rename_fc_connection(selected_file)
 

ardupilot_methodic_configurator/frontend_tkinter_progress_window.py

@@ -15,7 +15,7 @@ from logging import error as logging_error
 from tkinter import ttk
 
 from ardupilot_methodic_configurator import _
-from ardupilot_methodic_configurator.frontend_tkinter_base import BaseWindow
+from ardupilot_methodic_configurator.frontend_tkinter_base_window import BaseWindow
 
 
 class ProgressWindow:

ardupilot_methodic_configurator/frontend_tkinter_template_overview.py

@@ -22,7 +22,7 @@ from ardupilot_methodic_configurator import _, __version__
 from ardupilot_methodic_configurator.backend_filesystem_program_settings import ProgramSettings
 from ardupilot_methodic_configurator.backend_filesystem_vehicle_components import VehicleComponents
 from ardupilot_methodic_configurator.common_arguments import add_common_arguments
-from ardupilot_methodic_configurator.frontend_tkinter_base import BaseWindow
+from ardupilot_methodic_configurator.frontend_tkinter_base_window import BaseWindow
 from ardupilot_methodic_configurator.middleware_template_overview import TemplateOverview
 
 IMAGE_HEIGHT_PX = 100
@@ -38,7 +38,7 @@ class TemplateOverviewWindow(BaseWindow):
     manner, making it easier for users to navigate and select the desired template for configuration.
 
     Attributes:
-        window (tk.Toplevel): The root Tkinter window object for the GUI.
+        window (tk.Tk|None): The root Tkinter window object for the GUI.
 
     Methods:
         on_row_double_click(event): Handles the event triggered when a row in the Treeview is double-clicked, allowing the user
@@ -46,7 +46,7 @@ class TemplateOverviewWindow(BaseWindow):
 
     """
 
-    def __init__(self, parent: Optional[tk.Toplevel] = None) -> None:
+    def __init__(self, parent: Optional[tk.Tk] = None) -> None:
         super().__init__(parent)
         title = _("Amilcar Lucas's - ArduPilot methodic configurator {} - Template Overview and selection")
         self.root.title(title.format(__version__))

ardupilot_methodic_configurator/frontend_tkinter_usage_popup_window.py

@@ -19,7 +19,7 @@ from tkinter import BooleanVar, ttk
 
 from ardupilot_methodic_configurator import _
 from ardupilot_methodic_configurator.backend_filesystem_program_settings import ProgramSettings
-from ardupilot_methodic_configurator.frontend_tkinter_base import BaseWindow
+from ardupilot_methodic_configurator.frontend_tkinter_base_window import BaseWindow
 from ardupilot_methodic_configurator.frontend_tkinter_rich_text import RichText
 
 
@@ -40,7 +40,7 @@ class UsagePopupWindow:
 
     @staticmethod
     def display(  # pylint: disable=too-many-arguments, too-many-positional-arguments
-        parent: tk.Toplevel,
+        parent: tk.Tk,
         usage_popup_window: BaseWindow,
         title: str,
         ptype: str,
@@ -82,7 +82,7 @@ class UsagePopupWindow:
         usage_popup_window.root.protocol("WM_DELETE_WINDOW", lambda: UsagePopupWindow.close(usage_popup_window, parent))
 
     @staticmethod
-    def close(usage_popup_window: BaseWindow, parent: tk.Toplevel) -> None:
+    def close(usage_popup_window: BaseWindow, parent: tk.Tk) -> None:
         usage_popup_window.root.destroy()
         if platform_system() == "Windows":
             parent.attributes("-disabled", False)  # noqa: FBT003  # Re-enable the parent window