Merge pull request #131 from mathworks/44-add-template-hand-code-app-files

rjackey · web-flow · commit eb57464720cf · 2025-04-14T13:25:06.000-04:00
44 add template hand code app files
diff --git a/resources/project/EEtUlUb-dLAdf0KpMVivaUlztwA/-6uET5ueEMV8-JHVE8F8gxpEZdgd.xml b/resources/project/EEtUlUb-dLAdf0KpMVivaUlztwA/-6uET5ueEMV8-JHVE8F8gxpEZdgd.xml
@@ -0,0 +1,2 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<Info Ref="widgets/examples/templates" Type="Relative"/>
diff --git a/resources/project/EEtUlUb-dLAdf0KpMVivaUlztwA/-6uET5ueEMV8-JHVE8F8gxpEZdgp.xml b/resources/project/EEtUlUb-dLAdf0KpMVivaUlztwA/-6uET5ueEMV8-JHVE8F8gxpEZdgp.xml
@@ -0,0 +1,2 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<Info location="3455837e-0fca-40ad-bdd0-5c6ee613fa96" type="Reference"/>
diff --git a/resources/project/EEtUlUb-dLAdf0KpMVivaUlztwA/GlNzMPyGOM0BrQS1yt1y4cFWeUUd.xml b/resources/project/EEtUlUb-dLAdf0KpMVivaUlztwA/GlNzMPyGOM0BrQS1yt1y4cFWeUUd.xml
@@ -1,2 +1,2 @@
-<?xml version='1.0' encoding='UTF-8'?>
-<Info Ref="widgets/examples" Type="Relative" />
+<?xml version="1.0" encoding="UTF-8"?>
+<Info Ref="widgets/examples" Type="Relative"/>
diff --git a/resources/project/EEtUlUb-dLAdf0KpMVivaUlztwA/GlNzMPyGOM0BrQS1yt1y4cFWeUUp.xml b/resources/project/EEtUlUb-dLAdf0KpMVivaUlztwA/GlNzMPyGOM0BrQS1yt1y4cFWeUUp.xml
@@ -1,2 +1,2 @@
-<?xml version='1.0' encoding='UTF-8'?>
-<Info location="3e6a7481-8733-409c-bfa6-02e29452eeab" type="Reference" />
+<?xml version="1.0" encoding="UTF-8"?>
+<Info location="3e6a7481-8733-409c-bfa6-02e29452eeab" type="Reference"/>
diff --git a/resources/project/EEtUlUb-dLAdf0KpMVivaUlztwA/MCNyQ04ZNyCaVv14MUbnfNGfpPQd.xml b/resources/project/EEtUlUb-dLAdf0KpMVivaUlztwA/MCNyQ04ZNyCaVv14MUbnfNGfpPQd.xml
@@ -1,2 +1,2 @@
-<?xml version='1.0' encoding='UTF-8'?>
-<Info Ref="deploy" Type="Relative" />
+<?xml version="1.0" encoding="UTF-8"?>
+<Info Ref="deploy" Type="Relative"/>
diff --git a/resources/project/EEtUlUb-dLAdf0KpMVivaUlztwA/MCNyQ04ZNyCaVv14MUbnfNGfpPQp.xml b/resources/project/EEtUlUb-dLAdf0KpMVivaUlztwA/MCNyQ04ZNyCaVv14MUbnfNGfpPQp.xml
@@ -1,2 +1,2 @@
-<?xml version='1.0' encoding='UTF-8'?>
-<Info location="68fdb71a-f6db-4d2b-9a4e-76e3570d1276" type="Reference" />
+<?xml version="1.0" encoding="UTF-8"?>
+<Info location="68fdb71a-f6db-4d2b-9a4e-76e3570d1276" type="Reference"/>
diff --git a/resources/project/EEtUlUb-dLAdf0KpMVivaUlztwA/sGQWKvrvt2ruQjk-XJfB0Jza4dUd.xml b/resources/project/EEtUlUb-dLAdf0KpMVivaUlztwA/sGQWKvrvt2ruQjk-XJfB0Jza4dUd.xml
@@ -1,2 +1,2 @@
-<?xml version='1.0' encoding='UTF-8'?>
-<Info Ref="widgets" Type="Relative" />
+<?xml version="1.0" encoding="UTF-8"?>
+<Info Ref="widgets" Type="Relative"/>
diff --git a/resources/project/EEtUlUb-dLAdf0KpMVivaUlztwA/sGQWKvrvt2ruQjk-XJfB0Jza4dUp.xml b/resources/project/EEtUlUb-dLAdf0KpMVivaUlztwA/sGQWKvrvt2ruQjk-XJfB0Jza4dUp.xml
@@ -1,2 +1,2 @@
-<?xml version='1.0' encoding='UTF-8'?>
-<Info location="96a61ccb-178c-44ac-b446-b707f70144fb" type="Reference" />
+<?xml version="1.0" encoding="UTF-8"?>
+<Info location="96a61ccb-178c-44ac-b446-b707f70144fb" type="Reference"/>
diff --git a/resources/project/EEtUlUb-dLAdf0KpMVivaUlztwA/tCUNwVQSieE2RoENiCkr-MV2apcd.xml b/resources/project/EEtUlUb-dLAdf0KpMVivaUlztwA/tCUNwVQSieE2RoENiCkr-MV2apcd.xml
@@ -1,2 +1,2 @@
-<?xml version='1.0' encoding='UTF-8'?>
-<Info Ref="widgets/doc" Type="Relative" />
+<?xml version="1.0" encoding="UTF-8"?>
+<Info Ref="widgets/doc" Type="Relative"/>
diff --git a/resources/project/EEtUlUb-dLAdf0KpMVivaUlztwA/tCUNwVQSieE2RoENiCkr-MV2apcp.xml b/resources/project/EEtUlUb-dLAdf0KpMVivaUlztwA/tCUNwVQSieE2RoENiCkr-MV2apcp.xml
@@ -1,2 +1,2 @@
-<?xml version='1.0' encoding='UTF-8'?>
-<Info location="d29e81e6-6e00-4082-826d-de0a6a1da0c7" type="Reference" />
+<?xml version="1.0" encoding="UTF-8"?>
+<Info location="d29e81e6-6e00-4082-826d-de0a6a1da0c7" type="Reference"/>
diff --git a/resources/project/EEtUlUb-dLAdf0KpMVivaUlztwA/uDx_v6ZvW-Br8iKhWiFaxE8NSJ0d.xml b/resources/project/EEtUlUb-dLAdf0KpMVivaUlztwA/uDx_v6ZvW-Br8iKhWiFaxE8NSJ0d.xml
@@ -1,2 +1,2 @@
-<?xml version='1.0' encoding='UTF-8'?>
-<Info Ref="widgets/icons" Type="Relative" />
+<?xml version="1.0" encoding="UTF-8"?>
+<Info Ref="widgets/icons" Type="Relative"/>
diff --git a/resources/project/EEtUlUb-dLAdf0KpMVivaUlztwA/uDx_v6ZvW-Br8iKhWiFaxE8NSJ0p.xml b/resources/project/EEtUlUb-dLAdf0KpMVivaUlztwA/uDx_v6ZvW-Br8iKhWiFaxE8NSJ0p.xml
@@ -1,2 +1,2 @@
-<?xml version='1.0' encoding='UTF-8'?>
-<Info location="94f413ee-d5a4-4016-aa70-226d0d4d9b47" type="Reference" />
+<?xml version="1.0" encoding="UTF-8"?>
+<Info location="94f413ee-d5a4-4016-aa70-226d0d4d9b47" type="Reference"/>
diff --git a/resources/project/EEtUlUb-dLAdf0KpMVivaUlztwA/wLsNKNXO4UtoK-s3CTap0Umd4TUd.xml b/resources/project/EEtUlUb-dLAdf0KpMVivaUlztwA/wLsNKNXO4UtoK-s3CTap0Umd4TUd.xml
@@ -1,2 +1,2 @@
-<?xml version='1.0' encoding='UTF-8'?>
-<Info Ref="test" Type="Relative" />
+<?xml version="1.0" encoding="UTF-8"?>
+<Info Ref="test" Type="Relative"/>
diff --git a/resources/project/EEtUlUb-dLAdf0KpMVivaUlztwA/wLsNKNXO4UtoK-s3CTap0Umd4TUp.xml b/resources/project/EEtUlUb-dLAdf0KpMVivaUlztwA/wLsNKNXO4UtoK-s3CTap0Umd4TUp.xml
@@ -1,2 +1,2 @@
-<?xml version='1.0' encoding='UTF-8'?>
-<Info location="f8d40992-9dcd-4000-bc2b-2e41881b91a0" type="Reference" />
+<?xml version="1.0" encoding="UTF-8"?>
+<Info location="f8d40992-9dcd-4000-bc2b-2e41881b91a0" type="Reference"/>
diff --git a/resources/project/Xc4-tOl6vkwzCeVKSWRahPrXJiQ/51VqhzOOH8Yqqc2oa1CzaYTZP14d.xml b/resources/project/Xc4-tOl6vkwzCeVKSWRahPrXJiQ/51VqhzOOH8Yqqc2oa1CzaYTZP14d.xml
@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<Info>
+    <Category UUID="FileClassCategory">
+        <Label UUID="test"/>
+    </Category>
+</Info>
diff --git a/resources/project/Xc4-tOl6vkwzCeVKSWRahPrXJiQ/51VqhzOOH8Yqqc2oa1CzaYTZP14p.xml b/resources/project/Xc4-tOl6vkwzCeVKSWRahPrXJiQ/51VqhzOOH8Yqqc2oa1CzaYTZP14p.xml
@@ -0,0 +1,2 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<Info location="TemplateApps.m" type="File"/>
diff --git a/resources/project/f1CasPtPWEKkULO6lQ_WTjau2Nw/f2kdi_ZH-kkLCJnHzBMki3bnqgod.xml b/resources/project/f1CasPtPWEKkULO6lQ_WTjau2Nw/f2kdi_ZH-kkLCJnHzBMki3bnqgod.xml
@@ -0,0 +1,2 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<Info/>
diff --git a/resources/project/f1CasPtPWEKkULO6lQ_WTjau2Nw/f2kdi_ZH-kkLCJnHzBMki3bnqgop.xml b/resources/project/f1CasPtPWEKkULO6lQ_WTjau2Nw/f2kdi_ZH-kkLCJnHzBMki3bnqgop.xml
@@ -0,0 +1,2 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<Info location="templates" type="File"/>
diff --git a/resources/project/f2kdi_ZH-kkLCJnHzBMki3bnqgo/FVJBsRjCJsxU-SL7Pp8kYCsHV2wd.xml b/resources/project/f2kdi_ZH-kkLCJnHzBMki3bnqgo/FVJBsRjCJsxU-SL7Pp8kYCsHV2wd.xml
@@ -0,0 +1,2 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<Info/>
diff --git a/resources/project/f2kdi_ZH-kkLCJnHzBMki3bnqgo/FVJBsRjCJsxU-SL7Pp8kYCsHV2wp.xml b/resources/project/f2kdi_ZH-kkLCJnHzBMki3bnqgo/FVJBsRjCJsxU-SL7Pp8kYCsHV2wp.xml
@@ -0,0 +1,2 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<Info location="1" type="DIR_SIGNIFIER"/>
diff --git a/resources/project/f2kdi_ZH-kkLCJnHzBMki3bnqgo/NdScGNwbGcD5YerOttsmPZeexiod.xml b/resources/project/f2kdi_ZH-kkLCJnHzBMki3bnqgo/NdScGNwbGcD5YerOttsmPZeexiod.xml
@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<Info>
+    <Category UUID="FileClassCategory">
+        <Label UUID="design"/>
+    </Category>
+</Info>
diff --git a/resources/project/f2kdi_ZH-kkLCJnHzBMki3bnqgo/NdScGNwbGcD5YerOttsmPZeexiop.xml b/resources/project/f2kdi_ZH-kkLCJnHzBMki3bnqgo/NdScGNwbGcD5YerOttsmPZeexiop.xml
@@ -0,0 +1,2 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<Info location="TemplateBaseMultiSessionApp.m" type="File"/>
diff --git a/resources/project/f2kdi_ZH-kkLCJnHzBMki3bnqgo/bAXFH3dEyqTJSksdI1ytU-SpEb8d.xml b/resources/project/f2kdi_ZH-kkLCJnHzBMki3bnqgo/bAXFH3dEyqTJSksdI1ytU-SpEb8d.xml
@@ -0,0 +1,6 @@
+<?xml version='1.0' encoding='UTF-8'?>
+<Info>
+    <Category UUID="FileClassCategory">
+        <Label UUID="design"/>
+    </Category>
+</Info>
diff --git a/resources/project/f2kdi_ZH-kkLCJnHzBMki3bnqgo/bAXFH3dEyqTJSksdI1ytU-SpEb8p.xml b/resources/project/f2kdi_ZH-kkLCJnHzBMki3bnqgo/bAXFH3dEyqTJSksdI1ytU-SpEb8p.xml
@@ -0,0 +1,2 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<Info location="TemplateBaseSingleSessionApp.m" type="File"/>
diff --git a/resources/project/f2kdi_ZH-kkLCJnHzBMki3bnqgo/zj4G2uES496vbFcI_EghE2iPm2Ed.xml b/resources/project/f2kdi_ZH-kkLCJnHzBMki3bnqgo/zj4G2uES496vbFcI_EghE2iPm2Ed.xml
@@ -0,0 +1,6 @@
+<?xml version='1.0' encoding='UTF-8'?>
+<Info>
+    <Category UUID="FileClassCategory">
+        <Label UUID="design"/>
+    </Category>
+</Info>
diff --git a/resources/project/f2kdi_ZH-kkLCJnHzBMki3bnqgo/zj4G2uES496vbFcI_EghE2iPm2Ep.xml b/resources/project/f2kdi_ZH-kkLCJnHzBMki3bnqgo/zj4G2uES496vbFcI_EghE2iPm2Ep.xml
@@ -0,0 +1,2 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<Info location="TemplateBaseApp.m" type="File"/>
diff --git a/test/+wt/+test/TemplateApps.m b/test/+wt/+test/TemplateApps.m
@@ -0,0 +1,119 @@
+classdef TemplateApps < matlab.uitest.TestCase
+    % Implements unit tests for the app templates
+
+    % Copyright 2025 The MathWorks Inc.
+    
+    %% Properties
+    properties
+        App
+        Figure matlab.ui.Figure
+        % TempFolder
+    end
+
+
+    %% Test Method Setup
+    methods (TestMethodSetup)
+
+        % function prepareTempFolder(testCase)
+        %
+        %     % Use a temporary folder for sessions
+        %     import matlab.unittest.fixtures.TemporaryFolderFixture
+        %     fixture = testCase.applyFixture(TemporaryFolderFixture);
+        %     testCase.TempFolder = fixture.Folder;
+        %
+        % end %function
+
+    end %methods
+
+
+    %% Test Method Teardown
+    methods (TestMethodTeardown)
+        % Teardown for each test
+
+        function deleteApp(testCase)
+
+            if isscalar(testCase.App) && isvalid(testCase.App)
+                if isscalar(testCase.App.Figure)
+                    delete(testCase.App.Figure)
+                end
+                delete(testCase.App)
+            end
+
+        end %function
+
+    end %methods
+
+    %% Test methods
+    methods (Test)
+
+        function testTemplateBaseApp(testCase)
+            % Verifies behavior of the app template
+
+            % Launch the app
+            diag = "Expected app to launch without warnings.";
+            fcn = @()TemplateBaseApp();
+            testCase.App = testCase.verifyWarningFree(fcn, diag);
+
+            % Verify app and component creation
+            diag = "Expected app figure to be populated.";
+            testCase.verifyNotEmpty(testCase.App.Figure, diag)
+
+            % Verify app closes
+            diag = "Expected app to close without warnings.";
+            fcn = @()close(testCase.App);
+            testCase.verifyWarningFree(fcn, diag);
+
+            diag = "Expected app to be deleted.";
+            testCase.verifyFalse(isvalid(testCase.App), diag)
+
+        end %function
+
+
+        function testTemplateBaseSingleSessionApp(testCase)
+            % Verifies behavior of the app template
+
+            % Launch the app
+            diag = "Expected app to launch without warnings.";
+            fcn = @()TemplateBaseSingleSessionApp();
+            testCase.App = testCase.verifyWarningFree(fcn, diag);
+
+            % Verify app and component creation
+            diag = "Expected app figure to be populated.";
+            testCase.verifyNotEmpty(testCase.App.Figure, diag)
+
+            % Verify app closes
+            diag = "Expected app to close without warnings.";
+            fcn = @()close(testCase.App);
+            testCase.verifyWarningFree(fcn, diag);
+
+            diag = "Expected app to be deleted.";
+            testCase.verifyFalse(isvalid(testCase.App), diag)
+
+        end %function
+
+
+        function testTemplateBaseMultiSessionApp(testCase)
+            % Verifies behavior of the app template
+
+            % Launch the app
+            diag = "Expected app to launch without warnings.";
+            fcn = @()TemplateBaseMultiSessionApp();
+            testCase.App = testCase.verifyWarningFree(fcn, diag);
+
+            % Verify app and component creation
+            diag = "Expected app figure to be populated.";
+            testCase.verifyNotEmpty(testCase.App.Figure, diag)
+
+            % Verify app closes
+            diag = "Expected app to close without warnings.";
+            fcn = @()close(testCase.App);
+            testCase.verifyWarningFree(fcn, diag);
+
+            diag = "Expected app to be deleted.";
+            testCase.verifyFalse(isvalid(testCase.App), diag)
+
+        end %function
+
+    end %methods
+
+end %classdef
diff --git a/widgets/+wt/+apps/AbstractSessionApp.m b/widgets/+wt/+apps/AbstractSessionApp.m
@@ -2,7 +2,7 @@
         ?wt.apps.BaseMultiSessionApp}) AbstractSessionApp < wt.apps.BaseApp
     % Abstract base class for Widgets Toolbox app with 1+ sessions
 
