Mercurial > octave-nkf

changeset 10089:dd70982c81a3

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Allow markerfacecolor and markeredgecolor to be set and used for patch objects
author David Bateman <dbateman@free.fr>
date Tue, 12 Jan 2010 23:05:17 +0100
parents 5edee330d4cb
children 655ab6f6c369
files scripts/ChangeLog scripts/plot/__go_draw_axes__.m src/ChangeLog src/graphics.h.in
diffstat 4 files changed, 189 insertions(+), 44 deletions(-) [+]
line wrap: on
line diff
--- a/scripts/ChangeLog	Tue Jan 12 16:50:25 2010 +0100
+++ b/scripts/ChangeLog	Tue Jan 12 23:05:17 2010 +0100
@@ -1,3 +1,9 @@
+2010-01-12  David Bateman  <dbateman@free.fr>
+
+	* plot/__go_draw_axes_.m:  Allow patch markerfacecolor and 
+	markeredgecolor properties to be used and set the marker colors
+	appropriately.
+
 2010-01-12  Jaroslav Hajek  <highegg@gmail.com>, Ben Barrowes  <benjamin.e.barrowes@usace.army.mil>
 
 	* set/private/validargs.m: New function.
--- a/scripts/plot/__go_draw_axes__.m	Tue Jan 12 16:50:25 2010 +0100
+++ b/scripts/plot/__go_draw_axes__.m	Tue Jan 12 23:05:17 2010 +0100
@@ -711,7 +711,9 @@
 	   endif
 
            ## patch outline
-	   if (! strncmp (obj.edgecolor, "none", 4))
+	   if (!(strncmp (obj.edgecolor, "none", 4)
+                  && strncmp (obj.markeredgecolor, "none", 4)
+                  && strncmp (obj.markerfacecolor, "none", 4)))
 
 	     data_idx++;
              is_image_data(data_idx) = false;
@@ -797,75 +799,184 @@
 	       if (isfield (obj, "marker"))
 		 switch (obj.marker)
 		   case "+"
-		     pt = "pt 1";
+		     pt = pt2 = "pt 1";
 		   case "o"
 		     pt = "pt 6";
+                     pt2 = "pt 7";
 		   case "*"
-		     pt = "pt 3";
+		     pt = pt2 = "pt 3";
 		   case "."
-		     pt = "pt 0";
+		     pt = pt2 = "pt 0";
 		   case "x"
-		     pt = "pt 2";
+		     pt = pt2 = "pt 2";
 		   case {"square", "s"}
-		     pt = "pt 5";
+		     pt = "pt 4";
+		     pt2 = "pt 5";
 		   case {"diamond", "d"}
 		     pt = "pt 13";
+		     pt2 = "pt 14";
 		   case "^"
-		     pt = "pt 9";
+		     pt = "pt 8";
+		     pt2 = "pt 9";
 		   case "v"
-		     pt = "pt 11";
-		   case ">"
-		     pt = "pt 8";
-		   case "<"
 		     pt = "pt 10";
+		     pt2 = "pt 11";
+		   case ">"
+	             ## FIXME missing point type 
+		     pt = "pt 8";
+		     pt2 = "pt 9";
+		   case "<"
+	             ## FIXME missing point type 
+		     pt = "pt 10";
+		     pt2 = "pt 11";
 		   case {"pentagram", "p"}
-		     pt = "pt 4";
+	             ## FIXME missing point type 
+		     pt = pt2 = "pt 3";
 		   case {"hexagram", "h"}
-		     pt = "pt 12";
+		     pt = pt2 = "pt 3";
 		   case "none"
-		     pt = "";
+		     pt = pt2 = "";
 		   otherwise
-		     pt = "";
+		     pt = pt2 = "";
 		 endswitch
 	       endif
 	     else
 	       pt = "";
 	     endif
 
