wine

src/recipes.jl

@@ -58,17 +58,17 @@ end
 
 
 "Do a correlation plot"
-function corrplot{T<:Real,S<:Real}(mat::AMat{T}, corrmat::AMat{S};
+function corrplot{T<:Real,S<:Real}(mat::AMat{T}, corrmat::AMat{S} = cor(mat);
                                    colors = :redsblues,
                                    labels = nothing, kw...)
   m = size(mat,2)
 
   # might be a mistake? 
-  @assert m <= 10
+  @assert m <= 20
   @assert size(corrmat) == (m,m)
 
   # create a subplot grid, and a gradient from -1 to 1
-  p = subplot(rand(0,m^2); n=m^2, kw...)
+  p = subplot(rand(0,m^2); n=m^2, leg=false, kw...)
   cgrad = ColorGradient(colors, [-1,1])
 
   # make all the plots

src/subplot.jl

@@ -1,17 +1,14 @@
 
 function subplotlayout(sz::@compat(Tuple{Int,Int}))
-  # create a GridLayout
   GridLayout(sz...)
 end
 
 function subplotlayout(rowcounts::AVec{Int})
-  # create a FlexLayout
   FlexLayout(sum(rowcounts), rowcounts)
 end
 
 function subplotlayout(numplts::Int, nr::Int, nc::Int)
 
-
   # figure out how many rows/columns we need
   if nr == -1
     if nc == -1
@@ -41,35 +38,6 @@ function subplotlayout(numplts::Int, nr::Int, nc::Int)
   FlexLayout(numplts, rowcounts)
 end
 
-# # create a layout directly
-# SubplotLayout(rowcounts::AbstractVector{Int}) = SubplotLayout(sum(rowcounts), rowcounts)
-
-# # create a layout given counts... nr/nc == -1 implies we figure out a good number automatically
-# function SubplotLayout(numplts::Int, nr::Int, nc::Int)
-
-#   # figure out how many rows/columns we need
-#   if nr == -1
-#     if nc == -1
-#       nr = round(Int, sqrt(numplts))
-#       nc = ceil(Int, numplts / nr)
-#     else
-#       nr = ceil(Int, numplts / nc)
-#     end
-#   else
-#     nc = ceil(Int, numplts / nr)
-#   end
-
-#   # create the rowcounts vector
-#   i = 0
-#   rowcounts = Int[]
-#   for r in 1:nr
-#     cnt = min(nc, numplts - i)
-#     push!(rowcounts, cnt)
-#     i += cnt
-#   end
-
-#   SubplotLayout(numplts, rowcounts)
-# end
 
 
 Base.length(layout::FlexLayout) = layout.numplts
@@ -253,11 +221,6 @@ function subplot!(subplt::Subplot, args...; kw...)
       delete!(d, s)
     end
   end
-  # haskey(d, :linkx) && (subplt.linkx = d[:linkx]; delete!(d, :linkx))
-  # haskey(d, :linky) && (subplt.linky = d[:linky])
-  # if haskey(d, :linkfunc)
-  #   subplt.linkfunc = d[:linkfunc]
-  # end
 
   # create the underlying object (each backend will do this differently)
   # note: we call it once before doing the individual plots, and once after
@@ -272,10 +235,13 @@ function subplot!(subplt::Subplot, args...; kw...)
   # TODO: something useful with meta info?
 
   for (i,di) in enumerate(kwList)
+    
     subplt.n += 1
     plt = getplot(subplt)  # get the Plot object where this series will be drawn
     di[:show] = false
+    haskey(d, :dataframe) && delete!(d, :dataframe)
     dumpdict(di, "subplot! kwList $i")
+    
     plot!(plt; di...)
   end
 

src/utils.jl

@@ -122,8 +122,8 @@ function expandLimits!(lims, x)
     e1, e2 = extrema(x)
     lims[1] = min(lims[1], e1)
     lims[2] = max(lims[2], e2)
-  catch err
-    warn(err)
+  # catch err
+  #   warn(err)
   end
   nothing
 end