File tree 2 files changed +4
-4
lines changed
2 files changed +4
-4
lines changed Original file line number Diff line number Diff line change 3
3
% License: https://github.com/jmgirard/CARMA/blob/master/license.txt
4
4
5
5
global version ;
6
- version = 14.00 ;
6
+ version = 14.01 ;
7
7
% Create and center main window
8
8
defaultBackground = get(0 ,' defaultUicontrolBackgroundColor' );
9
9
handles.figure_launcher = figure( ...
Original file line number Diff line number Diff line change @@ -330,14 +330,14 @@ function addseries_Callback(hObject,~)
330
330
handles.axMin = axis_min ;
331
331
handles.axMax = axis_max ;
332
332
elseif handles .axMin ~= axis_min || handles .axMax ~= axis_max
333
+ delete(w );
333
334
msgbox(' Annotation files must have the same axis settings to be loaded together.' ,' Error' ,' Error' );
334
- waitbar(1 );
335
335
return ;
336
336
end
337
337
% Check that the import file matches the media file
338
338
if ~isempty(handles .AllRatings ) && size(handles .AllRatings ,1 )~=size(ratings ,1 )
339
+ delete(w );
339
340
msgbox(' Annotation file must have the same bin size as the other annotation files.' ,' Error' ,' Error' );
340
- waitbar(1 );
341
341
return ;
342
342
else
343
343
% Append the new file to the stored data
@@ -349,7 +349,7 @@ function addseries_Callback(hObject,~)
349
349
handles.MeanRatings = nanmean(handles .AllRatings ,2 );
350
350
guidata(hObject ,handles );
351
351
end
352
- waitbar(f / length(filenames ));
352
+ waitbar(f / length(filenames ), w );
353
353
end
354
354
update_plots(handles );
355
355
update_boxplots(handles .figure_review ,[]);
You can’t perform that action at this time.
0 commit comments