bug in "normalisezed vectors" norm resolved

crqa.m

@@ -149,6 +149,9 @@ function xout=crqa(varargin)
 % $Revision$
 %
 % $Log$
+% Revision 5.50  2014/09/23 07:11:25  marwan
+% Matlab R2014b incompatibility issues fixed
+%
 % Revision 5.49  2014/01/07 15:41:16  marwan
 % bug in windowing approach when using window length = data length fixed
 %
@@ -379,6 +382,7 @@ errcode=1;
         method={'Maximum Norm','Euclidean Norm','Minimum Norm','Normalized Norm','Maximum Norm, fixed RR','FAN','Interdependent','Order Matrix','Order Pattern','Distance Plot'};
         method=method{get(h(1),'Value')};
         method_n = get(h(1),'Value');
+        method=check_meth{method_n};
         nonorm=get(h(1),'UserData');
         h=findobj('Tag','crqa_lmin');
         lmin=str2num(get(h(1),'String'));
@@ -687,7 +691,7 @@ case 'init'
             'Tag','text_logo',...
             'String','Uni Potsdam',...
             'Position',[97+30 24.2143+14.5 22  3.5714]);    
-  h2=textwrap(h,{[char(169),' AGNLD'],'University of Potsdam','1998-2007'});
+  h2=textwrap(h,{[char(169),' AGNLD'],'University of Potsdam','1998-2015'});
   set(h,'String',h2)
 
 
@@ -1084,7 +1088,11 @@ h_button_apply=findobj('tag','crqa_button_apply','Parent',h_fig(1));
 
 if Nx==w & wstep<2, wstep=1; Nx=w; end
 if Nx==w, Nx=w; end
-if nogui~=2, hw=waitbar(0,['0/',num2str(Nx-w)]);set(hw,'Name','Please Wait!');h1=get(hw,'chil');h1=get(h1,'title'); drawnow; end
+if nogui~=2 
+    hw=waitbar(0,['0/',num2str(Nx-w)]);
+    set(hw,'Name','Please Wait!');
+    drawnow 
+end
 if strcmpi(method,'Order Pattern') method = 'op'; end
 if strcmpi(method,'Order Matrx') method = 'om'; end
 if strcmpi(method,'Maximum Norm, fixed RR') method = 'rr'; end
@@ -1108,12 +1116,15 @@ if undocumented
    Y = zeros(length(xscale)-w+1,17);
 end
 
+if ~nogui
+    set(0,'ShowHidden','on')
+end
    
 for i=1:wstep:Nx-w+1; 
      if ~nogui
-         set(0,'ShowHidden','on')
          if strcmpi(get(h_button_apply(1),'string'),'stopped')
               Y(i:Nx-w,1:13)=NaN;
+              drawnow
               break
          end
      end
@@ -1212,7 +1223,10 @@ for i=1:wstep:Nx-w+1;
              warning on
          end
 
-         if nogui~=2 & ishandle(h1), set(h1,'str',[num2str(i),'/',num2str(Nx-w)]); waitbar(i/(Nx-w)); drawnow, end
+         if nogui~=2
+              waitbar(i/(Nx-w),hw,[num2str(i),'/',num2str(Nx-w)]); 
+              drawnow 
+         end
 
 
 
@@ -1245,7 +1259,9 @@ for i=1:wstep:Nx-w+1;
            %%%%%%%%%%%%
            
            warning off 
-           if nogui~=2 & ishandle(h1), set(h1,'str',[num2str(i),'/',num2str(Nx-w)]); waitbar(i/(Nx-w)); drawnow, end
+           if nogui~=2 
+               waitbar(i/(Nx-w),hw,[num2str(i),'/',num2str(Nx-w)]); 
+           end
 
          %if 0
          catch
@@ -1507,6 +1523,7 @@ if ~nogui
      ylabel(tx(i));
      set(gca,'Tag',tags{i},'color',props.axes.Color,'Units','Norm',...
         'xlim',[xscale(1) xscale(end)])
+     if length(Y(:,1)) == 1, axis([0 1 0 1]), end
    end
    h=findobj('Tag','crqa_button_store');
    set(h(1),'UserData',Y,'Enable','On')