Added property 'Color' in IShape interface. Also added loading and saving of colors in the IO

Author: MorenoB

Form1.cs

@@ -27,8 +27,6 @@ private Color PaintColor
                     return;
 
                 paintColor = value;
-
-                brush = new SolidBrush(paintColor);
             }
         }
 
@@ -52,8 +50,6 @@ private ToolItem CurrentTool
             }
         }
 
-        private SolidBrush brush;
-
         private Point dragMouseLocation = new Point(0, 0);
         private Rectangle previousShapeBounds = new Rectangle();
         private Rectangle newShapeBounds = new Rectangle();
@@ -68,7 +64,6 @@ public Form()
         {
             InitializeComponent();
 
-            brush = new SolidBrush(PaintColor);
             commandHandler = new CommandHandler();
             CurrentTool = ToolItem.None;
 
@@ -241,7 +236,7 @@ private void Picturebox_DrawArea_MouseDown(object sender, MouseEventArgs e)
                 {
                     case ToolItem.Rectangle:
 
-                        RectangleShape rectangle = new RectangleShape(brush, e.Location, Constants.SHAPE_DEFAULT_WIDTH, Constants.SHAPE_DEFAULT_HEIGHT);
+                        RectangleShape rectangle = new RectangleShape(PaintColor, e.Location, Constants.SHAPE_DEFAULT_WIDTH, Constants.SHAPE_DEFAULT_HEIGHT);
 
                         commandHandler.AddCommand(new CreateShapeCommand(rectangle));
 
@@ -250,7 +245,7 @@ private void Picturebox_DrawArea_MouseDown(object sender, MouseEventArgs e)
 
                     case ToolItem.Ellipse:
 
-                        EllipseShape ellipse = new EllipseShape(brush, e.Location, Constants.SHAPE_DEFAULT_WIDTH, Constants.SHAPE_DEFAULT_HEIGHT);
+                        EllipseShape ellipse = new EllipseShape(PaintColor, e.Location, Constants.SHAPE_DEFAULT_WIDTH, Constants.SHAPE_DEFAULT_HEIGHT);
 
                         commandHandler.AddCommand(new CreateShapeCommand(ellipse));
 

IO/Parser.cs

@@ -157,7 +157,13 @@ public static string ParseShapeList(List<IShape> shapeList)
             {
                 string stringToAdd = "";
 
-                string suffix = " " + shape.Location.X + " " + shape.Location.Y + " " + shape.Bounds.Width + " " + shape.Bounds.Height + '\r';
+                
+                string suffix = " " + shape.Location.X +
+                    " " + shape.Location.Y +
+                    " " + shape.Bounds.Width +
+                    " " + shape.Bounds.Height +
+                    " " + shape.Color.ToArgb() +
+                    '\r';
 
                 if (shape is RectangleShape)
                 {
@@ -199,16 +205,19 @@ private static List<IShape> ProcessNodesIntoShapelist(Queue<BaseNode> nodes)
                     int y = 100;
                     int width = 100;
                     int height = 100;
+                    int argb = 0;
+                    
 
                     int.TryParse(splitNodeName[1], out x);
                     int.TryParse(splitNodeName[2], out y);
                     int.TryParse(splitNodeName[3], out width);
                     int.TryParse(splitNodeName[4], out height);
+                    int.TryParse(splitNodeName[5], out argb);
 
                     if (node.Name.Contains("ellipse"))
-                        shapeToAdd = new EllipseShape(Brushes.Blue, new Point(x, y), width, height);
+                        shapeToAdd = new EllipseShape(Color.FromArgb(argb), new Point(x, y), width, height);
                     else
-                        shapeToAdd = new RectangleShape(Brushes.Blue, new Point(x, y), width, height);
+                        shapeToAdd = new RectangleShape(Color.FromArgb(argb), new Point(x, y), width, height);
                 }
 
                 if (shapeToAdd != null)

Interfaces/IShape.cs

@@ -10,6 +10,7 @@ public interface IShape
         bool WasClicked(Point p);
         HitStatus GetHitStatus(Point p);
 
+        Color Color { get; }
         int ID { get; set; }
         bool IsSelected { get; set; }
         Point Location { get; set; }

Shapes/EllipseShape.cs

@@ -29,17 +29,6 @@ public Size MinimumSize
             }
         }
 
-        public Brush Brush
-        {
-            get { return brush; }
-            set
-            {
-                if (value == brush) return;
-
-                brush = value;
-            }
-        }
-
         public Point Location
         {
             get
@@ -102,24 +91,33 @@ public int ID
             }
         }
 
+        private Color color;
+        public Color Color
+        {
+            get
+            {
+                return color;
+            }
+        }
+
         private bool isSelected;
         private int id;
 
         private GrabHandles grabHandles;
         private Rectangle bounds;
-        private Brush brush;
         private Size minimumSize;
 
-        public EllipseShape(Brush brush, Point location, int width, int height)
+        public EllipseShape(Color color, Point location, int width, int height)
         {
             this.Size = new Size(width, height);
-            this.brush = brush;
+            this.color = color;
             this.Location = location;
             this.MinimumSize = new Size(Constants.SHAPE_MINIMUM_WIDTH, Constants.SHAPE_MINIMUM_HEIGHT);
         }
 
         public void Draw(Graphics g)
         {
+            Brush brush = new SolidBrush(Color);
             g.FillEllipse(brush, Location.X, Location.Y, Size.Width, Size.Height);
 
             if (IsSelected)

Shapes/RectangleShape.cs

@@ -29,17 +29,6 @@ public Size MinimumSize
             }
         }
 
-        public Brush Brush
-        {
-            get { return brush; }
-            set
-            {
-                if (value == brush) return;
-
-                brush = value;
-            }
-        }
-
         public Point Location
         {
             get
@@ -102,25 +91,33 @@ public int ID
             }
         }
 
+        private Color color;
+        public Color Color
+        {
+            get
+            {
+                return color;
+            }
+        }
 
         private bool isSelected;
         private int id;
 
         private GrabHandles grabHandles;
         private Rectangle bounds;
-        private Brush brush;
         private Size minimumSize;
 
-        public RectangleShape(Brush brush, Point location, int width, int height)
+        public RectangleShape(Color color, Point location, int width, int height)
         {
             this.Size = new Size(width, height);
-            this.brush = brush;
+            this.color = color;
             this.Location = location;
             this.MinimumSize = new Size(Constants.SHAPE_MINIMUM_WIDTH, Constants.SHAPE_MINIMUM_HEIGHT);
         }
 
         public void Draw(Graphics g)
         {
+            Brush brush = new SolidBrush(Color);
             g.FillRectangle(brush, Location.X, Location.Y, Size.Width, Size.Height);
 
             if (IsSelected)