Draw any DrawableContainers using color of the elements.

Author: awulkiew

Visual_Studio_2017/GraphicalDebugging/Colors.cs

@@ -71,7 +71,6 @@ public void Update()
                 MultiLinestringColor = Color.DarkGreen;
                 MultiPolygonColor = Color.FromArgb(0xFF, 0, 0, 128);
                 TurnColor = Color.DarkOrange;
-                GeometriesContainerColor = Color.SaddleBrown;
             }
             else
             {
@@ -95,7 +94,6 @@ public void Update()
                 MultiLinestringColor = Color.FromArgb(0xFF, 128, 172, 128);
                 MultiPolygonColor = Color.FromArgb(0xFF, 128, 128, 172);
                 TurnColor = Color.FromArgb(0xFF, 255, 197, 128);
-                GeometriesContainerColor = Color.Tan;
             }
         }
 
@@ -139,7 +137,6 @@ private float GetBrightness()
         public Color MultiLinestringColor { get; set; }
         public Color MultiPolygonColor { get; set; }
         public Color TurnColor { get; set; }
-        public Color GeometriesContainerColor { get; set; }
 
         private void CreateColors(uint[] colorValues)
         {

Visual_Studio_2017/GraphicalDebugging/ExpressionDrawer.cs

@@ -739,13 +739,24 @@ public class DrawablesContainer : List<IDrawable>, IDrawable
         {
             public void Draw(Geometry.Box box, Graphics graphics, Settings settings, Geometry.Traits traits)
             {
-                // TODO: Draw using IDrawable color?
                 for (int i = 0; i < this.Count; ++i)
                 {
                     this[i].Draw(box, graphics, settings, traits);
                 }
             }
 
+            // TODO: This overload is defined to allow drawing elements using their specific colors
+            //       Incorporate this into the IDrawable interface?
+            public void Draw(Geometry.Box box, Graphics graphics, Settings settings, Geometry.Traits traits, Colors colors)
+            {
+                for (int i = 0; i < this.Count; ++i)
+                {
+                    IDrawable drawable = this[i];
+                    settings.color = DefaultColor(drawable, colors);
+                    drawable.Draw(box, graphics, settings, traits);
+                }
+            }
+
             public Geometry.Box Aabb(Geometry.Traits traits, bool calculateEnvelope)
             {
                 Geometry.Box result = null;
@@ -1211,7 +1222,7 @@ static Color DefaultColor(IDrawable drawable, Colors colors)
                 return colors.BoxColor;
             else if (drawable is NSphere)
                 return colors.NSphereColor;
-            else if (drawable is Segment)
+            else if (drawable is Segment) // Ray, Line
                 return colors.SegmentColor;
             else if (drawable is Linestring)
                 return colors.LinestringColor;
@@ -1227,8 +1238,6 @@ static Color DefaultColor(IDrawable drawable, Colors colors)
                 return colors.MultiPolygonColor;
             else if (drawable is Turn || drawable is TurnsContainer)
                 return colors.TurnColor;
-            else if (drawable is DrawablesContainer)
-                return colors.GeometriesContainerColor;
             else
                 return colors.DrawColor;
         }
@@ -1254,7 +1263,11 @@ public static bool Draw(Graphics graphics,
                 bool fill = (traits == null);
                 if (drawable.DrawAxes())
                     Drawer.DrawAxes(graphics, aabb, unit, colors, fill);
-                drawable.Draw(aabb, graphics, settings, traits);
+                // TODO: This is ugly, it should probably be changed
+                if (drawable is DrawablesContainer)
+                    (drawable as DrawablesContainer).Draw(aabb, graphics, settings, traits, colors);
+                else
+                    drawable.Draw(aabb, graphics, settings, traits);
             }
             return true;
         }