regional pie

Author: Mohammed Sadique

lib/matplotex/element/rad_legend.ex

@@ -41,19 +41,19 @@ defmodule Matplotex.Element.RadLegend do
           x: x,
           y: y,
           width: width,
-          height: height,
-          label_margin: label_margin
-        } = legend
+          height: height
+        } = legend, legend_font
       ) do
+
     %{
       legend
       | label: %Label{
-          x: x + width + label_margin,
-          y: y - height / 4,
+          x: x + width ,
+          y: y + height / 2,
           text: text,
-          type: @label_type,
-          text_anchor: "start"
+          type: @label_type
         }
+        |> Label.cast_label(legend_font)
     }
   end
 end

lib/matplotex/figure.ex

@@ -31,6 +31,10 @@ defmodule Matplotex.Figure do
   def new(opts) do
     struct(__MODULE__, opts)
   end
+  # TODO: put error message in error
+  # def put_error(figure, opts) do
+
+  # end
 
   def add_label(%__MODULE__{axes: %module{} = axes} = figure, label, opts),
     do: %{figure | axes: module.add_label(axes, label, opts)}
@@ -110,4 +114,6 @@ defmodule Matplotex.Figure do
   defp update_rc_params(_, _) do
     raise Matplotex.InputError, keys: [:rc_params], message: "Invalid Input"
   end
+
+
 end

lib/matplotex/figure/cast.ex

@@ -138,6 +138,8 @@ defmodule Matplotex.Figure.Cast do
           rc_params: %RcParams{line_width: line_width}
         } = figure
       ) do
+    {lx, by} = Algebra.flip_y_coordinate({lx, by})
+    {rx, ty} = Algebra.flip_y_coordinate({rx, ty})
     left = %Line{x1: lx, y1: by, x2: lx, y2: ty, type: "border.left", stroke_width: line_width}
     right = %Line{x1: rx, y1: by, x2: rx, y2: ty, type: "border.right", stroke_width: line_width}
     top = %Line{x1: lx, x2: rx, y1: ty, y2: ty, type: "border.top", stroke_width: line_width}
@@ -158,14 +160,14 @@ defmodule Matplotex.Figure.Cast do
         %Figure{
           axes:
             %{
-              coords: %Coords{title: title_coord} = coords,
+              region_title: region_title,
               title: title,
               element: elements
             } = axes,
           rc_params: %RcParams{title_font: title_font}
         } = figure
       ) do
-    {ttx, tty} = calculate_center(coords, title_coord, :x)
+    {ttx, tty} = calculate_center(region_title, :x)
 
     title =
       %Label{
@@ -189,14 +191,15 @@ defmodule Matplotex.Figure.Cast do
         %Figure{
           axes:
             %{
-              region_title: region,
+              region_title: region_title,
               title: title,
               element: elements
             } = axes,
           rc_params: %RcParams{title_font: title_font, label_padding: title_padding}
         } = figure
       ) do
-    {title_x, title_y} = region |> calculate_center(:x) |> Algebra.flip_y_coordinate()
+
+    {title_x, title_y} = region_title |> calculate_center(:x) |> Algebra.flip_y_coordinate()
 
     title =
       %Label{

lib/matplotex/figure/lead.ex

@@ -33,6 +33,7 @@ defmodule Matplotex.Figure.Lead do
     |> module.set_region_title()
     |> module.set_region_legend()
     |> module.set_region_content()
+    |> focus_to_origin()
   end
 
   def set_regions_radial(figure), do: figure
@@ -195,11 +196,12 @@ defmodule Matplotex.Figure.Lead do
         }
     }
   end
+  def focus_to_origin(figure), do: figure
   defp plotable_radius(width, height, padding) when height < width do
-    (height - height * padding) / 2
+    (height - height * padding * 2) / 2
   end
  defp plotable_radius(width, height, padding) when width < height do
-  (width - width * padding) / 2
+  (width - width * padding * 2) / 2
  end
   # def focus_to_origin(
   #       %Figure{
@@ -242,32 +244,32 @@ defmodule Matplotex.Figure.Lead do
   #   }
   # end
 
-  defp center_and_radius(width, height, {leftx, _rightx, bottomy, _topy}) when height < width do
-    radius = height / 2
+  # defp center_and_radius(width, height, {leftx, _rightx, bottomy, _topy}) when height < width do
+  #   radius = height / 2
 
-    centerx = leftx + radius
-    centery = bottomy + radius
-    {{centerx, centery}, radius}
-  end
+  #   centerx = leftx + radius
+  #   centery = bottomy + radius
+  #   {{centerx, centery}, radius}
+  # end
 
