Merge pull request #1765 from pfitzseb/sp/juno2

honour `html_output_format` in Juno

NEWS.md

@@ -12,6 +12,13 @@
 ## (current master)
 - All new development should target Julia 1.x!
 
+## 0.20.3
+- implement guide position in gr, pyplot and pgfplots
+- inspectdr fixes
+- default appveyor
+- rudimentary missings support
+- deprecation fixes for PGFPlots
+
 ## 0.20.0
 Many updates, min julia 1.0
 - change display type to use PlotsDisplay (fixes Juno integration)

src/arg_desc.jl

@@ -111,6 +111,7 @@ const _arg_desc = KW(
 
 # axis args
 :guide     				  => "String. Axis guide (label).",
+:guide_position		  => "Symbol. Position of axis guides: :top, :bottom, :left or :right",
 :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`",

src/args.jl

@@ -350,6 +350,7 @@ const _subplot_defaults = KW(
 
 const _axis_defaults = KW(
     :guide     => "",
+    :guide_position => :auto,
     :lims      => :auto,
     :ticks     => :auto,
     :scale     => :identity,

src/backends/gr.jl

@@ -17,7 +17,7 @@ const _gr_attr = merge_with_base_supported([
     :bins,
     :layout,
     :title, :window_title,
-    :guide, :lims, :ticks, :scale, :flip,
+    :guide, :guide_position, :lims, :ticks, :scale, :flip,
     :match_dimensions,
     :titlefontfamily, :titlefontsize, :titlefonthalign, :titlefontvalign,
     :titlefontrotation, :titlefontcolor,
@@ -962,15 +962,25 @@ function gr_display(sp::Subplot{GRBackend}, w, h, viewport_canvas)
 
     if xaxis[:guide] != ""
         gr_set_font(guidefont(xaxis))
-        GR.settextalign(GR.TEXT_HALIGN_CENTER, GR.TEXT_VALIGN_BOTTOM)
-        gr_text(gr_view_xcenter(), viewport_subplot[3], xaxis[:guide])
+        if xaxis[:guide_position] == :top
+            GR.settextalign(GR.TEXT_HALIGN_CENTER, GR.TEXT_VALIGN_TOP)
+            gr_text(gr_view_xcenter(), viewport_subplot[4], xaxis[:guide])
+        else
+            GR.settextalign(GR.TEXT_HALIGN_CENTER, GR.TEXT_VALIGN_BOTTOM)
+            gr_text(gr_view_xcenter(), viewport_subplot[3], xaxis[:guide])
+        end
     end
 
     if yaxis[:guide] != ""
         gr_set_font(guidefont(yaxis))
-        GR.settextalign(GR.TEXT_HALIGN_CENTER, GR.TEXT_VALIGN_TOP)
         GR.setcharup(-1, 0)
-        gr_text(viewport_subplot[1], gr_view_ycenter(), yaxis[:guide])
+        if yaxis[:guide_position] == :left
+            GR.settextalign(GR.TEXT_HALIGN_CENTER, GR.TEXT_VALIGN_BOTTOM)
+            gr_text(viewport_subplot[2], gr_view_ycenter(), yaxis[:guide])
+        else
+            GR.settextalign(GR.TEXT_HALIGN_CENTER, GR.TEXT_VALIGN_TOP)
+            gr_text(viewport_subplot[1], gr_view_ycenter(), yaxis[:guide])
+        end
     end
     GR.restorestate()
 

src/backends/inspectdr.jl

@@ -22,6 +22,7 @@ const _inspectdr_attr = merge_with_base_supported([
     :foreground_color_legend, :foreground_color_title,
     :foreground_color_axis, :foreground_color_border, :foreground_color_guide, :foreground_color_text,
     :label,
+    :seriescolor, :seriesalpha,
     :linecolor, :linestyle, :linewidth, :linealpha,
     :markershape, :markercolor, :markersize, :markeralpha,
     :markerstrokewidth, :markerstrokecolor, :markerstrokealpha,
@@ -35,7 +36,8 @@ const _inspectdr_attr = merge_with_base_supported([
     :legendfontfamily, :legendfontsize, :legendfontcolor,
     :tickfontfamily, :tickfontsize, :tickfontcolor,
     :guidefontfamily, :guidefontsize, :guidefontcolor,
-    :grid, :legend, #:colorbar,
+    :grid, #:gridalpha, :gridstyle, :gridlinewidth, #alhpa & linewidth are per plot - not per subplot
+    :legend, #:legendtitle, :colorbar,
 #    :marker_z,
 #    :line_z,
 #    :levels,
@@ -260,8 +262,10 @@ For st in :shape:
             nmax = i
             if length(rng) > 1
                 linewidth = series[:linewidth]
-                linecolor = _inspectdr_mapcolor(_cycle(series[:linecolor], i))
-                fillcolor = _inspectdr_mapcolor(_cycle(series[:fillcolor], i))
+                c = plot_color(get_linecolor(series), get_linealpha(series))
+                linecolor = _inspectdr_mapcolor(_cycle(c, i))
+                c = plot_color(get_fillcolor(series), get_fillalpha(series))
+                fillcolor = _inspectdr_mapcolor(_cycle(c, i))
                 line = InspectDR.line(
                     style=:solid, width=linewidth, color=linecolor
                 )
@@ -275,8 +279,10 @@ For st in :shape:
         i = (nmax >= 2 ? div(nmax, 2) : nmax) #Must pick one set of colors for legend
         if i > 1 #Add dummy waveform for legend entry:
             linewidth = series[:linewidth]
-            linecolor = _inspectdr_mapcolor(_cycle(series[:linecolor], i))
-            fillcolor = _inspectdr_mapcolor(_cycle(series[:fillcolor], i))
+            c = plot_color(get_linecolor(series), get_linealpha(series))
+            linecolor = _inspectdr_mapcolor(_cycle(c, i))
+            c = plot_color(get_fillcolor(series), get_fillalpha(series))
+            fillcolor = _inspectdr_mapcolor(_cycle(c, i))
             wfrm = InspectDR.add(plot, Float64[], Float64[], id=series[:label])
             wfrm.line = InspectDR.line(
                 style=:none, width=linewidth, #linewidth affects glyph
@@ -295,7 +301,7 @@ For st in :shape:
         wfrm.line = InspectDR.line(
             style = _style,
             width = series[:linewidth],
-            color = series[:linecolor],
+            color = plot_color(get_linecolor(series), get_linealpha(series)),
         )
         #InspectDR does not control markerstrokewidth independently.
         if :none == _style
@@ -305,8 +311,8 @@ For st in :shape:
         wfrm.glyph = InspectDR.glyph(
             shape = _inspectdr_mapglyph(series[:markershape]),
             size = _inspectdr_mapglyphsize(series[:markersize]),
-            color = _inspectdr_mapcolor(series[:markerstrokecolor]),
-            fillcolor = _inspectdr_mapcolor(series[:markercolor]),
+            color = _inspectdr_mapcolor(plot_color(series[:markerstrokecolor], series[:markerstrokealpha])),
+            fillcolor = _inspectdr_mapcolor(plot_color(series[:markercolor], series[:markeralpha])),
         )
     end
 

src/backends/pgfplots.jl

@@ -20,7 +20,7 @@ const _pgfplots_attr = merge_with_base_supported([
     # :bar_width, :bar_edges,
     :title,
     # :window_title,
-    :guide, :lims, :ticks, :scale, :flip, :rotation,
+    :guide, :guide_position, :lims, :ticks, :scale, :flip, :rotation,
     :tickfont, :guidefont, :legendfont,
     :grid, :legend,
     :colorbar, :colorbar_title,
@@ -364,9 +364,17 @@ function pgf_axis(sp::Subplot, letter)
     # axis guide
     kw[Symbol(letter,:label)] = axis[:guide]
 
+    # axis label position
+    labelpos = ""
+    if letter == :x && axis[:guide_position] == :top
+        labelpos = "at={(0.5,1)},above,"
+    elseif letter == :y && axis[:guide_position] == :right
+        labelpos = "at={(1,0.5)},below,"
+    end
+
     # Add label font
     cstr, α = pgf_color(plot_color(axis[:guidefontcolor]))
-    push!(style, string(letter, "label style = {font = ", pgf_font(axis[:guidefontsize], pgf_thickness_scaling(sp)), ", color = ", cstr, ", draw opacity = ", α, ", rotate = ", axis[:guidefontrotation], "}"))
+    push!(style, string(letter, "label style = {", labelpos ,"font = ", pgf_font(axis[:guidefontsize], pgf_thickness_scaling(sp)), ", color = ", cstr, ", draw opacity = ", α, ", rotate = ", axis[:guidefontrotation], "}"))
 
     # flip/reverse?
     axis[:flip] && push!(style, "$letter dir=reverse")
@@ -405,7 +413,7 @@ function pgf_axis(sp::Subplot, letter)
         push!(style, string(letter, "tick = {", join(tick_values,","), "}"))
         if axis[:showaxis] && axis[:scale] in (:ln, :log2, :log10) && axis[:ticks] == :auto
             # wrap the power part of label with }
-            tick_labels = Vector{String}(length(ticks[2]))
+            tick_labels = Vector{String}(undef, length(ticks[2]))
             for (i, label) in enumerate(ticks[2])
                 base, power = split(label, "^")
                 power = string("{", power, "}")
@@ -416,7 +424,7 @@ function pgf_axis(sp::Subplot, letter)
             tick_labels = ispolar(sp) && letter == :x ? [ticks[2][3:end]..., "0", "45"] : ticks[2]
             if axis[:formatter] in (:scientific, :auto)
                 tick_labels = string.("\$", convert_sci_unicode.(tick_labels), "\$")
-                tick_labels = replace.(tick_labels, "×", "\\times")
+                tick_labels = replace.(tick_labels, Ref("×" => "\\times"))
             end
             push!(style, string(letter, "ticklabels = {", join(tick_labels,","), "}"))
         else
@@ -555,7 +563,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!.(Ref(o), pgf_series(sp, series))
 
             # add series annotations
             anns = series[:series_annotations]

src/backends/pyplot.jl

@@ -14,7 +14,7 @@ const _pyplot_attr = merge_with_base_supported([
     :bins, :bar_width, :bar_edges, :bar_position,
     :title, :title_location, :titlefont,
     :window_title,
-    :guide, :lims, :ticks, :scale, :flip, :rotation,
+    :guide, :guide_position, :lims, :ticks, :scale, :flip, :rotation,
     :titlefontfamily, :titlefontsize, :titlefontcolor,
     :legendfontfamily, :legendfontsize, :legendfontcolor,
     :tickfontfamily, :tickfontsize, :tickfontcolor,
@@ -1053,6 +1053,9 @@ function _before_layout_calcs(plt::Plot{PyPlotBackend})
                 pyaxis[:set_ticks_position]("both")  # the hash marks
                 pyaxis[Symbol(:tick_, pos)]()        # the tick labels
             end
+            if axis[:guide_position] != :auto && letter != :z
+                pyaxis[:set_label_position](axis[:guide_position])
+            end
             py_set_scale(ax, axis)
             axis[:ticks] != :native ? py_set_lims(ax, axis) : nothing
             if ispolar(sp) && letter == :y

src/output.jl

@@ -267,9 +267,21 @@ function showjuno(io::IO, m, plt)
     plt[:thickness_scaling] *= scale
 
     prepare_output(plt)
-    _show(io, m, plt)
-
-    plt[:size] = sz
-    plt[:dpi] = dpi
-    plt[:thickness_scaling] = thickness_scaling
+    try
+      _showjuno(io, m, plt)
+    finally
+      plt[:size] = sz
+      plt[:dpi] = dpi
+      plt[:thickness_scaling] = thickness_scaling
+    end
 end
+
+function _showjuno(io::IO, m::MIME"image/svg+xml", plt)
+  if Symbol(plt.attr[:html_output_format]) ≠ :svg
+    throw(MethodError(show, (typeof(m), typeof(plt))))
+  else
+    _show(io, m, plt)
+  end
+end
+
+_showjuno(io::IO, m, plt) = _show(io, m, plt)

test/imgcomp.jl

@@ -29,7 +29,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.17.4"
+const _current_plots_version = v"0.20.3"
 
 
 function image_comparison_tests(pkg::Symbol, idx::Int; debug = false, popup = isinteractive(), sigma = [1,1], tol = 1e-2)