Mercurial > hg > octave-lyh

changeset 12971:e65d1488ff6a

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
text.m: Improve logic and error checking. Modify demo.
author Ben Abbott <bpabbott@mac.com>
date Mon, 15 Aug 2011 19:43:57 -0400
parents 7b4ec6f841a2
children e4f82a337d66
files scripts/plot/text.m
diffstat 1 files changed, 20 insertions(+), 11 deletions(-) [+]
line wrap: on
line diff
--- a/scripts/plot/text.m
+++ b/scripts/plot/text.m
@@ -70,9 +70,9 @@
       if (nx > 1 && nt == 1)
         label = repmat ({label}, [nx, 1]);
         nt = nx;
-      elseif (nx > 1 && nt == nx)
-      else
+      elseif (! (nx > 1 && nt == nx))
         label = {label};
+        nt = 1;
       endif
     else
       error ("text: expecting LABEL to be a character string or cell array of character strings");
@@ -86,7 +86,7 @@
 
   if (rem (numel (varargin), 2) == 0)
 
-    if (nx == ny && nx == nz)
+    if (nx == ny && nx == nz && (nt == nx || nt == 1 || nx == 1))
       pos = [x(:), y(:), z(:)];
       ca = gca ();
       tmp = zeros (nt, 1);
@@ -106,8 +106,10 @@
       else
         error ("text: dimension mismatch for coordinates and LABEL");
       endif
+    elseif (nt == nx || nt == 1 || nx == 1)
+      error ("text: dimension mismatch for coordinates");
     else
-      error ("text: dimension mismatch for coordinates");
+      error ("text: mismatch betwween coordinates and strings");
     endif
 
     if (nargout > 0)
@@ -188,23 +190,30 @@
 
 %!demo
 %! clf
-%! h = text (0.6, 0.3, "char");
+%! h = text (0.5, 0.3, "char");
 %! assert ("char", class (get (h, "string")))
-%! h = text (0.6, 0.4, ["char row 1"; "char row 2"]);
+%! h = text (0.5, 0.4, ["char row 1"; "char row 2"]);
 %! assert ("char", class (get (h, "string")))
-%! h = text (0.6, 0.6, {"cell2str (1,1)", "cell2str (1,2)"; "cell2str (2,1)", "cell2str (2,2)"});
+%! h = text (0.5, 0.6, {"cell2str (1,1)", "cell2str (1,2)"; "cell2str (2,1)", "cell2str (2,2)"});
 %! assert ("cell", class (get (h, "string")))
-%! h = text (0.6, 0.8, "foobar");
+%! h = text (0.5, 0.8, "foobar");
 %! set (h, "string", 1:3)
-%! h = text ([0.2, 0.2], [0.3, 0.4], "one string & two objects");
+%! h = text ([0.1, 0.1], [0.3, 0.4], "one string & two objects");
 %! assert ("char", class (get (h(1), "string")))
 %! assert ("char", class (get (h(2), "string")))
-%! h = text ([0.2, 0.2], [0.5, 0.6], {"one cellstr & two objects"});
+%! h = text ([0.1, 0.1], [0.5, 0.6], {"one cellstr & two objects"});
 %! assert ("cell", class (get (h(1), "string")))
 %! assert ("cell", class (get (h(2), "string")))
-%! h = text ([0.2, 0.2], [0.7, 0.8], {"cellstr 1 object 1", "cellstr 2 object 2"});
+%! h = text ([0.1, 0.1], [0.7, 0.8], {"cellstr 1 object 1", "cellstr 2 object 2"});
 %! assert ("char", class (get (h(1), "string")))
 %! assert ("char", class (get (h(2), "string")))
+%! h = text ([0.1, 0.1], [0.1, 0.2], ["1st string & 1st object"; "2nd string & 2nd object"]);
+%! assert ("char", class (get (h(1), "string")))
+%! assert ("char", class (get (h(2), "string")))
+%! h = text (0.7, 0.6, "single string");
+%! assert ("char", class (get (h, "string")))
+%! h = text (0.7, 0.5, {"single cell-string"});
+%! assert ("cell", class (get (h, "string")))
 %! xlabel (1:2)
 %! ylabel (1:2)
 %! title (1:2)