-  defp center_and_radius(width, _height, {leftx, _rightx, _bottomy, topy}) do
-    radius = width / 2
+  # defp center_and_radius(width, _height, {leftx, _rightx, _bottomy, topy}) do
+  #   radius = width / 2
 
-    centerx = leftx + radius
-    centery = topy - radius
-    {{centerx, centery}, radius}
-  end
+  #   centerx = leftx + radius
+  #   centery = topy - radius
+  #   {{centerx, centery}, radius}
+  # end
 
-  defp label_offset(nil, _font_size), do: 0
-  defp label_offset("", _font_size), do: 0
+  # defp label_offset(nil, _font_size), do: 0
+  # defp label_offset("", _font_size), do: 0
 
-  defp label_offset(ticks, font_size) when is_list(ticks) do
-    font_size * @pt_to_inch + @padding
-  end
+  # defp label_offset(ticks, font_size) when is_list(ticks) do
+  #   font_size * @pt_to_inch + @padding
+  # end
 
-  defp label_offset(_label, font_size) do
-    font_size * @pt_to_inch + @padding
-  end
+  # defp label_offset(_label, font_size) do
+  #   font_size * @pt_to_inch + @padding
+  # end
 
   defp tick_length(tick) when is_integer(tick) do
     tick |> Integer.to_string() |> String.length()

lib/matplotex/figure/radial.ex

@@ -1,4 +1,6 @@
 defmodule Matplotex.Figure.Radial do
+  alias Matplotex.Utils.Algebra
+
   @callback create(struct(), list(), keyword()) :: struct()
   @callback materialize(struct()) :: struct()
 
@@ -31,7 +33,7 @@ defmodule Matplotex.Figure.Radial do
         figure
         |> Lead.set_regions_radial()
         |> Cast.cast_border()
-        |> Cast.cast_title()
+        |> Cast.cast_title_by_region()
       end
 
       def set_region_title(
@@ -72,17 +74,18 @@ defmodule Matplotex.Figure.Radial do
                rc_params: %RcParams{legend_width: legend_width},
                axes:
                  %{
-                   border: {_lx, by, rx, _ty},
+                   border: {_lx, by, rx, ty},
                    show_legend: true,
-                   region_title: %Region{y: y_region_title}
+                   region_title: %Region{y: y_region_title, height: height_region_title}
                  } = axes
              } = figure
            ) do
+        IO.inspect(legend_width)
         width_region_legend = fwidth * legend_width
         height_region_legend = abs(by - y_region_title)
 
         {x_region_legend, y_region_legend} =
-          Algebra.transform_given_point(rx - width_region_legend, 0, 0, by)
+          Algebra.transform_given_point(rx, abs(ty), -width_region_legend,height_region_title)|>Algebra.flip_y_coordinate()
 
         %Figure{
           figure
@@ -110,6 +113,7 @@ defmodule Matplotex.Figure.Radial do
                  } = axes
              } = figure
            ) do
+
         width_region_content = width - width_region_legend
         height_region_content = height - height_region_title
 

lib/matplotex/figure/radial/pie.ex

@@ -1,4 +1,7 @@
 defmodule Matplotex.Figure.Radial.Pie do
+
+  alias Matplotex.Figure.RcParams
+  alias Matplotex.Utils.Algebra
   alias Matplotex.Figure.Areal.Region
   alias Matplotex.Figure.Radial
   alias Matplotex.Element.RadLegend
@@ -24,7 +27,11 @@ defmodule Matplotex.Figure.Radial.Pie do
 
   @impl Radial
   def create(%Figure{axes: axes} = figure, sizes, opts) do
-    dataset = Dataset.cast(%Dataset{sizes: sizes}, opts)
+    dataset = if sizes|>Enum.sum()|>abs() > 0 do
+      Dataset.cast(%Dataset{sizes: sizes}, opts)
+    else
+      raise Matplotex.InputError, "Invalid set of values for a pie chart, sum of sizes should be greater than 0"
+    end
     %Figure{figure | axes: %{axes | dataset: dataset}}
   end
 
@@ -37,13 +44,14 @@ defmodule Matplotex.Figure.Radial.Pie do
 
   defp materialize_slices(
          %Figure{
-           figsize: {_fwidth, fheight},
+           figsize: {fwidth, fheight},
+           rc_params: %RcParams{legend_font: legend_font},
            axes:
              %__MODULE__{
                size: {_width, height},
                radius: radius,
-               center: %{y: cy} = center,
-               legend_pos: {legx, legy},
+               center: center,
+               region_legend: region_legend,
                dataset: %Dataset{
                  sizes: sizes,
                  labels: labels,
@@ -53,11 +61,11 @@ defmodule Matplotex.Figure.Radial.Pie do
                element: elements
              } = axes
          } = figure
-       ) do
+  ) when fwidth > 0  and fheight > 0 do
+    %Region{x: legx, y: legy} = Algebra.flip_y_coordinate(region_legend)
     total_size = Enum.sum(sizes)
     legend_rect_side = height / length(sizes) / 2
