serialization: You can load .json files that don't have terminal positions in them now

Models/Components/CustomComponent.cs

@@ -135,7 +135,7 @@ public override void DrawSelection(DrawingContext ctx)
         );
     }
 
-    protected void AddTerminalPoints()
+    public override void AddTerminalPoints(bool notMode = false)
     {
         // Snap to multiples of Grid Spacing
         Point SnapToGrid(Point pt)

Models/Components/DLatch.cs

@@ -72,7 +72,7 @@ public override void DrawSelection(DrawingContext ctx)
         );
     }
 
-    private void AddTerminalPoints()
+    public override void AddTerminalPoints(bool notMode = false)
     {
         Point SnapToGrid(Point pt)
         {

Models/Components/Decoder.cs

@@ -77,7 +77,7 @@ public override void DrawSelection(DrawingContext ctx)
         );
     }
 
-    protected void AddTerminalPoints()
+    public override void AddTerminalPoints(bool notMode = false)
     {
         Point SnapToGrid(Point pt)
         {

Models/Components/Demultiplexer.cs

@@ -82,7 +82,7 @@ public override void DrawSelection(DrawingContext ctx)
     }
 
     // Layout: one data input on the left (centered vertically), selection lines at bottom, many outputs on right
-    protected void AddTerminalPoints()
+    public override void AddTerminalPoints(bool notMode = false)
     {
         // Helper to snap to nearest grid
         Point SnapToGrid(Point pt)

Models/Components/Encoder.cs

@@ -85,7 +85,7 @@ public override void DrawSelection(DrawingContext ctx)
         );
     }
 
-    protected void AddTerminalPoints()
+    public override void AddTerminalPoints(bool notMode = false)
     {
         Point SnapToGrid(Point pt)
         {

Models/Components/JKLatch.cs

@@ -83,7 +83,7 @@ public override void DrawSelection(DrawingContext ctx)
         );
     }
 
-    private void AddTerminalPoints()
+    public override void AddTerminalPoints(bool notMode = false)
     {
         Point SnapToGrid(Point pt)
         {

Models/Components/Multiplexer.cs

@@ -75,7 +75,7 @@ public override void DrawSelection(DrawingContext ctx)
     }
 
     // Inputs are on the left, output on right, selection lines at bottom
-    protected void AddTerminalPoints()
+    public override void AddTerminalPoints(bool notMode = false)
     {
         // Helper to snap to nearest multiple of 10
         Point SnapToGrid(Point pt)

Models/Components/SRLatch.cs

@@ -83,7 +83,7 @@ public override void DrawSelection(DrawingContext ctx)
         );
     }
 
-    private void AddTerminalPoints()
+    public override void AddTerminalPoints(bool notMode = false)
     {
         Point SnapToGrid(Point pt)
         {

Models/Components/TLatch.cs

@@ -76,7 +76,7 @@ public override void DrawSelection(DrawingContext ctx)
         );
     }
 
-    private void AddTerminalPoints()
+    public override void AddTerminalPoints(bool notMode = false)
     {
         Point SnapToGrid(Point pt)
         {

Models/Components/Wire.cs

@@ -38,10 +38,7 @@ public Wire() : base(0, 0)
         IsCommitted = false;
     }
 
-    // DTO pattern for serializing
-
 
-
     public void AddPoint(Point point)
     {
         Points.Add(point);

Models/Core/Component.cs

@@ -80,6 +80,11 @@ public virtual bool HitTest(Point point)
         return new Rect(0,0,Width,Height).Contains(point);
     }
 
+    public virtual void AddTerminalPoints(bool notMode = false)
+    {
+
+    }
+
     public override void Render(DrawingContext context)
     {
         // Applies rotation to the drawing

Models/Core/Gate.cs

@@ -148,7 +148,7 @@ public override void DrawSelection(DrawingContext ctx)
 
     // The points are added differently for NOT-variants (NAND, NOT, NOR, XNOR)
     // notMode: Extra wire length to account for the bubble
-    protected void AddTerminalPoints(bool notMode = false)
+    public override void AddTerminalPoints(bool notMode = false)
     {
         double spacing = Height / (InputLineCount + 1);
 

Models/DTOs/CircuitDto.cs

@@ -38,6 +38,7 @@ public static List<Component> ToCircuit(CircuitDto circuit)
             {
                 terminal.Wires = terminal.Wires.Select(w => wireDict[w.Id]).ToList();
             }
+
         }
 
 

Models/DTOs/ComponentDto.cs

@@ -1,6 +1,7 @@
 using System.Collections.Generic;
 using System.Linq;
 using System.Reflection;
+using Avalonia;
 using Avalonia.Controls;
 using IRis.Models.Components;
 using IRis.Models.Core;
@@ -8,8 +9,8 @@
 namespace IRis.Models.DTOs;
 public class ComponentDto
 {
     public string Type { get; set; }
     public List<TerminalDto> Terminals { get; set; }
 
     public int InputLineCount { get; set; }
     public int SelectionLineCount { get; set; }
@@ -27,7 +28,7 @@
         return new ComponentDto()
         {
             // Get only the type name, without the full namespace
             Type = c.ToString().Split(".")[^1],
 
             InputLineCount = c.InputLineCount,
             SelectionLineCount = c.SelectionLineCount,
@@ -38,7 +39,7 @@
             Y = Canvas.GetTop(c),
 
             StoredStates = c.StoredStates,
             Terminals = c.Terminals.Select(p => TerminalDto.ToDto(p)).ToList(),
 
         };
     }
@@ -78,8 +79,14 @@
         result.Rotation = dto.Rotation;
         result.IsSelected = dto.IsSelected;
         result.StoredStates = dto.StoredStates;
-        result.Terminals = dto.Terminals.Select(p => TerminalDto.ToTerminal(p)).ToArray();
-
+
+        // Add terminal positions here by calling the function that generates them
+        result.AddTerminalPoints();
+        for (int i = 0; i < dto.Terminals.Count; i++)
+        {
+            result.Terminals[i].Wires = TerminalDto.ToTerminal(dto.Terminals[i]).Wires;
+        }
+
         Canvas.SetLeft(result, dto.X);
         Canvas.SetTop(result, dto.Y);
 

Models/DTOs/TerminalDto.cs

@@ -9,15 +9,13 @@
 
 public class TerminalDto
 {
-    public Point Position { get; set; }
 
     public List<Guid> ConnectedWireIds { get; set; }
 
     public static TerminalDto ToDto(Terminal t)
     {
         return new TerminalDto()
         {
-            Position = t.Position,
             ConnectedWireIds = t.Wires.Select(w => w.Id).ToList(),
         };
     }
@@ -26,7 +24,8 @@
     // This is required for post processing
     public static Terminal ToTerminal(TerminalDto dto)
     {
-        return new Terminal(dto.Position)
+        // Placeholder position
+        return new Terminal(new Point(1,1))
         {
             Wires = dto.ConnectedWireIds.Select(p => new Wire(){Id = p}).ToList()
         };