mantao/Plots.jl
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Change color handling of error recipes (#2675)

Browse Source 
* fix iteration of segments

* fix error vector arg detection

* change color handling of recipes
This commit is contained in:
Simon Christ 2020-05-06 18:21:54 +02:00 committed by GitHub
parent 6ddf31d465
commit 3d693d88e0
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 9 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
src/recipes.jl
View File

@ -71,8 +71,9 @@ const POTENTIAL_VECTOR_ARGUMENTS = [
:marker_z, :marker_z,
:markerstrokecolor, :markerstrokecolor,
:markerstrokealpha, :markerstrokealpha,
:xerror,
:yerror, :yerror,
:yerror, :zerror,
:series_annotations, :series_annotations,
:fillrange, :fillrange,
] ]
@ -1027,7 +1028,7 @@ end
function error_style!(plotattributes::AKW) function error_style!(plotattributes::AKW)
plotattributes[:seriestype] = :path plotattributes[:seriestype] = :path
plotattributes[:linecolor] = plotattributes[:markerstrokecolor] plotattributes[:markercolor] = plotattributes[:markerstrokecolor]
plotattributes[:linewidth] = plotattributes[:markerstrokewidth] plotattributes[:linewidth] = plotattributes[:markerstrokewidth]
plotattributes[:label] = "" plotattributes[:label] = ""
end end

8
src/utils.jl
View File

@ -75,7 +75,11 @@ function iter_segments(series::Series)
if series[:seriestype] in (:scatter, :scatter3d) if series[:seriestype] in (:scatter, :scatter3d)
return [[i] for i in eachindex(y)] return [[i] for i in eachindex(y)]
else else
return [i:(i + 1) for i in firstindex(y):lastindex(y)-1] if any(isnan,y)
return [iter_segments(y)...]
else
return [i:(i + 1) for i in firstindex(y):lastindex(y)-1]
end
end end
else else
segs = UnitRange{Int}[] segs = UnitRange{Int}[]
@ -439,7 +443,7 @@ end
get_clims(::Series, op=Plots.ignorenan_extrema) get_clims(::Series, op=Plots.ignorenan_extrema)
Finds the limits for the colorbar by taking the "z-values" for the series and passing them into `op`, Finds the limits for the colorbar by taking the "z-values" for the series and passing them into `op`,
which must return the tuple `(zmin, zmax)`. The default op is the extrema of the finite which must return the tuple `(zmin, zmax)`. The default op is the extrema of the finite
values of the input. values of the input.
""" """
function get_clims(series::Series, op=ignorenan_extrema) function get_clims(series::Series, op=ignorenan_extrema)