spline ploting

Author: Mohammed Sadique

lib/matplotex/element/polygon.ex

@@ -15,13 +15,6 @@ defmodule Matplotex.Element.Polygon do
     )
   end
 
-  defp flip_point(point, height) do
-    Enum.map(point, &flip_coord(&1, height))
-  end
-
-  defp flip_coord({x, y}, height) do
-    {x, height - y}
-  end
 
   defp assemble_point(%{points: point}) do
     for {x, y} <- point do

lib/matplotex/element/spline.ex

@@ -1,24 +1,34 @@
 defmodule Matplotex.Element.Spline do
   alias Matplotex.Element
   use Element
+  @default_stroke_width 2
+  @default_stroke "black"
 
-  defstruct [:type, :moveto, :cubic, :smooths, :fill, :stroke, :stroke_width]
+  @fill "none"
+  defstruct [
+    :type,
+    :moveto,
+    :cubic,
+    :smooths,
+    fill: @fill,
+    stroke: @default_stroke,
+    stroke_width: @default_stroke_width
+  ]
 
   @impl Element
   def assemble(element) do
     """
-     <path d="M #{to_pixel(element.moveto)}}
-     C #{points(element.cubic)}
-     #{smooth_beizer(element.smooths)}
+     <path d="M #{to_pixel(element.moveto)}
+     C #{points(element.cubic)} #{smooth_beizer(element.smooths)} "
       fill="#{element.fill}"
-      stroke="#{element.storke}"
+      stroke="#{element.stroke}"
       stroke-width="#{element.stroke_width}" />
     """
   end
 
   defp points(points) do
     for point <- points do
-      "#{to_pixel(point)}"
+      "#{to_pixel(point)} "
     end
   end
 

lib/matplotex/figure/areal/spline.ex

@@ -1,4 +1,6 @@
 defmodule Matplotex.Figure.Areal.Spline do
+  alias Matplotex.Element.Spline
+  alias Matplotex.Figure.RcParams
   alias Matplotex.Figure.Areal
   alias Matplotex.Figure.Dataset
   alias Matplotex.Figure.Areal.PlotOptions
@@ -27,6 +29,7 @@ defmodule Matplotex.Figure.Areal.Spline do
       ) do
     x = determine_numeric_value(x)
     y = determine_numeric_value(y)
+    opts = Keyword.put_new(opts, :color, "none")
     dataset = Dataset.cast(%Dataset{x: x, y: y}, opts)
     datasets = data ++ [dataset]
     xydata = flatten_for_data(datasets)
@@ -54,12 +57,12 @@ defmodule Matplotex.Figure.Areal.Spline do
     },
     element: elements
   } = axes,
-   rc_params: %RcParams{x_padding: x_padding, y_padding: y_padding}}) do
+   rc_params: %RcParams{x_padding: x_padding, y_padding: y_padding}} = figure) do
     x_padding_value = width_region_content * x_padding
     y_padding_value = height_region_content * y_padding
     shrinked_width_region_content = width_region_content - x_padding_value * 2
     shrinked_height_region_content = height_region_content - y_padding_value * 2
-
+    transition = {x_region_content + x_padding_value, y_region_content + y_padding_value}
     line_elements =
       data
       |> Enum.map(fn dataset ->
@@ -69,9 +72,9 @@ defmodule Matplotex.Figure.Areal.Spline do
           ylim,
           shrinked_width_region_content,
           shrinked_height_region_content,
-          {x_region_content + x_padding_value, y_region_content + y_padding_value}
+          transition
         )
-        |> capture()
+        |> capture(transition)
       end)
       |> List.flatten()
 
@@ -81,50 +84,18 @@ defmodule Matplotex.Figure.Areal.Spline do
   end
 
 
-  defp capture(%Dataset{transformed: transformed} = dataset) do
-    capture(transformed, [], dataset)
-  end
-
-
-  defp capture(%Dataset{transformed: transformed} = dataset, bly, region_width) do
-    capture(transformed, [], dataset, bly, region_width)
-  end
 
-  defp capture(
-         [{x, y} | to_capture],
-         captured,
-         %Dataset{
-           color: color,
-           x: bins,
-           pos: pos_factor,
-           edge_color: edge_color,
-           alpha: alpha
-         } = dataset,
-         bly,
-         region_width
-       ) do
-    capture(
-      to_capture,
-      captured ++
-        [
-          %Rect{
-            type: "figure.histogram",
-            x: bin_position(x, pos_factor),
-            y: y,
-            width: region_width / length(bins),
-            height: bly - y,
-            color: color,
-            stroke: edge_color,
-            fill_opacity: alpha,
-            stroke_opacity: alpha
-          }
-        ],
-      dataset,
-      bly,
-      region_width
-    )
+  defp capture(%Dataset{transformed: transformed, color: color,edge_color: edge_color, line_width: stroke_width}, move_to_def) do
+    {moveto, transformed} = List.pop_at(transformed, 0, move_to_def)
+    cubic = Enum.slice(transformed, 0..2)
+    smooths = blend(transformed, 3)
+    %Spline{type: "figure.spline", moveto: moveto, cubic: cubic, smooths: smooths, fill: color, stroke: edge_color, stroke_width: stroke_width}
   end
 
-  defp capture([], captured, _dataset, _bly, _region_width), do: captured
+  defp blend(smooths, start_from) do
+  smooths
+  |>Enum.slice(start_from..-1//1)
+  |>Enum.chunk_every(2)
 
+  end
 end

lib/matplotex/figure/dataset.ex

@@ -6,6 +6,7 @@ defmodule Matplotex.Figure.Dataset do
   @default_marker_size 3.5
   @default_stroke "black"
   @default_alpha 1.0
+  @line_width 2
 
   defstruct [
     :label,
@@ -19,7 +20,8 @@ defmodule Matplotex.Figure.Dataset do
     alpha: @default_alpha,
     marker: @default_marker,
     linestyle: @default_linestyle,
-    marker_size: @default_marker_size
+    marker_size: @default_marker_size,
+    line_width: @line_width
   ]
 
   def cast(dataset, values) do

lib/matplotex/helpers.ex

@@ -330,8 +330,10 @@ defmodule Matplotex.Helpers do
     x = Nx.to_list(x_nx)
     y = x_nx |> Nx.sin() |> Nx.to_list()
 
-    Matplotex.spline(x, y, x_label: "X", y_label: "Y")
+
+    Matplotex.spline(x, y, x_label: "X", y_label: "Y", edge_color: "green")
     |> Matplotex.show()
     |> copy()
   end
+
 end

test/matplotex/figure/areal/spline_test.exs

@@ -0,0 +1,19 @@
+defmodule Matplotex.Figure.Areal.SplineTest do
+  use Matplotex.PlotCase
+  alias Matplotex.Figure
+  alias Matplotex.Figure.Areal.Spline
+  setup do
+        x_nx = Nx.linspace(0, 10, n: 100)
+        x = Nx.to_list(x_nx)
+        y = x_nx |> Nx.sin() |> Nx.to_list()
+
+    figure =  Matplotex.spline(x, y, x_label: "X", y_label: "Y")
+     {:ok, %{figure: figure}}
+    end
+
+
+    test "adds a spline element in a figure",%{figure: figure} do
+      assert %Figure{axes: %Spline{element: elements}} =Spline.materialize(figure)
+      assert Enum.any?(elements, &(&1.type=="figure.spline"))
+    end
+end