fixes

Author: SimonDanisch

src/basic_recipes/axis.jl

@@ -164,13 +164,24 @@ isaxis(x::Union{Axis2D, Axis3D}) = true
 
 const Limits{N} = NTuple{N, Tuple{Number, Number}}
 
-default_ticks(limits::Limits, ticks, scale_func::Function) = default_ticks.(limits, (ticks,), scale_func)
+function default_ticks(limits::Limits, ticks, scale_func::Function)
+    default_ticks.(limits, (ticks,), scale_func)
+end
+
+# function default_ticks(limits::Limits, ticks::Tuple, scale_func::Function)
+#     default_ticks.(limits, ticks, scale_func)
+# end
 default_ticks(limits::Tuple{Number, Number}, ticks, scale_func::Function) = default_ticks(limits..., ticks, scale_func)
 
-function default_ticks(lmin::Number, lmax::Number, ticks::AbstractVector{<: Number}, scale_func::Function)
+function default_ticks(
+        lmin::Number, lmax::Number,
+        ticks::AbstractVector{<: Number}, scale_func::Function
+    )
     scale_func.((filter(t -> lmin <= t <= lmax, ticks)))
 end
-function default_ticks(lmin::Number, lmax::Number, ::Automatic, scale_func::Function)
+function default_ticks(
+        lmin::Number, lmax::Number, ::Automatic, scale_func::Function
+    )
     # scale the limits
     scaled_ticks, mini, maxi = optimize_ticks(
         scale_func(lmin),
@@ -182,7 +193,9 @@ function default_ticks(lmin::Number, lmax::Number, ::Automatic, scale_func::Func
     scaled_ticks
 end
 
-function default_ticks(lmin::Number, lmax::Number, n::Integer, scale_func = identity)
+function default_ticks(
+        lmin::Number, lmax::Number, ticks::Integer, scale_func = identity
+    )
     scaled_ticks, mini, maxi = optimize_ticks(
         scale_func(lmin),
         scale_func(lmax);
@@ -196,7 +209,10 @@ function default_ticks(lmin::Number, lmax::Number, n::Integer, scale_func = iden
     scaled_ticks
 end
 
-default_ticks(x::Automatic, limits::Tuple, n) = default_ticks(limits, n, identity)
+function default_ticks(x::Automatic, limits::Tuple, n)
+    default_ticks(limits, n, identity)
+end
+
 function default_ticks(ticks::Tuple, limits::Tuple, n::Tuple)
     default_ticks.(ticks, (limits,), n)
 end

src/conversions.jl

@@ -53,6 +53,7 @@ function convert_arguments(T::PlotFunc, args...; kw...)
         convert_arguments(ct, args...; kw...)
     catch e
         if e isa MethodError
+            @show e
             error("No overload for $T and also no overload for trait $ct found! Arguments: $(typeof.(args))")
         else
             rethrow(e)
@@ -134,6 +135,25 @@ function convert_arguments(::PointBased, positions::NTuple{N, AbstractVector}) w
     PlotSpec(points, tickranges = xyrange, ticklabels = labels)
 end
 
+function convert_arguments(
+        SL::SurfaceLike,
+        x::AbstractVector, y::AbstractVector, z::AbstractMatrix{<: Number}
+    )
+    n, m = size(z)
+    positions = (x, y)
+    labels = categoric_labels.(positions)
+    xyrange = categoric_range.(labels)
+    args = convert_arguments(SL, 0..n, 0..m, z)
+    xyranges = (
+        to_linspace(0.5..(n-0.5), n),
+        to_linspace(0.5..(m-0.5), m)
+    )
+    return PlotSpec(
+        args...,
+        tickranges = xyranges, ticklabels = labels
+    )
+end
+
 """
 Accepts a Vector of Pair of Points (e.g. `[Point(0, 0) => Point(1, 1), ...]`)
 to encode e.g. linesegments or directions.
@@ -222,10 +242,12 @@ outputs them in a Tuple.
 
 `P` is the plot Type (it is optional).
 """
-function convert_arguments(::SurfaceLike, x::AbstractVecOrMat, y::AbstractVecOrMat, z::AbstractMatrix)
+function convert_arguments(::SurfaceLike, x::AbstractVecOrMat{<: Number}, y::AbstractVecOrMat{<: Number}, z::AbstractMatrix{<: Union{Number, Colorant}})
+    return (el32convert(x), el32convert(y), el32convert(z))
+end
+function convert_arguments(::SurfaceLike, x::AbstractVecOrMat{<: Number}, y::AbstractVecOrMat{<: Number}, z::AbstractMatrix{<:Number})
     return (el32convert(x), el32convert(y), el32convert(z))
 end
-
 
 float32type(x::Type) = Float32
 float32type(::Type{<: RGB}) = RGB{Float32}

src/layouting/boundingbox.jl

@@ -108,7 +108,10 @@ function boundingbox(
 end
 
 
-function boundingbox(text::String, position, textsize, font, align, rotation, model = Mat4f0(I))
+function boundingbox(
+        text::String, position, textsize, font,
+        align, rotation, model = Mat4f0(I)
+    )
     atlas = get_texture_atlas()
     N = length(text)
     ctext_state = iterate(text)