-    center = %{center | y: fheight - cy}
-
+    center = Algebra.flip_y_coordinate(center)
     slices =
       sizes
       |> Enum.zip(labels)
@@ -74,7 +82,7 @@ defmodule Matplotex.Figure.Radial.Pie do
           }
         },
         fn raw, color, acc ->
-          roll_across(raw, color, acc, center, radius, total_size)
+          roll_across(raw, color, acc, center, radius, total_size, legend_font)
         end
       )
       |> then(fn %Accumulator{slices: slices, legends: legends} ->
@@ -108,7 +116,8 @@ defmodule Matplotex.Figure.Radial.Pie do
          },
          %{x: cx, y: cy} = center,
          radius,
-         total_size
+         total_size,
+         legend_font
        ) do
     percentage = size / total_size
     angle_for_size = percentage * @full_circle + start_angle
@@ -128,7 +137,7 @@ defmodule Matplotex.Figure.Radial.Pie do
       cy: cy
     }
 
-    y_legend = y_legend - legend_unit_height
+    {x_legend, y_legend} = Algebra.transform_given_point(0, legend_unit_height, x_legend, y_legend)
 
     legend =
       %RadLegend{
@@ -140,7 +149,7 @@ defmodule Matplotex.Figure.Radial.Pie do
         height: legend_unit_height,
         label: "#{label}-#{Float.ceil(percentage * 100, 2)}%"
       }
-      |> RadLegend.with_label()
+      |> RadLegend.with_label(legend_font)
 
     %Accumulator{
       lead: {x2, y2},

lib/matplotex/figure/rc_params.ex

@@ -23,8 +23,8 @@ defmodule Matplotex.Figure.RcParams do
             y_tick_font: %Font{text_anchor: "start"},
             x_label_font: @font,
             y_label_font: @font,
-            title_font: %Font{font_size: @default_title_font_size},
-            legend_font: @font,
+            title_font: %Font{font_size: @default_title_font_size, dominant_baseline: "auto"},
+            legend_font: %Font{text_anchor: "start"},
             figure_size: @default_figsize,
             figure_dpi: @default_dpi,
             line_width: @line_width,

lib/matplotex/helpers.ex

@@ -270,7 +270,8 @@ defmodule Matplotex.Helpers do
     sizes
     |> Matplotex.pie(colors: colors, labels: labels)
     |> Matplotex.set_title("Pie chart")
-    |> Matplotex.figure(%{figsize: {3.5, 2.5}, margin: 0.05})
+    |> Matplotex.figure(%{figsize: {4, 3}, margin: 0.05})
+    |> Matplotex.set_rc_params(%{line_width: 1, legend_width: 0.25})
     |> Matplotex.show()
     |> copy()
   end
@@ -305,7 +306,7 @@ defmodule Matplotex.Helpers do
     values
     |> Matplotex.pie(colors: colors, labels: categories)
     |> Matplotex.set_title("Asias Emission distribution(2008-2011)")
-    |> Matplotex.set_rc_params(%{line_width: 1})
+    |> Matplotex.set_rc_params(%{line_width: 1, legend_width: 0.5})
     |> Matplotex.figure(%{figsize: {10, 4}, margin: 0.15})
     |> Matplotex.show()
     |> copy()

lib/matplotex/utils/algebra.ex

@@ -1,4 +1,5 @@
 defmodule Matplotex.Utils.Algebra do
+  alias Matplotex.Figure.TwoD
   alias Nx
 
   @tensor_data_type_bits 64
@@ -90,4 +91,8 @@ defmodule Matplotex.Utils.Algebra do
   def flip_y_coordinate({x, y}) do
     {x, -y}
   end
+
+  def flip_y_coordinate(%{y: y} = point) do
+    %{point | y: -y}
+  end
 end

test/matplotex/figure/lead_test.exs

@@ -242,12 +242,9 @@ defmodule Matplotex.Figure.LeadTest do
       assert 2 * lx + width_region_content + width_region_legend == fwidth
       assert 2 * abs(ty) + height_region_content + height_region_title == fheight
     end
-  end
-
-  describe "focus_to_origin/1" do
-    @tab radial: true
+    @tag radial: true
     test "sets origin to center of the figure", %{figure: figure} do
-     assert  %Figure{axes: %{center: {cx, cy}}} = Lead.focus_to_origin(figure)
+     assert  %Figure{axes: %{center: %TwoD{x: cx, y: cy} }} = Lead.set_regions_radial(figure)
      assert cx != 0 && cy != 0
     end
   end