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

suppress_warnings fix; discrete values fixes

Browse Source
This commit is contained in:
Thomas Breloff 2016-05-23 16:42:24 -04:00
parent 6f0b8d1d7b
commit 0a00d1fbf3
4 changed files with 154 additions and 142 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

257
src/args.jl
View File

@ -1,18 +1,21 @@
const _allAxes = [:auto, :left, :right] const _allAxes = [:auto, :left, :right]
@compat const _axesAliases = KW( const _axesAliases = KW(
:a => :auto, :a => :auto,
:l => :left, :l => :left,
:r => :right :r => :right
) )
const _3dTypes = [:path3d, :scatter3d, :surface, :wireframe, :contour3d] const _3dTypes = [
:path3d, :scatter3d, :surface, :wireframe, :contour3d
]
const _allTypes = vcat([ const _allTypes = vcat([
:none, :line, :path, :steppre, :steppost, :sticks, :scatter, :none, :line, :path, :steppre, :steppost, :sticks, :scatter,
:heatmap, :hexbin, :hist, :hist2d, :hist3d, :density, :bar, :hline, :vline, #:ohlc, :heatmap, :hexbin, :hist, :hist2d, :hist3d, :density, :bar, :hline, :vline, #:ohlc,
:contour, :pie, :shape, :image #, :boxplot, :violin, :quiver, :contour, :pie, :shape, :image #, :boxplot, :violin, :quiver,
], _3dTypes) ], _3dTypes)
@compat const _typeAliases = KW( @compat const _typeAliases = KW(
:n => :none, :n => :none,
:no => :none, :no => :none,
@ -44,7 +47,7 @@ const _allTypes = vcat([
:img => :image, :img => :image,
:imshow => :image, :imshow => :image,
:imagesc => :image, :imagesc => :image,
) )
like_histogram(seriestype::Symbol) = seriestype in (:hist, :density) like_histogram(seriestype::Symbol) = seriestype in (:hist, :density)
like_line(seriestype::Symbol) = seriestype in (:line, :path, :steppre, :steppost) like_line(seriestype::Symbol) = seriestype in (:line, :path, :steppre, :steppost)
@ -61,7 +64,7 @@ const _allStyles = [:auto, :solid, :dash, :dot, :dashdot, :dashdotdot]
:d => :dash, :d => :dash,
:dd => :dashdot, :dd => :dashdot,
:ddd => :dashdotdot, :ddd => :dashdotdot,
) )
# const _allMarkers = [:none, :auto, :ellipse, :rect, :diamond, :utriangle, :dtriangle, # const _allMarkers = [:none, :auto, :ellipse, :rect, :diamond, :utriangle, :dtriangle,
# :cross, :xcross, :star5, :star8, :hexagon, :octagon, Shape] # :cross, :xcross, :star5, :star8, :hexagon, :octagon, Shape]
@ -104,122 +107,126 @@ const _allMarkers = vcat(:none, :auto, sort(collect(keys(_shapes))))
:o => :octagon, :o => :octagon,
:oct => :octagon, :oct => :octagon,
:spike => :vline, :spike => :vline,
) )
const _allScales = [:identity, :ln, :log2, :log10, :asinh, :sqrt] const _allScales = [:identity, :ln, :log2, :log10, :asinh, :sqrt]
@compat const _scaleAliases = KW( @compat const _scaleAliases = KW(
:none => :identity, :none => :identity,
:log => :log10, :log => :log10,
) )
# ----------------------------------------------------------------------------- # -----------------------------------------------------------------------------
const _series_defaults = KW() const _series_defaults = KW(
:label => "AUTO",
# series-specific :seriescolor => :auto,
# _series_defaults[:axis] = :left :seriesalpha => nothing,
_series_defaults[:label] = "AUTO" :seriestype => :path,
_series_defaults[:seriescolor] = :auto :linestyle => :solid,
_series_defaults[:seriesalpha] = nothing :linewidth => :auto,
_series_defaults[:seriestype] = :path :linecolor => :match,
_series_defaults[:linestyle] = :solid :linealpha => nothing,
_series_defaults[:linewidth] = :auto :fillrange => nothing, # ribbons, areas, etc
_series_defaults[:linecolor] = :match :fillcolor => :match,
_series_defaults[:linealpha] = nothing :fillalpha => nothing,
_series_defaults[:fillrange] = nothing # ribbons, areas, etc :markershape => :none,
_series_defaults[:fillcolor] = :match :markercolor => :match,
_series_defaults[:fillalpha] = nothing :markeralpha => nothing,
_series_defaults[:markershape] = :none :markersize => 6,
_series_defaults[:markercolor] = :match :markerstrokestyle => :solid,
_series_defaults[:markeralpha] = nothing :markerstrokewidth => 1,
_series_defaults[:markersize] = 6 :markerstrokecolor => :match,
_series_defaults[:markerstrokestyle] = :solid :markerstrokealpha => nothing,
_series_defaults[:markerstrokewidth] = 1 :bins => 30, # number of bins for hists
_series_defaults[:markerstrokecolor] = :match :smooth => false, # regression line?
_series_defaults[:markerstrokealpha] = nothing :group => nothing, # groupby vector
_series_defaults[:bins] = 30 # number of bins for hists :x => nothing,
_series_defaults[:smooth] = false # regression line? :y => nothing,
_series_defaults[:group] = nothing # groupby vector :z => nothing, # depth for contour, surface, etc
_series_defaults[:x] = nothing :marker_z => nothing, # value for color scale
_series_defaults[:y] = nothing :levels => 15,
_series_defaults[:z] = nothing # depth for contour, surface, etc :orientation => :vertical,
_series_defaults[:marker_z] = nothing # value for color scale :bar_position => :overlay, # for bar plots and histograms: could also be stack (stack up) or dodge (side by side)
_series_defaults[:levels] = 15 :bar_width => 0.8,
_series_defaults[:orientation] = :vertical :bar_edges => false,
_series_defaults[:bar_position] = :overlay # for bar plots and histograms: could also be stack (stack up) or dodge (side by side) :xerror => nothing,
_series_defaults[:bar_width] = 0.8 :yerror => nothing,
_series_defaults[:bar_edges] = false :ribbon => nothing,
_series_defaults[:xerror] = nothing :quiver => nothing,
_series_defaults[:yerror] = nothing :arrow => nothing, # allows for adding arrows to line/path... call `arrow(args...)`
_series_defaults[:ribbon] = nothing :normalize => false, # do we want a normalized histogram?
_series_defaults[:quiver] = nothing :weights => nothing, # optional weights for histograms (1D and 2D)
_series_defaults[:arrow] = nothing # allows for adding arrows to line/path... call `arrow(args...)` :contours => false, # add contours to 3d surface and wireframe plots
_series_defaults[:normalize] = false # do we want a normalized histogram? :match_dimensions => false, # do rows match x (true) or y (false) for heatmap/image/spy? see issue 196
_series_defaults[:weights] = nothing # optional weights for histograms (1D and 2D) # this ONLY effects whether or not the z-matrix is transposed for a heatmap display!
_series_defaults[:contours] = false # add contours to 3d surface and wireframe plots :subplot => :auto, # which subplot(s) does this series belong to?
_series_defaults[:match_dimensions] = false # do rows match x (true) or y (false) for heatmap/image/spy? see issue 196 :series_annotations => [], # a list of annotations which apply to the coordinates of this series
# this ONLY effects whether or not the z-matrix is transposed for a heatmap display! )
_series_defaults[:subplot] = :auto # which subplot(s) does this series belong to?
_series_defaults[:series_annotations] = [] # a list of annotations which apply to the coordinates of this series
const _plot_defaults = KW() const _plot_defaults = KW(
:plot_title => "",
_plot_defaults[:plot_title] = "" :background_color => colorant"white", # default for all backgrounds,
_plot_defaults[:background_color] = colorant"white" # default for all backgrounds :background_color_outside => :match, # background outside grid,
_plot_defaults[:background_color_outside] = :match # background outside grid :foreground_color => :auto, # default for all foregrounds, and title color,
_plot_defaults[:foreground_color] = :auto # default for all foregrounds, and title color :size => (600,400),
_plot_defaults[:size] = (600,400) :pos => (0,0),
_plot_defaults[:pos] = (0,0) :windowtitle => "Plots.jl",
_plot_defaults[:windowtitle] = "Plots.jl" :show => false,
_plot_defaults[:show] = false :layout => 1,
_plot_defaults[:layout] = 1 # :num_subplots => -1,
# _plot_defaults[:num_subplots] = -1 # :num_rows => -1,
# _plot_defaults[:num_rows] = -1 # :num_cols => -1,
# _plot_defaults[:num_cols] = -1 :link => false,
_plot_defaults[:link] = false :linkx => false,
_plot_defaults[:linkx] = false :linky => false,
_plot_defaults[:linky] = false :linkfunc => nothing,
_plot_defaults[:linkfunc] = nothing :overwrite_figure => true,
_plot_defaults[:overwrite_figure] = true )
const _subplot_defaults = KW() const _subplot_defaults = KW(
:title => "",
:title_location => :center, # also :left or :right
:titlefont => font(14),
:background_color_subplot => :match, # default for other bg colors... match takes plot default
:background_color_legend => :match, # background of legend
:background_color_inside => :match, # background inside grid
:foreground_color_subplot => :match, # default for other fg colors... match takes plot default
:foreground_color_legend => :match, # foreground of legend
:foreground_color_grid => :match, # grid color
:foreground_color_title => :match, # title color
:color_palette => :auto,
:legend => :best,
:colorbar => :legend,
:legendfont => font(8),
:grid => true,
:annotations => [], # annotation tuples... list of (x,y,annotation)
# :polar => false,
:projection => :none, # can also be :polar or :3d
:aspect_ratio => :none, # choose from :none or :equal
)
_subplot_defaults[:title] = "" const _axis_defaults = KW(
_subplot_defaults[:title_location] = :center # also :left or :right :guide => "",
_subplot_defaults[:titlefont] = font(14) :lims => :auto,
_subplot_defaults[:background_color_subplot] = :match # default for other bg colors... match takes plot default :ticks => :auto,
_subplot_defaults[:background_color_legend] = :match # background of legend :scale => :identity,
_subplot_defaults[:background_color_inside] = :match # background inside grid :rotation => 0,
_subplot_defaults[:foreground_color_subplot] = :match # default for other fg colors... match takes plot default :flip => false,
_subplot_defaults[:foreground_color_legend] = :match # foreground of legend :tickfont => font(8),
_subplot_defaults[:foreground_color_grid] = :match # grid color :guidefont => font(11),
_subplot_defaults[:foreground_color_title] = :match # title color :foreground_color_axis => :match, # axis border/tick colors,
_subplot_defaults[:color_palette] = :auto :foreground_color_border => :match, # plot area border/spines,
_subplot_defaults[:legend] = :best :foreground_color_text => :match, # tick text color,
_subplot_defaults[:colorbar] = :legend :foreground_color_guide => :match, # guide text color,
_subplot_defaults[:legendfont] = font(8) )
_subplot_defaults[:grid] = true
_subplot_defaults[:annotations] = [] # annotation tuples... list of (x,y,annotation)
# _subplot_defaults[:polar] = false
_subplot_defaults[:projection] = :none # can also be :polar or :3d
_subplot_defaults[:aspect_ratio] = :none # choose from :none or :equal
const _axis_defaults = KW() const _suppress_warnings = KW(
:x_discrete_indices => nothing,
_axis_defaults[:guide] = "" :y_discrete_indices => nothing,
_axis_defaults[:lims] = :auto :z_discrete_indices => nothing,
_axis_defaults[:ticks] = :auto )
_axis_defaults[:scale] = :identity
_axis_defaults[:rotation] = 0
_axis_defaults[:flip] = false
_axis_defaults[:tickfont] = font(8)
_axis_defaults[:guidefont] = font(11)
_axis_defaults[:foreground_color_axis] = :match # axis border/tick colors
_axis_defaults[:foreground_color_border] = :match # plot area border/spines
_axis_defaults[:foreground_color_text] = :match # tick text color
_axis_defaults[:foreground_color_guide] = :match # guide text color
# add defaults for the letter versions # add defaults for the letter versions
const _axis_defaults_byletter = KW() const _axis_defaults_byletter = KW()
@ -414,14 +421,9 @@ function default(k::Symbol)
return defaults[k] return defaults[k]
end end
end end
error("Unknown key: ", k) if !haskey(_suppress_warnings, k)
# if haskey(_series_defaults, k) error("Unknown key: ", k)
# return _series_defaults[k] end
# elseif haskey(_plot_defaults, k)
# return _plot_defaults[k]
# else
# error("Unknown key: ", k)
# end
end end
function default(k::Symbol, v) function default(k::Symbol, v)
@ -432,14 +434,9 @@ function default(k::Symbol, v)
return v return v
end end
end end
error("Unknown key: ", k) if !haskey(_suppress_warnings, k)
# if haskey(_series_defaults, k) error("Unknown key: ", k)
# _series_defaults[k] = v end
# elseif haskey(_plot_defaults, k)
# _plot_defaults[k] = v
# else
# error("Unknown key: ", k)
# end
end end
function default(; kw...) function default(; kw...)
@ -779,9 +776,9 @@ end
function warnOnUnsupportedArgs(pkg::AbstractBackend, d::KW) function warnOnUnsupportedArgs(pkg::AbstractBackend, d::KW)
for k in sortedkeys(d) for k in sortedkeys(d)
if (!(k in supportedArgs(pkg)) k in supportedArgs(pkg) && continue
# && k != :subplot haskey(_suppress_warnings, k) && continue
&& d[k] != default(k)) if d[k] != default(k)
warn("Keyword argument $k not supported with $pkg. Choose from: $(supportedArgs(pkg))") warn("Keyword argument $k not supported with $pkg. Choose from: $(supportedArgs(pkg))")
end end
end end

20
src/axes.jl
View File

@ -113,20 +113,28 @@ end
# these methods track the discrete values which correspond to axis continuous values (cv) # these methods track the discrete values which correspond to axis continuous values (cv)
# whenever we have discrete values, we automatically set the ticks to match. # whenever we have discrete values, we automatically set the ticks to match.
# we return the plot value # we return (continuous_value, discrete_index)
function discrete_value!(a::Axis, v) function discrete_value!(a::Axis, v)
cv = get(a[:discrete_map], v, NaN) cv_idx = get(a[:discrete_map], v, 0)
if isnan(cv) if cv_idx == 0
emin, emax = a[:extrema] emin, emax = a[:extrema]
cv = max(0.5, emax + 1.0) cv = max(0.5, emax + 1.0)
expand_extrema!(a, cv) expand_extrema!(a, cv)
a[:discrete_map][v] = cv a[:discrete_map][v] = cv
push!(a[:discrete_values], (cv, v)) push!(a[:discrete_values], (cv, v))
cv, length(a[:discrete_values])
else
a[:discrete_values][cv_idx][1], cv_idx
end end
cv
end end
# add the discrete value for each item # add the discrete value for each item. return the continuous values and the indices
function discrete_value!(a::Axis, v::AVec) function discrete_value!(a::Axis, v::AVec)
Float64[discrete_value!(a, vi) for vi=v] n = length(v)
cvec = zeros(n)
discrete_indices = zeros(Int, n)
for i=1:n
cvec[i], discrete_indices[i] = discrete_value!(a, v[i])
end
cvec, discrete_indices
end end

11
src/backends/pyplot.jl
View File

@ -508,6 +508,8 @@ end
function _series_added(plt::Plot{PyPlotBackend}, series::Series) function _series_added(plt::Plot{PyPlotBackend}, series::Series)
d = series.d d = series.d
st = d[:seriestype] st = d[:seriestype]
sp = d[:subplot]
if !(st in supportedTypes(plt.backend)) if !(st in supportedTypes(plt.backend))
error("seriestype $(st) is unsupported in PyPlot. Choose from: $(supportedTypes(plt.backend))") error("seriestype $(st) is unsupported in PyPlot. Choose from: $(supportedTypes(plt.backend))")
end end
@ -838,7 +840,13 @@ function _series_added(plt::Plot{PyPlotBackend}, series::Series)
handle = ax[:pie](y; handle = ax[:pie](y;
# label = d[:label], # label = d[:label],
# colors = # a vector of colors? # colors = # a vector of colors?
labels = x # labels = x
labels = if haskey(d,:x_discrete_indices)
dvals = sp.attr[:xaxis].d[:discrete_values]
[dvals[idx][2] for idx in d[:x_discrete_indices]]
else
d[:x]
end
) )
push!(handles, handle) push!(handles, handle)
end end
@ -849,7 +857,6 @@ function _series_added(plt::Plot{PyPlotBackend}, series::Series)
handleSmooth(plt, ax, d, d[:smooth]) handleSmooth(plt, ax, d, d[:smooth])
# add the colorbar legend # add the colorbar legend
sp = d[:subplot]
if needs_colorbar && sp.attr[:colorbar] != :none if needs_colorbar && sp.attr[:colorbar] != :none
# add keyword args for a discrete colorbar # add keyword args for a discrete colorbar
handle = handles[end] handle = handles[end]

8
src/plot.jl
View File

@ -114,16 +114,16 @@ function _apply_series_recipe(plt::Plot, d::KW)
end end
# adjust extrema and discrete info # adjust extrema and discrete info
for s in (:x, :y, :z) for letter in (:x, :y, :z)
data = d[s] data = d[letter]
axis = sp.attr[symbol(s, "axis")] axis = sp.attr[symbol(letter, "axis")]
if eltype(data) <: Number if eltype(data) <: Number
expand_extrema!(axis, data) expand_extrema!(axis, data)
else else
# TODO: need more here... gotta track the discrete reference value # TODO: need more here... gotta track the discrete reference value
# as well as any coord offset (think of boxplot shape coords... they all # as well as any coord offset (think of boxplot shape coords... they all
# correspond to the same x-value) # correspond to the same x-value)
d[s] = discrete_value!(axis, data) d[letter], d[symbol(letter,"_discrete_indices")] = discrete_value!(axis, data)
end end
end end