FIX - hotfix for nargin/ft_nargin bug, primarily in ft_selectdata but also in other functions. The cause was that these functions were not yet adjusted to the latest state of ft_preamble handling. See http://bugzilla.fieldtriptoolbox.org/show_bug.cgi?id=3145

robertoostenveld · robertoostenveld · commit f7de18765ae6 · 2016-06-14T19:45:19.000+02:00
diff --git a/compat/matlablt2010b/iscolumn.m b/compat/matlablt2010b/iscolumn.m
@@ -3,7 +3,7 @@
 % This is a compatibility directory that should only be added to the path on
 % MATLAB versions prior to 2010b.
 %
-% iscolumn is not present in older version.
+% iscolumn is not present in older versions.
 
 tf = length(size(x))==2 && size(x,2)==1;
 
diff --git a/contrib/nutmegtrip/nmt_sourceplot_spm8.m b/contrib/nutmegtrip/nmt_sourceplot_spm8.m
@@ -1,4 +1,5 @@
 function nmt_sourceplot_spm8(cfg,functional)
+
 % NMT_SOURCEPLOT_SPM8
 % plots functional source reconstruction data on slices or on
 % a surface, optionally as an overlay on anatomical MRI data, where
@@ -157,9 +158,12 @@ function nmt_sourceplot_spm8(cfg,functional)
 %
 % $Id$
 
-revision = '$Id$';
-
 %%
+% these are used by the ft_preamble/ft_postamble function and scripts
+ft_revision = '$Id$';
+ft_nargin   = nargin;
+ft_nargout  = nargout;
+
 % do the general setup of the function
 ft_defaults
 ft_preamble init
@@ -815,4 +819,4 @@ function nmt_sourceplot_spm8(cfg,functional)
 
 cfg.axsel = 1;
 nmt_spm8_plot(cfg);
-nmt_image;
+nmt_image;
diff --git a/contrib/spike/ft_spike_isi.m b/contrib/spike/ft_spike_isi.m
@@ -61,7 +61,10 @@
 %
 % $Id$
 
-revision = '$Id$';
+% these are used by the ft_preamble/ft_postamble function and scripts
+ft_revision = '$Id$';
+ft_nargin   = nargin;
+ft_nargout  = nargout;
 
 % do the general setup of the function
 ft_defaults
diff --git a/contrib/spike/ft_spike_jpsth.m b/contrib/spike/ft_spike_jpsth.m
@@ -56,7 +56,10 @@
 %
 % $Id$
 
-revision = '$Id$';
+% these are used by the ft_preamble/ft_postamble function and scripts
+ft_revision = '$Id$';
+ft_nargin   = nargin;
+ft_nargout  = nargout;
 
 % do the general setup of the function
 ft_defaults
diff --git a/contrib/spike/ft_spike_maketrials.m b/contrib/spike/ft_spike_maketrials.m
@@ -75,7 +75,10 @@
 %
 % $Id$
 
-revision = '$Id$';
+% these are used by the ft_preamble/ft_postamble function and scripts
+ft_revision = '$Id$';
+ft_nargin   = nargin;
+ft_nargout  = nargout;
 
 % do the general setup of the function
 ft_defaults
diff --git a/contrib/spike/ft_spike_plot_isi.m b/contrib/spike/ft_spike_plot_isi.m
@@ -40,7 +40,10 @@
 %
 % $Id$
 
-revision = '$Id$';
+% these are used by the ft_preamble/ft_postamble function and scripts
+ft_revision = '$Id$';
+ft_nargin   = nargin;
+ft_nargout  = nargout;
 
 % do the general setup of the function
 ft_defaults
diff --git a/contrib/spike/ft_spike_plot_isireturn.m b/contrib/spike/ft_spike_plot_isireturn.m
@@ -56,7 +56,10 @@
 %
 % $Id$
 
-revision = '$Id$';
+% these are used by the ft_preamble/ft_postamble function and scripts
+ft_revision = '$Id$';
+ft_nargin   = nargin;
+ft_nargout  = nargout;
 
 % do the general setup of the function
 ft_defaults
