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

rtri/ltri shapes; go between in directed_curve

Browse Source
This commit is contained in:
Tom Breloff 2016-11-11 11:10:06 -05:00
parent 9f2ba09fc4
commit ad71e81338
2 changed files with 28 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
src/args.jl
View File

@ -123,6 +123,16 @@ const _markerAliases = Dict{Symbol,Symbol}(
:dtri => :dtriangle, :dtri => :dtriangle,
:downtri => :dtriangle, :downtri => :dtriangle,
:downtriangle => :dtriangle, :downtriangle => :dtriangle,
:> => :rtriangle,
:rt => :rtriangle,
:rtri => :rtriangle,
:righttri => :rtriangle,
:righttriangle => :rtriangle,
:< => :ltriangle,
:lt => :ltriangle,
:ltri => :ltriangle,
:lighttri => :ltriangle,
:lighttriangle => :ltriangle,
# :+ => :cross, # :+ => :cross,
:plus => :cross, :plus => :cross,
# :x => :xcross, # :x => :xcross,

19
src/components.jl
View File

@ -111,6 +111,8 @@ const _shape_keys = Symbol[
:xcross, :xcross,
:utriangle, :utriangle,
:dtriangle, :dtriangle,
:rtriangle,
:ltriangle,
:pentagon, :pentagon,
:heptagon, :heptagon,
:octagon, :octagon,
@ -128,8 +130,10 @@ const _shapes = KW(
:circle => makeshape(20), :circle => makeshape(20),
:rect => makeshape(4, offset=-0.25), :rect => makeshape(4, offset=-0.25),
:diamond => makeshape(4), :diamond => makeshape(4),
:utriangle => makeshape(3), :utriangle => makeshape(3, offset=0.5),
:dtriangle => makeshape(3, offset=0.5), :dtriangle => makeshape(3, offset=-0.5),
:rtriangle => makeshape(3, offset=0.0),
:ltriangle => makeshape(3, offset=1.0),
:pentagon => makeshape(5), :pentagon => makeshape(5),
:hexagon => makeshape(6), :hexagon => makeshape(6),
:heptagon => makeshape(7), :heptagon => makeshape(7),
@ -631,8 +635,8 @@ function directed_curve(x1, x2, y1, y2; xview = 0:1, yview = 0:1, root::Symbol =
x = [x1, x1] x = [x1, x1]
y = [y1] y = [y1]
diffx = 0.5(x1+x2) # meanx = 0.5(x1+x2)
diffy = 0.5(y1+y2) # meany = 0.5(y1+y2)
minx, maxx = extrema(xview) minx, maxx = extrema(xview)
miny, maxy = extrema(yview) miny, maxy = extrema(yview)
dist = sqrt((x2-x1)^2+(y2-y1)^2) dist = sqrt((x2-x1)^2+(y2-y1)^2)
@ -650,9 +654,16 @@ function directed_curve(x1, x2, y1, y2; xview = 0:1, yview = 0:1, root::Symbol =
# try to figure out when to loop around vs just connecting straight # try to figure out when to loop around vs just connecting straight
need_loop = (flip && y1 <= y2) || (!flip && y1 >= y2) need_loop = (flip && y1 <= y2) || (!flip && y1 >= y2)
if need_loop if need_loop
if abs(x2-x1) > 0.1 * (maxx - minx)
# go between
sgn = x2 > x1 ? 1 : -1
x_offset = 0.5 * abs(x2-x1)
append!(x, [x1 + sgn * x_offset, x2 - sgn * x_offset])
else
# add curve points which will create a loop # add curve points which will create a loop
x_offset = 0.3 * (maxx - minx) * (rand(Bool) ? 1 : -1) x_offset = 0.3 * (maxx - minx) * (rand(Bool) ? 1 : -1)
append!(x, [x1 + x_offset, x2 + x_offset]) append!(x, [x1 + x_offset, x2 + x_offset])
end
append!(y, [y1 + y_offset, y2 - y_offset]) append!(y, [y1 + y_offset, y2 - y_offset])
end end