link axis of RP and data for simultaneous effects when zooming etc.

bug fix: output of rqa-measures when using store-button and on commandline had been differently handled

Contents.m

 % Cross Recurrence Plot Toolbox.
-% Version 5.18  (R29.6) 02-Mar-2016
+% Version 5.20  (R30.5) 13-Jul-2016
 %
 %   ace            - Finds optimal transformation and maximal correlation.
 %   adjust         - Adjusts two two-column vectors.
@@ -66,4 +66,4 @@
 % along with this program; if not, write to the Free Software
 % Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
 
-% Modified at 02-Mar-2016 17:54:35 by MAKEINSTALL
+% Modified at 13-Jul-2016 10:12:47 by MAKEINSTALL

crqa.m

@@ -149,6 +149,9 @@ function xout=crqa(varargin)
 % $Revision$
 %
 % $Log$
+% Revision 5.57  2016/05/23 11:53:20  marwan
+% forgotten to remove a debug option
+%
 % Revision 5.56  2016/05/23 11:46:24  marwan
 % again fixing time sxis bug (when using multi-column vector)
 %
@@ -331,8 +334,12 @@ theiler_window=1;
 hw=-1;
 xscale = [];
 yscale = [];
-undocumented = 0;
-argout_index=[1,2,3,4,5,6,7,8,9,10,11,12,13];
+undocumented = 1;
+if undocumented
+   argout_index=1:17;
+else
+   argout_index=1:13;
+end
 RTE = NaN; Clust = NaN; Trans = NaN;
 
 flag_pdist = 0; % use Matlab function PDIST, but only working for single x
@@ -735,7 +742,7 @@ case 'init'
   axes_height = 5.8;
   axes_base = 3;
   axes_hoffset = 2.5;
-  h=axes(props.axes,...
+  h(1)=axes(props.axes,...
             'Tag','crqa_axes_Data',...
                 'Box','On',...
             'Position',[11.2017  axes_base+4*(axes_height+axes_hoffset)    28.1785+15    axes_height]);    
@@ -747,10 +754,10 @@ case 'init'
       plot(xscale,x(:,1:end),'color',props.line.Color)
       if ~all(x(:)==y(:)) hold on; plot(yscale,y(:,1),'r'), end
   end
-  set(h,'Tag','crqa_axes_Data','color',props.axes.Color)
+  set(h(1),'Tag','crqa_axes_Data','color',props.axes.Color)
   ylabel('Data')
 
-  h=axes(props.axes,...
+  h(2)=axes(props.axes,...
             'Tag','crqa_axes_Var',...
             'Box','On',...
             'Position',[49.8023+15   axes_base+4*(axes_height+axes_hoffset)   28.1785+15    axes_height]);    
@@ -790,57 +797,59 @@ case 'init'
   end
   set(gcf,'CurrentAxes',h);
   ylabel('Variance')
-  set(h,'Tag','crqa_axes_Var','color',props.axes.Color)
+  set(h(2),'Tag','crqa_axes_Var','color',props.axes.Color)
 
 
-  h=axes(props.axes,...
+  h(3)=axes(props.axes,...
             'Tag','crqa_axes_RR',...
             'Box','On',...
             'Position',[11.2017   axes_base+3*(axes_height+axes_hoffset)   28.1785+15    axes_height]);    
   ylabel('RR')
 
-  h=axes(props.axes,...
+  h(4)=axes(props.axes,...
             'Tag','crqa_axes_DET',...
             'Box','On',...
             'Position',[49.8023+15   axes_base+3*(axes_height+axes_hoffset)   28.1785+15    axes_height]);    
   ylabel('DET')
 
-  h=axes(props.axes,...
+  h(5)=axes(props.axes,...
             'Tag','crqa_axes_L',...
             'Box','On',...
             'Position',[11.2017   axes_base+2*(axes_height+axes_hoffset)   28.1785+15    axes_height]);    
   ylabel('L')
 
-  h=axes(props.axes,...
+  h(6)=axes(props.axes,...
             'Tag','crqa_axes_ENTR',...
             'Box','On',...
             'Position',[49.8023+15   axes_base+2*(axes_height+axes_hoffset)   28.1785+15    axes_height]);    
   ylabel('ENTR')
 
-  h=axes(props.axes,...
+  h(7)=axes(props.axes,...
             'Tag','crqa_axes_LAM',...
             'Box','On',...
             'Position',[11.2017    axes_base+1*(axes_height+axes_hoffset)   28.1785+15    axes_height]);    
   ylabel('LAM')
 
-  h=axes(props.axes,...
+  h(8)=axes(props.axes,...
             'Tag','crqa_axes_TT',...
             'Box','On',...
             'Position',[49.8023+15    axes_base+1*(axes_height+axes_hoffset)   28.1785+15    axes_height]);    
   ylabel('TT')
 
-  h=axes(props.axes,...
+  h(9)=axes(props.axes,...
             'Tag','crqa_axes_RTE',...
             'Box','On',...
             'Position',[11.2017    axes_base+0*(axes_height+axes_hoffset)   28.1785+15    axes_height]);    
   ylabel('RTE')
 
-  h=axes(props.axes,...
+  h(10)=axes(props.axes,...
             'Tag','crqa_axes_T2',...
             'Box','On',...
             'Position',[49.8023+15    axes_base+0*(axes_height+axes_hoffset)   28.1785+15    axes_height]);    
   ylabel('T_2')
 
+  linkaxes(h,'x')
+
 %%%%%%%%%%% embedding
   h=uicontrol(props.frame,...
             'Tag','frame',...
@@ -1039,7 +1048,7 @@ case 'store'
       return
     else
       crqa_values=get(h(1),'UserData');
-      assignin('base',vname, [crqa_values])
+      assignin('base',vname, crqa_values(:,argout_index))
       warndlg(['CRQA measures have been assigned to the workspace variable ''',vname,'''.'],'Store output');
            waitforbuttonpress
       set(h1(1),'UserData',vname)