Merge pull request #1557 from daschw/release

prepare release

NEWS.md

@@ -11,6 +11,34 @@
 ---
 ## (current master)
 
+## 0.17.2
+- fix single subplot in plotly
+- implement `(xyz)lims = :round`
+- PyPlot: fix bg_legend = invisible()
+- set fallback tick specification for axes with discrete values
+- restructure of show methods
+
+## 0.17.1
+- Fix contour for PGFPlots
+- 32Bit fix: Int64 -> Int
+- Make series of shapes and segments toggle together in Plotly(JS)
+- Fix marker arguments
+- Fix processing order of series recipes
+- Fix Plotly(JS) ribbon
+- Contour plots with x,y in grid form on PyPlot
+
+## 0.17.0
+- Add GR dependency to make it the default backend
+- Improve histogram2d bin estimation
+- Allow vector arguments for certain series attributes and support line_z and fill_z on GR, PyPlot, Plotly(JS) and PGFPlots
+- Automatic scientific notation for tick labels
+- Allow to set the theme in PLOTS_DEFAULTS
+- Implement plots_heatmap seriestype providing a Plots recipe for heatmaps
+
+## 0.16.0
+- fix 3D plotting in PyPlot
+- Infinite objects
+
 ## 0.15.1
 
 - fix scientific notation for labels in GR

REQUIRE

@@ -13,3 +13,4 @@ JSON
 NaNMath
 Requires
 Contour
+GR 0.31.0

src/Plots.jl

@@ -183,6 +183,7 @@ include("output.jl")
 @shorthands histogram2d
 @shorthands density
 @shorthands heatmap
+@shorthands plots_heatmap
 @shorthands hexbin
 @shorthands sticks
 @shorthands hline
@@ -296,8 +297,11 @@ const CURRENT_BACKEND = CurrentBackend(:none)
 # for compatibility with Requires.jl:
 @init begin
     if isdefined(Main, :PLOTS_DEFAULTS)
+        if haskey(Main.PLOTS_DEFAULTS, :theme)
+            theme(Main.PLOTS_DEFAULTS[:theme])
+        end
         for (k,v) in Main.PLOTS_DEFAULTS
-            default(k, v)
+            k == :theme || default(k, v)
         end
     end
 end

src/arg_desc.jl

