bug in output fixed (same time scales for all sub-plots)

crqa.m

@@ -135,6 +135,9 @@ function xout=crqa(varargin)
 % $Revision$
 %
 % $Log$
+% Revision 5.11  2005/03/16 12:23:08  marwan
+% support long data series by using crp_big
+%
 % Revision 5.10  2005/03/16 11:23:52  marwan
 % automatic detection:
 % * of provided time-scale
@@ -539,11 +542,18 @@ case 'init'
     end
     if size(y_var,1) > 2
       stairs(yscale(round(y_var(:,1))),y_var(:,2),'r')
-      h3=axes('Units','Char','Pos',get(h,'Pos'),'XLim',get(h,'XLim'),'YLim',get(h,'YLim'),'YAxisLocation','right','Color','none','Tag','crqa_axes_CoVar','visible','off');
     else
       cla
       text(0.5,0.5,sprintf('%6.5f, %6.5f',x_var(2,2),y_var(1,2)),'FontWeight','bold','HorizontalAlign','Center')
     end
+    h3=axes('Units','Char',...
+              'Pos',get(h,'Pos'),...
+              'XLim',get(h,'XLim'),...
+              'YLim',get(h,'YLim'),...
+              'YAxisLocation','right',...
+              'Color','none',...
+              'Tag','crqa_axes_CoVar',...
+              'visible','off');
   end
   set(gcf,'CurrentAxes',h);
   ylabel('Variance')
@@ -895,12 +905,12 @@ try
 %  X=crp_big(x(i:i+w-1,:),y(i:i+w-1,:),m,t,e,'fan','silent');
   if time_scale_flag
     if length(x(i:i+w-1,:)) > 2000
-       X=crp_big(x(i:i+w-1,:),y(i:i+w-1,:),m,t,e,method,do_norm{nonorm+1},'silent',varargin{i_char});
+       X=crp_big(x(i:i+w-1,:),y(i:i+w-1,:),m,t,e,method,do_norm{nonorm+1},'silent');
     else
-       X=crp(x(i:i+w-1,:),y(i:i+w-1,:),m,t,e,method,do_norm{nonorm+1},'silent',varargin{i_char});
+       X=crp(x(i:i+w-1,:),y(i:i+w-1,:),m,t,e,method,do_norm{nonorm+1},'silent');
     end
   else
-    X=crp2(x(i:i+w-1,:),y(i:i+w-1,:),m,t,e,method,do_norm{nonorm+1},'silent',varargin{i_char});
+    X=crp2(x(i:i+w-1,:),y(i:i+w-1,:),m,t,e,method,do_norm{nonorm+1},'silent');
   end
 %  X=crp(x(i:i+w-1,:),y(i:i+w-1,:),m,t,e,varargin{i_char},'silent');
   if time_scale_flag
@@ -1038,11 +1048,12 @@ if ~nogui
          cla
              h2=stairs(xscale(1:wstep:length(Y)),Y(1:wstep:end,index(i)));
              set(h2,'color',props.line.Color)
-         if ~all(x(:)==y(:)) 
+         if ~all(x(:)==y(:))
            set(gca,'Color','none')
            hold on; h2=stairs(xscale(1:wstep:length(Y)),Y(1:wstep:end,index(10)),'r');
            set(gcf,'CurrentAxes',h_axes.h(i+1));cla
            set(h_axes.h(10),'visible','on');
+           
            h3=stairs(xscale(1:wstep:length(Y)),Y(1:wstep:end,index(11))); set(h3,'color',[0 .4 0]);
            ylabel(tx(i+1));
            set(h_axes.h(i+1),'Tag',tags{i+1},'Units','Norm','Color','none','YAxisLocation','right','YColor',[0 .4 0])
@@ -1058,7 +1069,8 @@ if ~nogui
    h=findobj('Tag','crqa_button_store');
    set(h(1),'UserData',Y,'Enable','On')
    xlim = get(h_axes.h(9),'xlim');
-   set(h_crqa_axes_Data,'xlim',xlim)
+   if length(Y(:,1)) > 1, set(h_crqa_axes_Data,'xlim',xlim), end
+   if ~all(x(:)==y(:)) & length(Y(:,1)) == 1, set(h_axes.h(10),'visible','off'); delete(get(h_axes.h(10),'children')), end
 else
   if nargout, xout=Y(:,1:10); end
 end