updated color scheme

Author: Mohammed Sadique

lib/matplotex/figure/areal/plot_options.ex

@@ -1,5 +1,6 @@
 defmodule Matplotex.Figure.Areal.PlotOptions do
   @moduledoc false
+  alias Matplotex.Colorscheme.Colormap
   alias Matplotex.Figure
   alias Matplotex.Figure.TwoD
   alias Matplotex.Figure.RcParams
@@ -15,11 +16,11 @@ defmodule Matplotex.Figure.Areal.PlotOptions do
     :region_legend,
     :region_color_bar
   ]
+  @default_cmap :viridis
 
   @spec set_options_in_figure(Figure.t(), keyword()) :: Figure.t()
   def set_options_in_figure(%Figure{} = figure, opts) do
     opts = sanitize(opts)
-
     figure
     |> cast_figure(opts)
     |> cast_axes(opts)
@@ -31,11 +32,14 @@ defmodule Matplotex.Figure.Areal.PlotOptions do
   end
 
   defp cast_axes(%Figure{axes: axes} = figure, opts) do
+
     opts = Keyword.delete(opts, :label)
+    cmap = Keyword.get(opts, :cmap)
+    colors = Keyword.get(opts, :colors)
 
     %Figure{
       figure
-      | axes: axes |> struct(opts) |> cast_two_d_structs(opts)
+      | axes: axes |> struct(opts) |> cast_two_d_structs(opts)|> update_cmap(cmap, colors)
     }
   end
 
@@ -58,4 +62,14 @@ defmodule Matplotex.Figure.Areal.PlotOptions do
   defp sanitize(opts) do
     Keyword.drop(opts, @immutable_keys)
   end
+  defp update_cmap(axes, nil, colors) when is_list(colors) do
+
+    %{axes | cmap: Colormap.fetch_cmap(@default_cmap)}
+  end
+
+  defp update_cmap(axes, cmap, colors) when is_list(colors) do
+   %{axes | cmap: Colormap.fetch_cmap(cmap)}
+  end
+
+  defp update_cmap(figure, _, _), do: figure
 end

lib/matplotex/figure/cast.ex

@@ -1,7 +1,6 @@
 defmodule Matplotex.Figure.Cast do
   @moduledoc false
   alias Matplotex.Element.Rect
-  alias Matplotex.Colorscheme.Colormap
   alias Matplotex.Element.Cmap
   alias Matplotex.Figure.Lead
   alias Matplotex.Element.Legend
@@ -20,6 +19,7 @@ defmodule Matplotex.Figure.Cast do
   @ytick_type "figure.y_tick"
   @lowest_tick 0
   @zero_to_move 0
+  @cmap_id "colorGradient"
 
   def cast_spines_by_region(
         %Figure{
@@ -516,7 +516,7 @@ defmodule Matplotex.Figure.Cast do
           }
         } = figure
       )
-      when not is_nil(cmap) do
+      when is_list(cmap) do
     cmap_elements =
       datasets
       |> Enum.with_index()
@@ -575,8 +575,8 @@ defmodule Matplotex.Figure.Cast do
 
         [
           %Cmap{
-            id: "colorGradient",
-            cmap: Colormap.fetch_cmap(cmap),
+            id: @cmap_id,
+            cmap: cmap,
             container: %Rect{
               x: x_cmap,
               y: y_cmap,

test/matplotex/colorscheme/garner_test.exs

@@ -1,11 +1,13 @@
 defmodule Matplotex.Colorscheme.GarnerTest do
+  alias Matplotex.Colorscheme.Colormap
   alias Matplotex.Colorscheme.Garner
   use Matplotex.PlotCase
 
   describe "garn_color/3" do
     test "garn the color for specific point in the number" do
       colorset = [3,4,5,6,6,4,9]
-      color = Garner.garn_color(Enum.min_max(colorset), Enum.min(colorset), "viridis")
+      viridis = Colormap.fetch_cmap(:viridis)
+      color = Garner.garn_color(Enum.min_max(colorset), Enum.min(colorset), viridis)
       assert is_color(color)
     end
   end

test/matplotex/figure/areal/plot_options_test.exs

@@ -1,4 +1,5 @@
 defmodule Matplotex.Figure.Areal.PlotOptionsTest do
+  alias Matplotex.Figure
   use Matplotex.PlotCase
 
   setup do
@@ -27,5 +28,13 @@ defmodule Matplotex.Figure.Areal.PlotOptionsTest do
       refute figure.axes.element == nil
       refute figure.axes == nil
     end
+    test "updates cmap as a list by its name" do
+    assert %Figure{axes: %{cmap: cmap}} =   [1, 2, 3, 4, 5, 6]
+      |> Matplotex.plot([1, 2, 3, 4, 5],
+        cmap: "viridis",
+        colors: [3, 4, 5, 6, 7, 3, 2, 4]
+      )
+      assert is_list(cmap)
+    end
   end
 end

test/matplotex/figure/areal/scatter_test.exs

@@ -12,18 +12,6 @@ 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 "adds point with specific color with color scheme" do
-      x = [1, 3, 7, 4, 2, 5, 6]
-      y = [1, 3, 7, 4, 2, 5, 6]
-      colors = [1, 3, 7, 4, 2, 5, 6]
-
-    assert %Figure{axes: %{element: elements}} =   x
-    |> Matplotex.scatter(y, colors: colors)
-    |> Matplotex.figure(%{figsize: size, margin: margin})
-    |> Scatter.materialize()
-
-    assert elements|>Enum.filter(fn elem -> elem.type == "point.color" end)|>length()
-    end
   end
 
   describe "generate_ticks/2" do