WIP

Author: amilcarlucas

ardupilot_methodic_configurator/frontend_tkinter_parameter_editor.py

@@ -171,14 +171,17 @@ def __init__(self, current_file: str, flight_controller: FlightController, local
         self.__create_conf_widgets(__version__)
 
         # Get the first two characters of the last configuration step filename
-        last_step_filename = next(reversed(self.local_filesystem.configuration_steps.keys()))
-        last_step_nr = int(last_step_filename[:2])+1 if len(last_step_filename) >= 2 else 0
+        last_step_filename = next(reversed(self.local_filesystem.file_parameters.keys()))
+        last_step_nr = int(last_step_filename[:2]) + 1 if len(last_step_filename) >= 2 else 1
 
-        stage_progress_bar = StageProgressBar(self.main_frame, self.local_filesystem.configuration_phases, last_step_nr)
-        stage_progress_bar.pack(side=tk.TOP, fill="x", expand=False, pady=(4, 4), padx=(4, 4))  # Pack the frame at the top of the window
+        self.stage_progress_bar = StageProgressBar(self.main_frame, self.local_filesystem.configuration_phases, last_step_nr)
+        self.stage_progress_bar.pack(
+            side=tk.TOP, fill="x", expand=False, pady=(2, 2), padx=(4, 4)
+        )  # Pack the frame at the top of the window
 
         # Create a DocumentationFrame object for the Documentation Content
         self.documentation_frame = DocumentationFrame(self.main_frame, self.local_filesystem, self.current_file)
+        self.documentation_frame.documentation_frame.pack(side=tk.TOP, fill="x", expand=False, pady=(2, 2), padx=(4, 4))
 
         self.__create_parameter_area_widgets()
 
@@ -504,6 +507,7 @@ def on_param_file_combobox_change(self, _event: Union[None, tk.Event], forced: b
         selected_file = self.file_selection_combobox.get()
         if self.current_file != selected_file or forced:
             self.write_changes_to_intermediate_parameter_file()
+            self.stage_progress_bar.update_progress(int(selected_file[:2]))
             self.__do_tempcal_imu(selected_file)
             self.__should_copy_fc_values_to_file(selected_file)
             selected_file = self.__should_jump_to_file(selected_file)

ardupilot_methodic_configurator/frontend_tkinter_parameter_editor_documentation_frame.py

@@ -42,7 +42,6 @@ def __init__(self, root: tk.Widget, local_filesystem: LocalFilesystem, current_f
 
     def __create_documentation_frame(self) -> None:
         self.documentation_frame = ttk.LabelFrame(self.root, text=_("Documentation"))
-        self.documentation_frame.pack(side=tk.TOP, fill="x", expand=False, pady=(4, 4), padx=(4, 4))
 
         # Create a grid structure within the documentation_frame
         documentation_grid = ttk.Frame(self.documentation_frame)

ardupilot_methodic_configurator/frontend_tkinter_stage_progress.py

@@ -25,6 +25,7 @@
 import tkinter as tk
 from logging import basicConfig as logging_basicConfig
 from logging import getLevelName as logging_getLevelName
+from logging import error as logging_error
 from tkinter import ttk
 from typing import Union
 
@@ -49,6 +50,13 @@ def __init__(self, master: tk.Widget, phases: dict[str, dict], total_steps: int,
 
         self.create_phase_frames()
         self.bind("<Configure>", self._on_resize)
+        show_tooltip(
+            self,
+            _(
+                "This bar shows your progress through the configuration phases. Each phase contains configuration steps that must be completed in sequence."
+            ),
+            position_below=False,
+        )
 
     def create_phase_frames(self) -> None:
         """Create frames for each phase with progress bars and labels."""
@@ -91,17 +99,25 @@ def create_phase_frames(self) -> None:
             if "\n" not in label_text and len(label_text) < 20:
                 label_text += "\n "
 
+            # Use gray text color if phase is marked as optional
+            is_optional = phase_data.get("optional", False)
+            label_fg = "gray" if is_optional else "black"
+
             label = ttk.Label(
                 frame,
                 text=label_text,
                 wraplength=0,  # Will be updated in _on_resize
                 justify=tk.CENTER,
                 anchor="center",
+                foreground=label_fg,
             )
             label.grid(row=1, column=0, sticky="ew")
 
             self.phase_frames[phase_name] = frame
-            show_tooltip(frame, phase_data.get("description", ""))
+            tooltip_msg = _(phase_data.get("description", ""))
+            if is_optional:
+                tooltip_msg += "\n" + _("This phase is optional.")
+            show_tooltip(frame, tooltip_msg)
             self.phase_bars.append({"bar": progress, "start": start, "end": end})
 
     def _on_resize(self, _event: Union[tk.Event, None] = None) -> None:
@@ -133,6 +149,12 @@ def update_progress(self, current_file: int) -> None:
         - Show progress between start-end otherwise
 
         """
+        if not (0 < current_file < self.total_files):
+            msg = _("Out of expected range [0 .. {self.total_files}] current file number: {current_file}")
+            msg = msg.format(self=self, current_file=current_file)
+            logging_error(msg)
+            return
+
         for phase in self.phase_bars:
             if phase["start"] <= current_file <= phase["end"]:
                 # Calculate progress within this phase