Changeset 7397

Timestamp:

02/09/11 11:32:42 (14 years ago)

Author:

jschierm

Message:

Utility updates made for LIMS project.

Location:

issm/trunk/src/m/utils/Array

Files:

• allequal.m (modified) (5 diffs)
• rotateticklabel.m (modified) (1 diff)

issm/trunk/src/m/utils/Array/allequal.m

@@ -1 +1 @@
 %
 %  function to return an empty array if all array elements are
-%  equal to the given value.
+%  equal to the given value, which may also be empty but not nan.
+%
+%  (note that by definition, nan is not equal to nan.  this could
+%  be changed by using isequalwithequalnans.)
 %
 %  function [aout]=allequal(ain,aval)
@@ -16 +19 @@
 if     islogical(ain) && islogical(aval)
     for i=1:numel(ain)
-        if ain(i) ~= aval
+        if ~isequal(ain(i),aval)
             return
         end
@@ -24 +27 @@
 elseif isnumeric(ain) && isnumeric(aval)
     for i=1:numel(ain)
-        if ain(i) ~= aval
+        if ~isequal(ain(i),aval)
             return
         end
@@ -41 +44 @@
     if     islogical(aval)
         for i=1:numel(ain)
-            if ~islogical(ain{i}) || ain{i} ~= aval
+            if ~islogical(ain{i}) || ~isequal(ain{i},aval)
                 return
             end
@@ -49 +52 @@
     elseif isnumeric(aval)
         for i=1:numel(ain)
-            if ~isnumeric(ain{i}) || ain{i} ~= aval
+            if ~isnumeric(ain{i}) || ~isequal(ain{i},aval)
                 return
             end

issm/trunk/src/m/utils/Array/rotateticklabel.m

@@ -51 +51 @@
 c=get(h,'YTick');
 %make new tick labels
-if rot<180
-    th=text(b,repmat(c(1)-.1*(c(2)-c(1)),length(b),1),a,'HorizontalAlignment','right','rotation',rot,'Interpreter','none');
-else
-    th=text(b,repmat(c(1)-.1*(c(2)-c(1)),length(b),1),a,'HorizontalAlignment','left','rotation',rot,'Interpreter','none');
+%  must consider yscale (jes, 9/14/10)
+switch lower(get(h,'YScale'))
+    case 'linear'
+        if rot<180
+            th=text(b,repmat(c(1)-.1*(c(2)-c(1)),length(b),1),a,'HorizontalAlignment','right','rotation',rot,'Interpreter','none');
+        else
+            th=text(b,repmat(c(1)-.1*(c(2)-c(1)),length(b),1),a,'HorizontalAlignment','left','rotation',rot,'Interpreter','none');
+        end
+    case 'log'
+        if rot<180
+            th=text(b,repmat(10^(log10(c(1))-.1*(log10(c(2))-log10(c(1)))),length(b),1),a,'HorizontalAlignment','right','rotation',rot,'Interpreter','none');
+        else
+            th=text(b,repmat(10^(log10(c(1))-.1*(log10(c(2))-log10(c(1)))),length(b),1),a,'HorizontalAlignment','left','rotation',rot,'Interpreter','none');
+        end
+    otherwise
+        set(h,'XTickLabel',a);
 end
-
-end