Mercurial > hg > octave-lyh
diff scripts/plot/private/__errplot__.m @ 11587:c792872f8942
all script files: untabify and strip trailing whitespace
author | John W. Eaton <jwe@octave.org> |
---|---|
date | Thu, 20 Jan 2011 17:35:29 -0500 |
parents | fd0a3ac60b0e |
children | d5bd2766c640 |
line wrap: on
line diff
--- a/scripts/plot/private/__errplot__.m +++ b/scripts/plot/private/__errplot__.m @@ -57,7 +57,7 @@ hg = hggroup ("parent", p); h = [h; hg]; - args = __add_datasource__ ("__errplot__", hg, + args = __add_datasource__ ("__errplot__", hg, {"x", "y", "l", "u", "xl", "xu"}); if (isempty (fmt.color)) @@ -144,7 +144,7 @@ udata = varargin{6}(:,i); else error ("errorbar: error plot with 6 columns only valid for boxxy and xyerr"); - endif + endif otherwise error ("errorbar: error plot requires 2, 3, 4 or 6 arguments."); endswitch @@ -161,19 +161,19 @@ addproperty ("linewidth", hg, "linelinewidth", get (hl(1), "linewidth")) addproperty ("linestyle", hg, "linelinestyle", get (hl(1), "linestyle")) addproperty ("marker", hg, "linemarker", get (hl(1), "marker")) - addproperty ("markerfacecolor", hg, "linemarkerfacecolor", + addproperty ("markerfacecolor", hg, "linemarkerfacecolor", get (hl(1), "markerfacecolor")) - addproperty ("markeredgecolor", hg, "linemarkerfacecolor", + addproperty ("markeredgecolor", hg, "linemarkerfacecolor", get (hl(1), "markeredgecolor")) - addproperty ("markersize", hg, "linemarkersize", + addproperty ("markersize", hg, "linemarkersize", get (hl(1), "markersize")) fcn = {@update_props, hl}; addlistener (hg, "color", fcn); - addlistener (hg, "linewidth", fcn); - addlistener (hg, "linestyle", fcn); - addlistener (hg, "marker", fcn); - addlistener (hg, "markerfacecolor", fcn); + addlistener (hg, "linewidth", fcn); + addlistener (hg, "linestyle", fcn); + addlistener (hg, "marker", fcn); + addlistener (hg, "markerfacecolor", fcn); addlistener (hg, "markersize", fcn); fcn = {@update_data, hl}; @@ -195,7 +195,7 @@ endfunction -function [xdata, ydata] = errorbar_data (xdata, ydata, ldata, udata, +function [xdata, ydata] = errorbar_data (xdata, ydata, ldata, udata, xldata, xudata, ifmt, xscale, yscale) if (strcmp (xscale, "linear")) @@ -249,9 +249,9 @@ ydata = [ydata-ldata, ydata-ldata, ydata+udata, ydata+udata, ... ydata-ldata, nans]; elseif (strcmp (ifmt, "xyerr")) - [x1, y1] = errorbar_data (xdata, ydata, ldata, udata, + [x1, y1] = errorbar_data (xdata, ydata, ldata, udata, xldata, xudata, "xerr", xscale, yscale); - [x2, y2] = errorbar_data (xdata, ydata, ldata, udata, + [x2, y2] = errorbar_data (xdata, ydata, ldata, udata, xldata, xudata, "yerr", xscale, yscale); xdata = [x1; x2]; ydata = [y1; y2]; @@ -264,9 +264,9 @@ endfunction function update_props (hg, dummy, hl) - set (hl, "color", get (hg, "color"), + set (hl, "color", get (hg, "color"), "linewidth", get (hg, "linewidth"));, - set (hl(1), "linestyle", get (hg, "linestyle"), + set (hl(1), "linestyle", get (hg, "linestyle"), "marker", get (hg, "marker"), "markersize", get (hg, "markersize"), "markerfacecolor", get (hg, "markerfacecolor"),