This commit is contained in:
Chris Rackauckas 2019-08-17 14:20:23 -04:00
parent f12f6db310
commit 0950c738e3
2 changed files with 4 additions and 4 deletions

View File

@ -620,7 +620,7 @@ end
function gr_set_gradient(series::Series) function gr_set_gradient(series::Series)
color = gr_get_color(series) color = gr_get_color(series)
color !=== nothing && gr_set_gradient(color) color !== nothing && gr_set_gradient(color)
end end
function gr_get_color(series::Series) function gr_get_color(series::Series)

View File

@ -560,18 +560,18 @@ function colorbar_style(series::Series)
elseif iscontour(series) elseif iscontour(series)
cbar_lines cbar_lines
elseif series[:seriestype] (:heatmap,:surface) || elseif series[:seriestype] (:heatmap,:surface) ||
any(series[z] !=== nothing for z [:marker_z,:line_z,:fill_z]) any(series[z] !== nothing for z [:marker_z,:line_z,:fill_z])
cbar_gradient cbar_gradient
else else
nothing nothing
end end
end end
hascolorbar(series::Series) = colorbar_style(series) !=== nothing hascolorbar(series::Series) = colorbar_style(series) !== nothing
hascolorbar(sp::Subplot) = sp[:colorbar] != :none && any(hascolorbar(s) for s in series_list(sp)) hascolorbar(sp::Subplot) = sp[:colorbar] != :none && any(hascolorbar(s) for s in series_list(sp))
iscontour(series::Series) = series[:seriestype] == :contour iscontour(series::Series) = series[:seriestype] == :contour
isfilledcontour(series::Series) = iscontour(series) && series[:fillrange] !=== nothing isfilledcontour(series::Series) = iscontour(series) && series[:fillrange] !== nothing
function contour_levels(series::Series, clims) function contour_levels(series::Series, clims)
iscontour(series) || error("Not a contour series") iscontour(series) || error("Not a contour series")