From 3b0bb6358f9c87ccdc6ed8ab42acdf46873d75d1 Mon Sep 17 00:00:00 2001
From: Tim Young <tim.young@lightsys.org>
Date: Sat, 24 Feb 2018 17:30:13 -0600
Subject: [PATCH] network loads and saves NetShapes

---
 EduNetworkBuilder/NetShape.cs | 4 ++++
 EduNetworkBuilder/Network.cs  | 9 +++++++++
 2 files changed, 13 insertions(+)

diff --git a/EduNetworkBuilder/NetShape.cs b/EduNetworkBuilder/NetShape.cs
index f045d3e..7607581 100644
--- a/EduNetworkBuilder/NetShape.cs
+++ b/EduNetworkBuilder/NetShape.cs
@@ -23,6 +23,10 @@ namespace EduNetworkBuilder
             InArea = Where;
             WhatColor = color;
         }
+        public NetShape(XmlNode what)
+        {
+            Load(what);
+        }
 
         /// <summary>
         /// Draw the specified shape on the image
diff --git a/EduNetworkBuilder/Network.cs b/EduNetworkBuilder/Network.cs
index dfd8dc1..fcfff56 100644
--- a/EduNetworkBuilder/Network.cs
+++ b/EduNetworkBuilder/Network.cs
@@ -68,6 +68,7 @@ namespace EduNetworkBuilder
         private List<Image> PacketImages = new List<Image>();
         private List<PingTestStatus> PingTestStats = new List<PingTestStatus>();
         private List<string> BrokenItems = new List<string>();
+        private List<NetShape> Shapes = new List<NetShape>(); //For storing simple shapes which are drawn on the network
         public bool IsRandomNetwork = false;
 
         private List<AnimationClass> Animations = new List<AnimationClass>();
@@ -271,6 +272,10 @@ namespace EduNetworkBuilder
                            StartingHelpLevel = NB.ParseEnum<NetTestVerbosity>(Individual.InnerText);
                            HintsToDisplay = StartingHelpLevel;
                             break;
+                        case "shape":
+                            NetShape nShape = new NetShape(Individual);
+                            Shapes.Add(nShape);
+                            break;
                         case "vlanname":
                             if (Individual.Attributes != null && Individual.Attributes["ID"] != null)
                             {
@@ -418,6 +423,10 @@ namespace EduNetworkBuilder
             {
                 writer.WriteElementString("tag",HT.ToString());
             }
+            foreach(NetShape shape in Shapes)
+            {
+                shape.Save(writer);
+            }
             foreach(VLANName VLAN in VlanNames)
             {
                 writer.WriteStartElement("VLANName");