Mercurial > hg > octave-nkf

comparison scripts/plot/__go_draw_axes__.m @ 10111:b52cba8be2eb

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
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
comparison
equal deleted inserted replaced
10110:c146b308739f 10111:b52cba8be2eb
523 endif 523 endif
524 524
525 style = do_linestyle_command (obj, obj.color, data_idx, mono, 525 style = do_linestyle_command (obj, obj.color, data_idx, mono,
526 plot_stream, errbars); 526 plot_stream, errbars);
527 527
528 if (isempty (style{1})) 528 withclause{data_idx} = sprintf ("with %s linestyle %d",
529 withclause{data_idx} = ''; 529 style{1}, data_idx);
530 else
531 withclause{data_idx} = sprintf ("with %s linestyle %d",
532 style{1}, data_idx);
533 endif
534 530
535 if (length (style) > 1) 531 if (length (style) > 1)
536 data_idx++; 532 data_idx++;
537 is_image_data(data_idx) = is_image_data(data_idx - 1); 533 is_image_data(data_idx) = is_image_data(data_idx - 1);
538 parametric(data_idx) = parametric(data_idx - 1); 534 parametric(data_idx) = parametric(data_idx - 1);
914 && !strncmp (obj.markeredgecolor, "none", 4)) 910 && !strncmp (obj.markeredgecolor, "none", 4))
915 if (facesame && (strncmp (obj.markeredgecolor, "auto", 4) 911 if (facesame && (strncmp (obj.markeredgecolor, "auto", 4)
916 || ! isnumeric (obj.markeredgecolor) 912 || ! isnumeric (obj.markeredgecolor)
917 || (isnumeric (obj.markeredgecolor) 913 || (isnumeric (obj.markeredgecolor)
918 && isequal (color, obj.markeredgecolor)))) 914 && isequal (color, obj.markeredgecolor))))
919 if (! isequal (pt, pt2) && sidx == 1 915 if (sidx == 1 && ((length (style) == 5
920 && ((length (style) == 5
921 && strncmp (style, "lines", 5)) 916 && strncmp (style, "lines", 5))
922 || isempty (style))) 917 || isempty (style)))
923 style = strcat (style, "points"); 918 style = strcat (style, "points");
924 if (isfield (obj, "markersize")) 919 if (isfield (obj, "markersize"))
925 if (length (mdat) == nc) 920 if (length (mdat) == nc)
1734 && !strncmp (obj.markeredgecolor, "none", 4)) 1729 && !strncmp (obj.markeredgecolor, "none", 4))
1735 if (facesame && (strncmp (obj.markeredgecolor, "auto", 4) 1730 if (facesame && (strncmp (obj.markeredgecolor, "auto", 4)
1736 || ! isnumeric (obj.markeredgecolor) 1731 || ! isnumeric (obj.markeredgecolor)
1737 || (isnumeric (obj.markeredgecolor) 1732 || (isnumeric (obj.markeredgecolor)
1738 && isequal (color, obj.markeredgecolor)))) 1733 && isequal (color, obj.markeredgecolor))))
1739 if (! isequal (pt, pt2) && sidx == 1 && ((length (style {sidx}) == 5 1734 if (sidx == 1 && ((length (style {sidx}) == 5
1740 && strncmp (style {sidx}, "lines", 5)) || isempty (style {sidx}))) 1735 && strncmp (style {sidx}, "lines", 5)) || isempty (style {sidx})))
1741 style {sidx} = strcat (style{sidx}, "points"); 1736 style {sidx} = strcat (style{sidx}, "points");
1742 if (! isempty (pt)) 1737 if (! isempty (pt))
1743 fprintf (plot_stream, " pointtype %s", pt); 1738 fprintf (plot_stream, " pointtype %s", pt);
1744 endif 1739 endif