fix ticks = nothing on pyplot, ...
This commit is contained in:
parent
2bbd4cbb17
commit
d301d2a06b
@ -432,7 +432,7 @@ add_aliases(:foreground_color_title, :fg_title, :fgtitle, :fgcolor_title, :fg_co
|
|||||||
add_aliases(:foreground_color_axis, :fg_axis, :fgaxis, :fgcolor_axis, :fg_color_axis, :foreground_axis,
|
add_aliases(:foreground_color_axis, :fg_axis, :fgaxis, :fgcolor_axis, :fg_color_axis, :foreground_axis,
|
||||||
:foreground_colour_axis, :fgcolour_axis, :fg_colour_axis, :axiscolor)
|
:foreground_colour_axis, :fgcolour_axis, :fg_colour_axis, :axiscolor)
|
||||||
add_aliases(:foreground_color_border, :fg_border, :fgborder, :fgcolor_border, :fg_color_border, :foreground_border,
|
add_aliases(:foreground_color_border, :fg_border, :fgborder, :fgcolor_border, :fg_color_border, :foreground_border,
|
||||||
:foreground_colour_border, :fgcolour_border, :fg_colour_border, :bordercolor, :border)
|
:foreground_colour_border, :fgcolour_border, :fg_colour_border, :bordercolor)
|
||||||
add_aliases(:foreground_color_text, :fg_text, :fgtext, :fgcolor_text, :fg_color_text, :foreground_text,
|
add_aliases(:foreground_color_text, :fg_text, :fgtext, :fgcolor_text, :fg_color_text, :foreground_text,
|
||||||
:foreground_colour_text, :fgcolour_text, :fg_colour_text, :textcolor)
|
:foreground_colour_text, :fgcolour_text, :fg_colour_text, :textcolor)
|
||||||
add_aliases(:foreground_color_guide, :fg_guide, :fgguide, :fgcolor_guide, :fg_color_guide, :foreground_guide,
|
add_aliases(:foreground_color_guide, :fg_guide, :fgguide, :fgcolor_guide, :fg_color_guide, :foreground_guide,
|
||||||
|
|||||||
@ -739,7 +739,7 @@ function gr_display(sp::Subplot{GRBackend}, w, h, viewport_canvas)
|
|||||||
GR.setclip(1)
|
GR.setclip(1)
|
||||||
|
|
||||||
# tick marks
|
# tick marks
|
||||||
if !(xticks in (nothing, false))
|
if !(xticks in (:none, nothing, false))
|
||||||
# x labels
|
# x labels
|
||||||
flip = sp[:yaxis][:flip]
|
flip = sp[:yaxis][:flip]
|
||||||
mirror = sp[:xaxis][:mirror]
|
mirror = sp[:xaxis][:mirror]
|
||||||
@ -756,7 +756,7 @@ function gr_display(sp::Subplot{GRBackend}, w, h, viewport_canvas)
|
|||||||
end
|
end
|
||||||
end
|
end
|
||||||
|
|
||||||
if !(yticks in (nothing, false))
|
if !(yticks in (:none, nothing, false))
|
||||||
# y labels
|
# y labels
|
||||||
flip = sp[:xaxis][:flip]
|
flip = sp[:xaxis][:flip]
|
||||||
mirror = sp[:yaxis][:mirror]
|
mirror = sp[:yaxis][:mirror]
|
||||||
|
|||||||
@ -1067,7 +1067,7 @@ function _before_layout_calcs(plt::Plot{PyPlotBackend})
|
|||||||
lab[:set_family](axis[:tickfont].family)
|
lab[:set_family](axis[:tickfont].family)
|
||||||
lab[:set_rotation](axis[:rotation])
|
lab[:set_rotation](axis[:rotation])
|
||||||
end
|
end
|
||||||
if axis[:grid] && sp[:framestyle] != :none
|
if axis[:grid] && !(ticks in (:none, nothing, false))
|
||||||
fgcolor = py_color(axis[:foreground_color_grid])
|
fgcolor = py_color(axis[:foreground_color_grid])
|
||||||
pyaxis[:grid](true,
|
pyaxis[:grid](true,
|
||||||
color = fgcolor,
|
color = fgcolor,
|
||||||
|
|||||||
Loading…
x
Reference in New Issue
Block a user