-%   Copyright 2024-2025 The MathWorks Inc.
+    % Copyright 2024-2025 The MathWorks Inc.
 
 
     %% Abstract Public Properties
@@ -87,10 +87,6 @@
             % Call superclass constructor
             app@wt.apps.BaseApp(varargin{:});
 
-            % Attach listeners to Session being set
-            app.SessionSetListener = listener(app,"Session","PostSet",...
-                @(~,~)app.onSessionSet_Private());
-
         end %function
 
     end %methods
@@ -99,6 +95,19 @@
     %% Protected Methods
     methods (Access = protected)
 
+        function setup_internal(app)
+            % Preform internal pre-setup necessary
+
+            % Show output if Debug is on
+            app.displayDebugText();
+
+            % Attach listeners to Session being set
+            app.SessionSetListener = listener(app,"Session","PostSet",...
+                @(~,~)app.onSessionSet_Private());
+
+        end %function
+
+
         function onSessionSet(app)
             % This method is called when the Session property has changed,
             % such as a session being added or removed from the app. The
@@ -248,11 +257,12 @@ function saveSession_Internal(app, useSaveAs, session)
                 cleanupObj = onCleanup(@()delete(dlg));
 
                 % Save the session
+                % This will trigger update if path updates and/or session
+                % is no longer dirty
                 session.save(sessionPath);
 
