pyplot fonts and fixes; examples

docs/pyplot_examples.md

@@ -1,6 +1,6 @@
 # Examples for backend: pyplot
 
-- Supported arguments: `annotation`, `axis`, `background_color`, `color`, `color_palette`, `fillrange`, `fillcolor`, `foreground_color`, `group`, `label`, `layout`, `legend`, `linestyle`, `linetype`, `linewidth`, `markershape`, `markercolor`, `markersize`, `n`, `nbins`, `nc`, `nr`, `show`, `size`, `title`, `windowtitle`, `x`, `xlabel`, `xlims`, `xticks`, `y`, `ylabel`, `ylims`, `yrightlabel`, `yticks`, `xscale`, `yscale`, `xflip`, `yflip`, `z`
+- Supported arguments: `annotation`, `axis`, `background_color`, `color`, `color_palette`, `fillrange`, `fillcolor`, `foreground_color`, `group`, `label`, `layout`, `legend`, `linestyle`, `linetype`, `linewidth`, `markershape`, `markercolor`, `markersize`, `n`, `nbins`, `nc`, `nr`, `show`, `size`, `title`, `windowtitle`, `x`, `xlabel`, `xlims`, `xticks`, `y`, `ylabel`, `ylims`, `yrightlabel`, `yticks`, `xscale`, `yscale`, `xflip`, `yflip`, `z`, `tickfont`, `guidefont`, `legendfont`
 - Supported values for axis: `:auto`, `:left`, `:right`
 - Supported values for linetype: `:none`, `:line`, `:path`, `:steppre`, `:steppost`, `:sticks`, `:scatter`, `:heatmap`, `:hexbin`, `:hist`, `:bar`, `:hline`, `:vline`
 - Supported values for linestyle: `:auto`, `:solid`, `:dash`, `:dot`, `:dashdot`

src/Plots.jl

@@ -60,8 +60,8 @@ export
   dataframes,
 
   Shape,
-  PlotText,
   text,
+  font,
   OHLC,
 
   colorscheme,

src/args.jl

@@ -121,7 +121,7 @@ _seriesDefaults[:fillopacity] = nothing
 # _seriesDefaults[:ribbon]      = nothing
 # _seriesDefaults[:ribboncolor] = :match
 _seriesDefaults[:nbins]       = 100               # number of bins for heatmaps and hists
-_seriesDefaults[:heatmap_c]   = (0.15, 0.5)   # TODO: this should be replaced with a ColorGradient
+# _seriesDefaults[:heatmap_c]   = (0.15, 0.5)   # TODO: this should be replaced with a ColorGradient
 # _seriesDefaults[:fill]      = nothing          # fills in the area
 _seriesDefaults[:smooth]      = false               # regression line?
 _seriesDefaults[:group]       = nothing           # groupby vector
@@ -163,9 +163,9 @@ _plotDefaults[:link]              = false
 _plotDefaults[:linkx]             = false
 _plotDefaults[:linky]             = false
 _plotDefaults[:linkfunc]          = nothing
-_plotDefaults[:tickfont]          = font(11)
-_plotDefaults[:guidefont]         = font(14)
-_plotDefaults[:legendfont]        = font(9)
+_plotDefaults[:tickfont]          = font(8)
+_plotDefaults[:guidefont]         = font(11)
+_plotDefaults[:legendfont]        = font(8)
 _plotDefaults[:grid]              = true
 
 
@@ -180,7 +180,7 @@ supportedArgs() = supportedArgs(backend())
 @compat const _argNotes = Dict(
     :color => "Series color.  To have different marker and/or fill colors, optionally set the markercolor and fillcolor args.",
     :z => "Determines the depth.  For color gradients, we expect 0 ≤ z ≤ 1.",
-    :heatmap_c => "For Qwt heatmaps only... will be deprecated eventually.",
+    # :heatmap_c => "For Qwt heatmaps only... will be deprecated eventually.",
   )
 
 

src/backends/pyplot.jl

@@ -55,9 +55,9 @@ supportedArgs(::PyPlotPackage) = [
     :xflip,
     :yflip,
     :z,
-    # :tickfont,
-    # :guidefont,
-    # :legendfont,
+    :tickfont,
+    :guidefont,
+    :legendfont,
     # :grid,
   ]
 supportedAxes(::PyPlotPackage) = _allAxes
@@ -376,6 +376,8 @@ function addPyPlotTicks(ax, ticks, isx::Bool)
   end
 end
 
+usingRightAxis(plt::Plot{PyPlotPackage}) = any(args -> args[:axis] in (:right,:auto), plt.seriesargs)
+
 function updatePlotItems(plt::Plot{PyPlotPackage}, d::Dict)
   figorax = plt.o
   ax = getLeftAxis(figorax)
@@ -387,7 +389,7 @@ function updatePlotItems(plt::Plot{PyPlotPackage}, d::Dict)
   if haskey(d, :ylabel)
     ax[:set_ylabel](d[:ylabel])
   end
-  if haskey(d, :yrightlabel)
+  if usingRightAxis(plt) && get(d, :yrightlabel, "") != ""
     rightax = getRightAxis(figorax)  
     rightax[:set_ylabel](d[:yrightlabel])
   end
@@ -409,6 +411,31 @@ function updatePlotItems(plt::Plot{PyPlotPackage}, d::Dict)
     ax[:invert_yaxis]()
   end
 
+  axes = [getLeftAxis(figorax)]
+  if usingRightAxis(plt)
+    push!(axes, getRightAxis(figorax))
+  end
+
+  # font sizes
+  for ax in axes
+    # haskey(d, :yrightlabel) || continue
+    
+
+    # guides
+    sz = get(d, :guidefont, plt.initargs[:guidefont]).pointsize
+    ax[:title][:set_fontsize](sz)
+    ax[:xaxis][:label][:set_fontsize](sz)
+    ax[:yaxis][:label][:set_fontsize](sz)
+
+    # ticks
+    sz = get(d, :tickfont, plt.initargs[:tickfont]).pointsize
+    for sym in (:get_xticklabels, :get_yticklabels)
+      for lab in ax[sym]()
+        lab[:set_fontsize](sz)
+      end
+    end
+  end
+
 end
 
 function applyPyPlotScale(ax, scaleType::Symbol, isx::Bool)

src/backends/qwt.jl

@@ -18,7 +18,7 @@ supportedArgs(::QwtPackage) = [
     :fillcolor,
     :foreground_color,
     :group,
-    :heatmap_c,
+    # :heatmap_c,
     # :kwargs,
     :label,
     :layout,