picking color

Author: Mohammed Sadique

lib/matplotex/figure/areal/scatter.ex

@@ -1,5 +1,6 @@
 defmodule Matplotex.Figure.Areal.Scatter do
   @moduledoc false
+  alias Matplotex.Colorscheme.Garner
   alias Matplotex.Figure.Areal.PlotOptions
   alias Matplotex.Figure.Areal.Region
   alias Matplotex.Figure.Areal.Ticker
@@ -31,7 +32,7 @@ defmodule Matplotex.Figure.Areal.Scatter do
   def create(%Figure{axes: %__MODULE__{dataset: data} = axes} = figure, {x, y}, opts \\ []) do
     x = determine_numeric_value(x)
     y = determine_numeric_value(y)
-    dataset = Dataset.cast(%Dataset{x: x, y: y}, opts)
+    dataset = Dataset.cast(%Dataset{x: x, y: y}, opts)|> Dataset.update_cmap()
     datasets = data ++ [dataset]
     xydata = flatten_for_data(datasets)
 
@@ -97,7 +98,10 @@ defmodule Matplotex.Figure.Areal.Scatter do
   end
   def capture([{{{x, y}, s},color}| to_capture],captured, %Dataset{
     marker: marker,
+    colors: colors,
+    cmap: cmap
   }= dataset) do
+    color = colors |> Enum.min_max()|>Garner.garn_color(color, cmap)
     capture(
       to_capture,
       captured ++

lib/matplotex/figure/dataset.ex

@@ -1,5 +1,7 @@
 defmodule Matplotex.Figure.Dataset do
   @moduledoc false
+  alias Matplotex.Colorscheme.Colormap
+
   @default_color "blue"
   @default_marker "o"
   @default_linestyle "_"
@@ -31,4 +33,9 @@ defmodule Matplotex.Figure.Dataset do
   def cast(dataset, values) do
     struct(dataset, values)
   end
+
+  def update_cmap(%__MODULE__{cmap: cmap} = dataset) do
+    %__MODULE__{dataset | cmap: Colormap.fetch_cmap(cmap)}
+  end
+
 end

test/matplotex/figure/areal/scatter_test.exs

@@ -25,6 +25,22 @@ defmodule Matplotex.Figure.Areal.ScatterTest do
      refute Enum.all?(tail, fn x -> x == h end)
 
     end
+
+    test "generates elements with various saizes and colors if it passed a size and color 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, colors: 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)
+     [h | tail] =  elements|>Enum.filter(fn x -> x.type == "plot.marker" end)|>Enum.map(fn x ->
+      x.fill
+    end)
+    refute Enum.all?(tail, fn x -> x == h end)
+    end
   end
 
   describe "generate_ticks/2" do