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

rebase

Browse Source
This commit is contained in:
SimonDanisch 2016-11-18 00:49:33 +01:00
parent e12c3f332e
commit 74c2db4909
1 changed files with 3 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
src/backends/glvisualize.jl
View File

@ -1169,12 +1169,11 @@ function _display(plt::Plot{GLVisualizeBackend}, visible = true)
append!(_glplot_deletes, del_signal) append!(_glplot_deletes, del_signal)
end end
anns = series[:series_annotations] anns = series[:series_annotations]
for (x, y, str) in EachAnn(anns, d[:x], d[:y]) for (x, y, str, font) in EachAnn(anns, d[:x], d[:y])
txt_args = Dict{Symbol, Any}(:model => eye(GLAbstraction.Mat4f0)) txt_args = Dict{Symbol, Any}(:model => eye(GLAbstraction.Mat4f0))
x, y = Reactive.value(model_m) * Vec{4, Float32}(x, y, 0, 1) x, y = Reactive.value(model_m) * Vec{4, Float32}(x, y, 0, 1)
extract_font(anns.font, txt_args) extract_font(font, txt_args)
pt = isa(str, String) ? PlotText(str, anns.font) : str t = text(Point2f0(x, y), PlotText(str, font), txt_args)
t = text(Point2f0(x, y), pt, txt_args)
GLVisualize._view(t, sp_screen, camera = :perspective) GLVisualize._view(t, sp_screen, camera = :perspective)
end end