From 90843eec0da3317e73a651a3682796ac7428f6d4 Mon Sep 17 00:00:00 2001
From: Tim Young <tim.young@lightsys.org>
Date: Thu, 1 Mar 2018 12:58:47 -0600
Subject: [PATCH] Some data validation

---
 EduNetworkBuilder/ShapeEditor.cs | 11 +++++++++--
 1 file changed, 9 insertions(+), 2 deletions(-)

diff --git a/EduNetworkBuilder/ShapeEditor.cs b/EduNetworkBuilder/ShapeEditor.cs
index 9df20dc..de06ff4 100644
--- a/EduNetworkBuilder/ShapeEditor.cs
+++ b/EduNetworkBuilder/ShapeEditor.cs
@@ -73,15 +73,18 @@ namespace EduNetworkBuilder
             lblShapes.Text = NB.Translate("SE_Shapes", OurSettings);
         }
 
-        void FillFormItems()
+        void FillFormItems(bool SaveIndex = false)
         {
             Network myNet = NB.GetNetwork();
 
+            int currentindex = lbShapeList.SelectedIndex;
+
             lbShapeList.Items.Clear();
             foreach (string one in myNet.ShapeDescriptions())
             {
                 lbShapeList.Items.Add(one);
             }
+            if (SaveIndex && currentindex >= 0) lbShapeList.SelectedIndex = currentindex;
         }
 
         void DataUpdated(object sender, EventArgs e)
@@ -157,12 +160,16 @@ namespace EduNetworkBuilder
                 int.TryParse(tbY.Text, out Y);
                 int.TryParse(tbWidth.Text, out Width);
                 int.TryParse(tbHeight.Text, out Height);
+                if (X < 0) X = 0;
+                if (Y < 0) Y = 0;
+                if (Height < 0) Height = 0;
+                if (Width < 0) Width = 0;
                 ShapeForEditing.InArea = new Rectangle(X, Y, Width, Height);
                 ShapeForEditing.FillColor = Color.FromName(cbFillColor.Text);
                 ShapeForEditing.LineColor = Color.FromName(cbLineColor.Text);
                 ShapeForEditing.MyShape = NB.TryParseEnum<NetShapeType>(cbShape.Text, NetShapeType.rectangle);
             }
-
+            FillFormItems(true); //Update the listbox
         }
 
         private void btnDone_Click(object sender, EventArgs e)