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

glvisualize fixes; limit ticks to amin/amax closes #495

Browse Source
This commit is contained in:
Thomas Breloff 2016-09-20 12:05:16 -04:00
parent 555145a650
commit 90d054c2ec
2 changed files with 11 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/axes.jl
View File

@ -165,7 +165,7 @@ function optimal_ticks_and_labels(axis::Axis, ticks = nothing)
k_max = 8, # maximum number of ticks k_max = 8, # maximum number of ticks
)[1] )[1]
else else
map(sf, ticks) map(sf, filter(t -> amin <= t <= amax, ticks))
end end
unscaled_ticks = map(invscalefunc(scale), scaled_ticks) unscaled_ticks = map(invscalefunc(scale), scaled_ticks)

14
src/backends/glvisualize.jl
View File

@ -646,14 +646,17 @@ function gl_draw_axes_2d(sp::Plots.Subplot{Plots.GLVisualizeBackend}, model, are
grid = draw_grid_lines(sp, grid_segs, 1f0, :dot, model, RGBA(c, 0.3f0)) grid = draw_grid_lines(sp, grid_segs, 1f0, :dot, model, RGBA(c, 0.3f0))
push!(axis_vis, grid) push!(axis_vis, grid)
end end
spine = draw_grid_lines(sp, spine_segs, 1f0, :solid, model, RGBA(c, 1.0f0)) if alpha(xaxis[:foreground_color_border]) > 0
push!(axis_vis, spine) spine = draw_grid_lines(sp, spine_segs, 1f0, :solid, model, RGBA(c, 1.0f0))
push!(axis_vis, spine)
end
fcolor = Plots.gl_color(xaxis[:foreground_color_axis]) fcolor = Plots.gl_color(xaxis[:foreground_color_axis])
xlim = Plots.axis_limits(xaxis) xlim = Plots.axis_limits(xaxis)
ylim = Plots.axis_limits(yaxis) ylim = Plots.axis_limits(yaxis)
m = Reactive.value(model) m = Reactive.value(model)
xs, ys = m[1,1], m[2,2] xs, ys = m[1,1], m[2,2]
# TODO: we should make sure we actually need to draw these...
t, positions, offsets = draw_ticks(xaxis, xticks, :top, Point2f0(0, 7/ys), true, ylim, model) t, positions, offsets = draw_ticks(xaxis, xticks, :top, Point2f0(0, 7/ys), true, ylim, model)
t, positions, offsets = draw_ticks(yaxis, yticks, :right, Point2f0(7/xs, 0), false, xlim, model, t, positions, offsets) t, positions, offsets = draw_ticks(yaxis, yticks, :right, Point2f0(7/xs, 0), false, xlim, model, t, positions, offsets)
sz = xaxis[:tickfont].pointsize sz = xaxis[:tickfont].pointsize
@ -665,7 +668,9 @@ function gl_draw_axes_2d(sp::Plots.Subplot{Plots.GLVisualizeBackend}, model, are
:model => model, :model => model,
:scale_primitive => false :scale_primitive => false
) )
push!(axis_vis, visualize(t, Style(:default), kw_args)) if !(xaxis[:ticks] in (nothing,false,:none))
push!(axis_vis, visualize(t, Style(:default), kw_args))
end
area_w = GeometryTypes.widths(area) area_w = GeometryTypes.widths(area)
if sp[:title] != "" if sp[:title] != ""
tf = sp[:titlefont]; color = gl_color(sp[:foreground_color_title]) tf = sp[:titlefont]; color = gl_color(sp[:foreground_color_title])
@ -1012,7 +1017,8 @@ function _display(plt::Plot{GLVisualizeBackend})
vis = gl_bar(d, kw_args) vis = gl_bar(d, kw_args)
elseif st == :image elseif st == :image
extract_extrema(d, kw_args) extract_extrema(d, kw_args)
vis = GL.gl_image(d[:z].surf, kw_args) z = transpose_z(series, d[:z].surf, false)
vis = GL.gl_image(z, kw_args)
elseif st == :boxplot elseif st == :boxplot
extract_c(d, kw_args, :fill) extract_c(d, kw_args, :fill)
vis = gl_boxplot(d, kw_args) vis = gl_boxplot(d, kw_args)