gui updates

src/pspm_cfg/pspm_cfg_combine_markerchannels.m

@@ -12,9 +12,7 @@
 channel_action   = pspm_cfg_selector_channel_action;
 
 %% Specific items
-marker_chan.help    = {['Choose any number of marker channel numbers ',...
-                           'to combine. If 0, all marker ',...
-                           'channels in the file are combined.']};
+marker_chan.help    = pspm_cfg_help_format('pspm_combine_markerchannels', 'options.marker_chan_num');
 
 %% Executable branch
 combine_markerchannels        = cfg_exbranch;

src/pspm_cfg/pspm_cfg_dcm.m

@@ -16,7 +16,7 @@
 timingfile.tag     = 'timingfile';
 timingfile.num     = [1 1];
 timingfile.filter  = '.*\.(mat|MAT)$';
-timingfile.help    = {'See general help for this item for more information on how to specify timings'};
+timingfile.help    = {'See general DCM help for more information on how to specify timings'};
 
 
 name         = cfg_entry;
@@ -44,7 +44,7 @@
 timing_man_rep.tag    = 'timing_man_rep';
 timing_man_rep.values = {timing_man};
 timing_man_rep.num   = [1 Inf];
-timing_man_rep.help   = {'See general help for this item for more information on how to specify timings'};
+timing_man_rep.help   = {'See general DCM help for more information on how to specify timings'};
 
 
 timing        = cfg_choice;

src/pspm_cfg/pspm_cfg_find_valid_fixations.m

@@ -55,18 +55,16 @@
 FixPtFile.name          = 'File';
 FixPtFile.tag           = 'fixpoint_file';
 FixPtFile.num           = [1 1];
-FixPtFile.help          = {['.mat file containing a variable F with an ', ...
-                            'n x 2 matrix. N should have the length of ', ...
-                            'the recorded data and each row should ', ...
-                            'define the fixation point for the ', ...
-                            'respective recorded data row.']};
+temphelp                = pspm_cfg_help_format('pspm_find_valid_fixations', 'options.fixation_point');
+FixPtFile.help          = {['Specify a .mat file containing a variable ''F'': ', ...
+                           temphelp{1}]};
 %% Fixation point value
 FixPtVal                = cfg_entry;
 FixPtVal.name           = 'Point';
 FixPtVal.tag            = 'fixpoint';
 FixPtVal.strtype        = 'r';
 FixPtVal.num            = [1 2];
-FixPtVal.help           = {['x/y coordinates of constant fixation point.']};
+FixPtVal.help           = {'x/y coordinates of constant fixation point.'};
 
 %% Fixation point
 FixPt                   = cfg_choice;
@@ -87,7 +85,9 @@
 bitmap.name             = 'Bitmap file';
 bitmap.tag              = 'bitmap_file';
 bitmap.num              = [1 1];
-bitmap.help             = pspm_cfg_help_format('pspm_find_valid_fixations', 'bitmap');
+temphelp                = pspm_cfg_help_format('pspm_find_valid_fixations', 'bitmap');
+bitmap.help          = {['Specify a .mat file containing a variable ''bitmap'': ', ...
+                           temphelp{1}]};
 %% Validation method
 val_method              = cfg_choice;
 val_method.name         = 'Validation method';

src/pspm_cfg/pspm_cfg_glm.m

@@ -65,16 +65,6 @@
 
 %% Modality dependent items
 % Basis function
-% SCRF
-for i=1:3
-    scrf{i}        = cfg_const;
-    scrf{i}.name   = ['SCRF ' num2str(i-1)];
-    scrf{i}.tag    = ['scrf' num2str(i-1)];
-    scrf{i}.val    = {i-1};
-end
-scrf{1}.help   = {'SCRF without derivatives.'};
-scrf{2}.help   = {'SCRF with time derivative (default).'};
-scrf{3}.help   = {'SCRF with time and dispersion derivative.'};
 
 %FIR
 n         = cfg_entry;
