Merge pull request #938 from AlbertoCuadra/develop

Update: include standalone app for macOS and fix minor bugs
Former-commit-id: 3adaaf9

CITATION.cff

@@ -5,9 +5,9 @@ message: "If you use this software, please cite it using these metadata."
 type: misc
 license: "GPL-3.0"
 title: "Combustion Toolbox: A MATLAB-GUI based open-source tool for solving gaseous combustion problems"
-version: 1.0.3
+version: 1.0.4
 doi: 10.5281/zenodo.5554911
-date-released: 2024-01-18
+date-released: 2024-01-26
 url: "https://combustion-toolbox-website.readthedocs.io"
 abstract:
     "

CONTENTS.m

@@ -1,5 +1,5 @@
 % -------------------------------------------------------------------------
-% COMBUSTION TOOLBOX @v1.0.3
+% COMBUSTION TOOLBOX @v1.0.4
 % A MATLAB-GUI based open-source tool for solving gaseous combustion problems
 %
 % Type of problems:
@@ -36,15 +36,15 @@
 % Thank you for using the Combustion Toolbox!
 %
 % Citing:
-%     Cuadra, A., Huete, C., & Vera, M. (2023). Combustion Toolbox: A
+%     Cuadra, A., Huete, C., & Vera, M. (2024). Combustion Toolbox: A
 %     MATLAB-GUI based open-source tool for solving gaseous combustion
-%     problems. (v1.0.3). Zenodo. https://doi.org/10.5281/zenodo.5554911.
+%     problems. (v1.0.4). Zenodo. https://doi.org/10.5281/zenodo.5554911.
 %
 % @author: Alberto Cuadra Lara
 %          PhD Candidate - Group Fluid Mechanics
 %          Universidad Carlos III de Madrid
 %                  
-% Last update Jan 18 2024
+% Last update Jan 26 2024
 % -------------------------------------------------------------------------
 help CONTENTS.m
 

gui/addons/uipreferences.m

@@ -107,6 +107,11 @@ function startupFcn(app, varargin)
             fill_combustion_toolbox_node(app);
             % Expand uitree
             expand(app.tree);
+            % Update width_amplification (only macOS)
+            if ismac
+                app.width_amplification = 0.91;
+            end
+
         end
 
         % Selection changed function: Tree

gui/combustion_toolbox.m

@@ -1162,7 +1162,6 @@ function createComponents(app)
             % Create UITable_R
             app.UITable_R = uitable(app.DefinereactantsandspeciestobeconsideredPanel);
             app.UITable_R.ColumnName = {'Species'; 'Nº moles'; 'Mole fraction'; 'Type'; 'Temperature [K]'};
-            app.UITable_R.ColumnWidth = {'auto', 100, 105, 65, 120};
             app.UITable_R.RowName = {};
             app.UITable_R.ColumnSortable = true;
             app.UITable_R.ColumnEditable = [true true false true true];

gui/utils/gui_display_splash.m

@@ -15,6 +15,7 @@
     % Default values
     color_splash = [0.5098, 0.6039, 0.6745];
     time_pause = [];
+    splash_path = fullfile('gui', 'assets', 'splash', 'splash.png');
 
     % Unpack
     for i = 1:2:nargin
@@ -32,7 +33,7 @@
     [release, date] = get_combustion_toolbox_version();
 
     % Generate splash
-    splash_obj = SplashScreen('Combustion Toolbox', fullfile('gui', 'assets', 'splash', 'splash.png'));               
+    splash_obj = SplashScreen('Combustion Toolbox', splash_path);               
     splash_obj.addText(110, 100, [release,' (', date,')'], 'FontSize', 18, 'Color', color_splash, 'FontName', 'Arial', 'Shadow', 'off');
 
     % Optional: auto-delete after x seconds

installer/combustion_toolbox_app.mlappinstall.REMOVED.git-id

@@ -1 +1 @@
-bcd5f2ec652025f8915aed6c7c50e16f2e5741c6
+ef8f846418879b0f7daa836ee741c6de560d12eb

installer/combustion_toolbox_standalone_macos.app/Contents/Info.plist

@@ -0,0 +1,43 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
+<plist version="1.0">
+<dict>
+	<key>CFBundleDevelopmentRegion</key>
+	<string>en</string>
+	<key>CFBundleExecutable</key>
+	<string>setup</string>
+	<key>CFBundleIconFile</key>
+	<string>installer.icns</string>
+	<key>CFBundleIdentifier</key>
+	<string>com.mathworks.toolbox.compiler.setup</string>
+	<key>CFBundleInfoDictionaryVersion</key>
+	<string>6.0</string>
+	<key>CFBundlePackageType</key>
+	<string>APPL</string>
+	<key>CFBundleShortVersionString</key>
+	<string>1.0</string>
+	<key>CFBundleSignature</key>
+	<string>????</string>
+	<key>CFBundleVersion</key>
+	<string>1</string>
+	<key>LSMinimumSystemVersion</key>
+	<string>11.0</string>
+	<key>NSAppTransportSecurity</key>
+	<dict>
+		<key>NSExceptionDomains</key>
+		<dict>
+			<key>mathworks.com</key>
+			<dict>
+				<key>NSIncludesSubdomains</key>
+				<true/>
+				<key>NSThirdPartyExceptionRequiresForwardSecrecy</key>
+				<false/>
+			</dict>
+		</dict>
+	</dict>
+	<key>NSMainNibFile</key>
+	<string>MainMenu</string>
+	<key>NSPrincipalClass</key>
+	<string>NSApplication</string>
+</dict>
+</plist>

installer/combustion_toolbox_standalone_macos.app/Contents/MacOS/setup.dSYM/Contents/Info.plist

@@ -0,0 +1,20 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE plist PUBLIC "-//Apple Computer//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
+<plist version="1.0">
+	<dict>
+		<key>CFBundleDevelopmentRegion</key>
+		<string>English</string>
+		<key>CFBundleIdentifier</key>
+		<string>com.apple.xcode.dsym.com.mathworks.toolbox.compiler.setup</string>
+		<key>CFBundleInfoDictionaryVersion</key>
+		<string>6.0</string>
+		<key>CFBundlePackageType</key>
+		<string>dSYM</string>
+		<key>CFBundleSignature</key>
+		<string>????</string>
+		<key>CFBundleShortVersionString</key>
+		<string>1.0</string>
+		<key>CFBundleVersion</key>
+		<string>1</string>
+	</dict>
+</plist>

installer/combustion_toolbox_standalone_macos.app/Contents/Resources/bundle.zip.REMOVED.git-id

@@ -0,0 +1 @@
+a18cbb56b2ede9f50b77cf3d742e81978d9cb8b4

installer/combustion_toolbox_standalone_macos.app/Contents/Resources/installAgentURL.txt

@@ -0,0 +1 @@
+https://ssd.mathworks.com/supportfiles/downloads/R2024a/Prerelease/1/deployment_files/installagent/complete/maca64/InstallAgent_R2024a_Prerelease_Update_1_maca64.zip

installer/combustion_toolbox_standalone_windows.exe.REMOVED.git-id

@@ -0,0 +1 @@
+7b065b218366a1feeecaeb8a4df3ef3c0aecea95

utils/get_combustion_toolbox_version.m

@@ -7,6 +7,6 @@
     %     * release (char): Release version
     %     * date (char): Release date
 
-    release = 'v1.0.3';
-    date = '18 May 2024';
+    release = 'v1.0.4';
+    date = '26 Jan 2024';
 end