save and open inclusion

Author: abbou169

breadboard.py

@@ -183,7 +183,7 @@ def draw_matrix_points(self, scale=1):  # used to debug the matrix
             radius = 2 * scale  # Adjust size as needed
             self.canvas.create_oval(x - radius, y - radius, x + radius, y + radius, fill=color, outline="")
 
-    def draw_blank_board_model(self, x_origin: int = 50, y_origin: int = 10):
+    def draw_blank_board_model(self, x_origin: int = 50, y_origin: int = 10, battery_pos_wire_end=None, battery_neg_wire_end=None):
         """
         Draws a blank breadboard model on the canvas.
         """
@@ -253,4 +253,9 @@ def draw_blank_board_model(self, x_origin: int = 50, y_origin: int = 10):
 
         battery_x = x_origin + 1200  # Adjust as needed for proper positioning
         battery_y = y_origin + 300   # Adjust as needed for proper positioning
-        self.sketcher.draw_battery(battery_x, battery_y)
+        self.sketcher.draw_battery(
+            battery_x,
+            battery_y,
+            pos_wire_end=battery_pos_wire_end,
+            neg_wire_end=battery_neg_wire_end,
+        )

component_sketch.py

@@ -2673,15 +2673,15 @@ def clear_board(self):
         # TODO Khalid update the Circuit instance
 
 
-    def draw_battery(self, x_distance, y_distance, scale=1, width=-1, direction=HORIZONTAL, **kwargs):
+    def draw_battery(self, x_distance, y_distance, scale=1, width=-1, direction=HORIZONTAL, pos_wire_end=None, neg_wire_end=None, **kwargs):
         """
         Draws a battery at the given coordinates with two hanging wires.
         """
         if width != -1:
             scale = width / 9.0
 
         inter_space = 15 * scale
-        thickness = 1 * self.scale_factor  # Adjusted thickness
+        thickness = 1 * self.scale_factor
 
         battery_id = '_battery'
 
@@ -2777,15 +2777,21 @@ def draw_battery(self, x_distance, y_distance, scale=1, width=-1, direction=HORI
         pos_wire_id = '_battery_pos_wire'
         pos_wire_start_x = battery_x
         pos_wire_start_y = battery_y + battery_height - 15 * scale
-        pos_wire_end_x = battery_x - 100 * scale  # Wires go to the left
-        pos_wire_end_y = pos_wire_start_y
+        if pos_wire_end:
+            pos_wire_end_x, pos_wire_end_y = pos_wire_end
+        else:
+            pos_wire_end_x = battery_x - 100 * scale  # Wires go to the left
+            pos_wire_end_y = pos_wire_start_y
 
         # Negative wire (from the '-' sign at the top)
         neg_wire_id = '_battery_neg_wire'
         neg_wire_start_x = battery_x
         neg_wire_start_y = battery_y + 15 * scale
-        neg_wire_end_x = battery_x - 100 * scale  # Wires go to the left
-        neg_wire_end_y = neg_wire_start_y
+        if neg_wire_end:
+            neg_wire_end_x, neg_wire_end_y = neg_wire_end
+        else:
+            neg_wire_end_x = battery_x - 100 * scale  # Wires go to the left
+            neg_wire_end_y = neg_wire_start_y
 
         # Use draw_battery_wire to draw the wires with similar appearance to draw_wire
         # Positive wire

menus.py

@@ -13,7 +13,7 @@
 
 from breadboard import Breadboard
 
-from dataCDLT import INPUT, OUTPUT
+from dataCDLT import INPUT, OUTPUT, USED
 
 MICROCONTROLLER_PINS = {
     "Arduino Mega": {
@@ -117,7 +117,7 @@ def __init__(
                 "NodeMCU ESP32"
             ],
             "Ports": ["Configure Ports"],
-            "Export": ["Show Correspondence Table"],
+            "Export": ["Correspondence Table"],
             "Help": ["Documentation", "About"],
         }
 
@@ -344,6 +344,8 @@ def new_file(self):
         # Clear the canvas and reset the circuit
         self.board.sketcher.clear_board()
         self.board.fill_matrix_1260_pts()
+        self.board.draw_blank_board_model()
+
         print("New file created.")
         messagebox.showinfo("New File", "A new circuit has been created.")
 
@@ -363,6 +365,23 @@ def open_file(self):
                 x_o, y_o = self.board.sketcher.id_origins["xyOrigin"]
                 self.board.sketcher.circuit(x_o, y_o, model=[])
 
+                battery_pos_wire_end = None
+                battery_neg_wire_end = None
+
+                for key, val in circuit_data.items():
+                    if key == "_battery_pos_wire":
+                        battery_pos_wire_end = val['end']
+                    elif key == "_battery_neg_wire":
+                        battery_neg_wire_end = val['end']
+
+                # Redraw the blank board model, including the battery with wire positions
+                self.board.draw_blank_board_model(
+                    x_o,
+                    y_o,
+                    battery_pos_wire_end=battery_pos_wire_end,
+                    battery_neg_wire_end=battery_neg_wire_end,
+                )
+
                 for key, val in circuit_data.items():
                     if "chip" in key:
                         x, y = val["XY"]
@@ -378,7 +397,7 @@ def open_file(self):
                         ]
                         self.board.sketcher.circuit(x, y, model=model_chip)
 
-                    elif "wire" in key:
+                    elif "wire" in key and not key.startswith("_battery"):
                         model_wire = [
                             (
                                 self.board.sketcher.draw_wire,
@@ -433,6 +452,8 @@ def save_file(self):
                         comp_data["label"] = comp_data["type"]
                     if "wire" in key:
                         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)