Merge pull request #2302 from daschw/clims

Ignore clims of series without z colors
This commit is contained in:
Daniel Schwabeneder 2019-12-04 16:07:13 +01:00 committed by GitHub
commit fae5c45cc4
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23

View File

@ -557,7 +557,7 @@ function get_clims(sp::Subplot)
isfinite(clims[1]) && (zmin = clims[1]) isfinite(clims[1]) && (zmin = clims[1])
isfinite(clims[2]) && (zmax = clims[2]) isfinite(clims[2]) && (zmax = clims[2])
end end
return zmin < zmax ? (zmin, zmax) : (-0.1, 0.1) return zmin < zmax ? (zmin, zmax) : (NaN, NaN)
end end
function get_clims(sp::Subplot, series::Series) function get_clims(sp::Subplot, series::Series)
@ -571,7 +571,7 @@ function get_clims(sp::Subplot, series::Series)
isfinite(clims[1]) && (zmin = clims[1]) isfinite(clims[1]) && (zmin = clims[1])
isfinite(clims[2]) && (zmax = clims[2]) isfinite(clims[2]) && (zmax = clims[2])
end end
return zmin < zmax ? (zmin, zmax) : (-0.1, 0.1) return zmin < zmax ? (zmin, zmax) : (NaN, NaN)
end end
function get_clims(series::Series) function get_clims(series::Series)
@ -584,10 +584,10 @@ function get_clims(series::Series)
zmin, zmax = _update_clims(zmin, zmax, ignorenan_extrema(vals)...) zmin, zmax = _update_clims(zmin, zmax, ignorenan_extrema(vals)...)
end end
end end
return zmin < zmax ? (zmin, zmax) : (-0.1, 0.1) return zmin < zmax ? (zmin, zmax) : (NaN, NaN)
end end
_update_clims(zmin, zmax, emin, emax) = min(zmin, emin), max(zmax, emax) _update_clims(zmin, zmax, emin, emax) = NaNMath.min(zmin, emin), NaNMath.max(zmax, emax)
@enum ColorbarStyle cbar_gradient cbar_fill cbar_lines @enum ColorbarStyle cbar_gradient cbar_fill cbar_lines