remove some more type piracies and use === when comparing to nothing
This commit is contained in:
parent
915eafcea0
commit
bd46b51b94
@ -10,7 +10,7 @@ using Reexport
|
|||||||
|
|
||||||
import GeometryTypes, GeometryBasics
|
import GeometryTypes, GeometryBasics
|
||||||
using Dates, Printf, Statistics, Base64, LinearAlgebra, Random
|
using Dates, Printf, Statistics, Base64, LinearAlgebra, Random
|
||||||
import SparseArrays: AbstractSparseMatrix, findnz
|
using SparseArrays
|
||||||
|
|
||||||
using FFMPEG
|
using FFMPEG
|
||||||
|
|
||||||
@ -224,8 +224,8 @@ let PlotOrSubplot = Union{Plot, Subplot}
|
|||||||
global xlims!(plt::PlotOrSubplot, xmin::Real, xmax::Real; kw...) = plot!(plt; xlims = (xmin,xmax), kw...)
|
global xlims!(plt::PlotOrSubplot, xmin::Real, xmax::Real; kw...) = plot!(plt; xlims = (xmin,xmax), kw...)
|
||||||
global ylims!(plt::PlotOrSubplot, ymin::Real, ymax::Real; kw...) = plot!(plt; ylims = (ymin,ymax), kw...)
|
global ylims!(plt::PlotOrSubplot, ymin::Real, ymax::Real; kw...) = plot!(plt; ylims = (ymin,ymax), kw...)
|
||||||
global zlims!(plt::PlotOrSubplot, zmin::Real, zmax::Real; kw...) = plot!(plt; zlims = (zmin,zmax), kw...)
|
global zlims!(plt::PlotOrSubplot, zmin::Real, zmax::Real; kw...) = plot!(plt; zlims = (zmin,zmax), kw...)
|
||||||
global xticks!(plt::PlotOrSubplot, ticks::TicksArgs; kw...) where {T<:Real} = plot!(plt; xticks = ticks, kw...)
|
global xticks!(plt::PlotOrSubplot, ticks::TicksArgs; kw...) = plot!(plt; xticks = ticks, kw...)
|
||||||
global yticks!(plt::PlotOrSubplot, ticks::TicksArgs; kw...) where {T<:Real} = plot!(plt; yticks = ticks, kw...)
|
global yticks!(plt::PlotOrSubplot, ticks::TicksArgs; kw...) = plot!(plt; yticks = ticks, kw...)
|
||||||
global xticks!(plt::PlotOrSubplot,
|
global xticks!(plt::PlotOrSubplot,
|
||||||
ticks::AVec{T}, labels::AVec{S}; kw...) where {T<:Real,S<:AbstractString} = plot!(plt; xticks = (ticks,labels), kw...)
|
ticks::AVec{T}, labels::AVec{S}; kw...) where {T<:Real,S<:AbstractString} = plot!(plt; xticks = (ticks,labels), kw...)
|
||||||
global yticks!(plt::PlotOrSubplot,
|
global yticks!(plt::PlotOrSubplot,
|
||||||
|
|||||||
@ -80,7 +80,7 @@ function __init__()
|
|||||||
artifact_toml = joinpath(@__DIR__, "Artifacts.toml")
|
artifact_toml = joinpath(@__DIR__, "Artifacts.toml")
|
||||||
|
|
||||||
plotly_sha = artifact_hash("plotly", artifact_toml)
|
plotly_sha = artifact_hash("plotly", artifact_toml)
|
||||||
if plotly_sha == nothing || !artifact_exists(plotly_sha)
|
if plotly_sha === nothing || !artifact_exists(plotly_sha)
|
||||||
plotly_sha = create_artifact() do artifact_dir
|
plotly_sha = create_artifact() do artifact_dir
|
||||||
download("https://cdn.plot.ly/plotly-1.54.2.min.js", joinpath(artifact_dir, "plotly-1.54.2.min.js"))
|
download("https://cdn.plot.ly/plotly-1.54.2.min.js", joinpath(artifact_dir, "plotly-1.54.2.min.js"))
|
||||||
end
|
end
|
||||||
|
|||||||
@ -49,7 +49,7 @@ RecipesPipeline.splittable_attribute(plt::Plot, key, val::SeriesAnnotations, len
|
|||||||
RecipesPipeline.splittable_attribute(plt, key, val.strs, len)
|
RecipesPipeline.splittable_attribute(plt, key, val.strs, len)
|
||||||
|
|
||||||
function RecipesPipeline.split_attribute(plt::Plot, key, val::SeriesAnnotations, indices)
|
function RecipesPipeline.split_attribute(plt::Plot, key, val::SeriesAnnotations, indices)
|
||||||
split_strs = RecipesPipeline.split_attribute(key, val.strs, indices)
|
split_strs = RecipesPipeline.split_attribute(plt, key, val.strs, indices)
|
||||||
return SeriesAnnotations(split_strs, val.font, val.baseshape, val.scalefactor)
|
return SeriesAnnotations(split_strs, val.font, val.baseshape, val.scalefactor)
|
||||||
end
|
end
|
||||||
|
|
||||||
|
|||||||
@ -280,7 +280,7 @@ end
|
|||||||
end
|
end
|
||||||
fillrange := nothing
|
fillrange := nothing
|
||||||
seriestype := :path
|
seriestype := :path
|
||||||
if plotattributes[:linecolor] == :auto && plotattributes[:marker_z] !== nothing && plotattributes[:line_z] == nothing
|
if plotattributes[:linecolor] == :auto && plotattributes[:marker_z] !== nothing && plotattributes[:line_z] === nothing
|
||||||
line_z := plotattributes[:marker_z]
|
line_z := plotattributes[:marker_z]
|
||||||
end
|
end
|
||||||
|
|
||||||
@ -933,7 +933,7 @@ end
|
|||||||
@recipe function f(::Type{Val{:mesh3d}}, x, y, z)
|
@recipe function f(::Type{Val{:mesh3d}}, x, y, z)
|
||||||
# As long as no i,j,k are supplied this should work with PyPlot and GR
|
# As long as no i,j,k are supplied this should work with PyPlot and GR
|
||||||
seriestype := :surface
|
seriestype := :surface
|
||||||
if plotattributes[:connections] != nothing
|
if plotattributes[:connections] !== nothing
|
||||||
throw(ArgumentError("Giving triangles using the connections argument is only supported on Plotly backend."))
|
throw(ArgumentError("Giving triangles using the connections argument is only supported on Plotly backend."))
|
||||||
end
|
end
|
||||||
()
|
()
|
||||||
@ -1496,7 +1496,7 @@ end
|
|||||||
end
|
end
|
||||||
|
|
||||||
|
|
||||||
Plots.findnz(A::AbstractSparseMatrix) = findnz(A)
|
Plots.findnz(A::AbstractSparseMatrix) = SparseArrays.findnz(A)
|
||||||
|
|
||||||
# fallback function for finding non-zero elements of non-sparse matrices
|
# fallback function for finding non-zero elements of non-sparse matrices
|
||||||
function Plots.findnz(A::AbstractMatrix)
|
function Plots.findnz(A::AbstractMatrix)
|
||||||
|
|||||||
@ -432,10 +432,10 @@ zlims!(zmin::Real, zmax::Real; kw...) = plot!(; zlims = (zmi
|
|||||||
|
|
||||||
|
|
||||||
"Set xticks for an existing plot"
|
"Set xticks for an existing plot"
|
||||||
xticks!(v::TicksArgs; kw...) where {T<:Real} = plot!(; xticks = v, kw...)
|
xticks!(v::TicksArgs; kw...) = plot!(; xticks = v, kw...)
|
||||||
|
|
||||||
"Set yticks for an existing plot"
|
"Set yticks for an existing plot"
|
||||||
yticks!(v::TicksArgs; kw...) where {T<:Real} = plot!(; yticks = v, kw...)
|
yticks!(v::TicksArgs; kw...) = plot!(; yticks = v, kw...)
|
||||||
|
|
||||||
xticks!(
|
xticks!(
|
||||||
ticks::AVec{T}, labels::AVec{S}; kw...) where {T<:Real,S<:AbstractString} = plot!(; xticks = (ticks,labels), kw...)
|
ticks::AVec{T}, labels::AVec{S}; kw...) where {T<:Real,S<:AbstractString} = plot!(; xticks = (ticks,labels), kw...)
|
||||||
|
|||||||
10
src/utils.jl
10
src/utils.jl
@ -207,9 +207,6 @@ end
|
|||||||
|
|
||||||
createSegments(z) = collect(repeat(reshape(z,1,:),2,1))[2:end]
|
createSegments(z) = collect(repeat(reshape(z,1,:),2,1))[2:end]
|
||||||
|
|
||||||
Base.first(c::Colorant) = c
|
|
||||||
Base.first(x::Symbol) = x
|
|
||||||
|
|
||||||
|
|
||||||
sortedkeys(plotattributes::Dict) = sort(collect(keys(plotattributes)))
|
sortedkeys(plotattributes::Dict) = sort(collect(keys(plotattributes)))
|
||||||
|
|
||||||
@ -295,13 +292,6 @@ limsType(lims::Tuple{T,S}) where {T<:Real,S<:Real} = :limits
|
|||||||
limsType(lims::Symbol) = lims == :auto ? :auto : :invalid
|
limsType(lims::Symbol) = lims == :auto ? :auto : :invalid
|
||||||
limsType(lims) = :invalid
|
limsType(lims) = :invalid
|
||||||
|
|
||||||
# axis_Symbol(letter, postfix) = Symbol(letter * postfix)
|
|
||||||
# axis_symbols(letter, postfix...) = map(s -> axis_Symbol(letter, s), postfix)
|
|
||||||
|
|
||||||
Base.convert(::Type{Vector{T}}, rng::AbstractRange{T}) where {T<:Real} = T[x for x in rng]
|
|
||||||
Base.convert(::Type{Vector{T}}, rng::AbstractRange{S}) where {T<:Real,S<:Real} = T[x for x in rng]
|
|
||||||
|
|
||||||
Base.merge(a::AbstractVector, b::AbstractVector) = sort(unique(vcat(a,b)))
|
|
||||||
|
|
||||||
# recursively merge kw-dicts, e.g. for merging extra_kwargs / extra_plot_kwargs in plotly)
|
# recursively merge kw-dicts, e.g. for merging extra_kwargs / extra_plot_kwargs in plotly)
|
||||||
recursive_merge(x::AbstractDict...) = merge(recursive_merge, x...)
|
recursive_merge(x::AbstractDict...) = merge(recursive_merge, x...)
|
||||||
|
|||||||
Loading…
x
Reference in New Issue
Block a user