diff --git a/.travis.yml b/.travis.yml index 2ccc93c6..353d1ce2 100644 --- a/.travis.yml +++ b/.travis.yml @@ -13,6 +13,6 @@ notifications: script: - if [[ -a .git/shallow ]]; then git fetch --unshallow; fi - julia -e 'Pkg.clone("Images"); Pkg.clone("ImageMagick")' - - julia -e 'Pkg.clone(pwd()); Pkg.build("Plots")` - - julia -e `Pkg.test("Plots"; coverage=true)' - - julia -e 'cd(Pkg.dir("ImageMagick")); Pkg.add("Coverage"); using Coverage; Coveralls.submit(process_folder()); Codecov.submit(process_folder())' + - julia -e 'Pkg.clone(pwd()); Pkg.build("Plots")' + - julia -e 'Pkg.test("Plots"; coverage=true)' + - julia -e 'cd(Pkg.dir("Plots")); Pkg.add("Coverage"); using Coverage; Coveralls.submit(process_folder()); Codecov.submit(process_folder())' diff --git a/examples/meetup/wine.ipynb b/examples/meetup/wine.ipynb index 87b31a1f..df242339 100644 --- a/examples/meetup/wine.ipynb +++ b/examples/meetup/wine.ipynb @@ -98405,7 +98405,7 @@ }, { "cell_type": "code", - "execution_count": 4, + "execution_count": null, "metadata": { "collapsed": false, "scrolled": false @@ -98415,32 +98415,20 @@ "name": "stdout", "output_type": "stream", "text": [ - "Dict{" - ] - }, - { - "ename": "LoadError", - "evalue": "LoadError: UndefRefError: access to undefined reference\nwhile loading In[4], in expression starting on line 1", - "output_type": "error", - "traceback": [ - "LoadError: UndefRefError: access to undefined reference\nwhile loading In[4], in expression starting on line 1", - "", - " in replaceAliases! at /home/tom/.julia/v0.4/Plots/src/utils.jl:162", - " in preprocessArgs! at /home/tom/.julia/v0.4/Plots/src/args.jl:453", - " in subplot at /home/tom/.julia/v0.4/Plots/src/subplot.jl:154" - ] - }, - { - "name": "stdout", - "output_type": "stream", - "text": [ - "Any,Any}(:group=>:quality,:l=>:hexbin,:xlim=>(0,4),:nr=>1,:size=>(1000,300),:link=>true,:title=>ASCIIString[\"Quality: 3\" \"Quality: 4\" \"Quality: 5\" \"Quality: 6\" \"Quality: 7\" \"Quality: 8\" \"Quality: 9\"],:n=>7,:leg=>false,:smooth=>true)\n" + "Dict{Any,Any}(:group=>:quality,:l=>:hexbin,:nr=>1,:size=>(1000,300),:link=>true,:title=>ASCIIString[\"Quality: 3\" \"Quality: 4\" \"Quality: 5\" \"Quality: 6\" \"Quality: 7\" \"Quality: 8\" \"Quality: 9\"],:n=>7,:leg=>false,:smooth=>true)\n", + "d = Dict{Any,Any}(:group=>:quality,:l=>:hexbin,:nr=>1,:size=>(1000,300),:link=>true,:title=>ASCIIString[\"Quality: 3\" \"Quality: 4\" \"Quality: 5\" \"Quality: 6\" \"Quality: 7\" \"Quality: 8\" \"Quality: 9\"],:n=>7,:leg=>false,:smooth=>true)\n", + "aliases = Dict(:c=>:color,:palette=>:color_palette,:width=>:linewidth,:lineopacitys=>:lineopacity,:type=>:linetype,:t=>:linetype,:shape=>:markershape,:xlink=>:linkx,:markeropacitys=>:markeropacity,:opacity=>:markeropacity,:display=>:show,:fg_color=>:foreground_color,:mcolor=>:markercolor,:gui=>:show,:xlab=>:xlabel,:ls=>:linestyle,:ylabel2=>:yrightlabel,:xlimits=>:xlims,:style=>:linestyle,:mark=>:marker,:mo=>:markeropacity,:alpha=>:markeropacity,:markercolors=>:markercolor,:lo=>:lineopacity,:lt=>:linetype,:markershapes=>:markershape,:nb=>:nbins,:fillrng=>:fillrange,:nbinss=>:nbins,:fillranges=>:fillrange,:windowsize=>:size,:nbin=>:nbins,:ytick=>:yticks,:smooths=>:smooth,:xlimit=>:xlims,:ylabelright=>:yrightlabel,:fc=>:fillcolor,:fo=>:fillopacity,:ylab2=>:yrightlabel,:l=>:line,:foreground=>:foreground_color,:regression=>:smooth,:ylink=>:linky,:m=>:marker,:bg_color=>:background_color,:w=>:linewidth,:fcolor=>:fillcolor,:colors=>:color,:y2label=>:yrightlabel,:annotate=>:annotation,:bg=>:background_color,:y2lab=>:yrightlabel,:linewidths=>:linewidth,:lab=>:label,:lw=>:linewidth,:msize=>:markersize,:yrlab=>:yrightlabel,:ylab=>:ylabel,:xlim=>:xlims,:markersizes=>:markersize,:f=>:fill,:groups=>:group,:bgcolor=>:background_color,:ylim=>:ylims,:ylimits=>:ylims,:g=>:group,:background=>:background_color,:labels=>:label,:ann=>:annotation,:reg=>:smooth,:ylimit=>:ylims,:area=>:fill,:annotations=>:annotation,:axiss=>:axis,:ylabr=>:yrightlabel,:fg=>:foreground_color,:linetypes=>:linetype,:xtick=>:xticks,:fillcolors=>:fillcolor,:rib=>:ribbon,:fillopacitys=>:fillopacity,:ms=>:markersize,:zs=>:z,:leg=>:legend,:mc=>:markercolor,:linestyles=>:linestyle,:wtitle=>:windowtitle,:wsize=>:size,:fgcolor=>:foreground_color,:s=>:linestyle,:anns=>:annotation)\n", + "d = Dict{Any,Any}(:group=>:quality,:l=>:hexbin,:nr=>1,:size=>(1000,300),:link=>true,:title=>ASCIIString[\"Quality: 3\" \"Quality: 4\" \"Quality: 5\" \"Quality: 6\" \"Quality: 7\" \"Quality: 8\" \"Quality: 9\"],:n=>7,:leg=>false,:smooth=>true)\n", + "aliases = Dict(:c=>:color,:palette=>:color_palette,:width=>:linewidth,:lineopacitys=>:lineopacity,:type=>:linetype,:t=>:linetype,:shape=>:markershape,:xlink=>:linkx,:markeropacitys=>:markeropacity,:opacity=>:markeropacity,:display=>:show,:fg_color=>:foreground_color,:mcolor=>:markercolor,:gui=>:show,:xlab=>:xlabel,:ls=>:linestyle,:ylabel2=>:yrightlabel,:xlimits=>:xlims,:style=>:linestyle,:mark=>:marker,:mo=>:markeropacity,:alpha=>:markeropacity,:markercolors=>:markercolor,:lo=>:lineopacity,:lt=>:linetype,:markershapes=>:markershape,:nb=>:nbins,:fillrng=>:fillrange,:nbinss=>:nbins,:fillranges=>:fillrange,:windowsize=>:size,:nbin=>:nbins,:ytick=>:yticks,:smooths=>:smooth,:xlimit=>:xlims,:ylabelright=>:yrightlabel,:fc=>:fillcolor,:fo=>:fillopacity,:ylab2=>:yrightlabel,:l=>:line,:foreground=>:foreground_color,:regression=>:smooth,:ylink=>:linky,:m=>:marker,:bg_color=>:background_color,:w=>:linewidth,:fcolor=>:fillcolor,:colors=>:color,:y2label=>:yrightlabel,:annotate=>:annotation,:bg=>:background_color,:y2lab=>:yrightlabel,:linewidths=>:linewidth,:lab=>:label,:lw=>:linewidth,:msize=>:markersize,:yrlab=>:yrightlabel,:ylab=>:ylabel,:xlim=>:xlims,:markersizes=>:markersize,:f=>:fill,:groups=>:group,:bgcolor=>:background_color,:ylim=>:ylims,:ylimits=>:ylims,:g=>:group,:background=>:background_color,:labels=>:label,:ann=>:annotation,:reg=>:smooth,:ylimit=>:ylims,:area=>:fill,:annotations=>:annotation,:axiss=>:axis,:ylabr=>:yrightlabel,:fg=>:foreground_color,:linetypes=>:linetype,:xtick=>:xticks,:fillcolors=>:fillcolor,:rib=>:ribbon,:fillopacitys=>:fillopacity,:ms=>:markersize,:zs=>:z,:leg=>:legend,:mc=>:markercolor,:linestyles=>:linestyle,:wtitle=>:windowtitle,:wsize=>:size,:fgcolor=>:foreground_color,:s=>:linestyle,:anns=>:annotation)\n", + "d = Dict{Any,Any}(:markersize=>6,:group=>nothing,:annotation=>nothing,:legend=>false,:color=>Plots.ColorWrapper{ColorTypes.RGBA{Float64}}(RGBA{Float64}(0.0,0.447,0.741,1.0)),:fillopacity=>nothing,:size=>(1000,300),:fillcolor=>Plots.ColorWrapper{ColorTypes.RGBA{Float64}}(RGBA{Float64}(0.0,0.447,0.741,1.0)),:z=>nothing,:markercolor=>Plots.ColorWrapper{ColorTypes.RGBA{Float64}}(RGBA{Float64}(0.0,0.447,0.741,1.0)),:linewidth=>1,:nbins=>100,:y=>[9.8,11.7,8.5,11.5,12.6,9.6,9.1,12.4,11.0,9.1,9.4,11.0,9.7,10.4,10.1,8.0,11.0,11.0,10.5,10.5],:label=>\"3\",:fillrange=>nothing,:markeropacity=>nothing,:show=>false,:subplot=>true,:lineopacity=>nothing,:nr=>1,:axis=>:left,:linetype=>:hexbin,:x=>[0.21,0.44,0.38,0.32,0.4,0.47,0.46,0.42,0.35,0.24,0.26,0.22,0.38,0.37,0.34,0.23,0.29,0.35,0.34,0.25],:linestyle=>:solid,:smooth=>true,:n=>7,:markershape=>:none)\n", + "aliases = Dict(:c=>:color,:palette=>:color_palette,:width=>:linewidth,:lineopacitys=>:lineopacity,:type=>:linetype,:t=>:linetype,:shape=>:markershape,:xlink=>:linkx,:markeropacitys=>:markeropacity,:opacity=>:markeropacity,:display=>:show,:fg_color=>:foreground_color,:mcolor=>:markercolor,:gui=>:show,:xlab=>:xlabel,:ls=>:linestyle,:ylabel2=>:yrightlabel,:xlimits=>:xlims,:style=>:linestyle,:mark=>:marker,:mo=>:markeropacity,:alpha=>:markeropacity,:markercolors=>:markercolor,:lo=>:lineopacity,:lt=>:linetype,:markershapes=>:markershape,:nb=>:nbins,:fillrng=>:fillrange,:nbinss=>:nbins,:fillranges=>:fillrange,:windowsize=>:size,:nbin=>:nbins,:ytick=>:yticks,:smooths=>:smooth,:xlimit=>:xlims,:ylabelright=>:yrightlabel,:fc=>:fillcolor,:fo=>:fillopacity,:ylab2=>:yrightlabel,:l=>:line,:foreground=>:foreground_color,:regression=>:smooth,:ylink=>:linky,:m=>:marker,:bg_color=>:background_color,:w=>:linewidth,:fcolor=>:fillcolor,:colors=>:color,:y2label=>:yrightlabel,:annotate=>:annotation,:bg=>:background_color,:y2lab=>:yrightlabel,:linewidths=>:linewidth,:lab=>:label,:lw=>:linewidth,:msize=>:markersize,:yrlab=>:yrightlabel,:ylab=>:ylabel,:xlim=>:xlims,:markersizes=>:markersize,:f=>:fill,:groups=>:group,:bgcolor=>:background_color,:ylim=>:ylims,:ylimits=>:ylims,:g=>:group,:background=>:background_color,:labels=>:label,:ann=>:annotation,:reg=>:smooth,:ylimit=>:ylims,:area=>:fill,:annotations=>:annotation,:axiss=>:axis,:ylabr=>:yrightlabel,:fg=>:foreground_color,:linetypes=>:linetype,:xtick=>:xticks,:fillcolors=>:fillcolor,:rib=>:ribbon,:fillopacitys=>:fillopacity,:ms=>:markersize,:zs=>:z,:leg=>:legend,:mc=>:markercolor,:linestyles=>:linestyle,:wtitle=>:windowtitle,:wsize=>:size,:fgcolor=>:foreground_color,:s=>:linestyle,:anns=>:annotation)\n", + "d = Dict{Any,Any}(:markersize=>6,:group=>nothing,:annotation=>nothing,:legend=>false,:color=>Plots.ColorWrapper{ColorTypes.RGBA{Float64}}(RGBA{Float64}(0.0,0.447,0.741,1.0)),:fillopacity=>nothing,:size=>(1000,300),:fillcolor=>Plots.ColorWrapper{ColorTypes.RGBA{Float64}}(RGBA{Float64}(0.0,0.447,0.741,1.0)),:z=>nothing,:markercolor=>Plots.ColorWrapper{ColorTypes.RGBA{Float64}}(RGBA{Float64}(0.0,0.447,0.741,1.0)),:linewidth=>1,:nbins=>100,:y=>[9.8,10.1,9.7,9.0,11.4,12.6,8.7,8.9,10.2,9.9,8.9,10.0,11.4,10.6,10.5,9.2,8.6,8.6,12.5,11.4,9.1,9.0,9.5,10.0,9.2,9.0,10.1,10.1,11.2,11.5,11.1,10.3,9.8,9.5,9.5,10.2,10.1,9.5,9.3,10.8,10.7,10.3,8.7,9.3,10.0,9.4,9.0,10.5,9.4,11.6,11.6,10.4,9.5,10.2,10.1,10.0,10.1,9.5,9.5,9.1,9.0,10.5,10.5,10.6,9.0,9.4,10.9,9.0,9.7,8.6,10.6,9.0,11.4,10.5,9.2,10.0,10.4,10.2,9.1,10.4,11.7,10.3,10.2,11.7,12.2,9.2,9.0,9.0,9.2,8.9,9.0,8.8,11.5,9.6,9.5,9.9,9.9,11.3,10.0,10.2,10.2,9.4,10.2,9.2,9.8,9.7,9.7,9.4,9.4,9.4,9.4,9.7,10.0,9.3,10.5,10.8,11.4,10.6,9.6,10.7,10.4,10.5,10.8,9.9,9.8,12.9,11.1,11.8,10.5,11.2,10.4,10.4,10.0,12.7,12.0,8.6,11.1,13.5,11.0,11.2,9.4,9.4,8.4,12.4,9.9,8.8,10.1,9.2,9.2,11.2,11.2,10.1,10.8,9.55,11.5,11.0,10.2,10.2,11.2,10.9,12.1,11.6,9.5],:label=>\"4\",:fillrange=>nothing,:markeropacity=>nothing,:show=>false,:subplot=>true,:lineopacity=>nothing,:nr=>1,:axis=>:left,:linetype=>:hexbin,:x=>[0.26,0.46,0.0,0.14,0.37,0.47,0.07,0.28,0.35,0.88,0.08,0.28,0.38,0.34,0.37,0.09,0.62,0.62,0.46,0.31,0.12,0.25,0.72,0.16,0.1,0.3,0.34,0.18,0.0,0.4,0.42,0.45,0.37,0.26,0.25,0.44,0.18,0.17,0.44,0.3,0.32,0.55,0.2,0.4,0.17,0.0,0.3,0.36,0.72,0.22,0.22,0.39,0.16,0.24,0.49,0.74,0.24,0.24,0.24,0.24,0.49,0.49,0.49,0.49,0.49,0.49,0.49,0.46,0.3,0.19,0.26,0.33,0.29,0.37,0.0,0.42,0.36,0.46,0.27,0.32,0.27,0.36,0.45,0.32,0.37,0.26,0.2,0.2,0.26,0.59,0.35,0.63,0.18,0.19,0.19,0.29,0.3,0.35,0.42,0.49,0.28,0.17,0.28,0.18,0.35,0.23,0.23,0.36,0.36,0.27,0.27,0.1,0.24,0.47,0.34,0.4,0.28,0.29,0.24,0.42,0.36,0.4,0.59,0.25,0.02,0.3,0.13,0.24,0.0,0.22,0.6,0.12,0.3,0.48,0.31,0.54,0.2,0.12,0.21,0.23,0.51,0.51,0.12,0.16,0.19,0.37,0.53,0.14,0.14,0.11,0.1,0.29,0.22,0.18,0.3,0.04,0.04,0.04,0.34,0.0,0.46,0.15,0.02],:linestyle=>:solid,:smooth=>true,:n=>7,:markershape=>:none)" ] } ], "source": [ "subplot(df, :citric_acid, :alcohol, group=:quality, l=:hexbin, n=7, nr=1, link=true,\n", - "title=map(i->\"Quality: $i\", (3:9)'), leg=false, size=(1000,300), smooth=true, xlim=(0,4))" + "title=map(i->\"Quality: $i\", (3:9)'), leg=false, size=(1000,300), smooth=true)" ] }, { diff --git a/src/utils.jl b/src/utils.jl index 5d4e14d0..56554f76 100644 --- a/src/utils.jl +++ b/src/utils.jl @@ -159,6 +159,7 @@ function replaceType(vec, val) end function replaceAliases!(d::Dict, aliases::Dict) + @show d aliases for (k,v) in d if haskey(aliases, k) d[aliases[k]] = v