make reuse of existing tick_interval explicit so tests can pass

mindok · Feb 4, 2024 · 47afca1 · 47afca1
1 parent 47803b5
commit 47afca1
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 3 deletions.
diff --git a/lib/chart/ohlc.ex b/lib/chart/ohlc.ex
@@ -415,7 +415,11 @@ defmodule Contex.OHLC do
 
     x_scale =
       x_scale
-      |> struct(interval_count: interval_count, tick_interval: tick_interval)
+      |> struct(
+        interval_count: interval_count,
+        tick_interval: tick_interval,
+        use_existing_tick_interval?: true
+      )
       |> TimeScale.domain(min, last_dt)
 
     apply_x_scale(plot, x_scale)

diff --git a/lib/chart/scale/time_scale.ex b/lib/chart/scale/time_scale.ex
@@ -90,6 +90,7 @@ defmodule Contex.TimeScale do
     :range,
     :interval_count,
     :tick_interval,
+    :use_existing_tick_interval?,
     :step,
     :custom_tick_formatter,
     :display_format
@@ -105,6 +106,7 @@ defmodule Contex.TimeScale do
     %TimeScale{
       range: {0.0, 1.0},
       interval_count: 11,
+      use_existing_tick_interval?: false,
       step: 1
     }
   end
@@ -171,8 +173,8 @@ defmodule Contex.TimeScale do
   defp nice(%TimeScale{domain: {min_d, max_d}, interval_count: interval_count} = scale)
        when is_number(interval_count) and interval_count > 1 do
     tick_interval =
-      if tick_interval = scale.tick_interval do
-        tick_interval
+      if scale.use_existing_tick_interval? do
+        scale.tick_interval
       else
         width = Utils.date_diff(max_d, min_d, :millisecond)
         unrounded_interval_size = width / (interval_count - 1)