-	     style = "lines";
-	     if (isempty (lt))
-	       if (! isempty (pt))
-		 style = "points";
-	       endif
-	     elseif (! isempty (pt))
-	       style = "linespoints";
-	     endif
-
-	     if (isfield (obj, "markersize"))
-	       if (length (mdat) == nc)
-		 m = mdat(i);
-	       else
-		 m = mdat;
-	       endif
-	       if (! strcmpi (style, "lines"))
-		 ps = sprintf("pointsize %f", m);
-	       else
-		 ps = "";
-	       endif
-	     else
-	       ps = "";
-	     endif
-
 	     if (mono)
 	       colorspec = "";
 	     else
 	       colorspec = sprintf ("lc rgb \"#%02x%02x%02x\"",
 				    round (255*color));
 	     endif
-	     withclause{data_idx} = sprintf ("with %s %s %s %s %s %s",
-					     style, lw, pt, lt, ps, 
-					     colorspec);
+
+             sidx = 1;
+             if (isempty (lt))
+               style = "";
+             else
+               style = "lines";
+             endif
+             tmpwith = {};
+
+             facesame = true;
+             if (! isequal (pt, pt2) && isfield (obj, "markerfacecolor") 
+	         && !strncmp (obj.markerfacecolor, "none", 4))
+               if (strncmp (obj.markerfacecolor, "auto", 4)
+	           || ! isnumeric (obj.markerfacecolor) 
+	           || (isnumeric (obj.markerfacecolor) 
+	               && isequal (color, obj.markerfacecolor)))
+	         style = strcat (style, "points");
+	         if (isfield (obj, "markersize"))
+	           if (length (mdat) == nc)
+		     m = mdat(i);
+	           else
+		     m = mdat;
+	           endif
+		   ps = sprintf("pointsize %f", m / 3);
+                 else
+                   ps = "";
+	         endif
+
+	         tmpwith{sidx} = sprintf ("with %s %s %s %s %s %s",
+					  style, lw, pt2, lt, ps, 
+					  colorspec);
+               else
+	         facesame = false;
+	         if (! isempty (style))	
+	           tmpwith{sidx} = sprintf ("with %s %s %s %s",
+					    style, lw, lt, 
+					    colorspec);
+	           sidx ++;
+	         endif
+	         if (isnumeric (obj.markerfacecolor) && ! mono)
+	           colorspec = sprintf ("lc rgb \"#%02x%02x%02x\"",
+				        round (255*obj.markerfacecolor));
+	         endif
+	         style = "points";
+	         if (isfield (obj, "markersize"))
+	           if (length (mdat) == nc)
+		     m = mdat(i);
+	           else
+		     m = mdat;
+	           endif
+		   ps = sprintf("pointsize %f", m / 3);
+                 else
+                   ps = "";
+	         endif
+	         tmpwith{sidx} = sprintf ("with %s %s %s %s %s %s",
+					  style, lw, pt2, lt, ps, 
+					  colorspec);
+               endif
+             endif
 
