Merge pull request #2414 from daschw/release

bump version

Project.toml

@@ -1,7 +1,7 @@
 name = "Plots"
 uuid = "91a5bcdd-55d7-5caf-9e0b-520d859cae80"
 author = ["Tom Breloff (@tbreloff)"]
-version = "0.29.1"
+version = "0.29.2"
 
 [deps]
 Base64 = "2a0f44e3-6c83-55bd-87e4-b1978d98bd5f"
@@ -32,7 +32,7 @@ UUIDs = "cf7118a7-6976-5b1a-9a39-7adc72f591a4"
 
 [compat]
 Contour = "0.5"
-FFMPEG = "0.2"
+FFMPEG = "0.2, 0.3"
 FixedPointNumbers = "0.6, 0.7, 0.8"
 GR = "0.46"
 GeometryTypes = "0.7"

README.md

@@ -1,13 +1,25 @@
 # Plots
 
-[![Build Status](https://travis-ci.org/JuliaPlots/Plots.jl.svg?branch=master)](https://travis-ci.org/JuliaPlots/Plots.jl)
-[![Build status](https://ci.appveyor.com/api/projects/status/github/juliaplots/plots.jl?branch=master&svg=true)](https://ci.appveyor.com/project/mkborregaard/plots-jl)
-[![Join the chat at https://gitter.im/tbreloff/Plots.jl](https://badges.gitter.im/tbreloff/Plots.jl.svg)](https://gitter.im/tbreloff/Plots.jl?utm_source=badge&utm_medium=badge&utm_campaign=pr-badge&utm_content=badge)
-<a href="http://docs.juliaplots.org/latest/" target="_blank"><img src="https://img.shields.io/badge/docs-latest-blue.svg" alt="Latest documentation"></a>
-<!-- [![Plots](http://pkg.julialang.org/badges/Plots_0.3.svg)](http://pkg.julialang.org/?pkg=Plots&ver=0.3) -->
-<!-- [![Plots](http://pkg.julialang.org/badges/Plots_0.4.svg)](http://pkg.julialang.org/?pkg=Plots&ver=0.4) -->
-<!-- [![Coverage Status](https://coveralls.io/repos/tbreloff/Plots.jl/badge.svg?branch=master)](https://coveralls.io/r/tbreloff/Plots.jl?branch=master) -->
-<!-- [![codecov.io](http://codecov.io/github/tbreloff/Plots.jl/coverage.svg?branch=master)](http://codecov.io/github/tbreloff/Plots.jl?branch=master) -->
+[travis-img]: https://img.shields.io/travis/JuliaPlots/Plots.jl?logo=travis
+[travis-url]: https://travis-ci.org/JuliaPlots/Plots.jl
+
+[appveyor-img]: https://ci.appveyor.com/api/projects/status/github/juliaplots/plots.jl?branch=master&svg=true
+[appveyor-url]: https://ci.appveyor.com/project/mkborregaard/plots-jl
+
+[pkgeval-img]: https://juliaci.github.io/NanosoldierReports/pkgeval_badges/P/Plots.svg
+[pkgeval-url]: https://juliaci.github.io/NanosoldierReports/pkgeval_badges/report.html
+
+[gitter-img]: https://badges.gitter.im/tbreloff/Plots.jl.svg
+[gitter-url]: https://gitter.im/tbreloff/Plots.jl?utm_source=badge&utm_medium=badge&utm_campaign=pr-badge&utm_content=badge
+
+[docs-img]: https://img.shields.io/badge/docs-stable-blue.svg
+[docs-url]: http://docs.juliaplots.org/latest/
+
+[![][travis-img]][travis-url]
+[![][appveyor-img]][appveyor-url]
+[![][pkgeval-img]][pkgeval-url]
+[![][gitter-img]][gitter-url]
+[![][docs-img]][docs-url]
 
 #### Created by Tom Breloff (@tbreloff)
 

src/animation.jl

@@ -163,16 +163,16 @@ function _animate(forloop::Expr, args...; callgif = false)
     error("Unsupported animate filter: $args")
   end
 
-  push!(block.args, :(if $filterexpr; frame($animsym); end))
+  push!(block.args, :(if $filterexpr; Plots.frame($animsym); end))
   push!(block.args, :(global $countersym += 1))
 
   # add a final call to `gif(anim)`?
-  retval = callgif ? :(gif($animsym)) : animsym
+  retval = callgif ? :(Plots.gif($animsym)) : animsym
 
   # full expression:
   esc(quote
     $freqassert             # if filtering, check frequency is an Integer > 0
-    $animsym = Animation()  # init animation object
+    $animsym = Plots.Animation()  # init animation object
     global $countersym = 1         # init iteration counter
     $forloop                # for loop, saving a frame after each iteration
     $retval                 # return the animation object, or the gif

src/backends/gr.jl

@@ -232,9 +232,7 @@ function gr_polaraxes(rmin::Real, rmax::Real, sp::Subplot)
     sinf = sind.(a)
     cosf = cosd.(a)
     rtick_values, rtick_labels = get_ticks(sp, yaxis)
-    if yaxis[:formatter] in (:scientific, :auto) && yaxis[:ticks] in (:auto, :native)
-        rtick_labels = convert_sci_unicode.(rtick_labels)
-    end
+    rtick_labels = gr_tick_label.((yaxis,), rtick_labels)
 
     #draw angular grid
     if xaxis[:grid]
@@ -770,6 +768,19 @@ function gr_get_ticks_size(ticks, rot)
     return w, h
 end
 
+gr_tick_label(axis,label) = (axis[:formatter] in (:scientific, :auto)) ?
+                                gr_convert_sci_tick_label(label) :
+                                label
+
+function gr_convert_sci_tick_label(label)
+    caret_split = split(label,'^')
+    if length(caret_split) == 2
+        base, exponent = caret_split
+        label = "$base^{$exponent}"
+    end
+    convert_sci_unicode(label)
+end
+
 function gr_axis_height(sp, axis)
     ticks = get_ticks(sp, axis)
     gr_set_font(tickfont(axis))
@@ -1223,18 +1234,9 @@ function gr_display(sp::Subplot{GRBackend}, w, h, viewport_canvas)
             end
             for (cv, dv) in zip(xticks...)
                 xi, yi = gr_w3tondc(cv, yt, zt)
-                if xaxis[:ticks] in (:auto, :native)
-                    if xaxis[:formatter] in (:scientific, :auto)
-                        # ensure correct dispatch in gr_text for automatic log ticks
-                        if xaxis[:scale] in _logScales
-                            dv = string(dv, "\\ ")
-                        end
-                        dv = convert_sci_unicode(dv)
-                    end
-                end
                 xi += (yaxis[:mirror] ? 1 : -1) * 1e-2 * (xaxis[:tick_direction] == :out ? 1.5 : 1.0)
                 yi += (xaxis[:mirror] ? 1 : -1) * 5e-3 * (xaxis[:tick_direction] == :out ? 1.5 : 1.0)
-                gr_text(xi, yi, string(dv))
+                gr_text(xi, yi, gr_tick_label(xaxis, dv))
             end
         end
 
@@ -1262,16 +1264,9 @@ function gr_display(sp::Subplot{GRBackend}, w, h, viewport_canvas)
             end
             for (cv, dv) in zip(yticks...)
                 xi, yi = gr_w3tondc(xt, cv, zt)
-                if yaxis[:ticks] in (:auto, :native)
-                    if xaxis[:formatter] in (:scientific, :auto)
-                        # ensure correct dispatch in gr_text for automatic log ticks
-                        if yaxis[:scale] in _logScales
-                            dv = string(dv, "\\ ")
-                        end
-                        dv = convert_sci_unicode(dv)
-                    end
-                end
-                gr_text(xi + (yaxis[:mirror] ? -1 : 1) * 1e-2 * (yaxis[:tick_direction] == :out ? 1.5 : 1.0), yi + (yaxis[:mirror] ? 1 : -1) * 5e-3 * (yaxis[:tick_direction] == :out ? 1.5 : 1.0), string(dv))
+                gr_text(xi + (yaxis[:mirror] ? -1 : 1) * 1e-2 * (yaxis[:tick_direction] == :out ? 1.5 : 1.0),
+                        yi + (yaxis[:mirror] ? 1 : -1) * 5e-3 * (yaxis[:tick_direction] == :out ? 1.5 : 1.0),
+                        gr_tick_label(yaxis, dv))
             end
         end
 
@@ -1299,16 +1294,8 @@ function gr_display(sp::Subplot{GRBackend}, w, h, viewport_canvas)
             end
             for (cv, dv) in zip(zticks...)
                 xi, yi = gr_w3tondc(xt, yt, cv)
-                if zaxis[:ticks] in (:auto, :native)
-                    if zaxis[:formatter] in (:scientific, :auto)
-                        # ensure correct dispatch in gr_text for automatic log ticks
-                        if zaxis[:scale] in _logScales
-                            dv = string(dv, "\\ ")
-                        end
-                        dv = convert_sci_unicode(dv)
-                    end
-                end
-                gr_text(xi + (zaxis[:mirror] ? 1 : -1) * 1e-2 * (zaxis[:tick_direction] == :out ? 1.5 : 1.0), yi, string(dv))
+                gr_text(xi + (zaxis[:mirror] ? 1 : -1) * 1e-2 * (zaxis[:tick_direction] == :out ? 1.5 : 1.0),
+                        yi, gr_tick_label(zaxis, dv))
             end
         end
         #
@@ -1405,19 +1392,9 @@ function gr_display(sp::Subplot{GRBackend}, w, h, viewport_canvas)
             # x labels
             flip, mirror = gr_set_xticks_font(sp)
             for (cv, dv) in zip(xticks...)
-                # use xor ($) to get the right y coords
                 xi, yi = GR.wctondc(cv, sp[:framestyle] == :origin ? 0 : xor(flip, mirror) ? ymax : ymin)
-                # @show cv dv ymin xi yi flip mirror (flip $ mirror)
-                if xaxis[:ticks] in (:auto, :native)
-                    # ensure correct dispatch in gr_text for automatic log ticks
-                    if xaxis[:formatter] in (:scientific, :auto)
-                        if xaxis[:scale] in _logScales
-                            dv = string(dv, "\\ ")
-                        end
-                        dv = convert_sci_unicode(dv)
-                    end
-                end
-                gr_text(xi, yi + (mirror ? 1 : -1) * 5e-3 * (xaxis[:tick_direction] == :out ? 1.5 : 1.0), string(dv))
+                gr_text(xi, yi + (mirror ? 1 : -1) * 5e-3 * (xaxis[:tick_direction] == :out ? 1.5 : 1.0),
+                        gr_tick_label(xaxis, dv))
             end
         end
 
@@ -1425,19 +1402,10 @@ function gr_display(sp::Subplot{GRBackend}, w, h, viewport_canvas)
             # y labels
             flip, mirror = gr_set_yticks_font(sp)
             for (cv, dv) in zip(yticks...)
-                # use xor ($) to get the right y coords
                 xi, yi = GR.wctondc(sp[:framestyle] == :origin ? 0 : xor(flip, mirror) ? xmax : xmin, cv)
-                # @show cv dv xmin xi yi
-                if yaxis[:ticks] in (:auto, :native)
-                    # ensure correct dispatch in gr_text for automatic log ticks
-                    if yaxis[:formatter] in (:scientific, :auto)
-                        if yaxis[:scale] in _logScales
-                            dv = string(dv, "\\ ")
-                        end
-                        dv = convert_sci_unicode(dv)
-                    end
-                end
-                gr_text(xi + (mirror ? 1 : -1) * 1e-2 * (yaxis[:tick_direction] == :out ? 1.5 : 1.0), yi, string(dv))
+                gr_text(xi + (mirror ? 1 : -1) * 1e-2 * (yaxis[:tick_direction] == :out ? 1.5 : 1.0),
+                        yi,
+                        gr_tick_label(yaxis, dv))
             end
         end
 

src/backends/hdf5.jl

@@ -109,7 +109,7 @@ _hdf5_datapath(subpath::String) = "$_hdf5_dataroot/$subpath"
 _hdf5_map_str2telem(k::String) = HDF5PLOT_MAP_STR2TELEM[k]
 _hdf5_map_str2telem(v::Vector) = HDF5PLOT_MAP_STR2TELEM[v[1]]
 
-function _hdf5_merge!(dest::Dict, src::Dict)
+function _hdf5_merge!(dest, src)
     for (k, v) in src
         if isa(v, Axis)
             _hdf5_merge!(dest[k].plotattributes, v.plotattributes)
@@ -295,7 +295,7 @@ function _hdf5plot_gwrite(grp, k::String, v::Tuple)
     end
     #NOTE: _hdf5plot_overwritetype overwrites "Array" type with "Tuple".
 end
-function _hdf5plot_gwrite(grp, k::String, plotattributes::Dict)
+function _hdf5plot_gwrite(grp, k::String, plotattributes::AKW)
 #    @warn("Cannot write dict: $k=$plotattributes")
 end
 function _hdf5plot_gwrite(grp, k::String, v::AbstractRange)
@@ -376,7 +376,7 @@ function _hdf5plot_gwrite(grp, k::String, v::Subplot)
     _hdf5plot_writetype(grp, Subplot)
     return
 end
-function _hdf5plot_write(grp, plotattributes::Dict)
+function _hdf5plot_write(grp, plotattributes::AKW)
     for (k, v) in plotattributes
         kstr = string(k)
         _hdf5plot_gwrite(grp, kstr, v)
@@ -567,7 +567,7 @@ function _hdf5plot_read(grp, k::String)
 end
 
 #Read in values in group to populate plotattributes:
-function _hdf5plot_read(grp, plotattributes::Dict)
+function _hdf5plot_read(grp, plotattributes::AKW)
     gnames = names(grp)
     for k in gnames
         try

src/backends/pgfplots.jl

@@ -482,12 +482,12 @@ function _update_plot_object(plt::Plot{PGFPlotsBackend})
         fg_alpha = alpha(plot_color(sp[:foreground_color_legend]))
 
         push!(style, string(
-            "legend style = {", 
-                pgf_linestyle(pgf_thickness_scaling(sp), sp[:foreground_color_legend], fg_alpha, "solid", ), ",", 
-                "fill = $cstr,", 
-                "fill opacity = $bg_alpha,", 
-                "text opacity = $(alpha(plot_color(sp[:legendfontcolor]))),", 
-                "font = ", pgf_font(sp[:legendfontsize], pgf_thickness_scaling(sp)), 
+            "legend style = {",
+                pgf_linestyle(pgf_thickness_scaling(sp), sp[:foreground_color_legend], fg_alpha, "solid", ), ",",
+                "fill = $cstr,",
+                "fill opacity = $bg_alpha,",
+                "text opacity = $(alpha(plot_color(sp[:legendfontcolor]))),",
+                "font = ", pgf_font(sp[:legendfontsize], pgf_thickness_scaling(sp)),
             "}",
         ))
 

src/examples.jl

@@ -433,7 +433,7 @@ each line segment or marker in the plot.
         x = t .* cos.(θ)
         y = t .* sin.(θ)
         p1 = plot(x, y, line_z=t, linewidth=3, legend=false)
-        p2 = scatter(x, y, marker_z=(x,y)->x+y, color=:bluesreds, legend=false)
+        p2 = scatter(x, y, marker_z=+, color=:bluesreds, legend=false)
         plot(p1, p2)
     end)]
 ),
@@ -507,7 +507,8 @@ _backend_skips = Dict(
     :gr => [25, 30],
     :pyplot => [25, 30],
     :plotlyjs => [2, 21, 24, 25, 30, 31],
-    :pgfplots => [2, 5, 6, 10, 16, 20, 22, 23, 25, 28, 30],
+    :plotly => [2, 21, 24, 25, 30, 31],
+    :pgfplots => [2, 5, 6, 10, 16, 20, 22, 23, 25, 28, 30, 31, 34, 37, 38, 39],
 )
 
 

src/output.jl

@@ -60,6 +60,13 @@ function html(plt::Plot, fn::AbstractString)
 end
 html(fn::AbstractString) = html(current(), fn)
 
+function txt(plt::Plot, fn::AbstractString)
+  fn = addExtension(fn, "txt")
+  io = open(fn, "w")
+  show(io, MIME("text/plain"), plt)
+  close(io)
+end
+txt(fn::AbstractString) = txt(current(), fn)
 
 # ----------------------------------------------------------------
 
@@ -73,6 +80,7 @@ const _savemap = Dict(
     "tex" => tex,
     "html" => html,
     "tikz" => tex,
+    "txt" => txt,
   )
 
 function getExtension(fn::AbstractString)

src/utils.jl

@@ -1158,7 +1158,7 @@ function convert_sci_unicode(label::AbstractString)
     for key in keys(unicode_dict)
         label = replace(label, key => unicode_dict[key])
     end
-    if occursin("10^{", label)
+    if occursin("×10^{", label)
         label = string(label, "}")
     end
     label