Mercurial > octave

changeset 21844:c0a552e71ceb

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Fix gnuplot toolkit text object bug introduced by changeset 7fe10fcd8370. * __gnuplot_draw_axes.m: Pass axis reference rather than number of dimensions into do_text(). (do_text): Change input variable nd to hax. Use hax rather than text object's parent for retrieving 'yaxislocation' property. Simplify 2D/3D label command construction to common elements with the z-coordinate string created separately.
author Daniel J Sebald <daniel.sebald@ieee.org>
date Thu, 09 Jun 2016 01:02:17 -0500
parents f7a57b07c81d
children f794cefc2372
files scripts/plot/util/private/__gnuplot_draw_axes__.m
diffstat 1 files changed, 12 insertions(+), 16 deletions(-) [+]
line wrap: on
line diff
--- a/scripts/plot/util/private/__gnuplot_draw_axes__.m	Wed Jun 08 21:30:49 2016 -0700
+++ b/scripts/plot/util/private/__gnuplot_draw_axes__.m	Thu Jun 09 01:02:17 2016 -0500
@@ -186,7 +186,7 @@
       screenpos(1) = axispos(1)+screenpos(1)*axispos(3);
       screenpos(2) = axispos(2)+screenpos(2)*axispos(4);
       fputs (plot_stream, "unset title;\n");
-      do_text (plot_stream, gnuplot_term, enhanced, t, nd, screenpos);
+      do_text (plot_stream, gnuplot_term, enhanced, t, h, screenpos);
     endif
   endif
 
@@ -1317,7 +1317,7 @@
         endif
 
       case "text"
-        do_text (plot_stream, gnuplot_term, enhanced, obj, nd);
+        do_text (plot_stream, gnuplot_term, enhanced, obj, h);
 
       case "hggroup"
         ## Push group children into the kid list.
@@ -2668,7 +2668,7 @@
 
 endfunction
 
-function do_text (stream, gpterm, enhanced, obj, nd, screenpos)
+function do_text (stream, gpterm, enhanced, obj, hax, screenpos)
 
   [label, f, s] = __maybe_munge_text__ (enhanced, obj, "string");
   fontspec = create_fontspec (f, s, gpterm);
@@ -2683,7 +2683,7 @@
     lpos = screenpos;
   elseif (strcmpi (units, "normalized"))
     units = "graph";
-  elseif (strcmp (get (obj.parent, "yaxislocation"), "right")
+  elseif (strcmp (get (hax, "yaxislocation"), "right")
           && strcmp (units, "data"))
     units = "second";
   else
@@ -2721,20 +2721,16 @@
 
   ## FIXME: Multiline text produced the gnuplot
   ##        "warning: ft_render: skipping glyph"
-  if (nd == 3)
-    ## This produces the desired vertical alignment in 3D.
-    fprintf (stream,
-             "set label \"%s\" at %s %.15e,%.15e,%.15e %s rotate by %f offset character %f,%f %s %s front %s;\n",
-             undo_string_escapes (label), units, lpos(1),
-             lpos(2), lpos(3), halign, angle, dx_and_dy, fontspec,
-             __do_enhanced_option__ (enhanced, obj), colorspec);
+  if (__calc_dimensions__ (hax) == 3)
+    zstr = sprintf(",%.15e", lpos(3));
   else
-    fprintf (stream,
-             "set label \"%s\" at %s %.15e,%.15e %s rotate by %f offset character %f,%f %s %s front %s;\n",
-             undo_string_escapes (label), units,
-             lpos(1), lpos(2), halign, angle, dx_and_dy, fontspec,
-             __do_enhanced_option__ (enhanced, obj), colorspec);
+    zstr = "";
   endif
+  fprintf (stream,
+           "set label \"%s\" at %s %.15e,%.15e%s %s rotate by %f offset character %f,%f %s %s front %s;\n",
+           undo_string_escapes (label), units, lpos(1),
+           lpos(2), zstr, halign, angle, dx_and_dy, fontspec,
+           __do_enhanced_option__ (enhanced, obj), colorspec);
 
 endfunction