Mercurial > hg > octave-nkf
diff scripts/plot/__go_draw_axes__.m @ 10111:b52cba8be2eb
Fix for markerfacecolor and markeredgecolor properties with unfillable markers like '+'
author | David Bateman <dbateman@free.fr> |
---|---|
date | Thu, 14 Jan 2010 21:50:37 +0100 |
parents | dd70982c81a3 |
children | b5cc666da6ca |
line wrap: on
line diff
--- a/scripts/plot/__go_draw_axes__.m +++ b/scripts/plot/__go_draw_axes__.m @@ -525,12 +525,8 @@ style = do_linestyle_command (obj, obj.color, data_idx, mono, plot_stream, errbars); - if (isempty (style{1})) - withclause{data_idx} = ''; - else - withclause{data_idx} = sprintf ("with %s linestyle %d", - style{1}, data_idx); - endif + withclause{data_idx} = sprintf ("with %s linestyle %d", + style{1}, data_idx); if (length (style) > 1) data_idx++; @@ -916,8 +912,7 @@ || ! isnumeric (obj.markeredgecolor) || (isnumeric (obj.markeredgecolor) && isequal (color, obj.markeredgecolor)))) - if (! isequal (pt, pt2) && sidx == 1 - && ((length (style) == 5 + if (sidx == 1 && ((length (style) == 5 && strncmp (style, "lines", 5)) || isempty (style))) style = strcat (style, "points"); @@ -1736,7 +1731,7 @@ || ! isnumeric (obj.markeredgecolor) || (isnumeric (obj.markeredgecolor) && isequal (color, obj.markeredgecolor)))) - if (! isequal (pt, pt2) && sidx == 1 && ((length (style {sidx}) == 5 + if (sidx == 1 && ((length (style {sidx}) == 5 && strncmp (style {sidx}, "lines", 5)) || isempty (style {sidx}))) style {sidx} = strcat (style{sidx}, "points"); if (! isempty (pt))