readme

README.md

@@ -184,20 +184,22 @@ Keyword | Default | Type | Aliases
 `:annotation` | `nothing` | Series | `:ann`, `:annotate`, `:annotations`, `:anns`  
 `:axis` | `left` | Series | `:axiss`  
 `:color` | `auto` | Series | `:c`, `:colors`  
-`:fill` | `nothing` | Series | `:area`, `:fill`, `:fills`  
+`:fillcolor` | `match` | Series | `:fc`, `:fcolor`, `:fillcolors`  
+`:fillrange` | `nothing` | Series | `:fillranges`, `:fillrng`  
 `:group` | `nothing` | Series | `:g`, `:groups`  
 `:heatmap_c` | `(0.15,0.5)` | Series | `:heatmap_cs`  
 `:label` | `AUTO` | Series | `:lab`, `:labels`  
 `:linestyle` | `solid` | Series | `:linestyles`, `:ls`, `:s`, `:style`  
 `:linetype` | `path` | Series | `:linetypes`, `:lt`, `:t`, `:type`  
-`:marker` | `none` | Series | `:m`, `:markers`, `:shape`  
+`:linewidth` | `1` | Series | `:linewidths`, `:lw`, `:w`, `:width`  
 `:markercolor` | `match` | Series | `:markercolors`, `:mc`, `:mcolor`  
+`:markershape` | `none` | Series | `:markershapes`, `:shape`  
 `:markersize` | `6` | Series | `:markersizes`, `:ms`, `:msize`  
 `:nbins` | `100` | Series | `:nb`, `:nbin`, `:nbinss`  
 `:reg` | `false` | Series | `:regression`, `:regs`  
-`:ribbon` | `nothing` | Series | `:rib`, `:ribbons`  
+`:z` | `nothing` | Series | `:zs`  
-`:width` | `1` | Series | `:linewidth`, `:w`, `:widths`  
 `:background_color` | `RGB{U8}(1.0,1.0,1.0)` | Plot | `:background`, `:bg`, `:bg_color`, `:bgcolor`  
+`:color_palette` | `auto` | Plot | `:palette`  
 `:foreground_color` | `auto` | Plot | `:fg`, `:fg_color`, `:fgcolor`, `:foreground`  
 `:layout` | `nothing` | Plot |   
 `:legend` | `true` | Plot | `:leg`  
@@ -206,13 +208,15 @@ Keyword | Default | Type | Aliases
 `:nr` | `-1` | Plot |   
 `:pos` | `(0,0)` | Plot |   
 `:show` | `false` | Plot | `:display`, `:gui`  
-`:size` | `(800,600)` | Plot | `:windowsize`, `:wsize`  
+`:size` | `(600,400)` | Plot | `:windowsize`, `:wsize`  
 `:title` | `` | Plot |   
 `:windowtitle` | `Plots.jl` | Plot | `:wtitle`  
+`:xflip` | `false` | Plot |   
 `:xlabel` | `` | Plot | `:xlab`  
 `:xlims` | `auto` | Plot | `:xlim`, `:xlimit`, `:xlimits`  
 `:xscale` | `identity` | Plot |   
 `:xticks` | `auto` | Plot | `:xtick`  
+`:yflip` | `true` | Plot |   
 `:ylabel` | `` | Plot | `:ylab`  
 `:ylims` | `auto` | Plot | `:ylim`, `:ylimit`, `:ylimits`  
 `:yrightlabel` | `` | Plot | `:y2lab`, `:y2label`, `:ylab2`, `:ylabel2`, `:ylabelright`, `:ylabr`, `:yrlab`  

docs/example_generation.jl

@@ -57,7 +57,7 @@ const examples = PlotExample[
               [:(scatter!(rand(100), markersize=6, c=:orange))]),
   PlotExample("Heatmaps",
               "",
-              [:(heatmap(randn(10000),randn(10000), nbins=100))]),
+              [:(heatmap(randn(10000),randn(10000), nbins=(100,20)))]),
   PlotExample("Line types",
               "",
               [:(types = intersect(supportedTypes(), [:line, :path, :steppre, :steppost, :sticks, :scatter])'),

src/args.jl

@@ -506,10 +506,10 @@ end
 
 # -----------------------------------------------------------------------------
 
-# Tuples and 1-row matrices will give an element
+# 1-row matrices will give an element
 # multi-row matrices will give a column
 # anything else is returned as-is
-getArgValue(v::Tuple, idx::Int) = v[mod1(idx, length(v))]
+# getArgValue(v::Tuple, idx::Int) = v[mod1(idx, length(v))]
 function getArgValue(v::AMat, idx::Int)
   c = mod1(idx, size(v,2))
   size(v,1) == 1 ? v[1,c] : v[:,c]

src/backends/gadfly.jl

@@ -159,7 +159,7 @@ function addGadflySeries!(gplt, d::Dict, initargs::Dict)
   # line_color = isa(d[:color], AbstractVector) ? colorant"black" : d[:color]
   line_color = getColor(d[:color])
   fillcolor = getColor(d[:fillcolor])
-  @show fillcolor
+  # @show fillcolor
   # fg = initargs[:foreground_color]
   theme = Gadfly.Theme(; default_color = line_color,
                        line_width = line_width,
@@ -505,6 +505,7 @@ end
 
 function Base.writemime(io::IO, ::MIME"image/png", plt::Plot{GadflyPackage})
   gplt = getGadflyContext(plt.backend, plt)
+  @show plt.initargs
   setGadflyDisplaySize(plt.initargs[:size]...)
   Gadfly.draw(Gadfly.PNG(io, Compose.default_graphic_width, Compose.default_graphic_height), gplt)
 end

src/backends/pyplot.jl

@@ -52,8 +52,8 @@ supportedArgs(::PyPlotPackage) = [
     :yticks,
     :xscale,
     :yscale,
-    # :xflip,
+    :xflip,
-    # :yflip,
+    :yflip,
     # :z,
   ]
 supportedAxes(::PyPlotPackage) = _allAxes

src/utils.jl

@@ -248,10 +248,10 @@ function supportGraph(allvals, func)
   for val in vals
     for b in bs
         supported = func(Plots.backendInstance(b))
-          if val in supported
+        if val in supported
-              push!(x, string(b))
+            push!(x, string(b))
-              push!(y, string(val))
+            push!(y, string(val))
-          end
+        end
       end 
   end
   n = length(vals)