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

Avoid global 'fig' object

Browse Source
This commit is contained in:
Josef Heinen 2016-01-03 10:32:47 +01:00
parent a33161aa9c
commit 2b6619b3c4
1 changed files with 4 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
src/backends/gr.jl
View File

@ -1,10 +1,6 @@
# https://github.com/jheinen/GR.jl # https://github.com/jheinen/GR.jl
fig = Dict()
fig[:size] = [500, 500]
const gr_linetype = Dict( const gr_linetype = Dict(
:auto => 0, :solid => 1, :dash => 2, :dot => 3, :dashdot => 4, :auto => 0, :solid => 1, :dash => 2, :dot => 3, :dashdot => 4,
:dashdotdot => -1 ) :dashdotdot => -1 )
@ -15,10 +11,10 @@ const gr_markertype = Dict(
:cross => 2, :xcross => 5, :star5 => 3 ) :cross => 2, :xcross => 5, :star5 => 3 )
function _create_plot(pkg::GRPackage; kw...) function _create_plot(pkg::GRPackage; kw...)
global fig
d = Dict(kw) d = Dict(kw)
fig = Dict()
fig[:size] = d[:size] fig[:size] = d[:size]
Plot(nothing, pkg, 0, d, Dict[]) Plot(fig, pkg, 0, d, Dict[])
end end
function _add_series(::GRPackage, plt::Plot; kw...) function _add_series(::GRPackage, plt::Plot; kw...)
@ -39,12 +35,10 @@ function _before_update_plot(plt::Plot{GRPackage})
end end
function _update_plot(plt::Plot{GRPackage}, d::Dict) function _update_plot(plt::Plot{GRPackage}, d::Dict)
global fig
GR.clearws() GR.clearws()
mwidth, mheight, width, height = GR.inqdspsize() mwidth, mheight, width, height = GR.inqdspsize()
w, h = fig[:size] w, h = plt.o[:size]
if w > h if w > h
ratio = float(h) / w ratio = float(h) / w
size = mwidth * w / width size = mwidth * w / width
@ -182,9 +176,8 @@ function _update_plot(plt::Plot{GRPackage}, d::Dict)
end end
function _update_plot_pos_size(plt::PlottingObject{GRPackage}, d::Dict) function _update_plot_pos_size(plt::PlottingObject{GRPackage}, d::Dict)
global fig
if haskey(d, :size) if haskey(d, :size)
fig[:size] = d[:size] plt.o[:size] = d[:size]
end end
end end