mantao/Plots.jl
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

added weights kw; pyplot hist2d and hexbin

Browse Source
This commit is contained in:
Thomas Breloff 2016-04-24 23:33:51 -04:00
parent 44079a7bf7
commit 40a121198d
3 changed files with 60 additions and 41 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
src/args.jl
View File

@ -155,6 +155,7 @@ _seriesDefaults[:yerror] = nothing
_seriesDefaults[:ribbon] = nothing
_seriesDefaults[:quiver] = nothing
_seriesDefaults[:normalize] = false # do we want a normalized histogram?
_seriesDefaults[:weights] = nothing # optional weights for histograms (1D and 2D)
const _plotDefaults = KW()
@ -770,7 +771,9 @@ function getPlotArgs(pkg::AbstractBackend, kw, idx::Int; set_defaults = true)
d
end
function has_black_border_for_default(lt::Symbol)
like_histogram(lt) || lt == :hexbin
end
# build the argument dictionary for a series
function getSeriesArgs(pkg::AbstractBackend, plotargs::KW, kw, commandIndex::Int, plotIndex::Int, globalIndex::Int) # TODO, pass in plotargs, not plt
@ -818,7 +821,7 @@ function getSeriesArgs(pkg::AbstractBackend, plotargs::KW, kw, commandIndex::Int
# update colors
for csym in (:linecolor, :markercolor, :fillcolor)
d[csym] = if d[csym] == :match
if like_histogram(d[:linetype]) && csym == :linecolor
if has_black_border_for_default(d[:linetype]) && csym == :linecolor
:black
else
d[:seriescolor]

92
src/backends/pyplot.jl
View File

@ -334,11 +334,13 @@ function color_fix(c, x)
end
end
pylinecolor(d::KW) = getPyPlotColor(d[:linecolor], d[:linealpha])
pymarkercolor(d::KW) = getPyPlotColor(d[:markercolor], d[:markeralpha])
pymarkercolormap(d::KW) = getPyPlotColorMap(d[:markercolor], d[:markeralpha])
pymarkerstrokecolor(d::KW) = getPyPlotColor(d[:markerstrokecolor], d[:markerstrokealpha])
pyfillcolor(d::KW) = getPyPlotColor(d[:fillcolor], d[:fillalpha])
pylinecolor(d::KW) = getPyPlotColor(d[:linecolor], d[:linealpha])
pymarkercolor(d::KW) = getPyPlotColor(d[:markercolor], d[:markeralpha])
pymarkerstrokecolor(d::KW) = getPyPlotColor(d[:markerstrokecolor], d[:markerstrokealpha])
pyfillcolor(d::KW) = getPyPlotColor(d[:fillcolor], d[:fillalpha])
pymarkercolormap(d::KW) = getPyPlotColorMap(d[:markercolor], d[:markeralpha])
pyfillcolormap(d::KW) = getPyPlotColorMap(d[:fillcolor], d[:fillalpha])
function _add_series(pkg::PyPlotBackend, plt::Plot, d::KW)
lt = d[:linetype]
@ -355,31 +357,15 @@ function _add_series(pkg::PyPlotBackend, plt::Plot, d::KW)
fix_xy_lengths!(plt, d)
ax = getAxis(plt, d[:axis])
# linecolor = getPyPlotColor(d[:linecolor], d[:linealpha])
# markercolor = if d[:marker_z] == nothing
# getPyPlotColor(d[:markercolor], d[:markeralpha])
# else
# getPyPlotColorMap(d[:markercolor], d[:markeralpha])
# end
# fillcolor = getPyPlotColor(d[:fillcolor], d[:fillalpha])
# strokecolor = getPyPlotColor(d[:markerstrokecolor], d[:markerstrokealpha])
# linecmap = getPyPlotColorMap(d[:linecolor], d[:linealpha])
# fillcmap = getPyPlotColorMap(d[:fillcolor], d[:fillalpha])
# linestyle = getPyPlotLineStyle(lt, d[:linestyle])
# markershape = getPyPlotMarker(d[:markershape])
x, y, z = d[:x], d[:y], d[:z]
# cmap = get_cmap(plt, d)
# dumpdict(d, "",true)
# handle zcolor and get c/cmap
# extra_kw = get_extra_kw(plt, d)
extrakw = KW()
# :shape,
# :hist2d, :hexbin,
# :bar,
# :hline, :vline, :heatmap,
# :contour, :surface, :wireframe
@ -401,6 +387,7 @@ function _add_series(pkg::PyPlotBackend, plt::Plot, d::KW)
# holds references to any python object representing the matplotlib series
handles = []
needs_colorbar = false
# path/line/scatter should all do UP TO 2 series... a line, and a scatter
if lt in (:path, :line, :scatter, :path3d, :scatter3d, :steppre, :steppost)
@ -426,6 +413,7 @@ function _add_series(pkg::PyPlotBackend, plt::Plot, d::KW)
else
extrakw[:c] = convert(Vector{Float64}, d[:marker_z])
extrakw[:cmap] = pymarkercolormap(d)
needs_colorbar = true
end
handle = ax[:scatter](xyargs...;
label = d[:label],
@ -440,22 +428,6 @@ function _add_series(pkg::PyPlotBackend, plt::Plot, d::KW)
end
end
# histograms
if lt in (:hist, :density)
handle = ax[:hist](y;
label = d[:label],
zorder = plt.n + 0.5,
color = pyfillcolor(d),
edgecolor = pylinecolor(d),
linewidth = d[:linewidth],
bins = d[:nbins],
normed = d[:normalize],
orientation = (isvertical(d) ? "vertical" : "horizontal"),
histtype = (d[:bar_position] == :stack ? "barstacked" : "bar")
)[1]
push!(handles, handle)
end
# bars
if lt in (:bar, :sticks)
extrakw[isvertical(d) ? :width : :height] = (lt == :sticks ? 0.1 : 0.9)
@ -471,13 +443,57 @@ function _add_series(pkg::PyPlotBackend, plt::Plot, d::KW)
push!(handles, handle)
end
# histograms
if lt == :hist
handle = ax[:hist](y;
label = d[:label],
zorder = plt.n + 0.5,
color = pyfillcolor(d),
edgecolor = pylinecolor(d),
linewidth = d[:linewidth],
bins = d[:nbins],
normed = d[:normalize],
weights = d[:weights],
orientation = (isvertical(d) ? "vertical" : "horizontal"),
histtype = (d[:bar_position] == :stack ? "barstacked" : "bar")
)[1]
push!(handles, handle)
end
# 2d histograms
if lt == :hist2d
handle = ax[:hist2d](x, y;
label = d[:label],
zorder = plt.n + 0.5,
bins = d[:nbins],
normed = d[:normalize],
weights = d[:weights],
cmap = pyfillcolormap(d) # applies to the pcolorfast object
)[4]
push!(handles, handle)
end
# hexbins
if lt == :hexbin
handle = ax[:hexbin](x, y;
label = d[:label],
zorder = plt.n + 0.5,
gridsize = d[:nbins],
linewidths = d[:linewidth],
edgecolors = pylinecolor(d),
cmap = pyfillcolormap(d) # applies to the pcolorfast object
)
push!(handles, handle)
needs_colorbar = true
end
d[:serieshandle] = handles
# smoothing
handleSmooth(plt, ax, d, d[:smooth])
# add the colorbar legend
if plt.plotargs[:colorbar] != :none && haskey(extrakw, :cmap)
if needs_colorbar && plt.plotargs[:colorbar] != :none
PyPlot.colorbar(handles[end], ax=ax)
end

2
src/backends/supported.jl
View File

@ -101,7 +101,7 @@ supportedArgs(::PyPlotBackend) = [
:orientation,
:overwrite_figure,
:polar,
:normalize,
:normalize, :weights
]
supportedAxes(::PyPlotBackend) = _allAxes
supportedTypes(::PyPlotBackend) = [