changeset 11673:e6364723ae29 release-3-0-x

markersize compatibility changes
author John W. Eaton <jwe@octave.org>
date Thu, 06 Mar 2008 04:04:04 -0500
parents a5a86cc9ef38
children 270677feba91
files scripts/ChangeLog scripts/plot/__go_draw_axes__.m src/ChangeLog
diffstat 3 files changed, 18 insertions(+), 5 deletions(-) [+]
line wrap: on
line diff
--- a/scripts/ChangeLog
+++ b/scripts/ChangeLog
@@ -1,3 +1,7 @@
+2008-03-06  John W. Eaton  <jwe@octave.org>
+
+	* plot/__go_draw_axes__.m: Adjust markersize by a factor of 1/6.
+
 2008-03-05  Ben Abbott  <bpabbott@mac.com>
 
 	* polynomial/roots.m: Catch Infs and/or NaNs.
--- a/scripts/plot/__go_draw_axes__.m
+++ b/scripts/plot/__go_draw_axes__.m
@@ -640,7 +640,7 @@
 	     usingclause{data_idx} = "";
 
 	     if (isfield (obj, "markersize"))
-	       mdat = obj.markersize;
+	       mdat = obj.markersize / 6;
 	     endif
 
              if (isfield (obj, "edgecolor"))
@@ -755,9 +755,9 @@
 
 	     if (isfield (obj, "markersize"))
 	       if (length (mdat) == nc)
-		 m = mdat(i);
+		 m = mdat(i) / 6;
 	       else
-		 m = mdat;
+		 m = mdat / 6;
 	       endif
 	       if (! strcmpi (style, "lines"))
 		 if (have_newer_gnuplot)
@@ -1409,10 +1409,10 @@
 
     if (isfield (obj, "markersize"))
       if (have_newer_gnuplot)
-	fprintf (plot_stream, " pointsize %f", obj.markersize);
+	fprintf (plot_stream, " pointsize %f", obj.markersize /6);
       else
 	if (! strcmpi (style, "lines"))
-	  with = sprintf ("%s ps %f", with, obj.markersize);
+	  with = sprintf ("%s ps %f", with, obj.markersize / 6);
 	endif
       endif
       found_style = true;
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,3 +1,12 @@
+2008-03-06  John W. Eaton  <jwe@octave.org>
+
+	* graphics.cc (line::properties::properties,
+	line::properties::factory:defaults, patch::properties::properties, 
+	patch::properties::factory:defaults,
+	surface::properties::properties,
+	surface::properties::factory:defaults):
+	Set markersize to 6 by default.
+
 2008-03-06  Alexander Barth  <barth.alexander@gmail.com>
 
 	* DLD-FUNCTIONS/__lin_interpn__.cc (lookup):