+             if (isfield (obj, "markeredgecolor") 
+	         && !strncmp (obj.markeredgecolor, "none", 4))
+               if (facesame && (strncmp (obj.markeredgecolor, "auto", 4)
+		                || ! isnumeric (obj.markeredgecolor) 
+		                || (isnumeric (obj.markeredgecolor) 
+			            && isequal (color, obj.markeredgecolor))))
+	         if (! isequal (pt, pt2) && sidx == 1 
+                     && ((length (style) == 5 
+	                  && strncmp (style, "lines", 5)) 
+                         || isempty (style)))
+	           style = strcat (style, "points");
+	           if (isfield (obj, "markersize"))
+	             if (length (mdat) == nc)
+		       m = mdat(i);
+	             else
+		       m = mdat;
+	             endif
+		     ps = sprintf("pointsize %f", m / 3);
+                   else
+                     ps = "";
+	           endif
+	           tmpwith{sidx} = sprintf ("with %s %s %s %s %s %s",
+					    style, lw, pt, lt, ps, 
+					    colorspec);
+	         endif
+               else
+	         if (!isempty (style))	
+                   if (isempty (tmpwith{sidx}))
+	             tmpwith{sidx} = sprintf ("with %s %s %s %s",
+					      style, lw, lt, 
+					      colorspec);
+                   endif
+	           sidx ++;
+	         endif
+	         if (! mono)
+	           if (strncmp (obj.markeredgecolor, "auto", 4))
+	             colorspec = sprintf ("lc rgb \"#%02x%02x%02x\"",
+				          round (255*color));
+	           elseif (isnumeric (obj.markeredgecolor) && ! mono)
+	             colorspec = sprintf ("lc rgb \"#%02x%02x%02x\"",
+				          round (255*obj.markeredgecolor));
+	           endif
+	         endif
+	         style = "points";
+	         if (isfield (obj, "markersize"))
+	           if (length (mdat) == nc)
+		     m = mdat(i);
+	           else
+		     m = mdat;
+	           endif
+		   ps = sprintf("pointsize %f", m / 3);
+                 else
+                   ps = "";
+	         endif
+	         tmpwith{sidx} = sprintf ("with %s %s %s %s %s %s",
+					  style, lw, pt, lt, ps, 
+					  colorspec);
+               endif
+             endif
+
+             if (isempty (tmpwith))
+               withclause{data_idx} = sprintf ("with %s %s %s %s %s",
+                                               style, lw, pt, lt, 
+                                               colorspec);
+             else
+	       withclause{data_idx} = tmpwith{1};
+             endif
 	     if (nd == 3)
 	       if (! isnan (xcol) && ! isnan (ycol) && ! isnan (zcol))
 		 data{data_idx} = [[xcol; xcol(1)], [ycol; ycol(1)], ...
@@ -882,6 +993,29 @@
 	       endif
 	       usingclause{data_idx} = sprintf ("record=%d using ($1):($2)", columns (data{data_idx}));
 	     endif
+
+	     if (length (tmpwith) > 1)
+	       data_idx++;
+	       is_image_data(data_idx) = is_image_data(data_idx - 1); 
+	       parametric(data_idx) = parametric(data_idx - 1);
+	       have_cdata(data_idx) = have_cdata(data_idx - 1);
+	       have_3d_patch(data_idx) = have_3d_patch(data_idx - 1);
+	       titlespec{data_idx} = "title \"\"";
+	       usingclause{data_idx} = usingclause{data_idx - 1};
+	       data{data_idx} = data{data_idx - 1};
+	       withclause{data_idx} = tmpwith{2};
+	     endif
+	     if (length (tmpwith) > 2)
+	       data_idx++;
+	       is_image_data(data_idx) = is_image_data(data_idx - 1); 
+	       parametric(data_idx) = parametric(data_idx - 1);
+	       have_cdata(data_idx) = have_cdata(data_idx - 1);
+	       have_3d_patch(data_idx) = have_3d_patch(data_idx - 1);
+	       titlespec{data_idx} = "title \"\"";
+	       usingclause{data_idx} = usingclause{data_idx - 1};
+	       data{data_idx} = data{data_idx - 1};
+	       withclause{data_idx} = tmpwith{3};
+	     endif
 	   endif
 	 endfor
 
--- a/src/ChangeLog	Tue Jan 12 16:50:25 2010 +0100
+++ b/src/ChangeLog	Tue Jan 12 23:05:17 2010 +0100
@@ -1,3 +1,8 @@
+2010-01-12  David Bateman  <dbateman@free.fr>
+
+	* graphics.h.in (patch::properties): Add "flat" value to
+	markeredgecolor and  markerfacecolor properties.
+
 2010-01-12  Jaroslav Hajek  <highegg@gmail.com>
 
 	* ov-base.h (builtin_type_t): New enum constants: btyp_cell,
--- a/src/graphics.h.in	Tue Jan 12 16:50:25 2010 +0100
+++ b/src/graphics.h.in	Tue Jan 12 23:05:17 2010 +0100
@@ -3299,8 +3299,8 @@
       radio_property linestyle , "{-}|--|:|-.|none"
       double_property linewidth , 0.5
       radio_property marker , "{none}|s|o|x|+|.|*|<|>|v|^|d|p|h"
-      color_property markeredgecolor , "{auto}|none"
-      color_property markerfacecolor , "auto|{none}"
+      color_property markeredgecolor , "{auto}|none|flat"
+      color_property markerfacecolor , "auto|{none}|flat"
       double_property markersize , 6
       string_property keylabel , ""
       radio_property interpreter , "{tex}|none|latex"