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

Fix PyCall deprecations (#3864)

Browse Source 
Fixes #3818
This commit is contained in:
Jack Dunn 2021-10-11 05:55:52 -04:00 committed by Zhanibek
parent 219f5ca12a
commit d34c9b903f
1 changed files with 16 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

32
src/backends/pyplot.jl
View File

@ -981,7 +981,7 @@ end
function py_set_spine_color(spines, color) function py_set_spine_color(spines, color)
for loc in spines for loc in spines
spines[loc]."set_color"(color) getproperty(spines, loc)."set_color"(color)
end end
end end
@ -1206,7 +1206,7 @@ function _before_layout_calcs(plt::Plot{PyPlotBackend})
if !ispolar(sp) && !RecipesPipeline.is3d(sp) if !ispolar(sp) && !RecipesPipeline.is3d(sp)
for pos in ("left", "right", "top", "bottom") for pos in ("left", "right", "top", "bottom")
# Scale all axes by default first # Scale all axes by default first
ax.spines[pos]."set_linewidth"(py_thickness_scale(plt, 1)) getproperty(ax.spines, pos)."set_linewidth"(py_thickness_scale(plt, 1))
end end
# Then set visible some of them # Then set visible some of them
@ -1214,28 +1214,28 @@ function _before_layout_calcs(plt::Plot{PyPlotBackend})
intensity = 0.5 intensity = 0.5
spine = sp[:yaxis][:mirror] ? "left" : "right" spine = sp[:yaxis][:mirror] ? "left" : "right"
ax.spines[spine]."set_alpha"(intensity) getproperty(ax.spines, spine)."set_alpha"(intensity)
ax.spines[spine]."set_linewidth"(py_thickness_scale(plt, intensity)) getproperty(ax.spines, spine)."set_linewidth"(py_thickness_scale(plt, intensity))
spine = sp[:xaxis][:mirror] ? "bottom" : "top" spine = sp[:xaxis][:mirror] ? "bottom" : "top"
ax.spines[spine]."set_linewidth"(py_thickness_scale(plt, intensity)) getproperty(ax.spines, spine)."set_linewidth"(py_thickness_scale(plt, intensity))
ax.spines[spine]."set_alpha"(intensity) getproperty(ax.spines, spine)."set_alpha"(intensity)
elseif sp[:framestyle] == :box elseif sp[:framestyle] == :box
ax.tick_params(top = true) # Add ticks too ax.tick_params(top = true) # Add ticks too
ax.tick_params(right = true) # Add ticks too ax.tick_params(right = true) # Add ticks too
elseif sp[:framestyle] in (:axes, :origin) elseif sp[:framestyle] in (:axes, :origin)
sp[:xaxis][:mirror] ? ax.spines["bottom"]."set_visible"(false) : sp[:xaxis][:mirror] ? ax.spines."bottom"."set_visible"(false) :
ax.spines["top"]."set_visible"(false) ax.spines."top"."set_visible"(false)
sp[:yaxis][:mirror] ? ax.spines["left"]."set_visible"(false) : sp[:yaxis][:mirror] ? ax.spines."left"."set_visible"(false) :
ax.spines["right"]."set_visible"(false) ax.spines."right"."set_visible"(false)
if sp[:framestyle] == :origin if sp[:framestyle] == :origin
ax.spines["bottom"]."set_position"("zero") ax.spines."bottom"."set_position"("zero")
ax.spines["left"]."set_position"("zero") ax.spines."left"."set_position"("zero")
end end
elseif sp[:framestyle] in (:grid, :none, :zerolines) elseif sp[:framestyle] in (:grid, :none, :zerolines)
if PyPlot.version >= v"3.4.1" # that is one where it worked, the API change may have some other value if PyPlot.version >= v"3.4.1" # that is one where it worked, the API change may have some other value
for spine in ax.spines for spine in ax.spines
ax.spines[string(spine)]."set_visible"(false) getproperty(ax.spines, string(spine))."set_visible"(false)
end end
else else
for (loc, spine) in ax.spines for (loc, spine) in ax.spines
@ -1406,11 +1406,11 @@ function _before_layout_calcs(plt::Plot{PyPlotBackend})
if !sp[:xaxis][:showaxis] if !sp[:xaxis][:showaxis]
kw = KW() kw = KW()
if ispolar(sp) if ispolar(sp)
ax.spines["polar"].set_visible(false) ax.spines."polar".set_visible(false)
end end
for dir in (:top, :bottom) for dir in (:top, :bottom)
if !ispolar(sp) if !ispolar(sp)
ax.spines[string(dir)].set_visible(false) getproperty(ax.spines, string(dir)).set_visible(false)
end end
kw[dir] = kw[get_attr_symbol(:label, dir)] = false kw[dir] = kw[get_attr_symbol(:label, dir)] = false
end end
@ -1420,7 +1420,7 @@ function _before_layout_calcs(plt::Plot{PyPlotBackend})
kw = KW() kw = KW()
for dir in (:left, :right) for dir in (:left, :right)
if !ispolar(sp) if !ispolar(sp)
ax.spines[string(dir)].set_visible(false) getproperty(ax.spines, string(dir)).set_visible(false)
end end
kw[dir] = kw[get_attr_symbol(:label, dir)] = false kw[dir] = kw[get_attr_symbol(:label, dir)] = false
end end