Mercurial > octave

changeset 21957:6be06f0c7463

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
gnuplot graphics: Fix MarkerFaceColor invalid and MarkerEdgeColor 'none' bugs (bug #47974). * __gnuplot_draw_axes__.m: If after calling do_linestyle_command() the style is empty, use 'points' as a placeholder point-type but leave the data empty. (gnuplot_pointtype): Treat '.' point type as having no marker face and therefore no color.
author Daniel J Sebald <daniel.sebald@ieee.org>
date Mon, 20 Jun 2016 02:21:10 -0500
parents d5a58720459d
children da9127ba1e0a
files scripts/plot/util/private/__gnuplot_draw_axes__.m
diffstat 1 files changed, 11 insertions(+), 7 deletions(-) [+]
line wrap: on
line diff
--- a/scripts/plot/util/private/__gnuplot_draw_axes__.m	Mon Jun 20 09:19:15 2016 -0700
+++ b/scripts/plot/util/private/__gnuplot_draw_axes__.m	Mon Jun 20 02:21:10 2016 -0500
@@ -632,6 +632,10 @@
           scmd = "linestyle";
         endif
 
+        if isempty (style{1})
+          style{1} = "points";
+          data{data_idx} = {};
+        endif
         withclause{data_idx} = sprintf ("with %s %s %d",
                                         style{1}, scmd, sidx(1));
 
@@ -1313,7 +1317,12 @@
               titlespec{data_idx} = tspec;
               usingclause{data_idx} = sprintf ("record=%dx1 using ($1):($2):($3)%s",
                                                yrec, ccol);
-              data{data_idx} = zz;
+              if isempty (style{i_stl})
+                style{i_stl} = "points";
+                data{data_idx} = {};
+              else
+                data{data_idx} = zz;
+              endif
               withclause{data_idx} = sprintf ("with %s %s %s",
                                               style{i_stl}, scmd, sopt);
             endfor
@@ -2012,12 +2021,7 @@
       case "*"
         pt = pt2 = "3";
       case "."
-        pt = "6";
-        pt2 = "7";
-        if (isfield (obj, "markerfacecolor")
-            || strcmp (obj.markerfacecolor, "none"))
-          obj.markerfacecolor = "auto";
-        endif
+        pt = pt2 = "7";
         if (isfield (obj, "markersize"))
           obj.markersize /= 3;
         else