added pyplot scales

README.md

@@ -195,7 +195,7 @@ Keyword | Default | Type | Aliases
 `:markersize` | `6` | Series | `:markersizes`, `:ms`, `:msize`  
 `:nbins` | `100` | Series | `:nb`, `:nbin`, `:nbinss`  
 `:reg` | `false` | Series | `:regression`, `:regs`  
-`:ribbon` | `nothing` | Series | `:r`, `:ribbons`  
+`:ribbon` | `nothing` | Series | `:rib`, `:ribbons`  
 `:width` | `1` | Series | `:linewidth`, `:w`, `:widths`  
 `:background_color` | `RGB{U8}(1.0,1.0,1.0)` | Plot | `:background`, `:bg`, `:bg_color`, `:bgcolor`  
 `:foreground_color` | `auto` | Plot | `:fg`, `:fg_color`, `:fgcolor`, `:foreground`  
@@ -211,10 +211,12 @@ Keyword | Default | Type | Aliases
 `:windowtitle` | `Plots.jl` | Plot | `:wtitle`  
 `:xlabel` | `` | Plot | `:xlab`  
 `:xlims` | `auto` | Plot | `:xlim`, `:xlimit`, `:xlimits`  
+`:xscale` | `identity` | Plot |   
 `:xticks` | `auto` | Plot | `:xtick`  
 `:ylabel` | `` | Plot | `:ylab`  
 `:ylims` | `auto` | Plot | `:ylim`, `:ylimit`, `:ylimits`  
 `:yrightlabel` | `` | Plot | `:y2lab`, `:y2label`, `:ylab2`, `:ylabel2`, `:ylabelright`, `:ylabr`, `:yrlab`  
+`:yscale` | `identity` | Plot |   
 `:yticks` | `auto` | Plot | `:ytick`  
 
 

img/supported/supported.md

@@ -14,6 +14,10 @@
 
 ![styles](Plots.supportGraphStyles.png)
 
+## Supported scales
+
+![scales](Plots.supportGraphScales.png)
+
 ## Supported axes
 
 ![axes](Plots.supportGraphAxes.png)

src/backends/pyplot.jl

@@ -49,14 +49,14 @@ supportedArgs(::PyPlotPackage) = [
     :ylims,
     :yrightlabel,
     :yticks,
-    # :xscale,
+    :xscale,
-    # :yscale,
+    :yscale,
   ]
 supportedAxes(::PyPlotPackage) = _allAxes
 supportedTypes(::PyPlotPackage) = [:none, :line, :path, :step, :stepinverted, :sticks, :scatter, :heatmap, :hexbin, :hist, :bar, :hline, :vline]
 supportedStyles(::PyPlotPackage) = [:auto, :solid, :dash, :dot, :dashdot]
 supportedMarkers(::PyPlotPackage) = [:none, :auto, :rect, :ellipse, :diamond, :utriangle, :dtriangle, :cross, :xcross, :star1, :hexagon]
-supportedScales(::PyPlotPackage) = [:identity]
+supportedScales(::PyPlotPackage) = [:identity, :log, :log2, :log10]
 subplotSupported(::PyPlotPackage) = false
 
 # convert colorant to 4-tuple RGBA
@@ -326,9 +326,21 @@ function updatePlotItems(plt::Plot{PyPlotPackage}, d::Dict)
   haskey(d, :xticks) && addPyPlotTicks(d[:xticks], true)
   haskey(d, :yticks) && addPyPlotTicks(d[:yticks], false)
 
+  # scales
+  ax = getLeftAxis(fig)
+  haskey(d, :xscale) && applyPyPlotScale(ax, d[:xscale], true)
+  haskey(d, :yscale) && applyPyPlotScale(ax, d[:yscale], false)
+
 end
 
-
+function applyPyPlotScale(ax, scaleType::Symbol, isx::Bool)
+  func = ax[isx ? :set_xscale : :set_yscale]
+  scaleType == :identity && return func("linear")
+  scaleType == :log && return func("log", basex = e, basey = e)
+  scaleType == :log2 && return func("log", basex = 2, basey = 2)
+  scaleType == :log10 && return func("log", basex = 10, basey = 10)
+  warn("Unhandled scaleType: ", scaleType)
+end
 
 # -----------------------------------------------------------------