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

Added support for OHLC charts

Browse Source
This commit is contained in:
Josef Heinen 2016-01-28 13:29:19 +01:00
parent 87b050fad2
commit 5ea9e8a0d7
1 changed files with 19 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

25
src/backends/gr.jl
View File

@ -75,6 +75,8 @@ function gr_display(plt::Plot{GRPackage}, clear=true, update=true,
end end
if p[:linetype] == :bar if p[:linetype] == :bar
x, y = 1:length(p[:y]), p[:y] x, y = 1:length(p[:y]), p[:y]
elseif p[:linetype] == :ohlc
x, y = 1:size(p[:y], 1), p[:y]
elseif p[:linetype] in [:hist, :density] elseif p[:linetype] in [:hist, :density]
x, y = Base.hist(p[:y]) x, y = Base.hist(p[:y])
elseif p[:linetype] in [:heatmap, :hexbin] elseif p[:linetype] in [:heatmap, :hexbin]
@ -99,12 +101,14 @@ function gr_display(plt::Plot{GRPackage}, clear=true, update=true,
end end
xmin = min(minimum(x), xmin) xmin = min(minimum(x), xmin)
xmax = max(maximum(x), xmax) xmax = max(maximum(x), xmax)
# catch exception for OHLC vectors if p[:linetype] == :ohlc
try for val in y
ymin = min(val.open, val.high, val.low, val.close, ymin)
ymax = max(val.open, val.high, val.low, val.close, ymax)
end
else
ymin = min(minimum(y), ymin) ymin = min(minimum(y), ymin)
ymax = max(maximum(y), ymax) ymax = max(maximum(y), ymax)
catch MethodError
ymin, ymax = 0, 1
end end
end end
end end
@ -210,7 +214,7 @@ function gr_display(plt::Plot{GRPackage}, clear=true, update=true,
for p in plt.seriesargs for p in plt.seriesargs
xmin, xmax, ymin, ymax = extrema[gr_getaxisind(p),:] xmin, xmax, ymin, ymax = extrema[gr_getaxisind(p),:]
GR.setwindow(xmin, xmax, ymin, ymax) GR.setwindow(xmin, xmax, ymin, ymax)
if p[:linetype] in [:path, :line, :steppre, :steppost, :sticks, :hline, :vline] if p[:linetype] in [:path, :line, :steppre, :steppost, :sticks, :hline, :vline, :ohlc]
haskey(p, :linecolor) && GR.setlinecolorind(gr_getcolorind(p[:linecolor])) haskey(p, :linecolor) && GR.setlinecolorind(gr_getcolorind(p[:linecolor]))
haskey(p, :linestyle) && GR.setlinetype(gr_linetype[p[:linestyle]]) haskey(p, :linestyle) && GR.setlinetype(gr_linetype[p[:linestyle]])
end end
@ -399,7 +403,16 @@ function gr_display(plt::Plot{GRPackage}, clear=true, update=true,
end end
GR.axes3d(xtick, 0, ztick, xmin, ymin, zmin, 2, 0, 2, -ticksize) GR.axes3d(xtick, 0, ztick, xmin, ymin, zmin, 2, 0, 2, -ticksize)
GR.axes3d(0, ytick, 0, xmax, ymin, zmin, 0, 2, 0, ticksize) GR.axes3d(0, ytick, 0, xmax, ymin, zmin, 0, 2, 0, ticksize)
elseif p[:linetype] in [:ohlc, :pie] elseif p[:linetype] == :ohlc
y = p[:y]
n = size(y, 1)
ticksize = 0.5 * (xmax - xmin) / n
for i in 1:n
GR.polyline([i-ticksize, i], [y[i].open, y[i].open])
GR.polyline([i, i], [y[i].low, y[i].high])
GR.polyline([i, i+ticksize], [y[i].close, y[i].close])
end
elseif p[:linetype] in [:pie]
println("TODO: add support for linetype $(p[:linetype])") println("TODO: add support for linetype $(p[:linetype])")
end end
end end