maximums needed to account for categorical variables

TidierOrg · May 19, 2024 · 78c3490 · 78c3490 · rdboyes · May 19, 2024
1 parent 3ed1e32
commit 78c3490
Show file tree

Hide file tree

Showing 2 changed files with 17 additions and 15 deletions.
diff --git a/src/draw.jl b/src/draw.jl
@@ -83,13 +83,13 @@ function Makie.SpecApi.Axis(plot::GGPlot)
 
         # keep track of the global max and min on each axis
         if haskey(given_aes, :x)
-            xmin = min(xmin, minimum(given_aes[:x].raw))
-            xmax = max(xmax, maximum(given_aes[:x].raw))
+            xmin = min(xmin, minimum(given_aes[:x].makie_function(given_aes[:x].raw)))
+            xmax = max(xmax, maximum(given_aes[:x].makie_function(given_aes[:x].raw)))
         end
 
         if haskey(given_aes, :y)
-            ymin = min(ymin, minimum(given_aes[:y].raw))
-            ymax = max(ymax, maximum(given_aes[:y].raw))
+            ymin = min(ymin, minimum(given_aes[:y].makie_function(given_aes[:y].raw)))
+            ymax = max(ymax, maximum(given_aes[:y].makie_function(given_aes[:y].raw)))
         end
 
         if length(intersect(keys(given_aes), geom.grouping_aes)) == 0 && isnothing(plot.facet_options) 

diff --git a/src/transforms.jl b/src/transforms.jl
@@ -83,40 +83,42 @@ number_on_axis = AesTransform(number_on_axis_fn)
 # categorical array handling options for String columns
 
 function cat_inorder_fn(target::Symbol, source::Vector{Symbol}, data::DataFrame)
-    cat_column = data[!, source[1]]
-    cat_array = CategoricalArray(cat_column,
-        levels = unique(cat_column),
-        ordered = true)
 
     label_target = target == :x ? :xticks :
                    target == :y ? :yticks : 
                    nothing
 
     return Dict{Symbol, PlottableData}(
         target => PlottableData(
-            cat_array,
-            x -> levelcode.(x),
+            data[!, source[1]],
+            x -> levelcode.(CategoricalArray(x,
+                levels = unique(x),
+                ordered = true)),
             label_target,
-            x -> (1:length(levels(x)), levels(x))
+            x -> (1:length(levels(CategoricalArray(x,
+                levels = unique(x),
+                ordered = true))), 
+                levels(CategoricalArray(x,
+                levels = unique(x),
+                ordered = true)))
         )
     )    
 end
 
 cat_inorder = AesTransform(cat_inorder_fn)
 
 function cat_inseq_fn(target::Symbol, source::Vector{Symbol}, data::DataFrame)
-    cat_array = CategoricalArray(data[!, source[1]])
 
     label_target = target == :x ? :xticks :
                    target == :y ? :yticks : 
                    nothing
 
     return Dict{Symbol, PlottableData}(
         target => PlottableData(
-            cat_array,
-            x -> levelcode.(x),
+            data[!, source[1]],
+            x -> levelcode.(CategoricalArray(x)),
             label_target,
-            x -> (1:length(levels(x)), levels(x))
+            x -> (1:length(levels(CategoricalArray(x))), levels(CategoricalArray(x)))
         )
     )      
 end