Mercurial > octave-nkf
changeset 16909:8f9ed9d8a478
Allow gnuplot to handle keybox and axes positioning.
scripts/plot/legend.m: When the legend is place outside the plotbox, allow
gnuplot to handle its placement and the resizing of the plotbox.
Rename extra_offset to gnuplot_offset, and add some line continuations.
| author | Ben Abbott <bpabbott@mac.com> |
|---|---|
| date | Sat, 06 Jul 2013 12:06:45 -0400 |
| parents | 1c4be5dcacd5 |
| children | 8a4e53cf79c9 |
| files | scripts/plot/legend.m |
| diffstat | 1 files changed, 29 insertions(+), 17 deletions(-) [+] |
line wrap: on
line diff
--- a/scripts/plot/legend.m Sat Jul 06 11:54:31 2013 -0400 +++ b/scripts/plot/legend.m Sat Jul 06 12:06:45 2013 -0400 @@ -678,26 +678,27 @@ lpos = [0, 0, num1 * xstep, num2 * ystep]; endif - if (strcmp (get (fig, "__graphics_toolkit__"), "gnuplot")) + gnuplot = strcmp (get (fig, "__graphics_toolkit__"), "gnuplot"); + if (gnuplot) ## Gnuplot places the key (legend) at edge of the figure window. ## OpenGL places the legend box at edge of the unmodified axes ## position. if (isempty (strfind (location, "east"))) - extra_offset = unmodified_axes_outerposition(1) ... + gnuplot_offset = unmodified_axes_outerposition(1) ... + unmodified_axes_outerposition(3) ... - unmodified_axes_position(1) ... - unmodified_axes_position(3); else - extra_offset = unmodified_axes_position(1) ... + gnuplot_offset = unmodified_axes_position(1) ... - unmodified_axes_outerposition(1); endif ## FIXME - the "fontsize" is added to match the behavior of OpenGL. ## This implies that a change in fontsize should trigger a listener ## to update the legend. The "2" was determined using a long legend ## key in the absence of any subplots. - extra_offset = extra_offset - 2 * fontsize; + gnuplot_offset = gnuplot_offset - 2 * fontsize; else - extra_offset = 0; + gnuplot_offset = 0; endif switch (location) @@ -727,7 +728,7 @@ lpos = [ca_outpos(1) + ca_outpos(3) - lpos(3) - ypad, ... ca_pos(2) + (ca_pos(4) - lpos(4)) / 2, lpos(3), lpos(4)]; new_pos = [ca_pos(1), ca_pos(2), ca_pos(3) - lpos(3), ca_pos(4)]; - new_pos(3) = new_pos(3) + extra_offset; + new_pos(3) = new_pos(3) + gnuplot_offset; else lpos = [ca_pos(1) + ca_pos(3) - lpos(3) - ypad, ... ca_pos(2) + (ca_pos(4) - lpos(4)) / 2, lpos(3), lpos(4)]; @@ -739,8 +740,8 @@ lpos(3), lpos(4)]; new_pos = [ca_pos(1) + lpos(3), ca_pos(2), ... ca_pos(3) - lpos(3), ca_pos(4)]; - new_pos(1) = new_pos(1) - extra_offset; - new_pos(3) = new_pos(3) + extra_offset; + new_pos(1) = new_pos(1) - gnuplot_offset; + new_pos(3) = new_pos(3) + gnuplot_offset; else lpos = [ca_pos(1) + ypad, ... ca_pos(2) + (ca_pos(4) - lpos(4)) / 2, lpos(3), lpos(4)]; @@ -750,7 +751,7 @@ lpos = [ca_outpos(1) + ca_outpos(3) - lpos(3) - ypad, ... ca_pos(2) + ca_pos(4) - lpos(4), lpos(3), lpos(4)]; new_pos = [ca_pos(1), ca_pos(2), ca_pos(3) - lpos(3), ca_pos(4)]; - new_pos(3) = new_pos(3) + extra_offset; + new_pos(3) = new_pos(3) + gnuplot_offset; else lpos = [ca_pos(1) + ca_pos(3) - lpos(3) - ypad, ... ca_pos(2) + ca_pos(4) - lpos(4) - ypad, lpos(3), lpos(4)]; @@ -761,8 +762,8 @@ lpos(3), lpos(4)]; new_pos = [ca_pos(1) + lpos(3), ca_pos(2), ... ca_pos(3) - lpos(3), ca_pos(4)]; - new_pos(1) = new_pos(1) - extra_offset; - new_pos(3) = new_pos(3) + extra_offset; + new_pos(1) = new_pos(1) - gnuplot_offset; + new_pos(3) = new_pos(3) + gnuplot_offset; else lpos = [ca_pos(1) + ypad, ... ca_pos(2) + ca_pos(4) - lpos(4) - ypad, lpos(3), lpos(4)]; @@ -773,7 +774,7 @@ ca_pos(2), lpos(3), lpos(4)]; new_pos = [ca_pos(1), ca_pos(2), ... ca_pos(3) - lpos(3), ca_pos(4)]; - new_pos(3) = new_pos(3) + extra_offset; + new_pos(3) = new_pos(3) + gnuplot_offset; else lpos = [ca_pos(1) + ca_pos(3) - lpos(3) - ypad, ... ca_pos(2) + ypad, lpos(3), lpos(4)]; @@ -783,8 +784,8 @@ lpos = [ca_outpos(1) + ypad, ca_pos(2), lpos(3), lpos(4)]; new_pos = [ca_pos(1) + lpos(3), ca_pos(2), ... ca_pos(3) - lpos(3), ca_pos(4)]; - new_pos(1) = new_pos(1) - extra_offset; - new_pos(3) = new_pos(3) + extra_offset; + new_pos(1) = new_pos(1) - gnuplot_offset; + new_pos(3) = new_pos(3) + gnuplot_offset; else lpos = [ca_pos(1) + ypad, ca_pos(2) + ypad, lpos(3), lpos(4)]; endif @@ -902,7 +903,16 @@ units = get (ca(i), "units"); unwind_protect set (ca(i), "units", "points"); - set (ca(i), "position", new_pos); + if (gnuplot && numel (ca) == 1) + ## Let Gnuplot handle the positioning of the keybox. + ## This violates strict Matlab compatibility, but reliably + ## renders an esthetic result. + set (ca(i), "position", unmodified_axes_position); + set (ca(i), "activepositionproperty", "outerposition") + else + ## numel (ca) > 1 for axes overlays (like plotyy) + set (ca(i), "position", new_pos); + endif unwind_protect_cleanup set (ca(i), "units", units); end_unwind_protect @@ -910,9 +920,11 @@ set (hlegend, "deletefcn", {@deletelegend2, ca, ... unmodified_axes_position, ... - unmodified_axes_outerposition, t1, hplots}); + unmodified_axes_outerposition, ... + t1, hplots}); addlistener (hlegend, "visible", {@hideshowlegend, ca, ... - unmodified_axes_position, new_pos}); + unmodified_axes_position, ... + new_pos}); else set (hlegend, "deletefcn", {@deletelegend2, ca, [], [], t1, hplots}); endif