Skip to content

Commit 566a98a

Browse files
committed
packaging fixes
1 parent 2df536c commit 566a98a

16 files changed

Lines changed: 25 additions & 70 deletions

+export/do_export_pixel_data_Callback.m

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -228,6 +228,7 @@ function do_export_pixel_data_Callback(~, src, ~)
228228
disp(ME.identifier)
229229
disp(ME.message)
230230
if ~isdeployed
231+
%#exclude commandwindow
231232
commandwindow;
232233
end
233234
end

+import/loadimgsbutton_Callback.m

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -304,6 +304,7 @@ function loadimgsbutton_Callback(~,~,useGUI,path)
304304
end
305305
save sequencing_error_report.mat;
306306
if ~isdeployed
307+
%#exclude commandwindow
307308
commandwindow
308309
end
309310
end

+misc/toggle_parallel_Callback.m

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,9 @@ function toggle_parallel_Callback(~, ~, ~)
1515
gui.toolsavailable(0,'Please wait, opening parallel pool...')
1616
pause(0.1)
1717
try
18-
desired_num_cores=maxNumCompThreads('automatic');
18+
c = parcluster("Processes");
19+
%use matlab suggested num of cores
20+
desired_num_cores=c.NumWorkers;
1921
catch
2022
desired_num_cores=feature('numCores');
2123
end

+piv/piv_FFTmulti.m

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -96,6 +96,7 @@
9696
beep on
9797
beep
9898
if ~isdeployed
99+
%#exclude commandwindow
99100
commandwindow
100101
end
101102
end
@@ -201,6 +202,7 @@
201202
catch
202203
disp('Error: Most likely, your ROI is too small and/or the interrogation area too large.')
203204
if ~isdeployed
205+
%#exclude commandwindow
204206
commandwindow
205207
end
206208
utable=zeros(size(xtable));

.gitignore

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,2 +1,12 @@
11

22
*.asv
3+
4+
/.git/
5+
6+
/.git/
7+
8+
/ftp_info.txt
9+
10+
/clean_and_package_PIVlab.m
11+
12+
/_Github token.txt

PIVlab_GUI.m

Lines changed: 8 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -158,6 +158,7 @@ function PIVlab_GUI(desired_num_cores,batch_session_file)
158158
disp(['ERROR: A required package folder was not found: ' pivFiles{1,i}]);
159159
disp('Press any key to continue... (but remember, PIVlab won''t work like this...)')
160160
if ~isdeployed
161+
%#exclude commandwindow
161162
beep;commandwindow;pause
162163
end
163164
else
@@ -203,6 +204,7 @@ function PIVlab_GUI(desired_num_cores,batch_session_file)
203204
disp('WARNING: You need at least version 9.7 (R2019b) to use all features.')
204205
disp('Press any key to continue... (but remember, PIVlab won''t work like this...)')
205206
if ~isdeployed
207+
%#exclude commandwindow
206208
beep;commandwindow;pause
207209
end
208210
end
@@ -211,6 +213,7 @@ function PIVlab_GUI(desired_num_cores,batch_session_file)
211213
disp('WARNING: You need at least version 9.7 (R2019b) to use all features.')
212214
disp('Press any key to continue... (but remember, PIVlab won''t work like this...)')
213215
if ~isdeployed
216+
%#exclude commandwindow
214217
beep;commandwindow;pause
215218
end
216219
end
@@ -240,6 +243,7 @@ function PIVlab_GUI(desired_num_cores,batch_session_file)
240243
disp(' ');disp(' ');disp(' ');
241244
disp('Press any key to continue... (but remember, PIVlab WON''T WORK LIKE THIS! IT REALLY WON''T!)')
242245
if ~isdeployed
246+
%#exclude commandwindow
243247
beep;commandwindow;pause
244248
end
245249
end
@@ -253,6 +257,7 @@ function PIVlab_GUI(desired_num_cores,batch_session_file)
253257
disp(' ');disp(' ');disp(' ');
254258
disp(('Press any key to continue... (but remember, PIVlab WON''T WORK LIKE THIS! IT REALLY WON''T!)'))
255259
if ~isdeployed
260+
%#exclude commandwindow
256261
beep;commandwindow;pause
257262
end
258263
end
@@ -390,7 +395,9 @@ function PIVlab_GUI(desired_num_cores,batch_session_file)
390395
pause(0.1)
391396
switch answer
392397
case 'Yes'
393-
misc.pivparpool('open',maxNumCompThreads('automatic')); %use matlab suggested num of cores
398+
c = parcluster("Processes");
399+
misc.pivparpool('open',c.NumWorkers); %use matlab suggested num of cores
400+
%misc.pivparpool('open',maxNumCompThreads('automatic')); %use matlab suggested num of cores
394401
gui.put('parallel',1);
395402
case 'No'
396403
end

doc/GettingStarted.mlx

15 Bytes
Binary file not shown.

resources/project/qaw0eS1zuuY1ar9TdPn1GMfrjbQ/MDnWniV77enVhZz9_UXTaL0JBX8d.xml

Lines changed: 0 additions & 2 deletions
This file was deleted.

resources/project/qaw0eS1zuuY1ar9TdPn1GMfrjbQ/MDnWniV77enVhZz9_UXTaL0JBX8p.xml

Lines changed: 0 additions & 2 deletions
This file was deleted.

resources/project/qaw0eS1zuuY1ar9TdPn1GMfrjbQ/WiIlBAR_g1eFAWIzLArI-GF-KVsd.xml

Lines changed: 0 additions & 6 deletions
This file was deleted.

0 commit comments

Comments
 (0)