Mercurial > octave

changeset 22048:1a8e2a0251c3

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Add minor grid line control and alpha blending for gnuplot toolkit (bug #48401). * __gnuplot_draw_axes__.m: Replace have_grid with have_major_grid and have_minor_grid. Add visible_gls and visible_mgls variables derived from gridlinestyle and minorgridlinestyle properties. Add condition visible_gls to setting grids on and condition visible_mgls to setting minor grids on. Create a linetype for major and minor grid line if present and use the index in the 'set grid' command. Use linetype 0 if not present. (do_linestyle_command): If the object has an alpha field, convert the value to 8-bit and add two characters to the front of RGB specification.
author Daniel J Sebald <daniel.sebald@ieee.org>
date Wed, 06 Jul 2016 03:29:33 -0500
parents ff17e1c873b2
children ccf50f029999
files scripts/plot/util/private/__gnuplot_draw_axes__.m
diffstat 1 files changed, 52 insertions(+), 25 deletions(-) [+]
line wrap: on
line diff
--- a/scripts/plot/util/private/__gnuplot_draw_axes__.m	Wed Jul 06 07:57:44 2016 -0700
+++ b/scripts/plot/util/private/__gnuplot_draw_axes__.m	Wed Jul 06 03:29:33 2016 -0500
@@ -283,31 +283,36 @@
     endif
   endif
 
-  have_grid = false;
+  have_major_grid = false;
+  have_minor_grid = false;
+  visible_gls = ! strcmp (axis_obj.gridlinestyle, "none") ...
+                && ! strcmp (axis_obj.gridcolor, "none");
+  visible_mgls = ! strcmp (axis_obj.minorgridlinestyle, "none") ...
+                 && ! strcmp (axis_obj.minorgridcolor, "none");
 
-  if (strcmpi (axis_obj.xgrid, "on"))
-    have_grid = true;
+  if (strcmp (axis_obj.xgrid, "on") && visible_gls)
+    have_major_grid = true;
     fprintf (plot_stream, "set grid %stics;\n", xaxisloc);
   else
     fprintf (plot_stream, "set grid no%stics;\n", xaxisloc);
   endif
 
-  if (strcmpi (axis_obj.ygrid, "on"))
-    have_grid = true;
+  if (strcmp (axis_obj.ygrid, "on") && visible_gls)
+    have_major_grid = true;
     fprintf (plot_stream, "set grid %stics;\n", yaxisloc);
   else
     fprintf (plot_stream, "set grid no%stics;\n", yaxisloc);
   endif
 
-  if (strcmpi (axis_obj.zgrid, "on"))
-    have_grid = true;
+  if (strcmp (axis_obj.zgrid, "on") && visible_gls)
+    have_major_grid = true;
     fputs (plot_stream, "set grid ztics;\n");
   else
     fputs (plot_stream, "set grid noztics;\n");
   endif
 
-  if (strcmpi (axis_obj.xminorgrid, "on"))
-    have_grid = true;
+  if (strcmp (axis_obj.xminorgrid, "on") && visible_mgls)
+    have_minor_grid = true;
     if (strcmp (axis_obj.xscale, "log"))
       m = 10;
     else
@@ -319,8 +324,8 @@
     fprintf (plot_stream, "set grid nom%stics;\n", xaxisloc);
   endif
 
-  if (strcmpi (axis_obj.yminorgrid, "on"))
-    have_grid = true;
+  if (strcmp (axis_obj.yminorgrid, "on") && visible_mgls)
+    have_minor_grid = true;
     if (strcmp (axis_obj.yscale, "log"))
       m = 10;
     else
@@ -332,8 +337,8 @@
     fprintf (plot_stream, "set grid nom%stics;\n", yaxisloc);
   endif
 
-  if (strcmpi (axis_obj.zminorgrid, "on"))
-    have_grid = true;
+  if (strcmp (axis_obj.zminorgrid, "on") && visible_mgls)
+    have_minor_grid = true;
     if (strcmp (axis_obj.zscale, "log"))
       m = 10;
     else
@@ -1296,7 +1301,7 @@
               if (flat_interp_edge)
                 sopt = "";
               else
-                sopt = sprintf("%d", sidx(i_stl));
+                sopt = sprintf ("%d", sidx(i_stl));
               endif
               data_idx += 1;
               is_image_data(data_idx) = false;
@@ -1305,7 +1310,7 @@
                 have_cdata(data_idx) = true;
               else
                 have_cdata(data_idx) = false;
-              end
+              endif
               have_3d_patch(data_idx) = false;
               titlespec{data_idx} = tspec;
               usingclause{data_idx} = sprintf ("record=%dx1 using ($1):($2):($3)%s",
@@ -1470,20 +1475,37 @@
   endif
 
   grid_idx = axis_idx;
-  if (! have_grid)
+  if (! have_major_grid && ! have_minor_grid)
     fputs (plot_stream, "unset grid;\n");
   else
-    grid_idx += 1;
-    grid_obj.linestyle = axis_obj.gridlinestyle;
-    grid_obj.linewidth = axis_obj.linewidth;
-    [style, sidx] = do_linestyle_command (grid_obj, axis_obj.gridcolor,
-                                          grid_idx, plot_stream);
+    if (have_major_grid)
+      grid_idx += 1;
+      grid_obj.linestyle = axis_obj.gridlinestyle;
+      grid_obj.linewidth = axis_obj.linewidth;
+      grid_obj.alpha = axis_obj.gridalpha;
+      [style, sidx_major] = do_linestyle_command (grid_obj, axis_obj.gridcolor,
+                                                  grid_idx, plot_stream);
+    else
+      sidx_major = 0;
+    endif
+    if (have_minor_grid)
+      grid_idx += 1;
+      grid_obj.linestyle = axis_obj.minorgridlinestyle;
+      grid_obj.linewidth = axis_obj.linewidth;
+      grid_obj.alpha = axis_obj.minorgridalpha;
+      [style, sidx_minor] = do_linestyle_command (grid_obj,
+                                                  axis_obj.minorgridcolor,
+                                                  grid_idx, plot_stream);
+    else
+      sidx_minor = 0;
+    endif
     if (__gnuplot_has_feature__ ("linetype"))
       scmd = "linetype";
     else
       scmd = "linestyle";
     endif
-    fprintf (plot_stream, "set grid %s %d, %s %d;\n", scmd, sidx, scmd, sidx);
+    fprintf (plot_stream, "set grid %s %d, %s %d;\n",
+             scmd, sidx_major, scmd, sidx_minor);
   endif
 
   if (! isempty (hlgnd) && ! isempty (hlgnd.children)
@@ -1835,8 +1857,13 @@
   found_style = false;
   if (isnumeric (linecolor))
     color = linecolor;
-    fprintf (plot_stream, " linecolor rgb \"#%02x%02x%02x\"",
-             round (255*color));
+    if (isfield (obj, "alpha"))
+      alphastr = sprintf ("%02x", round (255*obj.alpha));
+    else
+      alphastr = "";
+    endif
+    fprintf (plot_stream, " linecolor rgb \"#%s%02x%02x%02x\"",
+             alphastr, round (255*color));
   else
     color = [0, 0, 0];
   endif
@@ -2744,7 +2771,7 @@
   ## FIXME: Multiline text produced the gnuplot
   ##        "warning: ft_render: skipping glyph"
   if (__calc_dimensions__ (hax) == 3)
-    zstr = sprintf(",%.15e", lpos(3));
+    zstr = sprintf (",%.15e", lpos(3));
   else
     zstr = "";
   endif