Stream

Canvas.Core/Shapes/GroupShape.cs

@@ -7,34 +7,6 @@ namespace Canvas.Core.Shapes
 {
   public class GroupShape : Shape
   {
-    /// <summary>
-    /// Get series
-    /// </summary>
-    /// <param name="view"></param>
-    /// <param name="coordinates"></param>
-    /// <returns></returns>
-    public override IDictionary<string, IList<double>> GetSeries(DataModel view, DataModel coordinates)
-    {
-      var group = this;
-      var groups = new Dictionary<string, IList<double>>();
-
-      if (group?.Groups?.Count <= 0)
-      {
-        return base.GetSeries(view, coordinates);
-      }
-
-      group.Groups.TryGetValue(Composer?.Name ?? string.Empty, out IShape series);
-
-      if (series?.Groups is null)
-      {
-        return null;
-      }
-
-      series.Groups.ForEach(o => groups[o.Key] = o.Value?.GetSeriesValues(view, coordinates));
-
-      return groups;
-    }
-
     /// <summary>
     /// Grouping implementation
     /// </summary>

Canvas.Core/Shapes/Shape.cs

@@ -179,10 +179,27 @@ public virtual void CreateShape(int index, string name, IList<IShape> items)
     /// <returns></returns>
     public virtual IDictionary<string, IList<double>> GetSeries(DataModel view, DataModel coordinates)
     {
-      return new Dictionary<string, IList<double>>
+      var group = this;
+      var groups = new Dictionary<string, IList<double>>();
+
+      if (group?.Groups?.Count <= 0)
       {
-        [Composer.Name] = GetSeriesValues(view, coordinates)
-      };
+        return new Dictionary<string, IList<double>>
+        {
+          [Composer.Name] = GetSeriesValues(view, coordinates)
+        };
+      }
+
+      group.Groups.TryGetValue(Composer?.Name ?? string.Empty, out IShape series);
+
+      if (series?.Groups is null)
+      {
+        return null;
+      }
+
+      series.Groups.ForEach(o => groups[o.Key] = o.Value?.GetSeriesValues(view, coordinates));
+
+      return groups;
     }
 
     /// <summary>