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

directed_curve; working on PyPlot fixes

Browse Source
This commit is contained in:
Thomas Breloff 2016-02-19 18:24:56 -05:00
parent 4f238caf5c
commit 732f2846de
2 changed files with 16 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
src/backends/pyplot.jl
View File

@ -30,7 +30,7 @@ end
# ------------------------------- # -------------------------------
# convert colorant to 4-tuple RGBA # convert colorant to 4-tuple RGBA
getPyPlotColor(c::Colorant, α=nothing) = map(f->float(f(convertColor(c,α))), (red, green, blue, alpha)) getPyPlotColor(c::Colorant, α=nothing) = map(f->float(f(convertColor(c,α))), [red, green, blue, alpha])
getPyPlotColor(cvec::ColorVector, α=nothing) = map(getPyPlotColor, convertColor(cvec, α).v) getPyPlotColor(cvec::ColorVector, α=nothing) = map(getPyPlotColor, convertColor(cvec, α).v)
getPyPlotColor(scheme::ColorScheme, α=nothing) = getPyPlotColor(convertColor(getColor(scheme), α)) getPyPlotColor(scheme::ColorScheme, α=nothing) = getPyPlotColor(convertColor(getColor(scheme), α))
getPyPlotColor(c, α=nothing) = getPyPlotColor(convertColor(c, α)) getPyPlotColor(c, α=nothing) = getPyPlotColor(convertColor(c, α))
@ -350,7 +350,7 @@ function _add_series(pkg::PyPlotPackage, plt::Plot; kw...)
extra_kwargs[:c] = convert(Vector{Float64}, d[:zcolor]) extra_kwargs[:c] = convert(Vector{Float64}, d[:zcolor])
extra_kwargs[:cmap] = getPyPlotColorMap(c, d[:markeralpha]) extra_kwargs[:cmap] = getPyPlotColorMap(c, d[:markeralpha])
else else
extra_kwargs[:c] = getPyPlotColor(c, d[:markeralpha]) extra_kwargs[:c] = getPyPlotColor(c, d[:markeralpha])'
end end
if d[:markeralpha] != nothing if d[:markeralpha] != nothing
extra_kwargs[:alpha] = d[:markeralpha] extra_kwargs[:alpha] = d[:markeralpha]
@ -358,13 +358,14 @@ function _add_series(pkg::PyPlotPackage, plt::Plot; kw...)
extra_kwargs[:edgecolors] = getPyPlotColor(d[:markerstrokecolor], d[:markerstrokealpha]) extra_kwargs[:edgecolors] = getPyPlotColor(d[:markerstrokecolor], d[:markerstrokealpha])
extra_kwargs[:linewidths] = d[:markerstrokewidth] extra_kwargs[:linewidths] = d[:markerstrokewidth]
else else
extra_kwargs[:markersize] = d[:markersize] extra_kwargs[:markersize] = d[:markersize].^2
extra_kwargs[:markerfacecolor] = getPyPlotColor(d[:markercolor], d[:markeralpha]) extra_kwargs[:markerfacecolor] = getPyPlotColor(d[:markercolor], d[:markeralpha])'
extra_kwargs[:markeredgecolor] = getPyPlotColor(d[:markerstrokecolor], d[:markerstrokealpha]) extra_kwargs[:markeredgecolor] = getPyPlotColor(d[:markerstrokecolor], d[:markerstrokealpha])
extra_kwargs[:markeredgewidth] = d[:markerstrokewidth] extra_kwargs[:markeredgewidth] = d[:markerstrokewidth]
extra_kwargs[:drawstyle] = getPyPlotStepStyle(lt) extra_kwargs[:drawstyle] = getPyPlotStepStyle(lt)
end end
end end
dumpdict(extra_kwargs, "",true)
# if d[:markeralpha] != nothing # if d[:markeralpha] != nothing
# extra_kwargs[:alpha] = d[:markeralpha] # extra_kwargs[:alpha] = d[:markeralpha]

22
src/components.jl
View File

@ -250,7 +250,8 @@ end
P2, P2,
P3, P3,
points, points,
BezierCurve BezierCurve,
directed_curve
typealias P2 FixedSizeArrays.Vec{2,Float64} typealias P2 FixedSizeArrays.Vec{2,Float64}
typealias P3 FixedSizeArrays.Vec{3,Float64} typealias P3 FixedSizeArrays.Vec{3,Float64}
@ -273,25 +274,24 @@ end
points(curve::BezierCurve, n::Integer = 50) = map(curve, linspace(0,1,n)) points(curve::BezierCurve, n::Integer = 50) = map(curve, linspace(0,1,n))
function BezierCurve(p::P2, q::P2) # build a BezierCurve which leaves point p vertically upwards and arrives point q vertically upwards.
# may create a loop if necessary
function directed_curve(p::P2, q::P2)
mn = mean(p,q) mn = mean(p,q)
yoffset = max(0.2, min(1.0, abs(mn[2]-p[2])))
firstoffset = P2(0, yoffset)
# these points give the initial/final "rise"
yoffset = max(0.3, min(1.0, abs(mn[2]-p[2])))
firstoffset = P2(0, yoffset)
uppery = p + firstoffset uppery = p + firstoffset
lowery = q - firstoffset lowery = q - firstoffset
# try to figure out when to loop around vs just connecting straight
# TODO: choose loop direction based on sign of p[1]??
insideoffset = P2(0.2,0) insideoffset = P2(0.2,0)
inside = [] inside = []
if abs(p[1]-q[1]) <= 0.1 && p[2] >= q[2] if abs(p[1]-q[1]) <= 0.1 && p[2] >= q[2]
inside = [uppery+insideoffset, lowery+insideoffset] inside = [uppery+insideoffset, lowery+insideoffset]
end end
# inside = if abs(p[1]-q[1]) <= 0
# [uppery+insideoffset, lowery+insideoffset]
# else
# []
# end
# if p[2] < q[2] + 0.5
BezierCurve([p, uppery, inside..., lowery, q]) BezierCurve([p, uppery, inside..., lowery, q])
end end