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

resolved conflicts

Browse Source
This commit is contained in:
Michael K. Borregaard 2017-06-08 15:10:35 +02:00
parent 5060bb97d5
commit 074a4002c0
2 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/axes.jl
View File

@ -370,8 +370,8 @@ function widen(lmin, lmax, scale)
sf = scalefunc(scale) sf = scalefunc(scale)
isf = invscalefunc(scale) isf = invscalefunc(scale)
span = sf(lmax) - sf(lmin) span = sf(lmax) - sf(lmin)
# eps = max(1e-16, min(1e-2span, 1e-10)) # eps = NaNMath.max(1e-16, min(1e-2span, 1e-10))
eps = max(1e-16, 0.03span) eps = NaNMath.max(1e-16, 0.03span)
isf(lmin-eps), isf(lmax+eps) isf(lmin-eps), isf(lmax+eps)
end end

2
src/recipes.jl
View File

@ -367,7 +367,7 @@ end
# widen limits out a bit # widen limits out a bit
if !(axis[:scale] in _logScales && extrema(xseg.pts)[1] <= 0) if !(axis[:scale] in _logScales && extrema(xseg.pts)[1] <= 0)
expand_extrema!(axis, widen(extrema(xseg.pts)..., axis[:scale])) expand_extrema!(axis, widen(ignorenan_extrema(xseg.pts)..., axis[:scale]))
end end
# switch back # switch back