Mercurial > hg > octave-lyh

diff scripts/plot/plot3.m @ 10135:4516a0c97ced

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Handle linestyleorder. Remove @ markers. Treat edgecolor, markeredgecolor and markerfacecolor correctly in scatter.
author David Bateman <dbateman@free.fr>
date Wed, 20 Jan 2010 02:52:22 +0100
parents 5497b0795fb9
children 95c3e38098bf
line wrap: on
line diff
--- a/scripts/plot/plot3.m
+++ b/scripts/plot/plot3.m
@@ -177,15 +177,19 @@
       endif
 
       for i = 1 : columns (x)
+        linestyle = options.linestyle;
+        marker = options.marker;
+	if (isempty (marker) && isempty (linestyle))
+	   [linestyle, marker] = __next_line_style__ ();
+	endif
 	color = options.color;
 	if (isempty (options.color))
 	  color = __next_line_color__ ();
 	endif
 
 	tmp(++idx) = line (x(:, i), y(:, i), z(:, i),  "keylabel", key,
-			   "color", color,
-			   "linestyle", options.linestyle,
-			   "marker", options.marker, properties{:});
+			   "color", color, "linestyle", linestyle,
+			   "marker", marker, properties{:});
       endfor
 
       x_set = 0;
@@ -226,15 +230,19 @@
       endif
 
       for i = 1 : columns (x)
+        linestyle = options.linestyle;
+        marker = options.marker;
+	if (isempty (marker) && isempty (linestyle))
+	   [linestyle, marker] = __next_line_style__ ();
+	endif
 	color = options.color;
 	if (isempty (color))
 	  color = __next_line_color__ ();
 	endif
 
 	tmp(++idx) = line (x(:, i), y(:, i), z(:, i),  "keylabel", key,
-			   "color", color,
-			   "linestyle", options.linestyle,
-			   "marker", options.marker, properties{:});
+			   "color", color, "linestyle", linestyle,
+			   "marker", marker, properties{:});
       endfor
 
       x = new;
@@ -294,15 +302,19 @@
     endif
 
     for i = 1 : columns (x)
+      linestyle = options.linestyle;
+      marker = options.marker;
+      if (isempty (marker) && isempty (linestyle))
+	[linestyle, marker] = __next_line_style__ ();
+      endif
       color = options.color;
       if (isempty (color))
 	color = __next_line_color__ ();
       endif
 
       tmp(++idx) = line (x(:, i), y(:, i), z(:, i),  "keylabel", key, 
-			 "color", color,
-			 "linestyle", options.linestyle,
-			 "marker", options.marker, properties{:});
+			 "color", color, "linestyle", linestyle,
+			 "marker", marker, properties{:});
     endfor
   endif