cmap

Author: Mohammed Sadique

lib/matplotex/colorscheme/colormap.ex

@@ -19,7 +19,7 @@ defmodule Matplotex.Colorscheme.Colormap do
   def fetch_cmap(cmap) when is_binary(cmap), do: cmap |> String.to_atom() |> fetch_cmap()
 
   def fetch_cmap(cmap) do
-    apply(Colormap, cmap, []) |> make_colormap()
+    apply(__MODULE__, cmap, []) |> make_colormap()
   end
   def make_colormap(colors) do
     size = length(colors)

lib/matplotex/colorscheme/garner.ex

@@ -1,4 +1,5 @@
 defmodule Matplotex.Colorscheme.Garner do
+alias Matplotex.Colorscheme.Rgb
 alias Matplotex.Colorscheme.Blender
 alias Matplotex.InputError
 alias Matplotex.Colorscheme.Colormap
@@ -16,29 +17,34 @@ alias Matplotex.Colorscheme.Colormap
   defp fetch_from_cmap(cmap) do
     cmap
     |>Colormap.fetch_cmap()
+    |>to_rgb()
     |>place_edges()
   end
 
   defp put_range(%__MODULE__{} = garner, range, cue) do
     %__MODULE__{garner | range: range, color_cue: cue}
   end
 
+  defp to_rgb(color_map) do
+    Enum.map(color_map, &Rgb.from_cmap!(&1))
+  end
+
   defp place_edges([preceeding, minor, major,final]) do
-    %__MODULE__{preceeding: preceeding, minor: minor, major: major, final: final}
+    %__MODULE__{preceeding: preceeding.color, minor: minor.color, major: major.color, final: final.color}
   end
   defp place_edges(_) do
     raise InputError, message: "Invalid colormap"
   end
 
   defp point_color(%__MODULE__{color_cue: cue, preceeding: preceeding, minor: minor}) when cue < minor do
-    Blender.mix(minor, preceeding, cue)
+   minor|> Blender.mix(preceeding, cue)|> Rgb.to_string()
   end
 
   defp point_color(%__MODULE__{color_cue: cue, minor: minor, major: major}) when cue < major do
-    Blender.mix(minor, major, cue)
+   major|> Blender.mix(minor, cue)|> Rgb.to_string()
   end
 
   defp point_color(%__MODULE__{color_cue: cue, major: major, final: final}) when cue >= major do
-    final
+    final|> Blender.mix(major)|> Rgb.to_string()
   end
  end

lib/matplotex/colorscheme/rgb.ex

@@ -1,6 +1,6 @@
 defmodule Matplotex.Colorscheme.Rgb do
   @moduledoc false
-
+alias Matplotex.Colorscheme.Colormap
   defstruct [
     red: 0.0, # 0-255
     green: 0.0, # 0-255
@@ -56,8 +56,28 @@ defmodule Matplotex.Colorscheme.Rgb do
   defp to_hex(value) when is_integer(value), do:
     Integer.to_string(value, 16)
 
+    def from_hex!(input) do
+      {:ok, color} = from_hex(input)
+      color
+    end
+
+    def from_cmap!(%Colormap{color: color} = cmap) do
+     %Colormap{cmap | color: from_hex!(color) }
+    end
+
+    def from_hex("#" <> <<r :: binary-size(2), g :: binary-size(2), b :: binary-size(2)>>) do
+      {:ok, rgb(parse_hex(r), parse_hex(g), parse_hex(b))}
+    end
+    def from_hex("#" <> <<r :: binary-size(1), g :: binary-size(1), b :: binary-size(1)>>) do
+      {:ok, rgb(parse_hex(r <> r), parse_hex(g <> g), parse_hex(b <> b))}
+    end
+
+    defp parse_hex(s), do: String.to_integer(s, 16)
+
+
 end
 
+
 defimpl String.Chars, for: CssColors.RGB do
 def to_string(struct) do
  Matplotex.Colorscheme.Rgb.to_string(struct)

test/matplotex/colorscheme/garner_test.exs

@@ -6,7 +6,10 @@ defmodule Matplotex.Colorscheme.GarnerTest 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")
-      assert is_binary(color)
+      assert is_color(color)
     end
   end
+
+  defp is_color("#" <> <<_r :: binary-size(2), _g :: binary-size(2), _b :: binary-size(2)>>), do: true
+  defp is_color(_), do: false
 end

test/matplotex/figure/areal/scatter_test.exs

@@ -12,6 +12,7 @@ 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
+
   end
 
   describe "generate_ticks/2" do