Merge branch 'master' of github.com:Team-Arduino-Logique/Arduino-Logique into fix-buttons-for-mac

Author: charlotrudel

component_sketch.py

@@ -26,6 +26,7 @@
     USED,
     INPUT,
     OUTPUT,
+    CLOCK,
 )
 from component_params import BOARD_830_PTS_PARAMS, DIP14_PARAMS
 from utils import resource_path
@@ -2581,18 +2582,19 @@ def draw_pin_io(self, x_distance, y_distance, scale=1, width=-1, direction=HORIZ
             label_x = (x_distance + x_origin + 5 * scale,)
             label_y = (y_distance + y_origin - 17 * scale,)
 
-            label_tag = f"{element_id}_label"
-            text_id = self.canvas.create_text(
-                label_x,
-                label_y,
-                text=pin_number,
-                font=("FiraCode-Bold", int(7 * scale)),
-                fill="#000000",
-                anchor="center",
-                tags=(element_id, label_tag),
-            )
-            params["label_tag"] = label_tag
-            params["tags"].append(text_id)
+            if element_type != CLOCK:
+                label_tag = f"{element_id}_label"
+                text_id = self.canvas.create_text(
+                    label_x,
+                    label_y,
+                    text=pin_number,
+                    font=("FiraCode-Bold", int(7 * scale)),
+                    fill="#000000",
+                    anchor="center",
+                    tags=(element_id, label_tag),
+                )
+                params["label_tag"] = label_tag
+                params["tags"].append(text_id)
 
             if element_type == INPUT:
                 # Arrow pointing down
@@ -2645,6 +2647,45 @@ def draw_pin_io(self, x_distance, y_distance, scale=1, width=-1, direction=HORIZ
                 )
                 params["tags"].append(arrow_head_id)
 
+            elif element_type == CLOCK:
+                x_start = x_distance + x_origin + 0 * scale
+                y_start = y_distance + y_origin - 13 * scale
+
+
+                l1 = 5 * scale 
+                h  = 5 * scale 
+                l2 = 5 * scale 
+
+                # Draw the first horizontal line '_'
+                line1_id = self.canvas.create_line(
+                    x_start, y_start,
+                    x_start + l1, y_start,
+                    fill="#404040",
+                    width=2,
+                    tags=(element_id, interactive_tag, outline_tag),
+                )
+                params["tags"].append(line1_id)
+
+                # Draw the vertical line '|'
+                line2_id = self.canvas.create_line(
+                    x_start + l1, y_start,
+                    x_start + l1, y_start - h,
+                    fill="#404040",
+                    width=2,
+                    tags=(element_id, interactive_tag, outline_tag),
+                )
+                params["tags"].append(line2_id)
+
+                # Draw the second horizontal line '_'
+                line3_id = self.canvas.create_line(
+                    x_start + l1, y_start - h,
+                    x_start + l1 + l2, y_start - h,
+                    fill="#404040",
+                    width=2,
+                    tags=(element_id, interactive_tag, outline_tag),
+                )
+                params["tags"].append(line3_id)
+
             self.current_dict_circuit[element_id] = params
 
             print("coord : " + str(coord[0][0]) + "," + str(coord[0][1]))

dataCDLT.py

@@ -8,6 +8,7 @@
 USED = 1
 INPUT = 0
 OUTPUT = 1
+CLOCK = 2
 NO = 0
 YES = 1
 LEFT = 0

menus.py

@@ -15,11 +15,11 @@
 
 from breadboard import Breadboard
 
-from dataCDLT import INPUT, OUTPUT
+from dataCDLT import INPUT, OUTPUT, CLOCK
 
 if os.name == "darwin":
     from tkinter import messagebox, filedialog, ttk
-    from tkmacosx import Button # type: ignore
+    from tkmacosx import Button  # type: ignore
 else:
     from tkinter import Button, messagebox, filedialog, ttk
 
@@ -83,7 +83,6 @@ class Menus:
         parent (tk.Tk | tk.Frame): The main window or parent frame.
         canvas (tk.Canvas): The canvas widget for drawing circuits.
         board (Breadboard): The Breadboard instance.
-        model (list): The model data for the circuit.
         current_dict_circuit (dict): The current circuit data.
         com_port (str | None): The selected COM port.
     """
@@ -126,10 +125,7 @@ def __init__(
         menus = {
             "Fichier": ["Nouveau", "Ouvrir", "Enregistrer", "Quitter"],
             "Microcontrôleur": ["Choisir un microcontrôleur", "Table de correspondance", "Configurer le port série"],
-            "Exporter": [
-                "Vérifier",
-                "Téléverser",
-            ],
+            "Exporter": ["Vérifier", "Téléverser"],
             "Aide": ["Documentation", "À propos"],
         }
 
@@ -148,6 +144,16 @@ def __init__(
         for menu_name, options in menus.items():
             self.create_menu(menu_name, options, menu_commands)
 
+        # Display selected microcontroller label
+        self.microcontroller_label = tk.Label(
+            self.menu_bar,
+            text="(Aucun microcontrôleur n'est choisi)",
+            bg="#333333",
+            fg="white",
+            font=("FiraCode-Bold", 12),
+        )
+        self.microcontroller_label.pack(side="right", padx=10)
+
         # Bind to parent to close dropdowns when clicking outside
         self.parent.bind("<Button-1>", self.close_dropdown, add="+")
         self.canvas.bind("<Button-1>", self.close_dropdown, add="+")
@@ -175,20 +181,24 @@ def confirm_selection():
             print(f"Selected option: {selected_option}")
             self.selected_microcontroller = selected_option
             print(f"{selected_option} selected.")
+            # Update the label text
+            self.microcontroller_label.config(text=self.selected_microcontroller)
             dialog.destroy()
 
-        confirm_button = Button(dialog, text="Confirm", command=confirm_selection)
+        confirm_button = Button(dialog, text="Confirmer", command=confirm_selection)
         confirm_button.pack(pady=10)
 
     def show_correspondence_table(self):
         """Displays the correspondence table between pin_io objects and microcontroller pins in a table format."""
         if self.selected_microcontroller is None:
-            messagebox.showwarning("No Microcontroller Selected", "Please select a microcontroller first.")
+            messagebox.showwarning(
+                "Aucun microcontrôleur sélectionné", "Veuillez d'abord sélectionner un microcontrôleur."
+            )
             return
 
         pin_mappings = MICROCONTROLLER_PINS.get(self.selected_microcontroller)
         if not pin_mappings:
-            messagebox.showerror("Error", f"No pin mappings found for {self.selected_microcontroller}.")
+            messagebox.showerror("Erreur", f"Aucun mappage de broches trouvé pour {self.selected_microcontroller}.")
             return
 
         input_pins = pin_mappings["input_pins"]
@@ -197,44 +207,50 @@ def show_correspondence_table(self):
         # Gather pin_io objects from current_dict_circuit
         pin_ios = [value for key, value in self.current_dict_circuit.items() if key.startswith("_io_")]
 
-        # Separate pin_ios into inputs and outputs
+        # Separate pin_ios into inputs, outputs, and clocks
         input_pin_ios = [pin for pin in pin_ios if pin["type"] == INPUT]
         output_pin_ios = [pin for pin in pin_ios if pin["type"] == OUTPUT]
+        clock_pin_ios = [pin for pin in pin_ios if pin["type"] == CLOCK]
+
+        # Ensure only one CLOCK type
+        if len(clock_pin_ios) > 1:
+            messagebox.showerror("Erreur d'horloge", "Une seule HORLOGE est autorisée.")
+            return
 
-        # Check if we have more pin_ios than available pins
+        # Check pin counts
         if len(input_pin_ios) > len(input_pins):
             messagebox.showerror(
-                "Too Many Inputs",
-                f"You have {len(input_pin_ios)} input pin_ios but only "
-                f"{len(input_pins)} available input pins on the microcontroller.",
+                "Trop d'entrées",
+                f"Vous avez {len(input_pin_ios)} broches d'entrée, mais seulement "
+                f"{len(input_pins)} broches d'entrée disponibles sur le microcontrôleur.",
             )
             return
         if len(output_pin_ios) > len(output_pins):
             messagebox.showerror(
-                "Too Many Outputs",
-                f"You have {len(output_pin_ios)} output pin_ios but only "
-                f"{len(output_pins)} available output pins on the microcontroller.",
+                "Trop de sorties",
+                f"Vous avez {len(output_pin_ios)} broches de sortie, mais seulement "
+                f"{len(output_pins)} broches de sortie disponibles sur le microcontrôleur.",
             )
             return
 
         # Create a new window for the correspondence table
         table_window = tk.Toplevel(self.parent)
         table_window.title("Correspondence Table")
-        table_window.geometry("400x300")
+        table_window.geometry("500x350")
 
         # Create a Treeview widget for the table
-        tree = ttk.Treeview(table_window, columns=("ID", "Type", "MCU Pin"), show="headings", height=10)
+        tree = ttk.Treeview(table_window, columns=("ID", "Type", "MCU Pin"), show="headings", height=15)
         tree.pack(expand=True, fill="both", padx=10, pady=10)
 
         # Define columns and headings
         tree.column("ID", anchor="center", width=120)
-        tree.column("Type", anchor="center", width=80)
+        tree.column("Type", anchor="center", width=120)
         tree.column("MCU Pin", anchor="center", width=120)
         tree.heading("ID", text="Pin IO ID")
         tree.heading("Type", text="Type")
         tree.heading("MCU Pin", text="MCU Pin")
 
-        # Populate the table with input and output pin mappings
+        # Populate the table with input, output, and clock pin mappings
         for idx, pin_io in enumerate(input_pin_ios):
             mcu_pin = input_pins[idx]
             pin_number = pin_io["id"].split("_")[-1]
@@ -245,6 +261,11 @@ def show_correspondence_table(self):
             pin_number = pin_io["id"].split("_")[-1]
             tree.insert("", "end", values=(pin_number, "Output", mcu_pin))
 
+        if clock_pin_ios:
+            clock_pin = pin_mappings["clock_pin"]
+            pin_number = clock_pin_ios[0]["id"].split("_")[-1]
+            tree.insert("", "end", values=(pin_number, "clk input", clock_pin))
+
         # Add a scrollbar if the list gets too long
         scrollbar = ttk.Scrollbar(table_window, orient="vertical", command=tree.yview)
         tree.configure(yscroll=scrollbar.set)
@@ -388,7 +409,7 @@ def new_file(self):
         self.board.draw_blank_board_model()
 
         print("New file created.")
-        messagebox.showinfo("New File", "A new circuit has been created.")
+        messagebox.showinfo("Nouveau fichier", "Un nouveau circuit a été créé.")
 
     def open_file(self):
         """Handler for the 'Open' menu item."""
@@ -409,9 +430,9 @@ def open_file(self):
 
                 for key, val in circuit_data.items():
                     if key == "_battery_pos_wire":
-                        battery_pos_wire_end = val['end']
+                        battery_pos_wire_end = val["end"]
                     elif key == "_battery_neg_wire":
-                        battery_neg_wire_end = val['end']
+                        battery_neg_wire_end = val["end"]
 
                 self.board.draw_blank_board_model(
                     x_o,
@@ -433,10 +454,12 @@ def open_file(self):
                     else:
 
                         print(f"Unspecified component: {key}")
-                messagebox.showinfo("Open File", f"Circuit loaded from {file_path}")
+                messagebox.showinfo("Ouvrir un fichier", f"Circuit chargé depuis {file_path}")
             except Exception as e:
                 print(f"Error loading file: {e}")
-                messagebox.showerror("Open Error", f"An error occurred while opening the file:\n{e}")
+                messagebox.showerror(
+                    "Erreur d'ouverture", f"Une erreur s'est produite lors de l'ouverture du fichier:\n{e}"
+                )
                 raise e
         else:
             print("Open file cancelled.")
@@ -514,17 +537,19 @@ def save_file(self):
                     if "label" in comp_data:
                         comp_data["label"] = comp_data["type"]
                     if "wire" in key:
-                        comp_data.pop("XY", None) # Remove XY, will be recalculated anyway
+                        comp_data.pop("XY", None)  # Remove XY, will be recalculated anyway
                     if key == "_battery":
                         comp_data.pop("battery_rect", None)
                 # Save the data to a JSON file
                 with open(file_path, "w", encoding="utf-8") as file:
                     json.dump(circuit_data, file, indent=4)
                 print(f"Circuit saved to {file_path}")
-                messagebox.showinfo("Save Successful", f"Circuit saved to {file_path}")
+                messagebox.showinfo("Sauvegarde réussie", f"Circuit sauvegardé dans {file_path}")
             except (TypeError, KeyError) as e:
                 print(f"Error saving file: {e}")
-                messagebox.showerror("Save Error", f"An error occurred while saving the file:\n{e}")
+                messagebox.showerror(
+                    "Erreur de sauvegarde", f"Une erreur s'est produite lors de la sauvegarde du fichier:\n{e}"
+                )
         else:
             print("Save file cancelled.")
 
@@ -535,7 +560,7 @@ def configure_ports(self):
         if len(options) == 0:
             message = "No COM ports available. Please connect a device and try again."
             print(message)
-            messagebox.showwarning("No COM Ports", message)
+            messagebox.showwarning("Pas de ports COM", message)
         else:
             dialog = tk.Toplevel(self.parent)
             dialog.title("Configure Ports")
@@ -569,7 +594,7 @@ def open_documentation(self):
     def about(self):
         """Handler for the 'About' menu item."""
         print("About this software")
-        messagebox.showinfo("About", "ArduinoLogique v1.0\nSimulateur de circuits logiques")
+        messagebox.showinfo("À propos", "ArduinoLogique v1.0\nSimulateur de circuits logiques")
 
     def open_port(self):
         """Handler for the 'Open Port' menu item."""

sidebar.py

@@ -122,7 +122,7 @@ def load_chip_images(self, img_path) -> dict[str, tk.PhotoImage]:
         images_dict: dict[str, tk.PhotoImage] = {}
 
         if not os.path.isdir(img_path):
-            messagebox.showerror("Error", f"Chip images directory '{img_path}' not found.")
+            messagebox.showerror("Erreur", f"Répertoire des images de puces '{img_path}' introuvable.")
             return images_dict
 
         supported_formats = (".png", ".gif", ".ppm", ".pgm")
@@ -139,7 +139,7 @@ def load_chip_images(self, img_path) -> dict[str, tk.PhotoImage]:
                     print(f"Loaded and scaled chip image: {filename}")
                 except (tk.TclError, FileNotFoundError) as e:
                     print(f"Error loading image '{filename}': {e}")
-                    messagebox.showwarning("Image Load Error", f"Failed to load '{filename}'.")
+                    messagebox.showwarning("Erreur de chargement d'image", f"Échec du chargement de '{filename}'.")
         return images_dict
 
     def create_search_bar(self, sidebar_frame):
@@ -152,7 +152,7 @@ def create_search_bar(self, sidebar_frame):
 
         # Search label
         search_label = tk.Label(
-            search_frame, text="Search Chips", bg="#333333", fg="#479dff", font=("Arial", 10, "bold")
+            search_frame, text="Rechercher des composants", bg="#333333", fg="#479dff", font=("Arial", 10, "bold")
         )
         search_label.pack(anchor="w")
 
@@ -174,7 +174,7 @@ def create_chips_area(self, sidebar_frame):
 
         # Chips label
         chips_label = tk.Label(
-            chips_label_frame, text="Available Chips", bg="#333333", fg="#479dff", font=("Arial", 10, "bold")
+            chips_label_frame, text="Composants disponibles", bg="#333333", fg="#479dff", font=("Arial", 10, "bold")
         )
         chips_label.pack(anchor="w")
 
@@ -264,7 +264,7 @@ def create_manage_button(self, sidebar_frame):
         """
         manage_button = Button(
             sidebar_frame,
-            text="Manage Components",
+            text="Gérer les composants",
             bg="#333333",  # Matching the sidebar's background to simulate transparency
             fg="white",
             activebackground="#333333",
@@ -405,7 +405,7 @@ def place_chip_at(self, x, y, chip_name):
         print(f"Nearest grid point: {nearest_x}, {nearest_y}, Column: {column}, Line: {line}")
 
         if column is None or line is None:
-            messagebox.showerror("Placement Error", "No grid point found nearby.")
+            messagebox.showerror("Erreur de placement", "Aucun point de grille trouvé à proximité.")
             return
 
         try:
@@ -414,7 +414,7 @@ def place_chip_at(self, x, y, chip_name):
                 raise IndexError()
         except IndexError as e:
             print(f"Error: {e}")
-            messagebox.showerror("Error", f"Unknown chip: {chip_name}")
+            messagebox.showerror("Erreur", f"Puces inconnues : {chip_name}")
             return
 
         chip_dict["internalFunc"] = self.sketcher.internal_func
@@ -496,7 +496,7 @@ def manage_components(self):
             with subprocess.Popen(["open", path] if sys.platform == "darwin" else ["xdg-open", path]):
                 pass
         else:
-            messagebox.showerror("Error", "Unsupported operating system.")
+            messagebox.showerror("Erreur", "Système d'exploitation non pris en charge.")
 
     def on_search(self, _):
         """