@@ -110,7 +110,7 @@ const _arg_desc = KW(
 
 # axis args
 :guide     				  => "String. Axis guide (label).",
-:lims      				  => "NTuple{2,Number}. Force axis limits.  Only finite values are used (you can set only the right limit with `xlims = (-Inf, 2)` for example).",
+:lims      				  => "NTuple{2,Number} or Symbol. Force axis limits.  Only finite values are used (you can set only the right limit with `xlims = (-Inf, 2)` for example). `:round` widens the limit to the nearest round number ie. [0.1,3.6]=>[0.0,4.0]",
 :ticks     				  => "Vector of numbers (set the tick values), Tuple of (tickvalues, ticklabels), or `:auto`",
 :scale     				  => "Symbol. Scale of the axis: `:none`, `:ln`, `:log2`, `:log10`",
 :rotation  				  => "Number. Degrees rotation of tick labels.",

src/args.jl

@@ -1450,18 +1450,18 @@ end
 
 
 # converts a symbol or string into a colorant (Colors.RGB), and assigns a color automatically
-function getSeriesRGBColor(c, α, sp::Subplot, n::Int)
+function getSeriesRGBColor(c, sp::Subplot, n::Int)
     if c == :auto
         c = autopick(sp[:color_palette], n)
     elseif isa(c, Int)
         c = autopick(sp[:color_palette], c)
     end
-    plot_color(c, α)
+    plot_color(c)
 end
 
 function ensure_gradient!(d::KW, csym::Symbol, asym::Symbol)
     if !isa(d[csym], ColorGradient)
-        d[csym] = cgrad(alpha = d[asym])
+        d[csym] = typeof(d[asym]) <: AbstractVector ? cgrad() : cgrad(alpha = d[asym])
     end
 end
 
@@ -1473,26 +1473,19 @@ function _replace_linewidth(d::KW)
 end
 
 function _add_defaults!(d::KW, plt::Plot, sp::Subplot, commandIndex::Int)
-    pkg = plt.backend
-    globalIndex = d[:series_plotindex]
-
     # add default values to our dictionary, being careful not to delete what we just added!
     for (k,v) in _series_defaults
         slice_arg!(d, d, k, v, commandIndex, false)
     end
 
-    # this is how many series belong to this subplot
-    # plotIndex = count(series -> series.d[:subplot] === sp && series.d[:primary], plt.series_list)
-    plotIndex = 0
-    for series in sp.series_list
-        if series[:primary]
-            plotIndex += 1
-        end
-    end
-    # plotIndex = count(series -> series[:primary], sp.series_list)
-    if get(d, :primary, true)
-        plotIndex += 1
-    end
+    return d
+end
+
+
+function _update_series_attributes!(d::KW, plt::Plot, sp::Subplot)
+    pkg = plt.backend
+    globalIndex = d[:series_plotindex]
+    plotIndex = _series_index(d, sp)
 
     aliasesAndAutopick(d, :linestyle, _styleAliases, supported_styles(pkg), plotIndex)
     aliasesAndAutopick(d, :markershape, _markerAliases, supported_markers(pkg), plotIndex)
@@ -1508,29 +1501,31 @@ function _add_defaults!(d::KW, plt::Plot, sp::Subplot, commandIndex::Int)
     end
 
     # update series color
-    d[:seriescolor] = getSeriesRGBColor(d[:seriescolor], d[:seriesalpha], sp, plotIndex)
+    d[:seriescolor] = getSeriesRGBColor.(d[:seriescolor], sp, plotIndex)
 
     # update other colors
     for s in (:line, :marker, :fill)
         csym, asym = Symbol(s,:color), Symbol(s,:alpha)
         d[csym] = if d[csym] == :auto
-            plot_color(if has_black_border_for_default(d[:seriestype]) && s == :line
+            plot_color.(if has_black_border_for_default(d[:seriestype]) && s == :line
                 sp[:foreground_color_subplot]
             else
                 d[:seriescolor]
-            end, d[asym])
+            end)
         elseif d[csym] == :match
-            plot_color(d[:seriescolor], d[asym])
+            plot_color.(d[:seriescolor])
         else
-            getSeriesRGBColor(d[csym], d[asym], sp, plotIndex)
+            getSeriesRGBColor.(d[csym], sp, plotIndex)
         end
     end
 
     # update markerstrokecolor
     d[:markerstrokecolor] = if d[:markerstrokecolor] == :match
-        plot_color(sp[:foreground_color_subplot], d[:markerstrokealpha])
+        plot_color(sp[:foreground_color_subplot])
+    elseif d[:markerstrokecolor] == :auto
+        getSeriesRGBColor.(d[:markercolor], sp, plotIndex)
     else
-        getSeriesRGBColor(d[:markerstrokecolor], d[:markerstrokealpha], sp, plotIndex)
+        getSeriesRGBColor.(d[:markerstrokecolor], sp, plotIndex)
     end
 
     # if marker_z, fill_z or line_z are set, ensure we have a gradient
@@ -1560,3 +1555,19 @@ function _add_defaults!(d::KW, plt::Plot, sp::Subplot, commandIndex::Int)
     _replace_linewidth(d)
     d
 end
+
+function _series_index(d, sp)
+    idx = 0
+    for series in series_list(sp)
+        if series[:primary]
+            idx += 1
+        end
+        if series == d
+            return idx
+        end
+    end
+    if get(d, :primary, true)
+        idx += 1
+    end
+    return idx
+end

src/axes.jl

@@ -212,12 +212,20 @@ function optimal_ticks_and_labels(axis::Axis, ticks = nothing)
         formatter = axis[:formatter]
         if formatter == :auto
             # the default behavior is to make strings of the scaled values and then apply the labelfunc
+            map(labelfunc(scale, backend()), Showoff.showoff(scaled_ticks, :auto))
+        elseif formatter == :plain
+            # Leave the numbers in plain format
             map(labelfunc(scale, backend()), Showoff.showoff(scaled_ticks, :plain))
         elseif formatter == :scientific
             Showoff.showoff(unscaled_ticks, :scientific)
         else
             # there was an override for the formatter... use that on the unscaled ticks
             map(formatter, unscaled_ticks)
+            # if the formatter left us with numbers, still apply the default formatter
+            # However it leave us with the problem of unicode number decoding by the backend
+            # if eltype(unscaled_ticks) <: Number
+            #     Showoff.showoff(unscaled_ticks, :auto)
+            # end
         end
     else
         # no finite ticks to show...
@@ -238,19 +246,17 @@ function get_ticks(axis::Axis)
     ticks = ticks == :native ? :auto : ticks
 
     dvals = axis[:discrete_values]
-    cv, dv = if !isempty(dvals)
-        # discrete ticks...
-        n = length(dvals)
-        rng = if ticks == :auto
-            Int[round(Int,i) for i in linspace(1, n, 15)]
-        elseif ticks == :all
-            1:n
-        elseif typeof(ticks) <: Int
-            Int[round(Int,i) for i in linspace(1, n, ticks)]
-        end
-        axis[:continuous_values][rng], dvals[rng]
-    elseif typeof(ticks) <: Symbol
-        if ispolar(axis.sps[1]) && axis[:letter] == :x
+    cv, dv = if typeof(ticks) <: Symbol
+        if !isempty(dvals)
+            # discrete ticks...
+            n = length(dvals)
+            rng = if ticks == :auto
+                Int[round(Int,i) for i in linspace(1, n, 15)]
+            else # if ticks == :all
+                1:n
+            end
+            axis[:continuous_values][rng], dvals[rng]
+        elseif ispolar(axis.sps[1]) && axis[:letter] == :x
             #force theta axis to be full circle
             (collect(0:pi/4:7pi/4), string.(0:45:315))
         else
@@ -258,8 +264,13 @@ function get_ticks(axis::Axis)
             optimal_ticks_and_labels(axis)
         end
     elseif typeof(ticks) <: Union{AVec, Int}
-        # override ticks, but get the labels
-        optimal_ticks_and_labels(axis, ticks)
+        if !isempty(dvals) && typeof(ticks) <: Int
+            rng = Int[round(Int,i) for i in linspace(1, length(dvals), ticks)]
+            axis[:continuous_values][rng], dvals[rng]
+        else
+            # override ticks, but get the labels
+            optimal_ticks_and_labels(axis, ticks)
+        end
     elseif typeof(ticks) <: NTuple{2, Any}
         # assuming we're passed (ticks, labels)
         ticks
@@ -430,6 +441,13 @@ function default_should_widen(axis::Axis)
     should_widen
 end
 
+function round_limits(amin,amax)
+    scale = 10^(1-round(log10(amax - amin)))
+    amin = floor(amin*scale)/scale
+    amax = ceil(amax*scale)/scale
+    amin, amax
+end
+
 # using the axis extrema and limit overrides, return the min/max value for this axis
 function axis_limits(axis::Axis, should_widen::Bool = default_should_widen(axis))
     ex = axis[:extrema]
@@ -460,6 +478,8 @@ function axis_limits(axis::Axis, should_widen::Bool = default_should_widen(axis)
         end
     elseif should_widen
         widen(amin, amax)
+    elseif lims == :round
+        round_limits(amin,amax)
     else
         amin, amax
     end

src/backends/gr.jl

@@ -135,7 +135,7 @@ const gr_font_family = Dict(
 # --------------------------------------------------------------------------------------
 
 function gr_getcolorind(c)
-    GR.settransparency(float(alpha(c)))
+    gr_set_transparency(float(alpha(c)))
     convert(Int, GR.inqcolorfromrgb(red(c), green(c), blue(c)))
 end
 
@@ -143,6 +143,8 @@ gr_set_linecolor(c)   = GR.setlinecolorind(gr_getcolorind(_cycle(c,1)))
 gr_set_fillcolor(c)   = GR.setfillcolorind(gr_getcolorind(_cycle(c,1)))
 gr_set_markercolor(c) = GR.setmarkercolorind(gr_getcolorind(_cycle(c,1)))
 gr_set_textcolor(c)   = GR.settextcolorind(gr_getcolorind(_cycle(c,1)))
+gr_set_transparency(α::Real) = GR.settransparency(clamp(α, 0, 1))
+function gr_set_transparency(::Void) end
 
 # --------------------------------------------------------------------------------------
 
@@ -223,14 +225,14 @@ function gr_polaraxes(rmin::Real, rmax::Real, sp::Subplot)
     sinf = sind.(a)
     cosf = cosd.(a)
     rtick_values, rtick_labels = get_ticks(yaxis)
-    if yaxis[:formatter] == :scientific && yaxis[:ticks] in (:auto, :native)
-        rtick_labels = convert_sci_unicode(rtick_labels)
+    if yaxis[:formatter] in (:scientific, :auto) && yaxis[:ticks] in (:auto, :native)
+        rtick_labels = convert_sci_unicode.(rtick_labels)
     end
 
     #draw angular grid
     if xaxis[:grid]
         gr_set_line(xaxis[:gridlinewidth], xaxis[:gridstyle], xaxis[:foreground_color_grid])
-        GR.settransparency(xaxis[:gridalpha])
+        gr_set_transparency(xaxis[:gridalpha])
         for i in 1:length(α)
             GR.polyline([sinf[i], 0], [cosf[i], 0])
         end
@@ -239,7 +241,7 @@ function gr_polaraxes(rmin::Real, rmax::Real, sp::Subplot)
     #draw radial grid
     if yaxis[:grid]
         gr_set_line(yaxis[:gridlinewidth], yaxis[:gridstyle], yaxis[:foreground_color_grid])
-        GR.settransparency(yaxis[:gridalpha])
+        gr_set_transparency(yaxis[:gridalpha])
         for i in 1:length(rtick_values)
             r = (rtick_values[i] - rmin) / (rmax - rmin)
             if r <= 1.0 && r >= 0.0
@@ -250,7 +252,7 @@ function gr_polaraxes(rmin::Real, rmax::Real, sp::Subplot)
     end
 
     #prepare to draw ticks
-    GR.settransparency(1)
+    gr_set_transparency(1)
     GR.setlinecolorind(90)
     GR.settextalign(GR.TEXT_HALIGN_CENTER, GR.TEXT_VALIGN_HALF)
 
@@ -319,9 +321,6 @@ function normalize_zvals(zv::AVec, clims::NTuple{2, <:Real})
     end
 end
 
-gr_alpha(α::Void) = 1
-gr_alpha(α::Real) = α
-
 # ---------------------------------------------------------
 
 # draw ONE Shape
@@ -354,25 +353,18 @@ function gr_draw_markers(series::Series, x, y, msize, mz)
             msi = _cycle(msize, i)
             shape = _cycle(shapes, i)
             cfunc = isa(shape, Shape) ? gr_set_fillcolor : gr_set_markercolor
-            cfuncind = isa(shape, Shape) ? GR.setfillcolorind : GR.setmarkercolorind
 
             # draw a filled in shape, slightly bigger, to estimate a stroke
             if series[:markerstrokewidth] > 0
-                cfunc(_cycle(series[:markerstrokecolor], i)) #, series[:markerstrokealpha])
+                cfunc(get_markerstrokecolor(series, i))
+                gr_set_transparency(get_markerstrokealpha(series, i))
                 gr_draw_marker(x[i], y[i], msi + series[:markerstrokewidth], shape)
             end
 
-            # draw the shape
-            if mz == nothing
-                cfunc(_cycle(series[:markercolor], i)) #, series[:markeralpha])
-            else
-                # pick a color from the pre-loaded gradient
-                ci = round(Int, 1000 + _cycle(mz, i) * 255)
-                cfuncind(ci)
-                GR.settransparency(_gr_gradient_alpha[ci-999])
-            end
-            # don't draw filled area if marker shape is 1D
+            # draw the shape - don't draw filled area if marker shape is 1D
             if !(shape in (:hline, :vline, :+, :x))
+                cfunc(get_markercolor(series, i))
+                gr_set_transparency(get_markeralpha(series, i))
                 gr_draw_marker(x[i], y[i], msi, shape)
             end
         end
@@ -794,21 +786,21 @@ function gr_display(sp::Subplot{GRBackend}, w, h, viewport_canvas)
 
         if xaxis[:grid]
             gr_set_line(xaxis[:gridlinewidth], xaxis[:gridstyle], xaxis[:foreground_color_grid])
-            GR.settransparency(xaxis[:gridalpha])
+            gr_set_transparency(xaxis[:gridalpha])
             GR.grid3d(xtick, 0, 0, xmin, ymax, zmin, 2, 0, 0)
         end
         if yaxis[:grid]
             gr_set_line(yaxis[:gridlinewidth], yaxis[:gridstyle], yaxis[:foreground_color_grid])
-            GR.settransparency(yaxis[:gridalpha])
+            gr_set_transparency(yaxis[:gridalpha])
             GR.grid3d(0, ytick, 0, xmin, ymax, zmin, 0, 2, 0)
         end
         if zaxis[:grid]
             gr_set_line(zaxis[:gridlinewidth], zaxis[:gridstyle], zaxis[:foreground_color_grid])
-            GR.settransparency(zaxis[:gridalpha])
+            gr_set_transparency(zaxis[:gridalpha])
             GR.grid3d(0, 0, ztick, xmin, ymax, zmin, 0, 0, 2)
         end
         gr_set_line(1, :solid, xaxis[:foreground_color_axis])
-        GR.settransparency(1)
+        gr_set_transparency(1)
         GR.axes3d(xtick, 0, ztick, xmin, ymin, zmin, 2, 0, 2, -ticksize)
         GR.axes3d(0, ytick, 0, xmax, ymin, zmin, 0, 2, 0, ticksize)
 
@@ -831,15 +823,15 @@ function gr_display(sp::Subplot{GRBackend}, w, h, viewport_canvas)
             # gr_set_linecolor(sp[:foreground_color_grid])
             # GR.grid(xtick, ytick, 0, 0, majorx, majory)
             gr_set_line(xaxis[:gridlinewidth], xaxis[:gridstyle], xaxis[:foreground_color_grid])
-            GR.settransparency(xaxis[:gridalpha])
+            gr_set_transparency(xaxis[:gridalpha])
             gr_polyline(coords(xgrid_segs)...)
         end
         if yaxis[:grid]
             gr_set_line(yaxis[:gridlinewidth], yaxis[:gridstyle], yaxis[:foreground_color_grid])
-            GR.settransparency(yaxis[:gridalpha])
+            gr_set_transparency(yaxis[:gridalpha])
             gr_polyline(coords(ygrid_segs)...)
         end
-        GR.settransparency(1.0)
+        gr_set_transparency(1.0)
 
         # axis lines
         if xaxis[:showaxis]
@@ -858,7 +850,7 @@ function gr_display(sp::Subplot{GRBackend}, w, h, viewport_canvas)
         if xaxis[:showaxis]
             if sp[:framestyle] in (:zerolines, :grid)
                 gr_set_line(1, :solid, xaxis[:foreground_color_grid])
-                GR.settransparency(xaxis[:gridalpha])
+                gr_set_transparency(xaxis[:gridalpha])
             else
                 gr_set_line(1, :solid, xaxis[:foreground_color_axis])
             end
@@ -868,7 +860,7 @@ function gr_display(sp::Subplot{GRBackend}, w, h, viewport_canvas)
         if  yaxis[:showaxis]
             if sp[:framestyle] in (:zerolines, :grid)
                 gr_set_line(1, :solid, yaxis[:foreground_color_grid])
-                GR.settransparency(yaxis[:gridalpha])
+                gr_set_transparency(yaxis[:gridalpha])
             else
                 gr_set_line(1, :solid, yaxis[:foreground_color_axis])
             end
@@ -889,7 +881,7 @@ function gr_display(sp::Subplot{GRBackend}, w, h, viewport_canvas)
                     # ensure correct dispatch in gr_text for automatic log ticks
                     if xaxis[:scale] in _logScales
                         dv = string(dv, "\\ ")
-                    elseif xaxis[:formatter] == :scientific
+                    elseif xaxis[:formatter] in (:scientific, :auto)
                         dv = convert_sci_unicode(dv)
                     end
                 end
@@ -908,7 +900,7 @@ function gr_display(sp::Subplot{GRBackend}, w, h, viewport_canvas)
                     # ensure correct dispatch in gr_text for automatic log ticks
                     if yaxis[:scale] in _logScales
                         dv = string(dv, "\\ ")
-                    elseif yaxis[:formatter] == :scientific
+                    elseif yaxis[:formatter] in (:scientific, :auto)
                         dv = convert_sci_unicode(dv)
                     end
                 end
@@ -920,10 +912,10 @@ function gr_display(sp::Subplot{GRBackend}, w, h, viewport_canvas)
         intensity = sp[:framestyle] == :semi ? 0.5 : 1.0
         if sp[:framestyle] in (:box, :semi)
             gr_set_line(intensity, :solid, xaxis[:foreground_color_border])
-            GR.settransparency(intensity)
+            gr_set_transparency(intensity)
             gr_polyline(coords(xborder_segs)...)
             gr_set_line(intensity, :solid, yaxis[:foreground_color_border])
-            GR.settransparency(intensity)
+            gr_set_transparency(intensity)
             gr_polyline(coords(yborder_segs)...)
         end
     end
@@ -1021,28 +1013,25 @@ function gr_display(sp::Subplot{GRBackend}, w, h, viewport_canvas)
         if st in (:path, :scatter, :straightline)
             if length(x) > 1
                 lz = series[:line_z]
-                segments_iterator = if lz != nothing && length(lz) > 1
-                    [i:(i + 1) for i in 1:(length(x) - 1)]
-                else
-                    iter_segments(x, y)
-                end
+                segments = iter_segments(series)
                 # do area fill
                 if frng != nothing
                     GR.setfillintstyle(GR.INTSTYLE_SOLID)
                     fr_from, fr_to = (is_2tuple(frng) ? frng : (y, frng))
-                    for (i, rng) in enumerate(segments_iterator)
-                        gr_set_fillcolor(get_fillcolor(sp, series, i))
+                    for (i, rng) in enumerate(segments)
+                        gr_set_fillcolor(get_fillcolor(series, i))
                         fx = _cycle(x, vcat(rng, reverse(rng)))
                         fy = vcat(_cycle(fr_from,rng), _cycle(fr_to,reverse(rng)))
-                        series[:fillalpha] != nothing && GR.settransparency(series[:fillalpha])
+                        gr_set_transparency(get_fillalpha(series, i))
                         GR.fillarea(fx, fy)
                     end
                 end
 
                 # draw the line(s)
                 if st in (:path, :straightline)
-                    for (i, rng) in enumerate(segments_iterator)
-                        gr_set_line(series[:linewidth], series[:linestyle], get_linecolor(sp, series, i)) #, series[:linealpha])
+                    for (i, rng) in enumerate(segments)
+                        gr_set_line(get_linewidth(series, i), get_linestyle(series, i), get_linecolor(series, i)) #, series[:linealpha])
+                        gr_set_transparency(get_linealpha(series, i))
                         arrowside = isa(series[:arrow], Arrow) ? series[:arrow].side : :none
                         gr_polyline(x[rng], y[rng]; arrowside = arrowside)
                     end
@@ -1050,10 +1039,6 @@ function gr_display(sp::Subplot{GRBackend}, w, h, viewport_canvas)
             end
 
             if series[:markershape] != :none
-                if series[:marker_z] != nothing
-                    zmin, zmax = extrema(series[:marker_z])
-                    GR.setspace(zmin, zmax, 0, 90)
-                end
                 gr_draw_markers(series, x, y, clims)
             end
 
@@ -1068,8 +1053,8 @@ function gr_display(sp::Subplot{GRBackend}, w, h, viewport_canvas)
             if series[:fillrange] != nothing
                 GR.surface(x, y, z, GR.OPTION_CELL_ARRAY)
             else
-                GR.setlinetype(gr_linetype[series[:linestyle]])
-                GR.setlinewidth(max(0, series[:linewidth] / (sum(gr_plot_size) * 0.001)))
+                GR.setlinetype(gr_linetype[get_linestyle(series)])
+                GR.setlinewidth(max(0, get_linewidth(series) / (sum(gr_plot_size) * 0.001)))
                 if plot_color(series[:linecolor]) == [plot_color(:black)]
                     GR.contour(x, y, h, z, 0 + (series[:contour_labels] == true ? 1 : 0))
                 else
@@ -1119,13 +1104,10 @@ function gr_display(sp::Subplot{GRBackend}, w, h, viewport_canvas)
             if st == :path3d
                 if length(x) > 1
                     lz = series[:line_z]
-                    segments_iterator = if lz != nothing && length(lz) > 1
-                        [i:(i + 1) for i in 1:(length(x) - 1)]
-                    else
-                        iter_segments(x, y, z)
-                    end
-                    for (i, rng) in enumerate(segments_iterator)
-                        gr_set_line(series[:linewidth], series[:linestyle], get_linecolor(sp, series, i)) #, series[:linealpha])
+                    segments = iter_segments(series)
+                    for (i, rng) in enumerate(segments)
+                        gr_set_line(get_linewidth(series, i), get_linestyle(series, i), get_linecolor(series, i)) #, series[:linealpha])
+                        gr_set_transparency(get_linealpha(series, i))
                         GR.polyline3d(x[rng], y[rng], z[rng])
                     end
                 end
@@ -1196,11 +1178,13 @@ function gr_display(sp::Subplot{GRBackend}, w, h, viewport_canvas)
                     xseg, yseg = x[rng], y[rng]
 
                     # draw the interior
-                    gr_set_fill(get_fillcolor(sp, series, i))
+                    gr_set_fill(get_fillcolor(series, i))
+                    gr_set_transparency(get_fillalpha(series, i))
                     GR.fillarea(xseg, yseg)
 
                     # draw the shapes
-                    gr_set_line(series[:linewidth], :solid, get_linecolor(sp, series, i))
+                    gr_set_line(get_linewidth(series, i), get_linestyle(series, i), get_linecolor(series, i))
+                    gr_set_transparency(get_linealpha(series, i))
                     GR.polyline(xseg, yseg)
                 end
             end
@@ -1232,7 +1216,7 @@ function gr_display(sp::Subplot{GRBackend}, w, h, viewport_canvas)
         # draw the colorbar
         if cmap && st != :contour # special colorbar with steps is drawn for contours
             gr_set_line(1, :solid, yaxis[:foreground_color_axis])
-            GR.settransparency(1)
+            gr_set_transparency(1)
             gr_colorbar(sp, clims)
         end
 
@@ -1279,29 +1263,30 @@ function gr_display(sp::Subplot{GRBackend}, w, h, viewport_canvas)
             if sp[:legendtitle] != nothing
                 GR.settextalign(GR.TEXT_HALIGN_CENTER, GR.TEXT_VALIGN_HALF)
                 gr_set_textcolor(sp[:legendfontcolor])
-                GR.settransparency(1)
+                gr_set_transparency(1)
                 gr_text(xpos - 0.03 + 0.5*w, ypos, string(sp[:legendtitle]))
                 ypos -= dy
             end
             for series in series_list(sp)
                 should_add_to_legend(series) || continue
                 st = series[:seriestype]
-                gr_set_line(series[:linewidth], series[:linestyle], get_linecolor(sp, series)) #, series[:linealpha])
+                gr_set_line(get_linewidth(series), get_linestyle(series), get_linecolor(series)) #, series[:linealpha])
 
                 if (st == :shape || series[:fillrange] != nothing) && series[:ribbon] == nothing
-                    gr_set_fill(get_fillcolor(sp, series)) #, series[:fillalpha])
+                    gr_set_fill(get_fillcolor(series)) #, series[:fillalpha])
                     l, r = xpos-0.07, xpos-0.01
                     b, t = ypos-0.4dy, ypos+0.4dy
                     x = [l, r, r, l, l]
                     y = [b, b, t, t, b]
-                    GR.settransparency(gr_alpha(series[:fillalpha]))
+                    gr_set_transparency(get_fillalpha(series))
                     gr_polyline(x, y, GR.fillarea)
-                    GR.settransparency(gr_alpha(series[:linealpha]))
+                    gr_set_transparency(get_linealpha(series))
+                    gr_set_line(get_linewidth(series), get_linestyle(series), get_linecolor(series))
                     st == :shape && gr_polyline(x, y)
                 end
 
                 if st in (:path, :straightline)
-                    GR.settransparency(gr_alpha(series[:linealpha]))
+                    gr_set_transparency(get_linealpha(series))
                     if series[:fillrange] == nothing || series[:ribbon] != nothing
                         GR.polyline([xpos - 0.07, xpos - 0.01], [ypos, ypos])
                     else

src/backends/hdf5.jl

@@ -167,6 +167,7 @@ function _initialize_backend(::HDF5Backend)
 #                "PLOTTEXT" => PlotText,
                 "COLORGRADIENT" => ColorGradient,
                 "AXIS" => Axis,
+                "SURFACE" => Surface,
                 "SUBPLOT" => Subplot,
                 "NULLABLE" => Nullable,
             )
@@ -239,10 +240,6 @@ end
 
 # ----------------------------------------------------------------
 
-_show(io::IO, mime::MIME"text/plain", plt::Plot{HDF5Backend}) = nothing #Don't show
-
-# ----------------------------------------------------------------
-
 # Display/show the plot (open a GUI window, or browser page, for example).
 function _display(plt::Plot{HDF5Backend})
     msg = "HDF5 interface does not support `display()` function."
@@ -407,6 +404,11 @@ function _hdf5plot_gwrite(grp, k::String, v::Axis)
     _hdf5plot_writetype(grp, Axis)
     return
 end
+function _hdf5plot_gwrite(grp, k::String, v::Surface)
+	grp = HDF5.g_create(grp, k)
+	_hdf5plot_gwrite(grp, "data2d", v.surf)
+	_hdf5plot_writetype(grp, Surface)
+end
 #TODO: "Properly" support Nullable using _hdf5plot_writetype?
 function _hdf5plot_gwrite(grp, k::String, v::Nullable)
     if isnull(v)
@@ -577,6 +579,11 @@ function _hdf5plot_read(grp, k::String, T::Type{Axis}, dtid)
     _hdf5plot_read(grp, kwlist)
     return Axis([], kwlist)
 end
+function _hdf5plot_read(grp, k::String, T::Type{Surface}, dtid)
+    grp = HDF5.g_open(grp, k)
+    data2d = _hdf5plot_read(grp, "data2d")
+    return Surface(data2d)
+end
 function _hdf5plot_read(grp, k::String, T::Type{Subplot}, dtid)
     grp = HDF5.g_open(grp, k)
     idx = _hdf5plot_read(grp, "index")

src/backends/inspectdr.jl

@@ -523,7 +523,6 @@ for (mime, fmt) in _inspectdr_mimeformats_nodpi
         _inspectdr_show(io, mime, _inspectdr_getmplot(plt.o), plt[:size]...)
     end
 end
-_show(io::IO, mime::MIME"text/plain", plt::Plot{InspectDRBackend}) = nothing #Don't show
 
 # ----------------------------------------------------------------
 

src/backends/pgfplots.jl

@@ -27,7 +27,7 @@ const _pgfplots_attr = merge_with_base_supported([
     :tickfont, :guidefont, :legendfont,
     :grid, :legend,
     :colorbar,
-    :marker_z, #:levels,
+    :fill_z, :line_z, :marker_z, :levels,
     # :ribbon, :quiver, :arrow,
     # :orientation,
     # :overwrite_figure,
@@ -38,6 +38,7 @@ const _pgfplots_attr = merge_with_base_supported([
     :tick_direction,
     :framestyle,
     :camera,
+    :contour_labels,
   ])
 const _pgfplots_seriestype = [:path, :path3d, :scatter, :steppre, :stepmid, :steppost, :histogram2d, :ysticks, :xsticks, :contour, :shape, :straightline,]
 const _pgfplots_style = [:auto, :solid, :dash, :dot, :dashdot, :dashdotdot]
@@ -148,33 +149,41 @@ function pgf_colormap(grad::ColorGradient)
     end,", ")
 end
 
-function pgf_fillstyle(d::KW)
-    cstr,a = pgf_color(d[:fillcolor])
+function pgf_fillstyle(d, i = 1)
+    cstr,a = pgf_color(get_fillcolor(d, i))
+    fa = get_fillalpha(d, i)
+    if fa != nothing
+        a = fa
+    end
     "fill = $cstr, fill opacity=$a"
 end
 
-function pgf_linestyle(d::KW)
-    cstr,a = pgf_color(d[:linecolor])
+function pgf_linestyle(d, i = 1)
+    cstr,a = pgf_color(get_linecolor(d, i))
+    la = get_linealpha(d, i)
+    if la != nothing
+        a = la
+    end
     """
     color = $cstr,
     draw opacity=$a,
-    line width=$(d[:linewidth]),
-    $(get(_pgfplots_linestyles, d[:linestyle], "solid"))"""
+    line width=$(get_linewidth(d, i)),
+    $(get(_pgfplots_linestyles, get_linestyle(d, i), "solid"))"""
 end
 
-function pgf_marker(d::KW)
-    shape = d[:markershape]
-    cstr, a = pgf_color(d[:markercolor])
-    cstr_stroke, a_stroke = pgf_color(d[:markerstrokecolor])
+function pgf_marker(d, i = 1)
+    shape = _cycle(d[:markershape], i)
+    cstr, a = pgf_color(plot_color(get_markercolor(d, i), get_markeralpha(d, i)))
+    cstr_stroke, a_stroke = pgf_color(plot_color(get_markerstrokecolor(d, i), get_markerstrokealpha(d, i)))
     """
     mark = $(get(_pgfplots_markers, shape, "*")),
-    mark size = $(0.5 * d[:markersize]),
+    mark size = $(0.5 * _cycle(d[:markersize], i)),
     mark options = {
         color = $cstr_stroke, draw opacity = $a_stroke,
         fill = $cstr, fill opacity = $a,
-        line width = $(d[:markerstrokewidth]),
+        line width = $(_cycle(d[:markerstrokewidth], i)),
         rotate = $(shape == :dtriangle ? 180 : 0),
-        $(get(_pgfplots_linestyles, d[:markerstrokestyle], "solid"))
+        $(get(_pgfplots_linestyles, _cycle(d[:markerstrokestyle], i), "solid"))
     }"""
 end
 
@@ -196,27 +205,10 @@ end
 function pgf_series(sp::Subplot, series::Series)
     d = series.d
     st = d[:seriestype]
-    style = []
-    kw = KW()
-    push!(style, pgf_linestyle(d))
-    push!(style, pgf_marker(d))
-
-    if d[:fillrange] != nothing || st in (:shape,)
-        push!(style, pgf_fillstyle(d))
-    end
-
-    # add to legend?
-    if sp[:legend] != :none && should_add_to_legend(series)
-        kw[:legendentry] = d[:label]
-        if st == :shape || d[:fillrange] != nothing
-            push!(style, "area legend")
-        end
-    else
-        push!(style, "forget plot")
-    end
+    series_collection = PGFPlots.Plot[]
 
     # function args
-    args = if st  == :contour
+    args = if st == :contour
         d[:z].surf, d[:x], d[:y]
     elseif is3d(st)
         d[:x], d[:y], d[:z]
@@ -224,10 +216,6 @@ function pgf_series(sp::Subplot, series::Series)
         straightline_data(series)
     elseif st == :shape
         shape_data(series)
-    elseif d[:marker_z] != nothing
-        # If a marker_z is used pass it as third coordinate to a 2D plot.
-        # See "Scatter Plots" in PGFPlots documentation
-        d[:x], d[:y], d[:marker_z]
     elseif ispolar(sp)
         theta, r = filter_radial_data(d[:x], d[:y], axis_limits(sp[:yaxis]))
         rad2deg.(theta), r
@@ -241,34 +229,131 @@ function pgf_series(sp::Subplot, series::Series)
         else
             a
         end, args)
-    # for (i,a) in enumerate(args)
-    #     if typeof(a) <: AbstractVector && typeof(a) != Vector
-    #         args[i] = collect(a)
-    #     end
-    # end
 
-    # include additional style, then add to the kw
+    if st in (:contour, :histogram2d)
+        style = []
+        kw = KW()
+        push!(style, pgf_linestyle(d))
+        push!(style, pgf_marker(d))
+        push!(style, "forget plot")
+
+        kw[:style] = join(style, ',')
+        func = if st == :histogram2d
+            PGFPlots.Histogram2
+        else
+            kw[:labels] = series[:contour_labels]
+            kw[:levels] = series[:levels]
+            PGFPlots.Contour
+        end
+        push!(series_collection, func(args...; kw...))
+
+    else
+        # series segments
+        segments = iter_segments(series)
+        for (i, rng) in enumerate(segments)
+            style = []
+            kw = KW()
+            push!(style, pgf_linestyle(d, i))
+            push!(style, pgf_marker(d, i))
+
+            if st == :shape
+                push!(style, pgf_fillstyle(d, i))
+            end
+
+            # add to legend?
+            if i == 1 && sp[:legend] != :none && should_add_to_legend(series)
+                if d[:fillrange] != nothing
+                    push!(style, "forget plot")
+                    push!(series_collection, pgf_fill_legend_hack(d, args))
+                else
+                    kw[:legendentry] = d[:label]
+                    if st == :shape # || d[:fillrange] != nothing
+                        push!(style, "area legend")
+                    end
+                end
+            else
+                push!(style, "forget plot")
+            end
+
+            seg_args = (arg[rng] for arg in args)
+
+            # include additional style, then add to the kw
+            if haskey(_pgf_series_extrastyle, st)
+                push!(style, _pgf_series_extrastyle[st])
+            end
+            kw[:style] = join(style, ',')
+
+            # add fillrange
+            if series[:fillrange] != nothing && st != :shape
+                push!(series_collection, pgf_fillrange_series(series, i, _cycle(series[:fillrange], rng), seg_args...))
+            end
+
+            # build/return the series object
+            func = if st == :path3d
+                PGFPlots.Linear3
+            elseif st == :scatter
+                PGFPlots.Scatter
+            else
+                PGFPlots.Linear
+            end
+            push!(series_collection, func(seg_args...; kw...))
+        end
+    end
+    series_collection
+end
+
+function pgf_fillrange_series(series, i, fillrange, args...)
+    st = series[:seriestype]
+    style = []
+    kw = KW()
+    push!(style, "line width = 0")
+    push!(style, "draw opacity = 0")
+    push!(style, pgf_fillstyle(series, i))
+    push!(style, pgf_marker(series, i))
+    push!(style, "forget plot")
     if haskey(_pgf_series_extrastyle, st)
         push!(style, _pgf_series_extrastyle[st])
     end
     kw[:style] = join(style, ',')
+    func = is3d(series) ? PGFPlots.Linear3 : PGFPlots.Linear
+    return func(pgf_fillrange_args(fillrange, args...)...; kw...)
+end
 
-    # build/return the series object
+function pgf_fillrange_args(fillrange, x, y)
+    n = length(x)
+    x_fill = [x; x[n:-1:1]; x[1]]
+    y_fill = [y; _cycle(fillrange, n:-1:1); y[1]]
+    return x_fill, y_fill
+end
+
+function pgf_fillrange_args(fillrange, x, y, z)
+    n = length(x)
+    x_fill = [x; x[n:-1:1]; x[1]]
+    y_fill = [y; y[n:-1:1]; x[1]]
+    z_fill = [z; _cycle(fillrange, n:-1:1); z[1]]
+    return x_fill, y_fill, z_fill
+end
+
+function pgf_fill_legend_hack(d, args)
+    style = []
+    kw = KW()
+    push!(style, pgf_linestyle(d, 1))
+    push!(style, pgf_marker(d, 1))
+    push!(style, pgf_fillstyle(d, 1))
+    push!(style, "area legend")
+    kw[:legendentry] = d[:label]
+    kw[:style] = join(style, ',')
+    st = d[:seriestype]
     func = if st == :path3d
         PGFPlots.Linear3
     elseif st == :scatter
         PGFPlots.Scatter
-    elseif st == :histogram2d
-        PGFPlots.Histogram2
-    elseif st == :contour
-        PGFPlots.Contour
     else
         PGFPlots.Linear
     end
-    func(args...; kw...)
+    return func(([arg[1]] for arg in args)...; kw...)
 end
 
-
 # ----------------------------------------------------------------
 
 function pgf_axis(sp::Subplot, letter)
@@ -333,7 +418,10 @@ function pgf_axis(sp::Subplot, letter)
             push!(style, string(letter, "ticklabels = {\$", join(tick_labels,"\$,\$"), "\$}"))
         elseif axis[:showaxis]
             tick_labels = ispolar(sp) && letter == :x ? [ticks[2][3:end]..., "0", "45"] : ticks[2]
-            tick_labels = axis[:formatter] == :scientific ? string.("\$", convert_sci_unicode.(tick_labels), "\$") : tick_labels
+            if axis[:formatter] in (:scientific, :auto)
+                tick_labels = string.("\$", convert_sci_unicode.(tick_labels), "\$")
+                tick_labels = replace.(tick_labels, "×", "\\times")
+            end
             push!(style, string(letter, "ticklabels = {", join(tick_labels,","), "}"))
         else
             push!(style, string(letter, "ticklabels = {}"))
@@ -414,7 +502,10 @@ function _update_plot_object(plt::Plot{PGFPlotsBackend})
             kw[:legendPos] = _pgfplots_legend_pos[legpos]
         end
 
-        if is3d(sp)
+        if any(s[:seriestype] == :contour for s in series_list(sp))
+            kw[:view] = "{0}{90}"
+            kw[:colorbar] = !(sp[:colorbar] in (:none, :off, :hide, false))
+        elseif is3d(sp)
             azim, elev = sp[:camera]
             kw[:view] = "{$(azim)}{$(elev)}"
         end
@@ -438,7 +529,7 @@ function _update_plot_object(plt::Plot{PGFPlotsBackend})
         # As it is likely that all series within the same axis use the same
         # colormap this should not cause any problem.
         for series in series_list(sp)
-            for col in (:markercolor, :fillcolor)
+            for col in (:markercolor, :fillcolor, :linecolor)
                 if typeof(series.d[col]) == ColorGradient
                     push!(style,"colormap={plots}{$(pgf_colormap(series.d[col]))}")
 
@@ -458,7 +549,7 @@ function _update_plot_object(plt::Plot{PGFPlotsBackend})
 
         # add the series object to the PGFPlots.Axis
         for series in series_list(sp)
-            push!(o, pgf_series(sp, series))
+            push!.(o, pgf_series(sp, series))
 
             # add series annotations
             anns = series[:series_annotations]
@@ -505,7 +596,6 @@ end
 
 function _display(plt::Plot{PGFPlotsBackend})
     # prepare the object
-    PGFPlots.pushPGFPlotsPreamble("\\usepackage{fontspec}")
     pgfplt = PGFPlots.plot(plt.o)
 
     # save an svg

src/backends/plotly.jl

@@ -30,7 +30,7 @@ const _plotly_attr = merge_with_base_supported([
     :tickfont, :guidefont, :legendfont,
     :grid, :gridalpha, :gridlinewidth,
     :legend, :colorbar, :colorbar_title,
-    :marker_z, :fill_z, :levels,
+    :marker_z, :fill_z, :line_z, :levels,
     :ribbon, :quiver,
     :orientation,
     # :overwrite_figure,
@@ -264,7 +264,10 @@ function plotly_axis(plt::Plot, axis::Axis, sp::Subplot)
 
     ax[:tickangle] = -axis[:rotation]
     lims = axis_limits(axis)
-    axis[:ticks] != :native ? ax[:range] = map(scalefunc(axis[:scale]), lims) : nothing
+
+    if axis[:ticks] != :native || axis[:lims] != :auto
+        ax[:range] = map(scalefunc(axis[:scale]), lims)
+    end
 
     if !(axis[:ticks] in (nothing, :none, false))
         ax[:titlefont] = plotly_font(guidefont(axis))
@@ -325,9 +328,11 @@ function plotly_layout(plt::Plot)
 
     d_out[:annotations] = KW[]
 
+    multiple_subplots = length(plt.subplots) > 1
+
     for sp in plt.subplots
-        spidx = sp[:subplot_index]
-        x_idx, y_idx = plotly_link_indicies(plt, sp)
+        spidx = multiple_subplots ? sp[:subplot_index] : ""
+        x_idx, y_idx = multiple_subplots ? plotly_link_indicies(plt, sp) : ("", "") 
         # add an annotation for the title... positioned horizontally relative to plotarea,
         # but vertically just below the top of the subplot bounding box
         if sp[:title] != ""
@@ -385,6 +390,7 @@ function plotly_layout(plt::Plot)
                 :bgcolor  => rgba_string(sp[:background_color_legend]),
                 :bordercolor => rgba_string(sp[:foreground_color_legend]),
                 :font     => plotly_font(legendfont(sp)),
+                :tracegroupgap => 0,
                 :x => xpos,
                 :y => ypos
             )
@@ -485,6 +491,21 @@ function plotly_close_shapes(x, y)
     nanvcat(xs), nanvcat(ys)
 end
 
+function plotly_data(series::Series, letter::Symbol, data)
+    axis = series[:subplot][Symbol(letter, :axis)]
+
+    data = if axis[:ticks] == :native && data != nothing
+        plotly_native_data(axis, data)
+    else
+       data
+    end
+
+    if series[:seriestype] in (:heatmap, :contour, :surface, :wireframe)
+        plotly_surface_data(series, data)
+    else
+        plotly_data(data)
+    end
+end
 plotly_data(v) = v != nothing ? collect(v) : v
 plotly_data(surf::Surface) = surf.surf
 plotly_data(v::AbstractArray{R}) where {R<:Rational} = float(v)
@@ -493,6 +514,28 @@ plotly_surface_data(series::Series, a::AbstractVector) = a
 plotly_surface_data(series::Series, a::AbstractMatrix) = transpose_z(series, a, false)
 plotly_surface_data(series::Series, a::Surface) = plotly_surface_data(series, a.surf)
 
+function plotly_native_data(axis::Axis, data::AbstractArray)
+    if !isempty(axis[:discrete_values])
+        construct_categorical_data(data, axis)
+    elseif axis[:formatter] in (datetimeformatter, dateformatter, timeformatter)
+        plotly_convert_to_datetime(data, axis[:formatter])
+    else
+        data
+    end
+end
+plotly_native_data(axis::Axis, a::Surface) = Surface(plotly_native_data(axis, a.surf))
+
+function plotly_convert_to_datetime(x::AbstractArray, formatter::Function)
+    if formatter == datetimeformatter
+        map(xi -> replace(formatter(xi), "T", " "), x)
+    elseif formatter == dateformatter
+        map(xi -> string(formatter(xi), " 00:00:00"), x)
+    elseif formatter == timeformatter
+        map(xi -> string(Dates.Date(Dates.now()), " ", formatter(xi)), x)
+    else
+        error("Invalid DateTime formatter. Expected Plots.datetime/date/time formatter but got $formatter")
+    end
+end
 #ensures that a gradient is called if a single color is supplied where a gradient is needed (e.g. if a series recipe defines marker_z)
 as_gradient(grad::ColorGradient, α) = grad
 as_gradient(grad, α) = cgrad(alpha = α)
@@ -513,20 +556,17 @@ function plotly_series(plt::Plot, series::Series)
     d_out[:yaxis] = "y$(y_idx)"
     d_out[:showlegend] = should_add_to_legend(series)
 
-
-    x, y, z = map(letter -> (axis = sp[Symbol(letter, :axis)];
-        if axis[:ticks] == :native && !isempty(axis[:discrete_values])
-            axis[:discrete_values]
-        elseif st in (:heatmap, :contour, :surface, :wireframe)
-            plotly_surface_data(series, series[letter])
-        else
-            plotly_data(series[letter])
-        end), (:x, :y, :z))
-
     if st == :straightline
         x, y = straightline_data(series)
+        z = series[:z]
+    else
+        x, y, z  = series[:x], series[:y], series[:z]
     end
 
+    x, y, z = (plotly_data(series, letter, data)
+        for (letter, data) in zip((:x, :y, :z), (x, y, z))
+    )
+
     d_out[:name] = series[:label]
 
     isscatter = st in (:scatter, :scatter3d, :scattergl)
@@ -543,23 +583,8 @@ function plotly_series(plt::Plot, series::Series)
     end
 
     # set the "type"
-    if st in (:path, :scatter, :scattergl, :straightline)
-        d_out[:type] = st==:scattergl ? "scattergl" : "scatter"
-        d_out[:mode] = if hasmarker
-            hasline ? "lines+markers" : "markers"
-        else
-            hasline ? "lines" : "none"
-        end
-        if series[:fillrange] == true || series[:fillrange] == 0 || isa(series[:fillrange], Tuple)
-            d_out[:fill] = "tozeroy"
-            d_out[:fillcolor] = rgba_string(series[:fillcolor])
-        elseif typeof(series[:fillrange]) <: Union{AbstractVector{<:Real}, Real}
-            d_out[:fill] = "tonexty"
-            d_out[:fillcolor] = rgba_string(series[:fillcolor])
-        elseif !(series[:fillrange] in (false, nothing))
-            warn("fillrange ignored... plotly only supports filling to zero and to a vector of values. fillrange: $(series[:fillrange])")
-        end
-        d_out[:x], d_out[:y] = x, y
+    if st in (:path, :scatter, :scattergl, :straightline, :path3d, :scatter3d)
+        return plotly_series_segments(series, d_out, x, y, z)
 
     elseif st == :heatmap
         d_out[:type] = "heatmap"
@@ -583,7 +608,7 @@ function plotly_series(plt::Plot, series::Series)
             d_out[:hidesurface] = true
             wirelines = KW(
                 :show => true,
-                :color => rgba_string(series[:linecolor]),
+                :color => rgba_string(plot_color(series[:linecolor], series[:linealpha])),
                 :highlightwidth => series[:linewidth],
             )
             d_out[:contours] = KW(:x => wirelines, :y => wirelines, :z => wirelines)
@@ -603,15 +628,6 @@ function plotly_series(plt::Plot, series::Series)
         d_out[:values] = y
         d_out[:hoverinfo] = "label+percent+name"
 
-    elseif st in (:path3d, :scatter3d)
-        d_out[:type] = "scatter3d"
-        d_out[:mode] = if hasmarker
-            hasline ? "lines+markers" : "markers"
-        else
-            hasline ? "lines" : "none"
-        end
-        d_out[:x], d_out[:y], d_out[:z] = x, y, z
-
     else
         warn("Plotly: seriestype $st isn't supported.")
         return KW()
@@ -619,128 +635,227 @@ function plotly_series(plt::Plot, series::Series)
 
     # add "marker"
     if hasmarker
+        inds = eachindex(x)
         d_out[:marker] = KW(
             :symbol => get(_plotly_markers, series[:markershape], string(series[:markershape])),
             # :opacity => series[:markeralpha],
-            :size => 2 * series[:markersize],
-            # :color => rgba_string(series[:markercolor]),
+            :size => 2 * _cycle(series[:markersize], inds),
+            :color => rgba_string.(plot_color.(get_markercolor.(series, inds), get_markeralpha.(series, inds))),
             :line => KW(
-                :color => _cycle(rgba_string.(series[:markerstrokecolor]),eachindex(series[:x])),
-                :width => series[:markerstrokewidth],
+                :color => rgba_string.(plot_color.(get_markerstrokecolor.(series, inds), get_markerstrokealpha.(series, inds))),
+                :width => _cycle(series[:markerstrokewidth], inds),
             ),
         )
-
-        # gotta hack this (for now?) since plotly can't handle rgba values inside the gradient
-        if series[:marker_z] == nothing
-            d_out[:marker][:color] = _cycle(rgba_string.(series[:markercolor]),eachindex(series[:x]))
-        else
-            # grad = ColorGradient(series[:markercolor], alpha=series[:markeralpha])
-            # grad = as_gradient(series[:markercolor], series[:markeralpha])
-            cmin, cmax = get_clims(sp)
-            # zrange = zmax == zmin ? 1 : zmax - zmin # if all marker_z values are the same, plot all markers same color (avoids division by zero in next line)
-            d_out[:marker][:color] = [clamp(zi, cmin, cmax) for zi in series[:marker_z]]
-            d_out[:marker][:cmin] = cmin
-            d_out[:marker][:cmax] = cmax
-            d_out[:marker][:colorscale] = plotly_colorscale(series[:markercolor], series[:markeralpha])
-            d_out[:marker][:showscale] = hascolorbar(sp)
-        end
-    end
-
-    # add "line"
-    if hasline
-        d_out[:line] = KW(
-            :color => rgba_string(series[:linecolor]),
-            :width => series[:linewidth],
-            :shape => if st == :steppre
-                "vh"
-            elseif st == :steppost
-                "hv"
-            else
-                "linear"
-            end,
-            :dash => string(series[:linestyle]),
-            # :dash => "solid",
-        )
     end
 
     plotly_polar!(d_out, series)
     plotly_hover!(d_out, series[:hover])
 
-    if hasfillrange
-        # if hasfillrange is true, return two dictionaries (one for original
-        # series, one for series being filled to) instead of one
-        d_out_fillrange = deepcopy(d_out)
-        d_out_fillrange[:showlegend] = false
-        # if fillrange is provided as real or tuple of real, expand to array
-        if typeof(series[:fillrange]) <: Real
-            series[:fillrange] = fill(series[:fillrange], length(series[:x]))
-        elseif typeof(series[:fillrange]) <: Tuple
-            f1 = typeof(series[:fillrange][1]) <: Real ? fill(series[:fillrange][1], length(series[:x])) : series[:fillrange][1]
-            f2 = typeof(series[:fillrange][2]) <: Real ? fill(series[:fillrange][2], length(series[:x])) : series[:fillrange][2]
-            series[:fillrange] = (f1, f2)
-        end
-        if isa(series[:fillrange], AbstractVector)
-            d_out_fillrange[:y] = series[:fillrange]
-            delete!(d_out_fillrange, :fill)
-            delete!(d_out_fillrange, :fillcolor)
-        else
-            # if fillrange is a tuple with upper and lower limit, d_out_fillrange
-            # is the series that will do the filling
-            d_out_fillrange[:x], d_out_fillrange[:y] =
-                concatenate_fillrange(series[:x], series[:fillrange])
-            d_out_fillrange[:line][:width] = 0
-            delete!(d_out, :fill)
-            delete!(d_out, :fillcolor)
-        end
-
-        return [d_out_fillrange, d_out]
-    else
-        return [d_out]
-    end
+    return [d_out]
 end
 
 function plotly_series_shapes(plt::Plot, series::Series)
-    d_outs = []
+    segments = iter_segments(series)
+    d_outs = Vector{KW}(length(segments))
 
     # TODO: create a d_out for each polygon
     # x, y = series[:x], series[:y]
 
     # these are the axes that the series should be mapped to
     x_idx, y_idx = plotly_link_indicies(plt, series[:subplot])
-    base_d = KW()
-    base_d[:xaxis] = "x$(x_idx)"
-    base_d[:yaxis] = "y$(y_idx)"
-    base_d[:name] = series[:label]
-    # base_d[:legendgroup] = series[:label]
+    d_base = KW(
+        :xaxis => "x$(x_idx)",
+        :yaxis => "y$(y_idx)",
+        :name => series[:label],
+        :legendgroup => series[:label],
+    )
 
-    x, y = shape_data(series)
-    for (i,rng) in enumerate(iter_segments(x,y))
+    x, y = (plotly_data(series, letter, data)
+        for (letter, data) in zip((:x, :y), shape_data(series))
+    )
+
+    for (i,rng) in enumerate(segments)
         length(rng) < 2 && continue
 
         # to draw polygons, we actually draw lines with fill
-        d_out = merge(base_d, KW(
+        d_out = merge(d_base, KW(
             :type => "scatter",
             :mode => "lines",
             :x => vcat(x[rng], x[rng[1]]),
             :y => vcat(y[rng], y[rng[1]]),
             :fill => "tozeroy",
-            :fillcolor => rgba_string(_cycle(series[:fillcolor], i)),
+            :fillcolor => rgba_string(plot_color(get_fillcolor(series, i), get_fillalpha(series, i))),
         ))
         if series[:markerstrokewidth] > 0
             d_out[:line] = KW(
-                :color => rgba_string(_cycle(series[:linecolor], i)),
-                :width => series[:linewidth],
-                :dash => string(series[:linestyle]),
+                :color => rgba_string(plot_color(get_linecolor(series, i), get_linealpha(series, i))),
+                :width => get_linewidth(series, i),
+                :dash => string(get_linestyle(series, i)),
             )
         end
         d_out[:showlegend] = i==1 ? should_add_to_legend(series) : false
         plotly_polar!(d_out, series)
         plotly_hover!(d_out, _cycle(series[:hover], i))
-        push!(d_outs, d_out)
+        d_outs[i] = d_out
+    end
+    if series[:fill_z] != nothing
+        push!(d_outs, plotly_colorbar_hack(series, d_base, :fill))
+    elseif series[:line_z] != nothing
+        push!(d_outs, plotly_colorbar_hack(series, d_base, :line))
+    elseif series[:marker_z] != nothing
+        push!(d_outs, plotly_colorbar_hack(series, d_base, :marker))
     end
     d_outs
 end
 
+function plotly_series_segments(series::Series, d_base::KW, x, y, z)
+    st = series[:seriestype]
+    sp = series[:subplot]
+    isscatter = st in (:scatter, :scatter3d, :scattergl)
+    hasmarker = isscatter || series[:markershape] != :none
+    hasline = st in (:path, :path3d, :straightline)
+    hasfillrange = st in (:path, :scatter, :scattergl, :straightline) &&
+        (isa(series[:fillrange], AbstractVector) || isa(series[:fillrange], Tuple))
+
+    segments = iter_segments(series)
+    d_outs = Vector{KW}((hasfillrange ? 2 : 1 ) * length(segments))
+
+    for (i,rng) in enumerate(segments)
+        !isscatter && length(rng) < 2 && continue
+
+        d_out = deepcopy(d_base)
+        d_out[:showlegend] = i==1 ? should_add_to_legend(series) : false
+        d_out[:legendgroup] = series[:label]
+
+        # set the type
+        if st in (:path, :scatter, :scattergl, :straightline)
+            d_out[:type] = st==:scattergl ? "scattergl" : "scatter"
+            d_out[:mode] = if hasmarker
+                hasline ? "lines+markers" : "markers"
+            else
+                hasline ? "lines" : "none"
+            end
+            if series[:fillrange] == true || series[:fillrange] == 0 || isa(series[:fillrange], Tuple)
+                d_out[:fill] = "tozeroy"
+                d_out[:fillcolor] = rgba_string(plot_color(get_fillcolor(series, i), get_fillalpha(series, i)))
+            elseif typeof(series[:fillrange]) <: Union{AbstractVector{<:Real}, Real}
+                d_out[:fill] = "tonexty"
+                d_out[:fillcolor] = rgba_string(plot_color(get_fillcolor(series, i), get_fillalpha(series, i)))
+            elseif !(series[:fillrange] in (false, nothing))
+                warn("fillrange ignored... plotly only supports filling to zero and to a vector of values. fillrange: $(series[:fillrange])")
+            end
+            d_out[:x], d_out[:y] = x[rng], y[rng]
+
+        elseif st in (:path3d, :scatter3d)
+            d_out[:type] = "scatter3d"
+            d_out[:mode] = if hasmarker
+                hasline ? "lines+markers" : "markers"
+            else
+                hasline ? "lines" : "none"
+            end
+            d_out[:x], d_out[:y], d_out[:z] = x[rng], y[rng], z[rng]
+        end
+
+        # add "marker"
+        if hasmarker
+            d_out[:marker] = KW(
+                :symbol => get(_plotly_markers, _cycle(series[:markershape], i), string(_cycle(series[:markershape], i))),
+                # :opacity => series[:markeralpha],
+                :size => 2 * _cycle(series[:markersize], i),
+                :color => rgba_string(plot_color(get_markercolor(series, i), get_markeralpha(series, i))),
+                :line => KW(
+                    :color => rgba_string(plot_color(get_markerstrokecolor(series, i), get_markerstrokealpha(series, i))),
+                    :width => _cycle(series[:markerstrokewidth], i),
+                ),
+            )
+        end
+
+        # add "line"
+        if hasline
+            d_out[:line] = KW(
+                :color => rgba_string(plot_color(get_linecolor(series, i), get_linealpha(series, i))),
+                :width => get_linewidth(series, i),
+                :shape => if st == :steppre
+                    "vh"
+                elseif st == :steppost
+                    "hv"
+                else
+                    "linear"
+                end,
+                :dash => string(get_linestyle(series, i)),
+            )
+        end
+
+        plotly_polar!(d_out, series)
+        plotly_hover!(d_out, series[:hover])
+
+        if hasfillrange
+            # if hasfillrange is true, return two dictionaries (one for original
+            # series, one for series being filled to) instead of one
+            d_out_fillrange = deepcopy(d_out)
+            d_out_fillrange[:showlegend] = false
+            # if fillrange is provided as real or tuple of real, expand to array
+            if typeof(series[:fillrange]) <: Real
+                series[:fillrange] = fill(series[:fillrange], length(rng))
+            elseif typeof(series[:fillrange]) <: Tuple
+                f1 = typeof(series[:fillrange][1]) <: Real ? fill(series[:fillrange][1], length(rng)) : series[:fillrange][1][rng]
+                f2 = typeof(series[:fillrange][2]) <: Real ? fill(series[:fillrange][2], length(rng)) : series[:fillrange][2][rng]
+                series[:fillrange] = (f1, f2)
+            end
+            if isa(series[:fillrange], AbstractVector)
+                d_out_fillrange[:y] = series[:fillrange]
+                delete!(d_out_fillrange, :fill)
+                delete!(d_out_fillrange, :fillcolor)
+            else
+                # if fillrange is a tuple with upper and lower limit, d_out_fillrange
+                # is the series that will do the filling
+                fillrng = Tuple(series[:fillrange][i][rng] for i in 1:2)
+                d_out_fillrange[:x], d_out_fillrange[:y] = concatenate_fillrange(x[rng], fillrng)
+                d_out_fillrange[:line][:width] = 0
+                delete!(d_out, :fill)
+                delete!(d_out, :fillcolor)
+            end
+
+            d_outs[(2 * i - 1):(2 * i)] = [d_out_fillrange, d_out]
+        else
+            d_outs[i] = d_out
+        end
+    end
+
+    if series[:line_z] != nothing
+        push!(d_outs, plotly_colorbar_hack(series, d_base, :line))
+    elseif series[:fill_z] != nothing
+        push!(d_outs, plotly_colorbar_hack(series, d_base, :fill))
+    elseif series[:marker_z] != nothing
+        push!(d_outs, plotly_colorbar_hack(series, d_base, :marker))
+    end
+
+    d_outs
+end
+
+function plotly_colorbar_hack(series::Series, d_base::KW, sym::Symbol)
+    d_out = deepcopy(d_base)
+    cmin, cmax = get_clims(series[:subplot])
+    d_out[:showlegend] = false
+    d_out[:type] = is3d(series) ? :scatter3d : :scatter
+    d_out[:mode] = :markers
+    d_out[:x], d_out[:y] = [series[:x][1]], [series[:y][1]]
+    if is3d(series)
+        d_out[:z] = [series[:z][1]]
+    end
+    # zrange = zmax == zmin ? 1 : zmax - zmin # if all marker_z values are the same, plot all markers same color (avoids division by zero in next line)
+    d_out[:marker] = KW(
+        :size => 0,
+        :color => [0.5],
+        :cmin => cmin,
+        :cmax => cmax,
+        :colorscale => plotly_colorscale(series[Symbol("$(sym)color")], 1),
+        :showscale => hascolorbar(series[:subplot]),
+    )
+    return d_out
+end
+
+
 function plotly_polar!(d_out::KW, series::Series)
     # convert polar plots x/y to theta/radius
     if ispolar(series[:subplot])
@@ -809,17 +924,7 @@ end
 # ----------------------------------------------------------------
 
 
-function _show(io::IO, ::MIME"image/png", plt::Plot{PlotlyBackend})
-    # show_png_from_html(io, plt)
-    error("png output from the plotly backend is not supported.  Please use plotlyjs instead.")
-end
-
-function _show(io::IO, ::MIME"image/svg+xml", plt::Plot{PlotlyBackend})
-    write(io, html_head(plt) * html_body(plt))
-end
-
-function Base.show(io::IO, ::MIME"text/html", plt::Plot{PlotlyBackend})
-    prepare_output(plt)
+function _show(io::IO, ::MIME"text/html", plt::Plot{PlotlyBackend})
     write(io, html_head(plt) * html_body(plt))
 end
 

src/backends/plotlyjs.jl

@@ -1,5 +1,5 @@
 @require Revise begin
-    Revise.track(Plots, joinpath(Pkg.dir("Plots"), "src", "backends", "plotlyjs.jl")) 
+    Revise.track(Plots, joinpath(Pkg.dir("Plots"), "src", "backends", "plotlyjs.jl"))
 end
 
 # https://github.com/spencerlyon2/PlotlyJS.jl
@@ -88,8 +88,7 @@ end
 
 # ----------------------------------------------------------------
 
-function Base.show(io::IO, ::MIME"text/html", plt::Plot{PlotlyJSBackend})
-    prepare_output(plt)
+function _show(io::IO, ::MIME"text/html", plt::Plot{PlotlyJSBackend})
     if isijulia() && !_use_remote[]
         write(io, PlotlyJS.html_body(PlotlyJS.JupyterPlot(plt.o)))
     else

src/backends/pyplot.jl

@@ -136,6 +136,7 @@ py_color(s) = py_color(parse(Colorant, string(s)))
 py_color(c::Colorant) = (red(c), green(c), blue(c), alpha(c))
 py_color(cs::AVec) = map(py_color, cs)
 py_color(grad::ColorGradient) = py_color(grad.colors)
+py_color(c::Colorant, α) = py_color(plot_color(c, α))
 
 function py_colormap(grad::ColorGradient)
     pyvals = [(z, py_color(grad[z])) for z in grad.values]
@@ -492,61 +493,51 @@ function py_add_series(plt::Plot{PyPlotBackend}, series::Series)
 
     # line plot
     if st in (:path, :path3d, :steppre, :steppost, :straightline)
-        if series[:linewidth] > 0
-            if series[:line_z] == nothing
-                handle = ax[:plot](xyargs...;
-                    label = series[:label],
-                    zorder = series[:series_plotindex],
-                    color = py_linecolor(series),
-                    linewidth = py_dpi_scale(plt, series[:linewidth]),
-                    linestyle = py_linestyle(st, series[:linestyle]),
-                    solid_capstyle = "round",
-                    drawstyle = py_stepstyle(st)
-                )[1]
-                push!(handles, handle)
-
-            else
-                # multicolored line segments
-                n = length(x) - 1
-                # segments = Array(Any,n)
-                segments = []
-                kw = KW(
-                    :label => series[:label],
-                    :zorder => plt.n,
-                    :cmap => py_linecolormap(series),
-                    :linewidth => py_dpi_scale(plt, series[:linewidth]),
-                    :linestyle => py_linestyle(st, series[:linestyle]),
-                    :norm => pycolors["Normalize"](; extrakw...)
-                )
-                lz = _cycle(series[:line_z], 1:n)
-                handle = if is3d(st)
-                    for rng in iter_segments(x, y, z)
-                        length(rng) < 2 && continue
-                        for i in rng[1:end-1]
-                            push!(segments, [(_cycle(x,i),_cycle(y,i),_cycle(z,i)),
-                                             (_cycle(x,i+1),_cycle(y,i+1),_cycle(z,i+1))])
-                        end
-                    end
-
-                    lc = pyart3d["Line3DCollection"](segments; kw...)
-                    lc[:set_array](lz)
-                    ax[:add_collection3d](lc, zs=z) #, zdir='y')
-                    lc
-                else
-                    for rng in iter_segments(x, y)
-                        length(rng) < 2 && continue
-                        for i in rng[1:end-1]
-                            push!(segments, [(_cycle(x,i),_cycle(y,i)), (_cycle(x,i+1),_cycle(y,i+1))])
-                        end
-                    end
-
-                    lc = pycollections["LineCollection"](segments; kw...)
-                    lc[:set_array](lz)
-                    ax[:add_collection](lc)
-                    lc
+        if maximum(series[:linewidth]) > 0
+            segments = iter_segments(series)
+            # TODO: check LineCollection alternative for speed
+            # if length(segments) > 1 && (any(typeof(series[attr]) <: AbstractVector for attr in (:fillcolor, :fillalpha)) || series[:fill_z] != nothing) && !(typeof(series[:linestyle]) <: AbstractVector)
+            #     # multicolored line segments
+            #     n = length(segments)
+            #     # segments = Array(Any,n)
+            #     segments = []
+            #     kw = KW(
+            #         :label => series[:label],
+            #         :zorder => plt.n,
+            #         :cmap => py_linecolormap(series),
+            #         :linewidths => py_dpi_scale(plt, get_linewidth.(series, 1:n)),
+            #         :linestyle => py_linestyle(st, get_linestyle.(series)),
+            #         :norm => pycolors["Normalize"](; extrakw...)
+            #     )
+            #     lz = _cycle(series[:line_z], 1:n)
+            #     handle = if is3d(st)
+            #         line_segments = [[(x[j], y[j], z[j]) for j in rng] for rng in segments]
+            #         lc = pyart3d["Line3DCollection"](line_segments; kw...)
+            #         lc[:set_array](lz)
+            #         ax[:add_collection3d](lc, zs=z) #, zdir='y')
+            #         lc
+            #     else
+            #         line_segments = [[(x[j], y[j]) for j in rng] for rng in segments]
+            #         lc = pycollections["LineCollection"](line_segments; kw...)
+            #         lc[:set_array](lz)
+            #         ax[:add_collection](lc)
+            #         lc
+            #     end
+            #     push!(handles, handle)
+            # else
+                for (i, rng) in enumerate(iter_segments(series))
+                    handle = ax[:plot]((arg[rng] for arg in xyargs)...;
+                        label = i == 1 ? series[:label] : "",
+                        zorder = series[:series_plotindex],
+                        color = py_color(get_linecolor(series, i), get_linealpha(series, i)),
+                        linewidth = py_dpi_scale(plt, get_linewidth(series, i)),
+                        linestyle = py_linestyle(st, get_linestyle(series, i)),
+                        solid_capstyle = "round",
+                        drawstyle = py_stepstyle(st)
+                    )[1]
+                    push!(handles, handle)
                 end
-                push!(handles, handle)
-            end
+            # end
 
             a = series[:arrow]
             if a != nothing && !is3d(st)  # TODO: handle 3d later
@@ -559,8 +550,8 @@ function py_add_series(plt::Plot{PyPlotBackend}, series::Series)
                         :shrinkB => 0,
                         :edgecolor => py_linecolor(series),
                         :facecolor => py_linecolor(series),
-                        :linewidth => py_dpi_scale(plt, series[:linewidth]),
-                        :linestyle => py_linestyle(st, series[:linestyle]),
+                        :linewidth => py_dpi_scale(plt, get_linewidth(series)),
+                        :linestyle => py_linestyle(st, get_linestyle(series)),
                     )
                     add_arrows(x, y) do xyprev, xy
                         ax[:annotate]("",
@@ -579,12 +570,12 @@ function py_add_series(plt::Plot{PyPlotBackend}, series::Series)
     if series[:markershape] != :none && st in (:path, :scatter, :path3d,
                                           :scatter3d, :steppre, :steppost,
                                           :bar)
-        if series[:marker_z] == nothing
-            extrakw[:c] = series[:markershape] in (:+, :x, :hline, :vline) ? py_markerstrokecolor(series) : py_color_fix(py_markercolor(series), x)
+        markercolor = if any(typeof(series[arg]) <: AVec for arg in (:markercolor, :markeralpha)) || series[:marker_z] != nothing
+            py_color(plot_color.(get_markercolor.(series, eachindex(x)), get_markeralpha.(series, eachindex(x))))
         else
-            extrakw[:c] = convert(Vector{Float64}, series[:marker_z])
-            extrakw[:cmap] = py_markercolormap(series)
+            py_color(plot_color(series[:markercolor], series[:markeralpha]))
         end
+        extrakw[:c] = py_color_fix(markercolor, x)
         xyargs = if st == :bar && !isvertical(series)
             (y, x)
         else
@@ -600,11 +591,7 @@ function py_add_series(plt::Plot{PyPlotBackend}, series::Series)
             msc = py_markerstrokecolor(series)
             lw = py_dpi_scale(plt, series[:markerstrokewidth])
             for i=1:length(y)
-                extrakw[:c] = if series[:marker_z] == nothing
-                    py_color_fix(py_color(_cycle(series[:markercolor],i)), x)
-                else
-                    extrakw[:c]
-                end
+                extrakw[:c] = _cycle(markercolor, i)
 
                 push!(handle, ax[:scatter](_cycle(x,i), _cycle(y,i);
                     label = series[:label],
@@ -647,6 +634,12 @@ function py_add_series(plt::Plot{PyPlotBackend}, series::Series)
 
     if st in (:contour, :contour3d)
         z = transpose_z(series, z.surf)
+	if typeof(x)<:Plots.Surface
+            x = Plots.transpose_z(series, x.surf)
+        end
+        if typeof(y)<:Plots.Surface
+            y = Plots.transpose_z(series, y.surf)
+        end
 
         if st == :contour3d
             extrakw[:extend3d] = true
@@ -794,16 +787,17 @@ function py_add_series(plt::Plot{PyPlotBackend}, series::Series)
 
     if st == :shape
         handle = []
-        for (i,rng) in enumerate(iter_segments(x, y))
+        for (i, rng) in enumerate(iter_segments(series))
             if length(rng) > 1
                 path = pypath["Path"](hcat(x[rng], y[rng]))
                 patches = pypatches["PathPatch"](
                     path;
                     label = series[:label],
                     zorder = series[:series_plotindex],
-                    edgecolor = py_color(_cycle(series[:linecolor], i)),
-                    facecolor = py_color(_cycle(series[:fillcolor], i)),
-                    linewidth = py_dpi_scale(plt, series[:linewidth]),
+                    edgecolor = py_color(get_linecolor(series, i), get_linealpha(series, i)),
+                    facecolor = py_color(get_fillcolor(series, i), get_fillalpha(series, i)),
+                    linewidth = py_dpi_scale(plt, get_linewidth(series, i)),
+                    linestyle = py_linestyle(st, get_linestyle(series, i)),
                     fill = true
                 )
                 push!(handle, ax[:add_patch](patches))
@@ -835,24 +829,26 @@ function py_add_series(plt::Plot{PyPlotBackend}, series::Series)
     # handle area filling
     fillrange = series[:fillrange]
     if fillrange != nothing && st != :contour
-        f, dim1, dim2 = if isvertical(series)
-            :fill_between, x, y
-        else
-            :fill_betweenx, y, x
-        end
-        n = length(dim1)
-        args = if typeof(fillrange) <: Union{Real, AVec}
-            dim1, expand_data(fillrange, n), dim2
-        elseif is_2tuple(fillrange)
-            dim1, expand_data(fillrange[1], n), expand_data(fillrange[2], n)
-        end
+        for (i, rng) in enumerate(iter_segments(series))
+            f, dim1, dim2 = if isvertical(series)
+                :fill_between, x[rng], y[rng]
+            else
+                :fill_betweenx, y[rng], x[rng]
+            end
+            n = length(dim1)
+            args = if typeof(fillrange) <: Union{Real, AVec}
+                dim1, expand_data(fillrange, n), dim2
+            elseif is_2tuple(fillrange)
+                dim1, expand_data(fillrange[1], n), expand_data(fillrange[2], n)
+            end
 
-        handle = ax[f](args..., trues(n), false, py_fillstepstyle(st);
-            zorder = series[:series_plotindex],
-            facecolor = py_fillcolor(series),
-            linewidths = 0
-        )
-        push!(handles, handle)
+            handle = ax[f](args..., trues(n), false, py_fillstepstyle(st);
+                zorder = series[:series_plotindex],
+                facecolor = py_color(get_fillcolor(series, i), get_fillalpha(series, i)),
+                linewidths = 0
+            )
+            push!(handles, handle)
+        end
     end
 
     # this is all we need to add the series_annotations text
@@ -1020,6 +1016,19 @@ function _before_layout_calcs(plt::Plot{PyPlotBackend})
                 kw[:ticks] = locator
                 kw[:format] = formatter
                 kw[:boundaries] = vcat(0, kw[:values] + 0.5)
+            elseif any(colorbar_series[attr] != nothing for attr in (:line_z, :fill_z, :marker_z))
+                cmin, cmax = get_clims(sp)
+                norm = pycolors[:Normalize](vmin = cmin, vmax = cmax)
+                f = if colorbar_series[:line_z] != nothing
+                    py_linecolormap
+                elseif colorbar_series[:fill_z] != nothing
+                    py_fillcolormap
+                else
+                    py_markercolormap
+                end
+                cmap = pycmap[:ScalarMappable](norm = norm, cmap = f(colorbar_series))
+                cmap[:set_array]([])
+                handle = cmap
             end
 
             # create and store the colorbar object (handle) and the axis that it is drawn on.
@@ -1250,15 +1259,16 @@ function py_add_legend(plt::Plot, sp::Subplot, ax)
                 # add a line/marker and a label
                 push!(handles, if series[:seriestype] == :shape || series[:fillrange] != nothing
                     pypatches[:Patch](
-                        edgecolor = py_color(_cycle(series[:linecolor],1)),
-                        facecolor = py_color(_cycle(series[:fillcolor],1)),
-                        linewidth = py_dpi_scale(plt, clamp(series[:linewidth], 0, 5)),
+                        edgecolor = py_color(get_linecolor(series), get_linealpha(series)),
+                        facecolor = py_color(get_fillcolor(series), get_fillalpha(series)),
+                        linewidth = py_dpi_scale(plt, clamp(get_linewidth(series), 0, 5)),
+                        linestyle = py_linestyle(series[:seriestype], get_linestyle(series))
                     )
                 elseif series[:seriestype] in (:path, :straightline)
                     PyPlot.plt[:Line2D]((0,1),(0,0),
-                        color = py_color(_cycle(series[:linecolor],1)),
-                        linewidth = py_dpi_scale(plt, clamp(series[:linewidth], 0, 5)),
-                        linestyle = py_linestyle(:path,series[:linestyle]),
+                        color = py_color(get_linecolor(series), get_linealpha(series)),
+                        linewidth = py_dpi_scale(plt, clamp(get_linewidth(series), 0, 5)),
+                        linestyle = py_linestyle(:path, get_linestyle(series)),
                         marker = py_marker(series[:markershape]),
                         markeredgecolor = py_markerstrokecolor(series),
                         markerfacecolor = series[:marker_z] == nothing ? py_markercolor(series) : py_color(series[:markercolor][0.5])
@@ -1276,23 +1286,17 @@ function py_add_legend(plt::Plot, sp::Subplot, ax)
                 labels,
                 loc = get(_pyplot_legend_pos, leg, "best"),
                 scatterpoints = 1,
-                fontsize = py_dpi_scale(plt, sp[:legendfontsize])
-                # family = sp[:legendfont].family
-                # framealpha = 0.6
+                fontsize = py_dpi_scale(plt, sp[:legendfontsize]),
+                facecolor = py_color(sp[:background_color_legend]),
+                edgecolor = py_color(sp[:foreground_color_legend]),
+                framealpha = alpha(plot_color(sp[:background_color_legend])),
             )
             leg[:set_zorder](1000)
             sp[:legendtitle] != nothing && leg[:set_title](sp[:legendtitle])
 
-            fgcolor = py_color(sp[:foreground_color_legend])
-            lfcolor = py_color(sp[:legendfontcolor])
             for txt in leg[:get_texts]()
-                PyPlot.plt[:setp](txt, color = lfcolor, family = sp[:legendfontfamily])
+                PyPlot.plt[:setp](txt, color = py_color(sp[:legendfontcolor]), family = sp[:legendfontfamily])
             end
-
-            # set some legend properties
-            frame = leg[:get_frame]()
-            frame[set_facecolor_sym](py_color(sp[:background_color_legend]))
-            frame[:set_edgecolor](fgcolor)
         end
     end
 end

src/backends/unicodeplots.jl

@@ -212,7 +212,7 @@ end
 
 function _show(io::IO, ::MIME"text/plain", plt::Plot{UnicodePlotsBackend})
     unicodeplots_rebuild(plt)
-    map(show, plt.o)
+    foreach(x -> show(io, x), plt.o)
     nothing
 end
 

src/backends/web.jl

@@ -12,6 +12,7 @@ function standalone_html(plt::AbstractPlot; title::AbstractString = get(plt.attr
     <html>
         <head>
             <title>$title</title>
+            <meta http-equiv="content-type" content="text/html; charset=UTF-8">
             $(html_head(plt))
         </head>
         <body>

src/output.jl

@@ -157,17 +157,6 @@ end
 
 # ---------------------------------------------------------
 
-const _mimeformats = Dict(
-    "application/eps"         => "eps",
-    "image/eps"               => "eps",
-    "application/pdf"         => "pdf",
-    "image/png"               => "png",
-    "application/postscript"  => "ps",
-    "image/svg+xml"           => "svg",
-    "text/plain"              => "txt",
-    "application/x-tex"       => "tex",
-)
-
 const _best_html_output_type = KW(
     :pyplot => :png,
     :unicodeplots => :txt,
@@ -177,7 +166,7 @@ const _best_html_output_type = KW(
 )
 
 # a backup for html... passes to svg or png depending on the html_output_format arg
-function Base.show(io::IO, ::MIME"text/html", plt::Plot)
+function _show(io::IO, ::MIME"text/html", plt::Plot)
     output_type = Symbol(plt.attr[:html_output_format])
     if output_type == :auto
         output_type = get(_best_html_output_type, backend_name(plt.backend), :svg)
@@ -191,26 +180,32 @@ function Base.show(io::IO, ::MIME"text/html", plt::Plot)
     elseif output_type == :txt
         show(io, MIME("text/plain"), plt)
     else
-        error("only png or svg allowed. got: $output_type")
+        error("only png or svg allowed. got: $(repr(output_type))")
     end
 end
 
-function _show(io::IO, m, plt::Plot{B}) where B
-    # Base.show_backtrace(STDOUT, backtrace())
-    warn("_show is not defined for this backend. m=", string(m))
+# delegate mimewritable (showable on julia 0.7) to _show instead
+function Base.mimewritable(m::M, plt::P) where {M<:MIME, P<:Plot}
+    return method_exists(_show, Tuple{IO, M, P})
 end
+
 function _display(plt::Plot)
     warn("_display is not defined for this backend.")
 end
 
 # for writing to io streams... first prepare, then callback
-for mime in keys(_mimeformats)
-    @eval function Base.show(io::IO, m::MIME{Symbol($mime)}, plt::Plot{B}) where B
+for mime in ("text/plain", "text/html", "image/png", "image/eps", "image/svg+xml",
+             "application/eps", "application/pdf", "application/postscript",
+             "application/x-tex")
+    @eval function Base.show(io::IO, m::MIME{Symbol($mime)}, plt::Plot)
         prepare_output(plt)
         _show(io, m, plt)
     end
 end
 
+# default text/plain for all backends
+_show(io::IO, ::MIME{Symbol("text/plain")}, plt::Plot) = show(io, plt)
+
 "Close all open gui windows of the current backend"
 closeall() = closeall(backend())
 
@@ -218,9 +213,10 @@ closeall() = closeall(backend())
 # ---------------------------------------------------------
 # A backup, if no PNG generation is defined, is to try to make a PDF and use FileIO to convert
 
+const PDFBackends = Union{PGFPlotsBackend,PlotlyJSBackend,PyPlotBackend,InspectDRBackend,GRBackend}
 if is_installed("FileIO")
     @eval import FileIO
-    function _show(io::IO, ::MIME"image/png", plt::Plot)
+    function _show(io::IO, ::MIME"image/png", plt::Plot{<:PDFBackends})
         fn = tempname()
 
         # first save a pdf file
@@ -288,7 +284,10 @@ end
                 output_type = get(_best_html_output_type, backend_name(plt.backend), :svg)
             end
             out = Dict()
-            if output_type == :png
+            if output_type == :txt
+                mime = "text/plain"
+                out[mime] = sprint(show, MIME(mime), plt)
+            elseif output_type == :png
                 mime = "image/png"
                 out[mime] = base64encode(show, MIME(mime), plt)
             elseif output_type == :svg
@@ -304,11 +303,6 @@ end
             out
         end
 
-        # default text/plain passes to html... handles Interact issues
-        function Base.show(io::IO, m::MIME"text/plain", plt::Plot)
-            show(io, MIME("text/html"), plt)
-        end
-
         ENV["MPLBACKEND"] = "Agg"
     end
 end
@@ -322,9 +316,6 @@ end
     if Juno.isactive()
         Media.media(Plot, Media.Plot)
 
-
-        _show(io::IO, m::MIME"text/plain", plt::Plot{B}) where {B} = print(io, "Plot{$B}()")
-
         function Juno.render(e::Juno.Editor, plt::Plot)
             Juno.render(e, nothing)
         end

src/pipeline.jl

@@ -327,7 +327,7 @@ end
 
 function _override_seriestype_check(d::KW, st::Symbol)
     # do we want to override the series type?
-    if !is3d(st)
+    if !is3d(st) && !(st in (:contour,:contour3d))
         z = d[:z]
         if !isa(z, Void) && (size(d[:x]) == size(d[:y]) == size(z))
             st = (st == :scatter ? :scatter3d : :path3d)
@@ -398,6 +398,7 @@ function _process_seriesrecipe(plt::Plot, d::KW)
         sp = _prepare_subplot(plt, d)
         _prepare_annotations(sp, d)
         _expand_subplot_extrema(sp, d, st)
+        _update_series_attributes!(d, plt, sp)
         _add_the_series(plt, sp, d)
 
     else

src/recipes.jl

@@ -389,6 +389,33 @@ end
 end
 @deps bar shape
 
+# ---------------------------------------------------------------------------
+# Plots Heatmap
+@recipe function f(::Type{Val{:plots_heatmap}}, x, y, z)
+    xe, ye = heatmap_edges(x), heatmap_edges(y)
+    m, n = size(z.surf)
+    x_pts, y_pts = fill(NaN, 6 * m * n), fill(NaN, 6 * m * n)
+    fz = zeros(m * n)
+    for i in 1:m # y
+        for j in 1:n # x
+            k = (j - 1) * m + i
+            inds = (6 * (k - 1) + 1):(6 * k - 1)
+            x_pts[inds] .= [xe[j], xe[j + 1], xe[j + 1], xe[j], xe[j]]
+            y_pts[inds] .= [ye[i], ye[i], ye[i + 1], ye[i + 1], ye[i]]
+            fz[k] = z.surf[i, j]
+        end
+    end
+    ensure_gradient!(plotattributes, :fillcolor, :fillalpha)
+    fill_z := fz
+    line_z := fz
+    x := x_pts
+    y := y_pts
+    z := nothing
+    seriestype := :shape
+    label := ""
+    ()
+end
+@deps plots_heatmap shape
 
 # ---------------------------------------------------------------------------
 # Histograms
@@ -562,7 +589,7 @@ function _auto_binning_nbins(vs::NTuple{N,AbstractVector}, dim::Integer; mode::S
 
     # The nd estimator is the key to most automatic binning methods, and is modified for twodimensional histograms to include correlation
     nd = n_samples^(1/(2+N))
-    nd = N == 2 ? nd / (1-cor(first(vs), last(vs))^2)^(3//8) : nd # the >2-dimensional case does not have a nice solution to correlations
+    nd = N == 2 ? min(n_samples^(1/(2+N)), nd / (1-cor(first(vs), last(vs))^2)^(3//8)) : nd # the >2-dimensional case does not have a nice solution to correlations
 
     v = vs[dim]
 

src/series.jl

@@ -8,7 +8,7 @@
 
 const FuncOrFuncs{F} = Union{F, Vector{F}, Matrix{F}}
 
-all3D(d::KW) = trueOrAllTrue(st -> st in (:contour, :contourf, :heatmap, :surface, :wireframe, :contour3d, :image), get(d, :seriestype, :none))
+all3D(d::KW) = trueOrAllTrue(st -> st in (:contour, :contourf, :heatmap, :surface, :wireframe, :contour3d, :image, :plots_heatmap), get(d, :seriestype, :none))
 
 # unknown
 convertToAnyVector(x, d::KW) = error("No user recipe defined for $(typeof(x))")
@@ -627,7 +627,7 @@ group_as_matrix(t) = false
     else
         g = args[1]
         if length(g.args) == 1
-            x = zeros(Int64, lengthGroup)
+            x = zeros(Int, lengthGroup)
             for indexes in groupby.groupIds
                 x[indexes] = 1:length(indexes)
             end

src/utils.jl

@@ -192,8 +192,26 @@ function iter_segments(args...)
     SegmentsIterator(tup, n)
 end
 
+function iter_segments(series::Series)
+    x, y, z = series[:x], series[:y], series[:z]
+    if has_attribute_segments(series)
+        if series[:seriestype] in (:scatter, :scatter3d)
+            return [[i] for i in 1:length(y)]
+        else
+            return [i:(i + 1) for i in 1:(length(y) - 1)]
+        end
+    else
+        segs = UnitRange{Int}[]
+        args = is3d(series) ? (x, y, z) : (x, y)
+        for seg in iter_segments(args...)
+            push!(segs, seg)
+        end
+        return segs
+    end
+end
+
 # helpers to figure out if there are NaN values in a list of array types
-anynan(i::Int, args::Tuple) = any(a -> !isfinite(_cycle(a,i)), args)
+anynan(i::Int, args::Tuple) = any(a -> try isnan(_cycle(a,i)) catch MethodError false end, args)
 anynan(istart::Int, iend::Int, args::Tuple) = any(i -> anynan(i, args), istart:iend)
 allnan(istart::Int, iend::Int, args::Tuple) = all(i -> anynan(i, args), istart:iend)
 
@@ -602,35 +620,84 @@ function hascolorbar(sp::Subplot)
     hascbar
 end
 
-function get_linecolor(sp::Subplot, series::Series, i::Int = 1)
+function get_linecolor(series, i::Int = 1)
     lc = series[:linecolor]
     lz = series[:line_z]
     if lz == nothing
-        isa(lc, ColorGradient) ? lc : _cycle(lc, i)
+        isa(lc, ColorGradient) ? lc : plot_color(_cycle(lc, i))
     else
-        cmin, cmax = get_clims(sp)
+        cmin, cmax = get_clims(series[:subplot])
         grad = isa(lc, ColorGradient) ? lc : cgrad()
         grad[clamp((_cycle(lz, i) - cmin) / (cmax - cmin), 0, 1)]
     end
 end
 
-function get_fillcolor(sp::Subplot, series::Series, i::Int = 1)
+function get_linealpha(series, i::Int = 1)
+    _cycle(series[:linealpha], i)
+end
+
+function get_linewidth(series, i::Int = 1)
+    _cycle(series[:linewidth], i)
+end
+
+function get_linestyle(series, i::Int = 1)
+    _cycle(series[:linestyle], i)
+end
+
+function get_fillcolor(series, i::Int = 1)
     fc = series[:fillcolor]
     fz = series[:fill_z]
-    lz = series[:line_z]
-    if fz == nothing && lz == nothing
-        isa(fc, ColorGradient) ? fc : _cycle(fc, i)
+    if fz == nothing
+        isa(fc, ColorGradient) ? fc : plot_color(_cycle(fc, i))
     else
-        cmin, cmax = get_clims(sp)
+        cmin, cmax = get_clims(series[:subplot])
         grad = isa(fc, ColorGradient) ? fc : cgrad()
-        if fz != nothing
-            grad[clamp((_cycle(fz, i) - cmin) / (cmax - cmin), 0, 1)]
-        elseif lz != nothing
-            grad[clamp((_cycle(lz, i) - cmin) / (cmax - cmin), 0, 1)]
-        end
+        grad[clamp((_cycle(fz, i) - cmin) / (cmax - cmin), 0, 1)]
     end
 end
 
+function get_fillalpha(series, i::Int = 1)
+    _cycle(series[:fillalpha], i)
+end
+
+function get_markercolor(series, i::Int = 1)
+    mc = series[:markercolor]
+    mz = series[:marker_z]
+    if mz == nothing
+        isa(mc, ColorGradient) ? mc : plot_color(_cycle(mc, i))
+    else
+        cmin, cmax = get_clims(series[:subplot])
+        grad = isa(mc, ColorGradient) ? mc : cgrad()
+        grad[clamp((_cycle(mz, i) - cmin) / (cmax - cmin), 0, 1)]
+    end
+end
+
+function get_markeralpha(series, i::Int = 1)
+    _cycle(series[:markeralpha], i)
+end
+
+function get_markerstrokecolor(series, i::Int = 1)
+    msc = series[:markerstrokecolor]
+    isa(msc, ColorGradient) ? msc : _cycle(msc, i)
+end
+
+function get_markerstrokealpha(series, i::Int = 1)
+    _cycle(series[:markerstrokealpha], i)
+end
+
+function has_attribute_segments(series::Series)
+    # we want to check if a series needs to be split into segments just because
+    # of its attributes
+    for letter in (:x, :y, :z)
+        # If we have NaNs in the data they define the segments and
+        # SegmentsIterator is used
+        series[letter] != nothing && NaN in collect(series[letter]) && return false
+    end
+    series[:seriestype] == :shape && return false
+    # ... else we check relevant attributes if they have multiple inputs
+    return any((typeof(series[attr]) <: AbstractVector && length(series[attr]) > 1) for attr in [:seriescolor, :seriesalpha, :linecolor, :linealpha, :linewidth, :fillcolor, :fillalpha, :markercolor, :markeralpha, :markerstrokecolor, :markerstrokealpha]) || any(typeof(series[attr]) <: AbstractArray{<:Real} for attr in (:line_z, :fill_z, :marker_z))
+end
+
 # ---------------------------------------------------------------
 
 makekw(; kw...) = KW(kw)
@@ -1150,3 +1217,7 @@ function shape_data(series)
     end
     return x, y
 end
+
+function construct_categorical_data(x::AbstractArray, axis::Axis)
+    map(xi -> axis[:discrete_values][searchsortedfirst(axis[:continuous_values], xi)], x)
+end

test/REQUIRE

@@ -2,7 +2,7 @@ StatPlots
 Images
 ImageMagick
 @osx QuartzImageIO
-GR
+GR 0.31.0
 RDatasets
 VisualRegressionTests
 UnicodePlots

test/imgcomp.jl

@@ -23,7 +23,7 @@ default(size=(500,300))
 # TODO: use julia's Condition type and the wait() and notify() functions to initialize a Window, then wait() on a condition that
 #       is referenced in a button press callback (the button clicked callback will call notify() on that condition)
 
-const _current_plots_version = v"0.16.0"
+const _current_plots_version = v"0.17.2"
 
 
 function image_comparison_tests(pkg::Symbol, idx::Int; debug = false, popup = isinteractive(), sigma = [1,1], eps = 1e-2)

test/travis_commands.jl

@@ -1,8 +1,8 @@
 Pkg.add("ImageMagick")
 Pkg.build("ImageMagick")
 
-Pkg.clone("GR")
-Pkg.build("GR")
+# Pkg.clone("GR")
+# Pkg.build("GR")
 
 Pkg.clone("https://github.com/JuliaPlots/PlotReferenceImages.jl.git")