Fix battery and window size

Author: charlotrudel

arduino_logique.py

@@ -24,7 +24,7 @@ def main():
     # Creating main window
     win = tk.Tk()
     win.title("Laboratoire virtuel de circuit logique - GIF-1002")
-    win.geometry("1700x800")  # Initial window size
+    win.geometry("1500x800")  # Initial window size
     win.resizable(False, False)  # Disabling window resizing
     win.configure(bg="#333333")  # Setting consistent background color
 

breadboard.py

@@ -225,7 +225,7 @@ def draw_blank_board_model(self, x_origin: int = 50, y_origin: int = 10, battery
         ]
         self.sketcher.circuit(x_origin, y_origin, scale=self.sketcher.scale_factor, model=blank_board_model)
 
-        battery_x = x_origin + 1200  # Adjust as needed for proper positioning
+        battery_x = x_origin + 1050  # Adjust as needed for proper positioning
         battery_y = y_origin + 300   # Adjust as needed for proper positioning
 
         # Reset all matrix elements' states to FREE

component_sketch.py

@@ -2764,8 +2764,8 @@ def draw_battery(
             original_width = battery_photo.width()
             original_height = battery_photo.height()
 
-            new_width = int(original_width * scale * 0.7)
-            new_height = int(original_height * scale * 0.7)
+            new_width = int(original_width * scale * 0.4)
+            new_height = int(original_height * scale * 0.4)
 
             scale_x = new_width / original_width
             scale_y = new_height / original_height
@@ -2817,8 +2817,8 @@ def draw_battery(
         if neg_wire_end:
             neg_wire_end_x, neg_wire_end_y = neg_wire_end
         else:
-            neg_wire_end_x = neg_wire_start_x - 100 * scale  # Wires go to the left
-            neg_wire_end_y = neg_wire_start_y
+            neg_wire_end_x = neg_wire_start_x - 50 * scale  # Wires go to the left
+            neg_wire_end_y = neg_wire_start_y - 50 * scale  # Wires go up
 
         self.draw_battery_wire(
             wire_id=neg_wire_id,
@@ -2834,8 +2834,8 @@ def draw_battery(
         if pos_wire_end:
             pos_wire_end_x, pos_wire_end_y = pos_wire_end
         else:
-            pos_wire_end_x = pos_wire_start_x - 100 * scale
-            pos_wire_end_y = pos_wire_start_y
+            pos_wire_end_x = pos_wire_start_x - 50 * scale
+            pos_wire_end_y = pos_wire_start_y + 50 * scale # Wires go down
 
         self.draw_battery_wire(
             wire_id=pos_wire_id,