Skip to content

Commit c501daa

Browse files
quantitativeTEMquantitativeTEM
authored andcommitted
Update for Mac
1 parent cab55d3 commit c501daa

3 files changed

Lines changed: 11 additions & 6 deletions

File tree

GUI/LeftPanels/updateLeftPanels.m

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -72,7 +72,7 @@ function updateLeftPanels(h,file,fitOpt)
7272
h.left.fit.panels.Width.UserBut.setEnabled(true)
7373
h.left.fit.panels.Width.EditBut.setEnabled(true)
7474
h.left.fit.panels.Test.But.setEnabled(true)
75-
% h.left.fit.panels.Parallel.Val.setEnabled(true)
75+
h.left.fit.panels.Parallel.Val.setEnabled(true)
7676

7777
% Analysis panel
7878
h.left.ana.panel.acl.incLib.setEnabled(true)

GUI/loadFiles/loadTab.m

Lines changed: 9 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -16,12 +16,17 @@
1616
% License: Open Source under GPLv3
1717
% Contact: sandra.vanaert@uantwerpen.be
1818
%--------------------------------------------------------------------------
19-
20-
tabs = get(h.right.tabgroup,'Children');
19+
try
20+
tabs = get(h.right.tabgroup,'Children');
21+
catch
22+
tab = [];
23+
mes = 'ERROR: StatSTEM closed';
24+
return
25+
end
2126
% First check if file is loaded
2227
if length(tabs)==1
2328
tab = [];
24-
mes = 'ERROR; First open a file';
29+
mes = 'ERROR: First open a file';
2530
else
2631
% Load tab
2732
v = version('-release');
@@ -35,7 +40,7 @@
3540
tTab = get(tab,'Title');
3641
if strcmp(tTab,'+')
3742
tab = [];
38-
mes = 'ERROR; First open a file';
43+
mes = 'ERROR: First open a file';
3944
end
4045
end
4146

functions/FitProgram/standardFitOptions.m

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -46,5 +46,5 @@
4646
if v<2015 || license('test','distrib_computing_toolbox')==0
4747
options.numWorkers = 1;
4848
else
49-
options.numWorkers = 1;%feature('numCores');
49+
options.numWorkers = feature('numCores');
5050
end

0 commit comments

Comments
 (0)