Merge branch 'master' of https://stash.pnnl.gov/scm/bawodp/archive_wa…

…lker
pnnl · Apr 26, 2021 · 06edc8c · 06edc8c
2 parents c5d4678 + 9b80acd
commit 06edc8c
Show file tree

Hide file tree

Showing 10 changed files with 70 additions and 70 deletions.
diff --git a/MATengine/DLLs/BAWSengine_R2018a.prj b/MATengine/DLLs/BAWSengine_R2018a.prj
@@ -3,7 +3,7 @@
     <param.appname>BAWSengine</param.appname>
     <param.icon />
     <param.icons />
-    <param.version>5.7</param.version>
+    <param.version>5.8</param.version>
     <param.authnamewatermark />
     <param.email />
     <param.company />

diff --git a/MATengine/DLLs/BAWSengine_R2018a/PackagingLog.html b/MATengine/DLLs/BAWSengine_R2018a/PackagingLog.html
@@ -29,71 +29,71 @@
 Parsing file "C:\GitFolders\archive_walker\MATengine\GUIfunctions\WriteMMreport.m"
 	(Referenced from: "Compiler Command Line").
 Deleting 65 temporary MEX authorization files.
-Removing: 'C:\Users\foll154\AppData\Local\Temp\6e22-66eb-daaf-66a3_202532.auth'.
-Removing: 'C:\Users\foll154\AppData\Local\Temp\2259-5cc4-08a5-bb47_202532.auth'.
-Removing: 'C:\Users\foll154\AppData\Local\Temp\f41d-dbcc-d151-ae2f_202532.auth'.
-Removing: 'C:\Users\foll154\AppData\Local\Temp\8832-27c0-95ac-86df_202532.auth'.
-Removing: 'C:\Users\foll154\AppData\Local\Temp\36b9-548b-1c3e-6eca_202532.auth'.
-Removing: 'C:\Users\foll154\AppData\Local\Temp\09a0-4c84-f758-9a4d_202532.auth'.
-Removing: 'C:\Users\foll154\AppData\Local\Temp\a554-a7eb-4436-c289_202532.auth'.
-Removing: 'C:\Users\foll154\AppData\Local\Temp\2b73-40d2-c7cd-a511_202532.auth'.
-Removing: 'C:\Users\foll154\AppData\Local\Temp\2b53-4862-5e84-d4c8_202532.auth'.
-Removing: 'C:\Users\foll154\AppData\Local\Temp\577d-33a8-4c82-552f_202532.auth'.
-Removing: 'C:\Users\foll154\AppData\Local\Temp\4a5e-2093-2d3a-a0d5_202532.auth'.
-Removing: 'C:\Users\foll154\AppData\Local\Temp\c6d0-b4ed-1d6f-3153_202532.auth'.
-Removing: 'C:\Users\foll154\AppData\Local\Temp\7c9b-d2c3-5db8-ddf1_202532.auth'.
-Removing: 'C:\Users\foll154\AppData\Local\Temp\8c71-45bd-77f8-ea61_202532.auth'.
-Removing: 'C:\Users\foll154\AppData\Local\Temp\4e36-10f5-f52f-c91c_202532.auth'.
-Removing: 'C:\Users\foll154\AppData\Local\Temp\f257-5dd4-42c0-1162_202532.auth'.
-Removing: 'C:\Users\foll154\AppData\Local\Temp\4a05-9a57-4f64-9aa6_202532.auth'.
-Removing: 'C:\Users\foll154\AppData\Local\Temp\109e-73ef-c779-75ae_202532.auth'.
-Removing: 'C:\Users\foll154\AppData\Local\Temp\0c0e-17a7-075b-078e_202532.auth'.
-Removing: 'C:\Users\foll154\AppData\Local\Temp\5c80-f18f-0211-7a2d_202532.auth'.
-Removing: 'C:\Users\foll154\AppData\Local\Temp\4ccc-5f32-02a8-d562_202532.auth'.
-Removing: 'C:\Users\foll154\AppData\Local\Temp\91d3-826d-7797-213e_202532.auth'.
-Removing: 'C:\Users\foll154\AppData\Local\Temp\ba59-1baf-e55d-0d00_202532.auth'.
-Removing: 'C:\Users\foll154\AppData\Local\Temp\eefd-d78c-fcab-4dcb_202532.auth'.
-Removing: 'C:\Users\foll154\AppData\Local\Temp\3507-dec8-23d6-86b1_202532.auth'.
-Removing: 'C:\Users\foll154\AppData\Local\Temp\c54a-3451-6326-2350_202532.auth'.
-Removing: 'C:\Users\foll154\AppData\Local\Temp\7e3e-3fa8-b879-bc64_202532.auth'.
-Removing: 'C:\Users\foll154\AppData\Local\Temp\4597-1285-8a63-1336_202532.auth'.
-Removing: 'C:\Users\foll154\AppData\Local\Temp\f12c-83f3-164d-8732_202532.auth'.
-Removing: 'C:\Users\foll154\AppData\Local\Temp\01fe-a969-3566-9080_202532.auth'.
-Removing: 'C:\Users\foll154\AppData\Local\Temp\7f59-39de-dfaa-9dad_202532.auth'.
-Removing: 'C:\Users\foll154\AppData\Local\Temp\31ee-3f5b-ae77-9f52_202532.auth'.
-Removing: 'C:\Users\foll154\AppData\Local\Temp\a044-8d96-274a-3583_202532.auth'.
-Removing: 'C:\Users\foll154\AppData\Local\Temp\b212-932e-be72-795e_202532.auth'.
-Removing: 'C:\Users\foll154\AppData\Local\Temp\0e81-5a55-642d-21ff_202532.auth'.
-Removing: 'C:\Users\foll154\AppData\Local\Temp\d908-65bb-9812-519b_202532.auth'.
-Removing: 'C:\Users\foll154\AppData\Local\Temp\707b-c234-3018-790e_202532.auth'.
-Removing: 'C:\Users\foll154\AppData\Local\Temp\e136-5742-8d31-a301_202532.auth'.
-Removing: 'C:\Users\foll154\AppData\Local\Temp\52ca-ecf8-f631-0b80_202532.auth'.
-Removing: 'C:\Users\foll154\AppData\Local\Temp\e866-9e0f-66fb-2a88_202532.auth'.
-Removing: 'C:\Users\foll154\AppData\Local\Temp\3d49-2151-b2ac-c2a9_202532.auth'.
-Removing: 'C:\Users\foll154\AppData\Local\Temp\b503-f075-a65c-d543_202532.auth'.
-Removing: 'C:\Users\foll154\AppData\Local\Temp\5291-3c84-6297-ad67_202532.auth'.
-Removing: 'C:\Users\foll154\AppData\Local\Temp\714a-4ef9-870e-e034_202532.auth'.
-Removing: 'C:\Users\foll154\AppData\Local\Temp\11e6-9fef-a61a-e236_202532.auth'.
-Removing: 'C:\Users\foll154\AppData\Local\Temp\3e26-4a22-ae7c-03c7_202532.auth'.
-Removing: 'C:\Users\foll154\AppData\Local\Temp\1b7d-92da-b2d2-4754_202532.auth'.
-Removing: 'C:\Users\foll154\AppData\Local\Temp\475e-d2cf-9908-5854_202532.auth'.
-Removing: 'C:\Users\foll154\AppData\Local\Temp\8687-4131-4c7e-9236_202532.auth'.
-Removing: 'C:\Users\foll154\AppData\Local\Temp\5584-f6ad-ea58-9083_202532.auth'.
-Removing: 'C:\Users\foll154\AppData\Local\Temp\8fdf-4bdd-d8f5-65e7_202532.auth'.
-Removing: 'C:\Users\foll154\AppData\Local\Temp\15c6-9382-87c2-493c_202532.auth'.
-Removing: 'C:\Users\foll154\AppData\Local\Temp\5a6e-f9c3-bfe0-fd15_202532.auth'.
-Removing: 'C:\Users\foll154\AppData\Local\Temp\30a7-1e52-0df3-a283_202532.auth'.
-Removing: 'C:\Users\foll154\AppData\Local\Temp\b715-4233-7323-0dd7_202532.auth'.
-Removing: 'C:\Users\foll154\AppData\Local\Temp\f1a5-3d76-6ed0-4656_202532.auth'.
-Removing: 'C:\Users\foll154\AppData\Local\Temp\f86d-20ae-42a7-ff6d_202532.auth'.
-Removing: 'C:\Users\foll154\AppData\Local\Temp\4fe3-24f5-1726-f040_202532.auth'.
-Removing: 'C:\Users\foll154\AppData\Local\Temp\1029-9e63-d79c-1c68_202532.auth'.
-Removing: 'C:\Users\foll154\AppData\Local\Temp\121a-4907-318c-d3ba_202532.auth'.
-Removing: 'C:\Users\foll154\AppData\Local\Temp\dc9c-4417-1d88-5a85_202532.auth'.
-Removing: 'C:\Users\foll154\AppData\Local\Temp\da04-3ea3-35fd-9649_202532.auth'.
-Removing: 'C:\Users\foll154\AppData\Local\Temp\d02e-9935-8d32-4c10_202532.auth'.
-Removing: 'C:\Users\foll154\AppData\Local\Temp\f793-4c04-5fad-73fd_202532.auth'.
-Removing: 'C:\Users\foll154\AppData\Local\Temp\f0c9-a220-24c6-247f_202532.auth'.
+Removing: 'C:\Users\foll154\AppData\Local\Temp\f41a-fc0b-14ce-f84b_14600.auth'.
+Removing: 'C:\Users\foll154\AppData\Local\Temp\c0e8-3e93-1b16-263d_14600.auth'.
+Removing: 'C:\Users\foll154\AppData\Local\Temp\012b-0c5e-2383-d16b_14600.auth'.
+Removing: 'C:\Users\foll154\AppData\Local\Temp\3cfc-8696-7c79-d5fb_14600.auth'.
+Removing: 'C:\Users\foll154\AppData\Local\Temp\2ef6-13f7-7116-65a7_14600.auth'.
+Removing: 'C:\Users\foll154\AppData\Local\Temp\3770-ba10-7843-d9ec_14600.auth'.
+Removing: 'C:\Users\foll154\AppData\Local\Temp\e298-78d4-7891-891a_14600.auth'.
+Removing: 'C:\Users\foll154\AppData\Local\Temp\0e04-504a-6d48-0209_14600.auth'.
+Removing: 'C:\Users\foll154\AppData\Local\Temp\aafb-d043-409b-6f98_14600.auth'.
+Removing: 'C:\Users\foll154\AppData\Local\Temp\b071-6ea6-2a08-b2c6_14600.auth'.
+Removing: 'C:\Users\foll154\AppData\Local\Temp\74c3-2e6e-3fc1-0d90_14600.auth'.
+Removing: 'C:\Users\foll154\AppData\Local\Temp\1a4c-cb63-2e17-ac56_14600.auth'.
+Removing: 'C:\Users\foll154\AppData\Local\Temp\f161-5c9b-0965-d0d1_14600.auth'.
+Removing: 'C:\Users\foll154\AppData\Local\Temp\b09a-1813-8ff6-58dd_14600.auth'.
+Removing: 'C:\Users\foll154\AppData\Local\Temp\dc36-b533-fc9d-5739_14600.auth'.
+Removing: 'C:\Users\foll154\AppData\Local\Temp\eb33-d953-4599-e081_14600.auth'.
+Removing: 'C:\Users\foll154\AppData\Local\Temp\8a1a-f32c-21e3-d3ac_14600.auth'.
+Removing: 'C:\Users\foll154\AppData\Local\Temp\f5db-9a1f-ee3a-c318_14600.auth'.
+Removing: 'C:\Users\foll154\AppData\Local\Temp\5f13-63ea-5a42-fa1e_14600.auth'.
+Removing: 'C:\Users\foll154\AppData\Local\Temp\d0ce-5134-b966-62f1_14600.auth'.
+Removing: 'C:\Users\foll154\AppData\Local\Temp\fa62-eac4-8cbc-cb4b_14600.auth'.
+Removing: 'C:\Users\foll154\AppData\Local\Temp\f788-c64e-e036-4639_14600.auth'.
+Removing: 'C:\Users\foll154\AppData\Local\Temp\119f-010c-2848-3db6_14600.auth'.
+Removing: 'C:\Users\foll154\AppData\Local\Temp\6e26-f65d-2ce4-fa69_14600.auth'.
+Removing: 'C:\Users\foll154\AppData\Local\Temp\2a37-2284-5f6f-555f_14600.auth'.
+Removing: 'C:\Users\foll154\AppData\Local\Temp\1495-e795-cfbf-61da_14600.auth'.
+Removing: 'C:\Users\foll154\AppData\Local\Temp\c9eb-1644-bc2d-e0e0_14600.auth'.
+Removing: 'C:\Users\foll154\AppData\Local\Temp\e659-2fff-8b96-58f2_14600.auth'.
+Removing: 'C:\Users\foll154\AppData\Local\Temp\e595-1ec5-3df6-c61f_14600.auth'.
+Removing: 'C:\Users\foll154\AppData\Local\Temp\3272-a21a-1513-99f7_14600.auth'.
+Removing: 'C:\Users\foll154\AppData\Local\Temp\8d6e-8ca6-78fb-6247_14600.auth'.
+Removing: 'C:\Users\foll154\AppData\Local\Temp\786c-c2b3-6e7c-826a_14600.auth'.
+Removing: 'C:\Users\foll154\AppData\Local\Temp\99f8-d744-995f-2f78_14600.auth'.
+Removing: 'C:\Users\foll154\AppData\Local\Temp\8014-ba64-632f-27c9_14600.auth'.
+Removing: 'C:\Users\foll154\AppData\Local\Temp\6bab-ea5c-122d-9ef2_14600.auth'.
+Removing: 'C:\Users\foll154\AppData\Local\Temp\585c-bcbe-d3fb-e6dc_14600.auth'.
+Removing: 'C:\Users\foll154\AppData\Local\Temp\f6c4-8ba3-0b64-3bd3_14600.auth'.
+Removing: 'C:\Users\foll154\AppData\Local\Temp\31ff-01ed-53f5-501c_14600.auth'.
+Removing: 'C:\Users\foll154\AppData\Local\Temp\634e-4c2c-3b16-dfde_14600.auth'.
+Removing: 'C:\Users\foll154\AppData\Local\Temp\ed26-1d40-6772-d29f_14600.auth'.
+Removing: 'C:\Users\foll154\AppData\Local\Temp\4cc5-88fc-9bf1-8cc0_14600.auth'.
+Removing: 'C:\Users\foll154\AppData\Local\Temp\fb9e-85dd-9c1e-6eb1_14600.auth'.
+Removing: 'C:\Users\foll154\AppData\Local\Temp\99f0-fb4d-8ac0-9812_14600.auth'.
+Removing: 'C:\Users\foll154\AppData\Local\Temp\d1ca-0c78-4104-252b_14600.auth'.
+Removing: 'C:\Users\foll154\AppData\Local\Temp\040f-fd5a-a353-05c5_14600.auth'.
+Removing: 'C:\Users\foll154\AppData\Local\Temp\aeb8-5212-0c03-3a84_14600.auth'.
+Removing: 'C:\Users\foll154\AppData\Local\Temp\cb22-cc14-761d-28fe_14600.auth'.
+Removing: 'C:\Users\foll154\AppData\Local\Temp\fe3f-da6c-522f-fcbc_14600.auth'.
+Removing: 'C:\Users\foll154\AppData\Local\Temp\d5a4-e5b7-61d4-6b0c_14600.auth'.
+Removing: 'C:\Users\foll154\AppData\Local\Temp\63fb-95b4-a0d9-f2c2_14600.auth'.
+Removing: 'C:\Users\foll154\AppData\Local\Temp\c870-aab8-0466-4447_14600.auth'.
+Removing: 'C:\Users\foll154\AppData\Local\Temp\4937-afb0-85af-775a_14600.auth'.
+Removing: 'C:\Users\foll154\AppData\Local\Temp\d6f9-e0a7-c606-61f4_14600.auth'.
+Removing: 'C:\Users\foll154\AppData\Local\Temp\ff66-3930-2c46-d155_14600.auth'.
+Removing: 'C:\Users\foll154\AppData\Local\Temp\91dc-b2ef-32cb-9b33_14600.auth'.
+Removing: 'C:\Users\foll154\AppData\Local\Temp\a1e8-1187-7ac4-030b_14600.auth'.
+Removing: 'C:\Users\foll154\AppData\Local\Temp\a7c5-2226-99e3-3a72_14600.auth'.
+Removing: 'C:\Users\foll154\AppData\Local\Temp\b9f2-1509-017b-de6f_14600.auth'.
+Removing: 'C:\Users\foll154\AppData\Local\Temp\90bb-9696-36a5-fd0f_14600.auth'.
+Removing: 'C:\Users\foll154\AppData\Local\Temp\4d7f-e504-d121-62de_14600.auth'.
+Removing: 'C:\Users\foll154\AppData\Local\Temp\17c0-a638-0825-4b93_14600.auth'.
+Removing: 'C:\Users\foll154\AppData\Local\Temp\dc92-58bf-6282-9c9e_14600.auth'.
+Removing: 'C:\Users\foll154\AppData\Local\Temp\0d0c-c4c2-0e23-8e51_14600.auth'.
+Removing: 'C:\Users\foll154\AppData\Local\Temp\3fe2-9ea0-d55c-6d4b_14600.auth'.
+Removing: 'C:\Users\foll154\AppData\Local\Temp\1877-7402-83ce-b77f_14600.auth'.
 Generating file "C:\GitFolders\archive_walker\MATengine\DLLs\BAWSengine_R2018a\for_testing\GUI2MATNative.cs".
 Generating file "C:\GitFolders\archive_walker\MATengine\DLLs\BAWSengine_R2018a\for_testing\GUI2MAT.cs".
 Generating file "C:\GitFolders\archive_walker\MATengine\DLLs\BAWSengine_R2018a\for_testing\readme.txt".
