Merge pull request #941 from daschw/ds-plotlyjs-colorbar

Allow turning off the colorbar for heatmap, contour and surface on Plotly and PlotlyJS (fix #932)
This commit is contained in:
Daniel Schwabeneder 2017-06-19 20:04:22 +02:00 committed by GitHub
commit dd2653968e

View File

@ -479,6 +479,7 @@ function plotly_series(plt::Plot, series::Series)
d_out[:type] = "heatmap" d_out[:type] = "heatmap"
# d_out[:x], d_out[:y], d_out[:z] = series[:x], series[:y], transpose_z(series, series[:z].surf, false) # d_out[:x], d_out[:y], d_out[:z] = series[:x], series[:y], transpose_z(series, series[:z].surf, false)
d_out[:colorscale] = plotly_colorscale(series[:fillcolor], series[:fillalpha]) d_out[:colorscale] = plotly_colorscale(series[:fillcolor], series[:fillalpha])
d_out[:showscale] = sp[:legend] != :none
elseif st == :contour elseif st == :contour
d_out[:type] = "contour" d_out[:type] = "contour"
@ -487,6 +488,7 @@ function plotly_series(plt::Plot, series::Series)
d_out[:ncontours] = series[:levels] d_out[:ncontours] = series[:levels]
d_out[:contours] = KW(:coloring => series[:fillrange] != nothing ? "fill" : "lines") d_out[:contours] = KW(:coloring => series[:fillrange] != nothing ? "fill" : "lines")
d_out[:colorscale] = plotly_colorscale(series[:linecolor], series[:linealpha]) d_out[:colorscale] = plotly_colorscale(series[:linecolor], series[:linealpha])
d_out[:showscale] = sp[:legend] != :none
elseif st in (:surface, :wireframe) elseif st in (:surface, :wireframe)
d_out[:type] = "surface" d_out[:type] = "surface"
@ -499,11 +501,13 @@ function plotly_series(plt::Plot, series::Series)
:highlightwidth => series[:linewidth], :highlightwidth => series[:linewidth],
) )
d_out[:contours] = KW(:x => wirelines, :y => wirelines, :z => wirelines) d_out[:contours] = KW(:x => wirelines, :y => wirelines, :z => wirelines)
d_out[:showscale] = false
else else
d_out[:colorscale] = plotly_colorscale(series[:fillcolor], series[:fillalpha]) d_out[:colorscale] = plotly_colorscale(series[:fillcolor], series[:fillalpha])
if series[:fill_z] != nothing if series[:fill_z] != nothing
d_out[:surfacecolor] = plotly_surface_data(series, series[:fill_z]) d_out[:surfacecolor] = plotly_surface_data(series, series[:fill_z])
end end
d_out[:showscale] = sp[:legend] != :none
end end
elseif st == :pie elseif st == :pie