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

gadfly cleanup

Browse Source
This commit is contained in:
Thomas Breloff 2015-10-16 11:03:34 -04:00
parent 03392a5f03
commit cd0dfc956d
1 changed files with 2 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/backends/gadfly_shapes.jl
View File

@ -48,8 +48,7 @@ function Gadfly.render(geom::ShapeGeometry, theme::Gadfly.Theme, aes::Gadfly.Aes
ctx = Compose.compose!( ctx = Compose.compose!(
Compose.context(), Compose.context(),
# circle(aes.x, aes.y, aes.size, geom.tag), make_polygon(geom, aes.x, aes.y, aes.size),
makeGadflyShapeContext(geom, aes.x, aes.y, aes.size),
Compose.fill(aes.color), Compose.fill(aes.color),
Compose.linewidth(theme.highlight_width)) Compose.linewidth(theme.highlight_width))
@ -72,7 +71,7 @@ end
# create a Compose context given a ShapeGeometry and the xs/ys/sizes # create a Compose context given a ShapeGeometry and the xs/ys/sizes
function makeGadflyShapeContext(geom::ShapeGeometry, xs::AbstractArray, ys::AbstractArray, rs::AbstractArray) function make_polygon(geom::ShapeGeometry, xs::AbstractArray, ys::AbstractArray, rs::AbstractArray)
n = max(length(xs), length(ys), length(rs)) n = max(length(xs), length(ys), length(rs))
T = @compat(Tuple{Compose.Measure, Compose.Measure}) T = @compat(Tuple{Compose.Measure, Compose.Measure})
polys = Array(Vector{T}, n) polys = Array(Vector{T}, n)
@ -80,7 +79,6 @@ function makeGadflyShapeContext(geom::ShapeGeometry, xs::AbstractArray, ys::Abst
x = Compose.x_measure(xs[mod1(i, length(xs))]) x = Compose.x_measure(xs[mod1(i, length(xs))])
y = Compose.y_measure(ys[mod1(i, length(ys))]) y = Compose.y_measure(ys[mod1(i, length(ys))])
r = rs[mod1(i, length(rs))] r = rs[mod1(i, length(rs))]
# polys[i] = [(x, y - r), (x + r, y), (x, y + r), (x - r, y)]
polys[i] = T[(x + r * sx, y + r * sy) for (sx,sy) in geom.vertices] polys[i] = T[(x + r * sx, y + r * sy) for (sx,sy) in geom.vertices]
end end
Gadfly.polygon(polys, geom.tag) Gadfly.polygon(polys, geom.tag)