diff --git a/src/backends/gr.jl b/src/backends/gr.jl index ad85090c..4e45161b 100644 --- a/src/backends/gr.jl +++ b/src/backends/gr.jl @@ -270,7 +270,7 @@ end # draw ONE Shape function gr_draw_marker(xi, yi, msize, shape::Shape) - sx, sy = shape_coords(shape) + sx, sy = coords(shape) # convert to ndc coords (percentages of window) GR.selntran(0) xi, yi = GR.wctondc(xi, yi) diff --git a/src/backends/plotly.jl b/src/backends/plotly.jl index 83a56f84..2b3528a0 100644 --- a/src/backends/plotly.jl +++ b/src/backends/plotly.jl @@ -375,7 +375,7 @@ function plotly_close_shapes(x, y) xs, ys = nansplit(x), nansplit(y) for i=1:length(xs) shape = Shape(xs[i], ys[i]) - xs[i], ys[i] = shape_coords(shape) + xs[i], ys[i] = coords(shape) end nanvcat(xs), nanvcat(ys) end diff --git a/src/backends/pyplot.jl b/src/backends/pyplot.jl index a5263c4c..b1f7e2c0 100644 --- a/src/backends/pyplot.jl +++ b/src/backends/pyplot.jl @@ -142,7 +142,7 @@ function py_linestyle(seriestype::Symbol, linestyle::Symbol) end function py_marker(marker::Shape) - x, y = shape_coords(marker) + x, y = coords(marker) n = length(x) mat = zeros(n+1,2) for i=1:n diff --git a/src/series.jl b/src/series.jl index 8b836af4..12fdf318 100644 --- a/src/series.jl +++ b/src/series.jl @@ -322,18 +322,18 @@ end @recipe function f(shape::Shape) seriestype --> :shape - shape_coords(shape) + coords(shape) end @recipe function f(shapes::AVec{Shape}) seriestype --> :shape - shape_coords(shapes) + coords(shapes) end @recipe function f(shapes::AMat{Shape}) seriestype --> :shape for j in 1:size(shapes,2) - @series shape_coords(vec(shapes[:,j])) + @series coords(vec(shapes[:,j])) end end diff --git a/src/utils.jl b/src/utils.jl index c6246837..aefc1495 100644 --- a/src/utils.jl +++ b/src/utils.jl @@ -493,6 +493,8 @@ zlims(sp_idx::Int = 1) = zlims(current(), sp_idx) # --------------------------------------------------------------- +makekw(; kw...) = KW(kw) + wraptuple(x::Tuple) = x wraptuple(x) = (x,)