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

Merge pull request #982 from daschw/ds-old-matplotlib

Browse Source 
Allow Matplotlib 1.5 usage (fix #978)
This commit is contained in:
Daniel Schwabeneder 2017-07-25 18:46:39 +02:00 committed by GitHub
commit 0dd5eef3f2
1 changed files with 11 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
src/backends/pyplot.jl
View File

@ -83,6 +83,14 @@ function _initialize_backend(::PyPlotBackend)
const pycollections = PyPlot.pywrap(PyPlot.pyimport("matplotlib.collections")) const pycollections = PyPlot.pywrap(PyPlot.pyimport("matplotlib.collections"))
const pyart3d = PyPlot.pywrap(PyPlot.pyimport("mpl_toolkits.mplot3d.art3d")) const pyart3d = PyPlot.pywrap(PyPlot.pyimport("mpl_toolkits.mplot3d.art3d"))
# "support" matplotlib v1.5
const set_facecolor_sym = if PyPlot.version < v"2"
warn("You are using Matplotlib $(PyPlot.version), which is no longer officialy supported by the Plots community. To ensure smooth Plots.jl integration update your Matplotlib library to a version >= 2.0.0")
:set_axis_bgcolor
else
:set_facecolor
end
# we don't want every command to update the figure # we don't want every command to update the figure
PyPlot.ioff() PyPlot.ioff()
end end
@ -985,7 +993,7 @@ function _before_layout_calcs(plt::Plot{PyPlotBackend})
fig[:clear]() fig[:clear]()
dpi = plt[:dpi] dpi = plt[:dpi]
fig[:set_size_inches](w/dpi, h/dpi, forward = true) fig[:set_size_inches](w/dpi, h/dpi, forward = true)
fig[:set_facecolor](py_color(plt[:background_color_outside])) fig[set_facecolor_sym](py_color(plt[:background_color_outside]))
fig[:set_dpi](dpi) fig[:set_dpi](dpi)
# resize the window # resize the window
@ -1074,7 +1082,7 @@ function _before_layout_calcs(plt::Plot{PyPlotBackend})
py_add_legend(plt, sp, ax) py_add_legend(plt, sp, ax)
# this sets the bg color inside the grid # this sets the bg color inside the grid
ax[:set_facecolor](py_color(sp[:background_color_inside])) ax[set_facecolor_sym](py_color(sp[:background_color_inside]))
end end
py_drawfig(fig) py_drawfig(fig)
end end
@ -1196,7 +1204,7 @@ function py_add_legend(plt::Plot, sp::Subplot, ax)
# set some legend properties # set some legend properties
frame = leg[:get_frame]() frame = leg[:get_frame]()
frame[:set_facecolor](py_color(sp[:background_color_legend])) frame[set_facecolor_sym](py_color(sp[:background_color_legend]))
frame[:set_edgecolor](fgcolor) frame[:set_edgecolor](fgcolor)
end end
end end