@@ -103,5 +103,5 @@
 Creating the bundle...
 Web based installer created at C:\GitFolders\archive_walker\MATengine\DLLs\BAWSengine_R2018a\for_redistribution\MyAppInstaller_web.exe.
 Packaging complete.
-Elapsed packaging time was: 2 minutes and 23 seconds.
+Elapsed packaging time was: 2 minutes and 18 seconds.
 </pre></html>
diff --git a/MATengine/DLLs/BAWSengine_R2018a/for_redistribution/MyAppInstaller_web.exe b/MATengine/DLLs/BAWSengine_R2018a/for_redistribution/MyAppInstaller_web.exe
diff --git a/MATengine/DLLs/BAWSengine_R2018a/for_redistribution_files_only/BAWSengine.dll b/MATengine/DLLs/BAWSengine_R2018a/for_redistribution_files_only/BAWSengine.dll
diff --git a/MATengine/DLLs/BAWSengine_R2018a/for_redistribution_files_only/BAWSengineNative.dll b/MATengine/DLLs/BAWSengine_R2018a/for_redistribution_files_only/BAWSengineNative.dll
diff --git a/MATengine/DLLs/BAWSengine_R2018a/for_testing/BAWSengine.dll b/MATengine/DLLs/BAWSengine_R2018a/for_testing/BAWSengine.dll
diff --git a/MATengine/DLLs/BAWSengine_R2018a/for_testing/BAWSengineNative.dll b/MATengine/DLLs/BAWSengine_R2018a/for_testing/BAWSengineNative.dll
diff --git a/MATengine/DLLs/BAWSengine_R2018a/for_testing/GUI2MAT.cs b/MATengine/DLLs/BAWSengine_R2018a/for_testing/GUI2MAT.cs
@@ -1,6 +1,6 @@
 /*
 * MATLAB Compiler: 6.6 (R2018a)
-* Date: Mon Mar 15 17:11:22 2021
+* Date: Mon Apr 26 09:36:27 2021
 * Arguments:
 * "-B""macro_default""-W""dotnet:BAWSengine,GUI2MAT,4.0,private""-T""link:lib""-d""C:\GitF
 * olders\archive_walker\MATengine\DLLs\BAWSengine_R2018a\for_testing""-v""class{GUI2MAT:C:

diff --git a/MATengine/DLLs/BAWSengine_R2018a/for_testing/GUI2MATNative.cs b/MATengine/DLLs/BAWSengine_R2018a/for_testing/GUI2MATNative.cs
@@ -1,6 +1,6 @@
 /*
 * MATLAB Compiler: 6.6 (R2018a)
-* Date: Mon Mar 15 17:11:22 2021
+* Date: Mon Apr 26 09:36:27 2021
 * Arguments:
 * "-B""macro_default""-W""dotnet:BAWSengine,GUI2MAT,4.0,private""-T""link:lib""-d""C:\GitF
 * olders\archive_walker\MATengine\DLLs\BAWSengine_R2018a\for_testing""-v""class{GUI2MAT:C:

diff --git a/MATengine/Detector/ModeMeter/WriteOperatingConditionsAndModeValues.m b/MATengine/Detector/ModeMeter/WriteOperatingConditionsAndModeValues.m
@@ -17,7 +17,7 @@ function WriteOperatingConditionsAndModeValues(AdditionalOutput,ResultPath,DEFpa
 end
 tt = round(tt,3);
 if exist(FileName,'file') > 0
-    Habc = readtable(FileName,'Format','auto');
+    Habc = readtable(FileName);
     H1 = Habc.Properties.VariableNames;
     H2 = Habc{1,:};
     H3 = Habc{2,:};