diff --git a/contrib/spike/ft_spike_plot_jpsth.m b/contrib/spike/ft_spike_plot_jpsth.m
@@ -54,7 +54,10 @@
 %
 % $Id$
 
-revision = '$Id$';
+% these are used by the ft_preamble/ft_postamble function and scripts
+ft_revision = '$Id$';
+ft_nargin   = nargin;
+ft_nargout  = nargout;
 
 % do the general setup of the function
 ft_defaults
diff --git a/contrib/spike/ft_spike_plot_psth.m b/contrib/spike/ft_spike_plot_psth.m
@@ -43,7 +43,10 @@
 %
 % $Id$
 
-revision = '$Id$';
+% these are used by the ft_preamble/ft_postamble function and scripts
+ft_revision = '$Id$';
+ft_nargin   = nargin;
+ft_nargout  = nargout;
 
 % do the general setup of the function
 ft_defaults
diff --git a/contrib/spike/ft_spike_plot_raster.m b/contrib/spike/ft_spike_plot_raster.m
@@ -61,7 +61,10 @@
 %
 % $Id$
 
-revision = '$Id$';
+% these are used by the ft_preamble/ft_postamble function and scripts
+ft_revision = '$Id$';
+ft_nargin   = nargin;
+ft_nargout  = nargout;
 
 % do the general setup of the function
 ft_defaults
diff --git a/contrib/spike/ft_spike_psth.m b/contrib/spike/ft_spike_psth.m
@@ -80,7 +80,10 @@
 %
 % $Id$
 
-revision = '$Id$';
+% these are used by the ft_preamble/ft_postamble function and scripts
+ft_revision = '$Id$';
+ft_nargin   = nargin;
+ft_nargout  = nargout;
 
 % do the general setup of the function
 ft_defaults
diff --git a/contrib/spike/ft_spike_rate.m b/contrib/spike/ft_spike_rate.m
@@ -58,7 +58,10 @@
 %
 % $Id$
 
-revision = '$Id$';
+% these are used by the ft_preamble/ft_postamble function and scripts
+ft_revision = '$Id$';
+ft_nargin   = nargin;
+ft_nargout  = nargout;
 
 % do the general setup of the function
 ft_defaults
diff --git a/contrib/spike/ft_spike_rate_orituning.m b/contrib/spike/ft_spike_rate_orituning.m
@@ -46,7 +46,10 @@
 %
 % $Id$
 
-revision = '$Id$';
+% these are used by the ft_preamble/ft_postamble function and scripts
+ft_revision = '$Id$';
+ft_nargin   = nargin;
+ft_nargout  = nargout;
 
 % do the general setup of the function
 ft_defaults
diff --git a/contrib/spike/ft_spike_select.m b/contrib/spike/ft_spike_select.m
@@ -42,7 +42,10 @@
 %
 % $Id$
 
-revision = '$Id$';
+% these are used by the ft_preamble/ft_postamble function and scripts
+ft_revision = '$Id$';
+ft_nargin   = nargin;
+ft_nargout  = nargout;
 
 % do the general setup of the function
 ft_defaults
diff --git a/contrib/spike/ft_spike_waveform.m b/contrib/spike/ft_spike_waveform.m
@@ -55,7 +55,10 @@
 %
 % $Id$
 
-revision = '$Id$';
+% these are used by the ft_preamble/ft_postamble function and scripts
+ft_revision = '$Id$';
+ft_nargin   = nargin;
+ft_nargout  = nargout;
 
 % do the general setup of the function
 ft_defaults
diff --git a/contrib/spike/ft_spike_xcorr.m b/contrib/spike/ft_spike_xcorr.m
@@ -88,7 +88,10 @@
 %
 % $Id$
 
-revision = '$Id$';
+% these are used by the ft_preamble/ft_postamble function and scripts
+ft_revision = '$Id$';
+ft_nargin   = nargin;
+ft_nargout  = nargout;
 
 % do the general setup of the function
 ft_defaults
diff --git a/contrib/spike/ft_spikedensity.m b/contrib/spike/ft_spikedensity.m
@@ -84,7 +84,10 @@
 %
 % $Id$
 