-                % Update the app in case filepath changed
+                % Update the title
                 app.updateTitle()
-                app.update()
 
             end %if strlength(sessionPath)
 
@@ -359,7 +369,7 @@ function saveSession_Internal(app, useSaveAs, session)
             % Define arguments
             arguments
                 app (1,1) wt.apps.BaseApp
-                session (1,1) wt.model.BaseSession = app.Session
+                session wt.model.BaseSession = app.Session
             end
 
             % Show output if Debug is on
@@ -369,7 +379,7 @@ function saveSession_Internal(app, useSaveAs, session)
             isCancelled = false;
 
             % Don't save and return now if session is invalid or clean
-            if ~isvalid(session) || ~session.Dirty
+            if ~isscalar(session) || ~isvalid(session) || ~session.Dirty
                 return
             end
 
diff --git a/widgets/+wt/+apps/BaseMultiSessionApp.m b/widgets/+wt/+apps/BaseMultiSessionApp.m
diff --git a/widgets/+wt/+apps/BaseSingleSessionApp.m b/widgets/+wt/+apps/BaseSingleSessionApp.m
diff --git a/widgets/+wt/+model/BaseSession.m b/widgets/+wt/+model/BaseSession.m
diff --git a/widgets/examples/templates/TemplateBaseApp.m b/widgets/examples/templates/TemplateBaseApp.m
diff --git a/widgets/examples/templates/TemplateBaseMultiSessionApp.m b/widgets/examples/templates/TemplateBaseMultiSessionApp.m
diff --git a/widgets/examples/templates/TemplateBaseSingleSessionApp.m b/widgets/examples/templates/TemplateBaseSingleSessionApp.m

Original file line number	Diff line number	Diff line change
`@@ -0,0 +1,2 @@`
	`1`	`+<?xml version="1.0" encoding="UTF-8"?>`
	`2`	`+<Info Ref="widgets/examples/templates" Type="Relative"/>`
Original file line number	Diff line number	Diff line change
`@@ -0,0 +1,2 @@`
	`1`	`+<?xml version="1.0" encoding="UTF-8"?>`
	`2`	`+<Info location="3455837e-0fca-40ad-bdd0-5c6ee613fa96" type="Reference"/>`