Mercurial > octave-nkf

changeset 17891:5fbab07c419f

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Fix legend markerstyle for errorbar (bug #36480) * scripts/plot/draw/private/__errplot__.m: change order of children to place line with markers through data first.
author Stefan Mahr <dac922@gmx.de>
date Wed, 06 Nov 2013 22:23:21 +0100
parents e0495a8c1b5d
children 5401637c3fa7
files scripts/plot/draw/private/__errplot__.m
diffstat 1 files changed, 15 insertions(+), 15 deletions(-) [+]
line wrap: on
line diff
--- a/scripts/plot/draw/private/__errplot__.m	Sat Nov 09 07:47:17 2013 -0800
+++ b/scripts/plot/draw/private/__errplot__.m	Wed Nov 06 22:23:21 2013 +0100
@@ -69,8 +69,8 @@
     args = __add_datasource__ ("__errplot__", hg,
                                {"x", "y", "l", "u", "xl", "xu"});
 
-    hl = [(__line__ (hg, "color", lc, "linestyle", ls, "marker", mk)),
-          (__line__ (hg, "color", lc, "linestyle", "-", "marker", "none"))];
+    hl = [(__line__ (hg, "color", lc, "linestyle", "-", "marker", "none")),
+          (__line__ (hg, "color", lc, "linestyle", ls, "marker", mk))];
 
     switch (numel (varargin))
       case 2
@@ -158,16 +158,16 @@
     addproperty ("xudata", hg, "data", xudata(:));
     addproperty ("format", hg, "string", ifmt);
 
-    addproperty ("color", hg, "linecolor", get (hl(1), "color"));
-    addproperty ("linestyle", hg, "linelinestyle", get (hl(1), "linestyle"));
-    addproperty ("linewidth", hg, "linelinewidth", get (hl(1), "linewidth"));
-    addproperty ("marker", hg, "linemarker", get (hl(1), "marker"));
+    addproperty ("color", hg, "linecolor", get (hl(2), "color"));
+    addproperty ("linestyle", hg, "linelinestyle", get (hl(2), "linestyle"));
+    addproperty ("linewidth", hg, "linelinewidth", get (hl(2), "linewidth"));
+    addproperty ("marker", hg, "linemarker", get (hl(2), "marker"));
     addproperty ("markeredgecolor", hg, "linemarkerfacecolor",
-                 get (hl(1), "markeredgecolor"));
+                 get (hl(2), "markeredgecolor"));
     addproperty ("markerfacecolor", hg, "linemarkerfacecolor",
-                 get (hl(1), "markerfacecolor"));
+                 get (hl(2), "markerfacecolor"));
     addproperty ("markersize", hg, "linemarkersize",
-                 get (hl(1), "markersize"));
+                 get (hl(2), "markersize"));
 
     ## Matlab property, although Octave does not implement it.
     addproperty ("hittestarea", hg, "radio", "on|{off}", "off");
@@ -309,7 +309,7 @@
 function update_props (hg, ~, hl)
   set (hl, "color", get (hg, "color"),
            "linewidth", get (hg, "linewidth"));
-  set (hl(1), "linestyle", get (hg, "linestyle"),
+  set (hl(2), "linestyle", get (hg, "linestyle"),
               "marker", get (hg, "marker"),
               "markeredgecolor", get (hg, "markeredgecolor"),
               "markerfacecolor", get (hg, "markerfacecolor"),
@@ -320,7 +320,7 @@
 
   if (strcmp (get (hg, "type"), "axes"))
     hax = hg;
-    hg = ancestor (hl(1), "hggroup");
+    hg = ancestor (hl(2), "hggroup");
   else
     hax = ancestor (hg, "axes");
   endif
@@ -335,15 +335,15 @@
   xudata = get (hg, "xudata");
   ifmt = get (hg, "format");
 
-  set (hl(1), "xdata", xdata);
-  set (hl(1), "ydata", ydata);
+  set (hl(2), "xdata", xdata);
+  set (hl(2), "ydata", ydata);
 
   [errorbar_xdata, errorbar_ydata] = ...
           errorbar_data (xdata, ydata, ldata, udata, xldata, xudata, ...
                          ifmt, xscale, yscale);
 
-  set (hl(2), "xdata", errorbar_xdata);
-  set (hl(2), "ydata", errorbar_ydata);
+  set (hl(1), "xdata", errorbar_xdata);
+  set (hl(1), "ydata", errorbar_ydata);
 
 endfunction