element creation

Author: Mohammed Sadique

lib/matplotex/figure/areal.ex

@@ -442,6 +442,9 @@ defmodule Matplotex.Figure.Areal do
   defp maybe_wrap_with_sizes(transformed, %Dataset{sizes: sizes} = dataset) when length(transformed) == length(sizes) do
    {Enum.zip(transformed,sizes), dataset}
   end
+  defp maybe_wrap_with_sizes(transformed, %Dataset{colors: colors, marker_size: marker_size} = dataset) when length(transformed) == length(colors) do
+    {Enum.zip(transformed,List.duplicate(marker_size,length(transformed))),dataset }
+  end
   defp maybe_wrap_with_sizes(transformed, dataset) do
     {transformed, dataset}
   end

lib/matplotex/figure/areal/scatter.ex

@@ -88,14 +88,38 @@ defmodule Matplotex.Figure.Areal.Scatter do
     elements = elements ++ line_elements
     %Figure{figure | axes: %{axes | element: elements}}
   end
-
   def capture(%Dataset{transformed: transformed} = dataset, concurrency) do
     if concurrency do
       process_concurrently(transformed, concurrency, [[], dataset])
     else
       capture(transformed, [], dataset)
     end
   end
+  def capture([{{{x, y}, s},color}| to_capture],captured, %Dataset{
+    marker: marker,
+  }= dataset) do
+    capture(
+      to_capture,
+      captured ++
+        [
+          Marker.generate_marker(marker, x, y, color, s)
+        ],
+      dataset
+    )
+  end
+  def capture([{{x, y}, s}| to_capture],captured, %Dataset{
+    color: color,
+    marker: marker,
+  }= dataset) do
+    capture(
+      to_capture,
+      captured ++
+        [
+          Marker.generate_marker(marker, x, y, color, s)
+        ],
+      dataset
+    )
+  end
 
   def capture(
         [{x, y} | to_capture],
@@ -116,6 +140,7 @@ defmodule Matplotex.Figure.Areal.Scatter do
     )
   end
 
+
   def capture(_, captured, _), do: captured
 
   @impl Areal

test/matplotex/figure/areal/scatter_test.exs

@@ -14,6 +14,17 @@ defmodule Matplotex.Figure.Areal.ScatterTest do
       assert %Figure{axes: %{data: {x, _y}, element: elements}} = Scatter.materialize(figure)
       assert Enum.count(elements, fn elem -> elem.type == "plot.marker" end) == length(x)
     end
+    test "generates elements with various saizes if it passed a size attrbute" do
+      x = [1,2,3,4,5]
+      y = [10, 20, 30, 40, 50]
+      sizes = [1, 2, 3, 4, 5]
+      assert %Figure{axes: %{element: elements}} = x|>Matplotex.scatter(y, sizes: sizes)|>Figure.materialize()
+     [h | tail] =  elements|>Enum.filter(fn x -> x.type == "plot.marker" end)|>Enum.map(fn x ->
+        x.r
+      end)
+     refute Enum.all?(tail, fn x -> x == h end)
+
+    end
   end
 
   describe "generate_ticks/2" do
@@ -38,6 +49,16 @@ defmodule Matplotex.Figure.Areal.ScatterTest do
       assert Enum.all?(transformed, &match?({{_,_},_}, &1))
 
     end
+    test "zips transformed values with marker size if colors exist without sizes" do
+      x = [1,2,3,4,5]
+      y = [10, 20, 30, 40, 50]
+      colors = [1, 2, 3, 4, 5]
+      width = 2
+      height = 2
+      assert %Figure{axes: %{dataset: [%Dataset{marker_size: _marker_size} = dataset]}} = x|>Matplotex.scatter(y,figsize: {width, height}, colors: colors)
+      assert %Dataset{transformed: transformed} = Areal.do_transform(dataset, Enum.min_max(x), Enum.min_max(y),width, height, {0,0})
+      assert Enum.all?(transformed, &match?({{{_,_},_marker_size},_}, &1))
+    end
     test "zips transformed values with colors if the dataset contanis colors" do
       x = [1,2,3,4,5]
       y = [10, 20, 30, 40, 50]
@@ -47,7 +68,7 @@ defmodule Matplotex.Figure.Areal.ScatterTest do
       assert %Figure{axes: %{dataset: [dataset]}} = x|>Matplotex.scatter(y,figsize: {width, height}, colors: colors)
       assert %Dataset{transformed: transformed} = Areal.do_transform(dataset, Enum.min_max(x), Enum.min_max(y),width, height, {0,0})
 
-      assert Enum.all?(transformed, &match?({{_,_},_}, &1))
+      assert Enum.all?(transformed, &match?({{{_,_},_},_}, &1))
 
     end
 
@@ -64,5 +85,8 @@ defmodule Matplotex.Figure.Areal.ScatterTest do
       assert Enum.all?(transformed, &match?({{{_,_},_},_}, &1))
 
     end
+
   end
+
+
 end