Skip to content
This repository was archived by the owner on Mar 21, 2025. It is now read-only.

Commit cdadac7

Browse files
committed
fixed cancellation error
1 parent 3dbf0b5 commit cdadac7

File tree

5 files changed

+27
-13
lines changed

5 files changed

+27
-13
lines changed

Diff for: eegplugin_fooof.m

+2-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,7 @@
11
function eegplugin_fooof(fig,try_strings,catch_strings)
22
% keyboard
3-
3+
addpath('fooof_mat');
4+
addpath('utils');
45
eeg_fooof_command = [try_strings.no_check '[EEG LASTCOM] = pop_eeg_fooof(EEG);' catch_strings.store_and_hist];
56
eeg_fooofplot_command = [try_strings.no_check 'LASTCOM = pop_eeg_fooofplot(EEG);' catch_strings.store_and_hist];
67

Diff for: pop_eeg_fooof.m

+6-3
Original file line numberDiff line numberDiff line change
@@ -54,6 +54,9 @@
5454
end
5555
end
5656

57-
EEG = eeg_fooof(EEG, params{1}, params{2}, params{3}, params{4}, params{5}, settings);
58-
LASTCOM = sprintf('EEG = eeg_fooof(EEG, %s, [ %s ], [%d %d], %d, [%d %d], %s)', params{1}, sprintf('%d ', params{2}), params{3}(1), params{3}(2), params{4}, params{5}(1), params{5}(2), struct2str(settings));
59-
% datatype %ids % epoch 1 epoch 2 percent f_range1 f_range2
57+
if ~isempty(params)
58+
EEG = eeg_fooof(EEG, params{1}, params{2}, params{3}, params{4}, params{5}, settings);
59+
LASTCOM = sprintf('EEG = eeg_fooof(EEG, %s, [ %s ], [%d %d], %d, [%d %d], %s)', params{1}, sprintf('%d ', params{2}), params{3}(1), params{3}(2), params{4}, params{5}(1), params{5}(2), struct2str(settings));
60+
else % datatype %ids % epoch 1 epoch 2 percent f_range1 f_range2
61+
LASTCOM = '';
62+
end

Diff for: pop_eeg_fooofplot.m

+6-2
Original file line numberDiff line numberDiff line change
@@ -43,5 +43,9 @@
4343
end
4444
end
4545

46-
eeg_fooofplot(EEG, params{3}, params{4}, params{1}, params{2}, params{5}, params{6}, settings);
47-
LASTCOM = sprintf('EEG = eeg_fooofplot(EEG, [%d %d], %d, "%s", %d, [%d %d], %d, %s)', params{3}(1), params{3}(2), params{4}, params{1}, params{2}, params{5}(1), params{5}(2), params{6}, struct2str(settings));
46+
if ~isempty(params)
47+
eeg_fooofplot(EEG, params{3}, params{4}, params{1}, params{2}, params{5}, params{6}, settings);
48+
LASTCOM = sprintf('EEG = eeg_fooofplot(EEG, [%d %d], %d, "%s", %d, [%d %d], %d, %s)', params{3}(1), params{3}(2), params{4}, params{1}, params{2}, params{5}(1), params{5}(2), params{6}, struct2str(settings));
49+
else
50+
LASTCOM = '';
51+
end

Diff for: pop_std_fooof.m

+7-4
Original file line numberDiff line numberDiff line change
@@ -49,7 +49,10 @@
4949
end
5050
end
5151
end
52-
53-
STUDY = std_fooof(STUDY, ALLEEG, params{1}, params{2}, params{3}, settings);
54-
LASTCOM = sprintf('STUDY = std_fooof(STUDY, ALLEEG, [ %s ], "%s", [%d %d], %s)', sprintf('%d ', params{1}), params{2}, params{3}(1), params{3}(2), struct2str(settings));
55-
% clusters %fit mode % f_range1 f_range2 settings
52+
53+
if ~isempty(params)
54+
STUDY = std_fooof(STUDY, ALLEEG, params{1}, params{2}, params{3}, settings);
55+
LASTCOM = sprintf('STUDY = std_fooof(STUDY, ALLEEG, [ %s ], "%s", [%d %d], %s)', sprintf('%d ', params{1}), params{2}, params{3}(1), params{3}(2), struct2str(settings));
56+
else % clusters %fit mode % f_range1 f_range2 settings
57+
LASTCOM = '';
58+
end

Diff for: pop_std_fooofplot.m

+6-3
Original file line numberDiff line numberDiff line change
@@ -35,6 +35,9 @@
3535
end
3636
end
3737

38-
std_fooofplot(STUDY, ALLEEG, params{1}, params{2}, params{3}, settings);
39-
LASTCOM = sprintf('STUDY = std_fooofplot(STUDY, ALLEEG, [ %s ], [%d %d], %s, %s)', sprintf('%d ', params{1}), params{2}(1), params{2}(2), params{3}, struct2str(settings));
40-
% clusters % f_range1 f_range2 %loglog settings
38+
if ~isempty(params)
39+
std_fooofplot(STUDY, ALLEEG, params{1}, params{2}, params{3}, settings);
40+
LASTCOM = sprintf('STUDY = std_fooofplot(STUDY, ALLEEG, [ %s ], [%d %d], %s, %s)', sprintf('%d ', params{1}), params{2}(1), params{2}(2), params{3}, struct2str(settings));
41+
else % clusters % f_range1 f_range2 %loglog settings
42+
LASTCOM = '';
43+
end

0 commit comments

Comments
 (0)