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

Merge pull request #239 from jheinen/dev

Browse Source 
Fix axes offset bug (#221)
This commit is contained in:
Tom Breloff 2016-05-09 11:28:04 -04:00
commit 43ba9b1172
1 changed files with 9 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
src/backends/gr.jl
View File

@ -228,6 +228,8 @@ function gr_display(plt::Plot{GRBackend}, clear=true, update=true,
GR.setfillintstyle(GR.INTSTYLE_SOLID) GR.setfillintstyle(GR.INTSTYLE_SOLID)
GR.setfillcolorind(gr_getcolorind(d[:background_color_outside])) GR.setfillcolorind(gr_getcolorind(d[:background_color_outside]))
GR.fillrect(vp[1], vp[2], vp[3], vp[4]) GR.fillrect(vp[1], vp[2], vp[3], vp[4])
c = getColor(d[:background_color_inside])
dark_bg = 0.21 * c.r + 0.72 * c.g + 0.07 * c.b < 0.9
GR.setfillcolorind(gr_getcolorind(d[:background_color_inside])) GR.setfillcolorind(gr_getcolorind(d[:background_color_inside]))
GR.fillrect(viewport[1], viewport[2], viewport[3], viewport[4]) GR.fillrect(viewport[1], viewport[2], viewport[3], viewport[4])
GR.selntran(1) GR.selntran(1)
@ -356,6 +358,7 @@ function gr_display(plt::Plot{GRBackend}, clear=true, update=true,
yorg = (ymax, ymin) yorg = (ymax, ymin)
end end
extrema[axis,:] = [xmin, xmax, ymin, ymax]
GR.setwindow(xmin, xmax, ymin, ymax) GR.setwindow(xmin, xmax, ymin, ymax)
GR.setscale(scale) GR.setscale(scale)
@ -371,9 +374,13 @@ function gr_display(plt::Plot{GRBackend}, clear=true, update=true,
if outside_ticks if outside_ticks
ticksize = -ticksize ticksize = -ticksize
end end
if grid_flag && fg == 1 if grid_flag
if dark_bg
GR.grid(xtick * majorx, ytick * majory, 0, 0, 1, 1)
else
GR.grid(xtick, ytick, 0, 0, majorx, majory) GR.grid(xtick, ytick, 0, 0, majorx, majory)
end end
end
GR.setlinecolorind(gr_getcolorind(d[:foreground_color_axis])) GR.setlinecolorind(gr_getcolorind(d[:foreground_color_axis]))
if num_axes == 1 if num_axes == 1
GR.axes(xtick, ytick, xorg[1], yorg[1], majorx, majory, ticksize) GR.axes(xtick, ytick, xorg[1], yorg[1], majorx, majory, ticksize)