Mercurial > octave-antonio

changeset 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 c146b308739f
children fddfebeeb33a
files scripts/ChangeLog scripts/plot/__go_draw_axes__.m
diffstat 2 files changed, 9 insertions(+), 9 deletions(-) [+]
line wrap: on
line diff
--- a/scripts/ChangeLog	Thu Jan 14 14:07:33 2010 +0100
+++ b/scripts/ChangeLog	Thu Jan 14 21:50:37 2010 +0100
@@ -1,3 +1,8 @@
+2010-01-14  David Bateman  <dbateman@free.fr>
+
+	* plot/__go_draw_axes__.m:  Fix for markerfacecolor and
+	markeredgecolor for unfillable points like '+'.
+
 2010-01-14  Jaroslav Hajek  <highegg@gmail.com>
 
 	* io/fileread.m: Add missing semicolon.
--- a/scripts/plot/__go_draw_axes__.m	Thu Jan 14 14:07:33 2010 +0100
+++ b/scripts/plot/__go_draw_axes__.m	Thu Jan 14 21:50:37 2010 +0100
@@ -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))