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

several fixes after gadfly reorg

Browse Source
This commit is contained in:
Thomas Breloff 2015-10-16 00:21:37 -04:00
parent fac2f5494b
commit 7c91d10c79
4 changed files with 56 additions and 28 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
docs/example_generation.jl
View File

@ -99,8 +99,8 @@ const examples = PlotExample[
"Currently only text annotations are supported. Pass in a tuple or vector-of-tuples: (x,y,text). `annotate!(ann)` is shorthand for `plot!(; annotation=ann)`",
[
:(y = rand(10)),
:(plot(y, ann=(3,y[3],"this is #3"))),
:(annotate!([(5,y[5],"this is #5"),(9,y[10],"this is #10")]))
:(plot(y, ann=(3,y[3],text("this is #3",:left)))),
:(annotate!([(5,y[5],text("this is #5",16,:red,:center)),(10,y[10],text("this is #10",:right,20,:Helvitica))]))
]),
]

2
src/Plots.jl
View File

@ -141,6 +141,7 @@ xticks!{T<:Real,S<:@compat(AbstractString)}(
yticks!{T<:Real,S<:@compat(AbstractString)}(
ticks::AVec{T}, labels::AVec{S}; kw...) = plot!(; yticks = (ticks,labels), kw...)
annotate!(anns...; kw...) = plot!(; annotation = anns, kw...)
annotate!{T<:Tuple}(anns::AVec{T}; kw...) = plot!(; annotation = anns, kw...)
xflip!(flip::Bool = true; kw...) = plot!(; xflip = flip, kw...)
yflip!(flip::Bool = true; kw...) = plot!(; yflip = flip, kw...)
xaxis!(args...; kw...) = plot!(; xaxis = args, kw...)
@ -160,6 +161,7 @@ xticks!{T<:Real,S<:@compat(AbstractString)}(plt::Plot,
yticks!{T<:Real,S<:@compat(AbstractString)}(plt::Plot,
ticks::AVec{T}, labels::AVec{S}; kw...) = plot!(plt; yticks = (ticks,labels), kw...)
annotate!(plt::Plot, anns...; kw...) = plot!(plt; annotation = anns, kw...)
annotate!{T<:Tuple}(plt::Plot, anns::AVec{T}; kw...) = plot!(plt; annotation = anns, kw...)
xflip!(plt::Plot, flip::Bool = true; kw...) = plot!(plt; xflip = flip, kw...)
yflip!(plt::Plot, flip::Bool = true; kw...) = plot!(plt; yflip = flip, kw...)
xaxis!(plt::Plot, args...; kw...) = plot!(plt; xaxis = args, kw...)

76
src/backends/gadfly.jl
View File

@ -83,10 +83,6 @@ function createGadflyPlotObject(d::Dict)
Gadfly.Guide.ylabel(d[:ylabel]),
Gadfly.Guide.title(d[:title])]
# add the legend?
if d[:legend]
unshift!(gplt.guides, Gadfly.Guide.manual_color_key("", @compat(AbstractString)[], Color[]))
end
# hide the legend
if get(d, :legend, true)
@ -98,7 +94,7 @@ function createGadflyPlotObject(d::Dict)
fg = getColor(d[:foreground_color])
gplt.theme = Gadfly.Theme(;
background_color = getColor(d[:background_color]),
grid_color = fg,
# grid_color = fg,
minor_label_color = fg,
major_label_color = fg,
key_title_color = fg,
@ -199,7 +195,6 @@ function getLineGeom(d::Dict)
elseif lt == :steppost
Gadfly.Geom.step
elseif lt == :steppre
# direction: Either :hv for horizontal then vertical, or :vh for
Gadfly.Geom.step(direction = :vh)
elseif lt == :hline
Gadfly.Geom.hline(color = getColor(d[:color]), size = d[:linewidth] * Gadfly.px)
@ -215,7 +210,7 @@ function getGadflyLineTheme(d::Dict)
fc = getColor(d[:fillcolor])
Gadfly.Theme(;
default_color = lc,
line_width = d[:linewidth] * Gadfly.px,
line_width = (d[:linetype] == :sticks ? 1 : d[:linewidth]) * Gadfly.px,
line_style = Gadfly.get_stroke_vector(d[:linestyle]),
lowlight_color = x->RGB(fc), # fill/ribbon
lowlight_opacity = alpha(fc), # fill/ribbon
@ -224,7 +219,8 @@ function getGadflyLineTheme(d::Dict)
end
# add a line as a new layer
function addGadflyLine!(gplt, d::Dict, geoms...)
function addGadflyLine!(plt::Plot, d::Dict, geoms...)
gplt = getGadflyContext(plt)
gfargs = vcat(geoms...,
getGadflyLineTheme(d))
kwargs = Dict()
@ -245,7 +241,7 @@ function addGadflyLine!(gplt, d::Dict, geoms...)
elseif lt == :vline
kwargs[:xintercept] = d[:y]
elseif lt == :sticks
w = 0.1 * mean(diff(d[:x]))
w = 0.01 * mean(diff(d[:x]))
kwargs[:xmin] = d[:x] - w
kwargs[:xmax] = d[:x] + w
end
@ -274,7 +270,8 @@ function getGadflyMarkerTheme(d::Dict)
)
end
function addGadflyMarker!(gplt, d::Dict, geoms...)
function addGadflyMarker!(plt::Plot, d::Dict, geoms...)
gplt = getGadflyContext(plt)
gfargs = vcat(geoms...,
getGadflyMarkerTheme(d),
getMarkerGeom(d))
@ -296,9 +293,49 @@ end
# ---------------------------------------------------------------------------
function addToGadflyLegend(plt::Plot, d::Dict)
# add the legend?
if plt.initargs[:legend]
gplt = getGadflyContext(plt)
# add the legend if needed
if all(g -> !isa(g, Gadfly.Guide.ManualColorKey), gplt.guides)
unshift!(gplt.guides, Gadfly.Guide.manual_color_key("", @compat(AbstractString)[], Color[]))
end
# now add the series to the legend
for guide in gplt.guides
if isa(guide, Gadfly.Guide.ManualColorKey)
# TODO: there's a BUG in gadfly if you pass in the same color more than once,
# since gadfly will call unique(colors), but doesn't also merge the rows that match
# Should ensure from this side that colors which are the same are merged together
c = getColor(d[d[:markershape] == :none ? :color : :markercolor])
foundit = false
# extend the label if we found this color
for i in 1:length(guide.colors)
if c == guide.colors[i]
guide.labels[i] *= ", " * d[:label]
foundit = true
end
end
# didn't find the color, so add a new entry into the legend
if !foundit
push!(guide.labels, d[:label])
push!(guide.colors, c)
end
end
end
end
end
function addGadflySeries!(gplt, d::Dict)
function addGadflySeries!(plt::Plot, d::Dict)
# add a regression line?
# TODO: make more flexible
@ -307,7 +344,7 @@ function addGadflySeries!(gplt, d::Dict)
# lines
geom = getLineGeom(d)
if geom != nothing
addGadflyLine!(gplt, d, geom, smooth...)
addGadflyLine!(plt, d, geom, smooth...)
# don't add a regression for markers too
smooth = Any[]
@ -323,21 +360,10 @@ function addGadflySeries!(gplt, d::Dict)
# markers
if d[:markershape] != :none
addGadflyMarker!(gplt, d, smooth...)
end
# add to the legend
for guide in gplt.guides
if isa(guide, Gadfly.Guide.ManualColorKey)
# TODO: there's a BUG in gadfly if you pass in the same color more than once,
# since gadfly will call unique(colors), but doesn't also merge the rows that match
# Should ensure from this side that colors which are the same are merged together
push!(guide.labels, d[:label])
push!(guide.colors, getColor(d[d[:markershape] == :none ? :color : :markercolor]))
end
addGadflyMarker!(plt, d, smooth...)
end
lt in (:hist, :heatmap, :hexbin) || addToGadflyLegend(plt, d)
end

2
src/backends/immerse.jl
View File

@ -37,7 +37,7 @@ end
# plot one data series
function plot!(::ImmersePackage, plt::Plot; kw...)
d = Dict(kw)
addGadflySeries!(getGadflyContext(plt), d)
addGadflySeries!(plt, d)
push!(plt.seriesargs, d)
plt
end