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

variable change from GLVisualize

Browse Source
This commit is contained in:
SimonDanisch 2016-11-07 17:12:03 +01:00
parent 2200b76054
commit 612ca15fc0
1 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
src/backends/glvisualize.jl
View File

@ -119,6 +119,7 @@ function create_window(plt::Plot{GLVisualizeBackend}, visible)
GLWindow.pollevents() GLWindow.pollevents()
if Base.n_avail(Reactive._messages) > 0 if Base.n_avail(Reactive._messages) > 0
Reactive.run_till_now() Reactive.run_till_now()
Base.n_avail(Reactive._messages) > 0 && Reactive.run_till_now() # two times for secondary signals
GLWindow.render_frame(screen) GLWindow.render_frame(screen)
GLWindow.swapbuffers(screen) GLWindow.swapbuffers(screen)
end end
@ -413,8 +414,10 @@ function hover(to_hover, to_display, window)
end end
mh = GLWindow.mouse2id(window) mh = GLWindow.mouse2id(window)
popup = GLWindow.Screen( popup = GLWindow.Screen(
window, hidden=true, area=area, window,
stroke=(2f0/100f0, RGBA(0f0, 0f0, 0f0, 0.8f0)) hidden = map(mh-> !(mh.id == to_hover.id), mh),
area = area,
stroke = (2f0/100f0, RGBA(0f0, 0f0, 0f0, 0.8f0))
) )
cam = get!(popup.cameras, :perspective) do cam = get!(popup.cameras, :perspective) do
GLAbstraction.PerspectiveCamera( GLAbstraction.PerspectiveCamera(
@ -423,9 +426,6 @@ function hover(to_hover, to_display, window)
theta= Signal(Vec3f0(0)), trans= Signal(Vec3f0(0)) theta= Signal(Vec3f0(0)), trans= Signal(Vec3f0(0))
) )
end end
Reactive.preserve(map(mh) do mh
popup.hidden = !(mh.id == to_hover.id)
end)
map(enumerate(to_display)) do id map(enumerate(to_display)) do id
i,d = id i,d = id
@ -936,7 +936,7 @@ function _display(plt::Plot{GLVisualizeBackend}, visible=true)
GLVisualize._view(axis, sp_screen, camera=:perspective) GLVisualize._view(axis, sp_screen, camera=:perspective)
push!(cam.projectiontype, GLVisualize.PERSPECTIVE) push!(cam.projectiontype, GLVisualize.PERSPECTIVE)
end end
for series in Plots.series_list(sp) for series in Plots.series_list(sp)
d = series.d d = series.d
st = d[:seriestype]; kw_args = KW() # exctract kw st = d[:seriestype]; kw_args = KW() # exctract kw