@@ -106,10 +96,9 @@
 bf        = cfg_choice;
 bf.name   = 'Basis Function';
 bf.tag    = 'bf';
-bf.val    = {scrf{2}};
-bf.values = {scrf{:}, fir};
-bf.help   = {['Basis functions. Standard is to use a canonical skin conductance response function ' ...
-    '(SCRF) with time derivative for later reconstruction of the response peak.']};
+bf.val    = {fir};
+bf.values = {fir};
+bf.help   = {};
 
 %% Latency
 time_window          = cfg_entry;

src/pspm_cfg/pspm_cfg_glm_hp_e.m

@@ -67,14 +67,9 @@
 hprf_e.val    = {n_bf};
 hprf_e.help   = {''};
 
-bf        = cfg_choice;
-bf.name   = 'Basis Function';
-bf.tag    = 'bf';
-bf.val    = {hprf_e};
-bf.values = {hprf_e, fir};
-bf.help   = {['Basis functions. Standard is to use a canonical evoked heart period response function ' ...
-    '(HPRF_E) with time derivative for later reconstruction of the response peak.']};
-
 % look for bf and replace
 b = cellfun(@(f) strcmpi(f.tag, 'bf'), glm_hp_e.val);
-glm_hp_e.val{b} = bf;
+glm_hp_e.val{b}.values = [{hprf_e}, glm_hp_e.val{b}.values];
+glm_hp_e.val{b}.val = {hprf_e};
+glm_hp_e.val{b}.help = {['Basis functions. Standard is to use a canonical evoked heart period response function ' ...
+    '(HPRF_E) with time derivative for later reconstruction of the response peak.']};

src/pspm_cfg/pspm_cfg_glm_scr.m

@@ -24,4 +24,21 @@
 glm_scr.name = 'GLM for SCR';
 glm_scr.tag = 'glm_scr';
 
+% BF
+for i=1:3
+    scrf{i}        = cfg_const;
+    scrf{i}.name   = ['SCRF ' num2str(i-1)];
+    scrf{i}.tag    = ['scrf' num2str(i-1)];
+    scrf{i}.val    = {i-1};
+end
+scrf{1}.help   = {'SCRF without derivatives.'};
+scrf{2}.help   = {'SCRF with time derivative (default).'};
+scrf{3}.help   = {'SCRF with time and dispersion derivative.'};
+b = cellfun(@(f) strcmpi(f.tag, 'bf'), glm_scr.val);
+glm_scr.val{b}.values = [scrf, glm_scr.val{b}.values];
+glm_scr.val{b}.val = {scrf{2}};
+glm_scr.val{b}.help = {['Basis functions. Standard is to use a canonical skin conductance response function ' ...
+    '(SCRF) with time derivative for later reconstruction of the response peak.']};
+
+
 

src/pspm_combine_markerchannels.m

@@ -8,7 +8,7 @@
 % ● Format
 %   [sts, outchannel] = pspm_combine_markerchannels(datafile, options)
 % ● Arguments
-%   *        datafile : data file name(s): char
+%   *        datafile : data file name: char
 %   ┌─────────options
 %   ├─.channel_action : Accepted values: 'add'/'replace'
 %   │                   Defines whether the new channel should be added
@@ -18,8 +18,9 @@
 %   │                   the first option is used, then use marker channel
 %   │                   indexing in further processing which by default
 %   │                   takes the first marker channel as input
-%   └.marker_chan_num:  any number of marker channel numbers - if undefined
-%                       or 0, all marker channels of each file are used
+%   └.marker_chan_num:  Choose any number of marker channel numbers to 
+%                       combine. If 0 all marker channels are 
+%                       used [default: use all channels].
 % ● History
 %   Introduced In PsPM 6.1.2
 %   Written in 2023 by Dominik R Bach (Uni Bonn)