-revision = '$Id$';
+% these are used by the ft_preamble/ft_postamble function and scripts
+ft_revision = '$Id$';
+ft_nargin   = nargin;
+ft_nargout  = nargout;
 
 % do the general setup of the function
 ft_defaults
diff --git a/contrib/spike/ft_spikedetection.m b/contrib/spike/ft_spikedetection.m
@@ -79,7 +79,10 @@
 %
 % $Id$
 
-revision = '$Id$';
+% these are used by the ft_preamble/ft_postamble function and scripts
+ft_revision = '$Id$';
+ft_nargin   = nargin;
+ft_nargout  = nargout;
 
 % do the general setup of the function
 ft_defaults
diff --git a/contrib/spike/ft_spikedownsample.m b/contrib/spike/ft_spikedownsample.m
@@ -83,7 +83,10 @@
 %
 % $Id$
 
-revision = '$Id$';
+% these are used by the ft_preamble/ft_postamble function and scripts
+ft_revision = '$Id$';
+ft_nargin   = nargin;
+ft_nargout  = nargout;
 
 % do the general setup of the function
 ft_defaults
diff --git a/contrib/spike/ft_spikefixdmafile.m b/contrib/spike/ft_spikefixdmafile.m
@@ -34,7 +34,10 @@ function ft_spikefixdmafile(cfg)
 %
 % $Id$
 
-revision = '$Id$';
+% these are used by the ft_preamble/ft_postamble function and scripts
+ft_revision = '$Id$';
+ft_nargin   = nargin;
+ft_nargout  = nargout;
 
 % do the general setup of the function
 ft_defaults
diff --git a/contrib/spike/ft_spikesimulation.m b/contrib/spike/ft_spikesimulation.m
@@ -29,7 +29,10 @@
 %
 % $Id$
 
-revision = '$Id$';
+% these are used by the ft_preamble/ft_postamble function and scripts
+ft_revision = '$Id$';
+ft_nargin   = nargin;
+ft_nargout  = nargout;
 
 % do the general setup of the function
 ft_defaults
diff --git a/contrib/spike/ft_spikesorting.m b/contrib/spike/ft_spikesorting.m
@@ -42,7 +42,10 @@
 %
 % $Id$
 
-revision = '$Id$';
+% these are used by the ft_preamble/ft_postamble function and scripts
+ft_revision = '$Id$';
+ft_nargin   = nargin;
+ft_nargout  = nargout;
 
 % do the general setup of the function
 ft_defaults
diff --git a/contrib/spike/ft_spikesplitting.m b/contrib/spike/ft_spikesplitting.m
@@ -43,7 +43,10 @@
 %
 % $Id$
 
-revision = '$Id$';
+% these are used by the ft_preamble/ft_postamble function and scripts
+ft_revision = '$Id$';
+ft_nargin   = nargin;
+ft_nargout  = nargout;
 
 % do the general setup of the function
 ft_defaults
diff --git a/contrib/spike/ft_spiketriggeredaverage.m b/contrib/spike/ft_spiketriggeredaverage.m
@@ -37,7 +37,10 @@
 %
 % $Id$
 
-revision = '$Id$';
+% these are used by the ft_preamble/ft_postamble function and scripts
+ft_revision = '$Id$';
+ft_nargin   = nargin;
+ft_nargout  = nargout;
 
 % do the general setup of the function
 ft_defaults
diff --git a/contrib/spike/ft_spiketriggeredinterpolation.m b/contrib/spike/ft_spiketriggeredinterpolation.m
@@ -49,7 +49,10 @@
 %
 % $Id$
 
-revision = '$Id$';
+% these are used by the ft_preamble/ft_postamble function and scripts
+ft_revision = '$Id$';
+ft_nargin   = nargin;
+ft_nargout  = nargout;
 
 % do the general setup of the function
 ft_defaults
diff --git a/contrib/spike/ft_spiketriggeredspectrum_convol.m b/contrib/spike/ft_spiketriggeredspectrum_convol.m
@@ -103,7 +103,10 @@
 %
 % $Id$
 
