Mercurial > hg > octave-lyh

changeset 7603:689652eb95d1

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
fix for scatter markersize
author David Bateman <dbateman@free.fr>
date Wed, 19 Mar 2008 17:30:01 +0100
parents 7bfaa9611558
children 90c9038170bf
files scripts/ChangeLog scripts/plot/__go_draw_axes__.m scripts/plot/__scatter__.m scripts/plot/scatter3.m
diffstat 4 files changed, 13 insertions(+), 12 deletions(-) [+]
line wrap: on
line diff
--- a/scripts/ChangeLog
+++ b/scripts/ChangeLog
@@ -1,3 +1,11 @@
+2008-03-19  David Bateman  <dbateman@free.fr>
+
+	* plot/__scatter__.m: Modify for change of markersize in
+	__go_draw_axes__.m and for compatibility.
+	* plot/__go_draw_axes__.m: Don't divide the marker size by 6
+	twice.
+	* plot/scatter3.m: Doc fix.
+
 2008-03-18  Ben Abbott <bpabbott@mac.com>
 
 	* specfun/beta.m: Fix for negative inputs.
--- a/scripts/plot/__go_draw_axes__.m
+++ b/scripts/plot/__go_draw_axes__.m
@@ -747,9 +747,9 @@
 
 	     if (isfield (obj, "markersize"))
 	       if (length (mdat) == nc)
-		 m = mdat(i) / 6;
+		 m = mdat(i);
 	       else
-		 m = mdat / 6;
+		 m = mdat;
 	       endif
 	       if (! strcmpi (style, "lines"))
 		 if (have_newer_gnuplot)
--- a/scripts/plot/__scatter__.m
+++ b/scripts/plot/__scatter__.m
@@ -52,17 +52,10 @@
   if (istart < nargin && firstnonnumeric > istart)
     s = varargin{istart};
     if (isempty (s))
-      s = 8;
+      s = 6;
     endif
   else
-    s = 8;
-  endif
-  ## Note markersize is in points^2 for 2D and points for 3D, and 
-  ## the below is an approximation, that is empircally visually correct.
-  if (nd == 2)
-    s = sqrt (s) / 2;
-  else
-    s = s / 4;
+    s = 6;
   endif
 
   if (istart < nargin && firstnonnumeric > istart + 1)
--- a/scripts/plot/scatter3.m
+++ b/scripts/plot/scatter3.m
@@ -17,7 +17,7 @@
 ## <http://www.gnu.org/licenses/>.
 
 ## -*- texinfo -*-
-## @deftypefn {Function File} {} scatter3 (@var{x}, @var{y}, @var{s}, @var{c})
+## @deftypefn {Function File} {} scatter3 (@var{x}, @var{y}, @var{z}, @var{s}, @var{c})
 ## @deftypefnx {Function File} {} scatter3 (@dots{}, 'filled')
 ## @deftypefnx {Function File} {} scatter3 (@dots{}, @var{style})
 ## @deftypefnx {Function File} {} scatter3 (@dots{}, @var{prop}, @var{val})