-revision = '$Id$';
+% these are used by the ft_preamble/ft_postamble function and scripts
+ft_revision = '$Id$';
+ft_nargin   = nargin;
+ft_nargout  = nargout;
 
 % do the general setup of the function
 ft_defaults
diff --git a/contrib/spike/ft_spiketriggeredspectrum_fft.m b/contrib/spike/ft_spiketriggeredspectrum_fft.m
@@ -69,7 +69,10 @@
 %
 % $Id$
 
-revision = '$Id$';
+% these are used by the ft_preamble/ft_postamble function and scripts
+ft_revision = '$Id$';
+ft_nargin   = nargin;
+ft_nargout  = nargout;
 
 % do the general setup of the function
 ft_defaults
diff --git a/contrib/spike/ft_spiketriggeredspectrum_stat.m b/contrib/spike/ft_spiketriggeredspectrum_stat.m
@@ -98,7 +98,10 @@
 %
 % $Id$
 
-revision = '$Id$';
+% these are used by the ft_preamble/ft_postamble function and scripts
+ft_revision = '$Id$';
+ft_nargin   = nargin;
+ft_nargout  = nargout;
 
 % do the general setup of the function
 ft_defaults
diff --git a/external/artinis/ft_transform_ODs.m b/external/artinis/ft_transform_ODs.m
@@ -56,7 +56,7 @@
 
 % You are using the FieldTrip NIRS toolbox developed and maintained by 
 % Artinis Medical Systems (http://www.artinis.com). For more information
-% on FieldTrip, see http://www.ru.nl/neuroimaging/fieldtrip
+% on FieldTrip, see http://www.fieldtriptoolbox.org
 % 
 % This work is licensed under a Creative Commons Attribution-ShareAlike 4.0 
 % International License. To view a copy of this license, visit 
@@ -100,8 +100,10 @@
 % Main programmer: J�rn M. Horschig
 % $Id: ft_transform_ODs.m 10169 2015-02-05 12:56:47Z jorhor $
 
-revision = '$Id: ft_transform_ODs.m 10169 2015-02-05 12:56:47Z jorhor $';
-
+% these are used by the ft_preamble/ft_postamble function and scripts
+ft_revision = '$Id$';
+ft_nargin   = nargin;
+ft_nargout  = nargout;
 
 % do the general setup of the function
 ft_defaults
@@ -224,4 +226,4 @@
 ft_postamble trackconfig
 ft_postamble previous    data
 ft_postamble provenance  data
-ft_postamble history     data
+ft_postamble history     data
diff --git a/private/moviefunction.m b/private/moviefunction.m
@@ -1,4 +1,5 @@
 function moviefunction(cfg, varargin)
+
 % we need cfg.plotfun to plot the data
 % data needs to be 3D, N x time x freq (last can be singleton)
 %   N needs to correspond to number of vertices (channels, gridpoints, etc)
@@ -40,12 +41,6 @@ function moviefunction(cfg, varargin)
 %   add an intro a la Jan-Mathijs for source, similar for normal topos
 %   make panels foldable (like on mobile devices)
 
-ft_defaults
-ft_preamble init
-ft_preamble callinfo
-ft_preamble trackconfig
-ft_preamble loadvar data
-
 % check if the input cfg is valid for this function
 cfg = ft_checkconfig(cfg, 'renamedval', {'zlim',         'absmax',  'maxabs'});
 cfg = ft_checkconfig(cfg, 'renamed',    {'zparam',       'funparameter'});
diff --git a/utilities/ft_selectdata.m b/utilities/ft_selectdata.m
diff --git a/utilities/ft_selectdata_new.m b/utilities/ft_selectdata_new.m

Original file line number	Diff line number	Diff line change
`@@ -3,7 +3,7 @@`
`3`	`3`	`% This is a compatibility directory that should only be added to the path on`
`4`	`4`	`% MATLAB versions prior to 2010b.`
`5`	`5`	`%`
`6`		`-% iscolumn is not present in older version.`
	`6`	`+% iscolumn is not present in older versions.`
`7`	`7`
`8`	`8`	`tf = length(size(x))==2 && size(x,2)==1;`
`9`	`9`