Merge pull request #159 from ImperialCollegeLondon/task/app-improvements

task: App and graphics improvements

Author: mfacchinelli

app/DataVisualization.m

@@ -68,10 +68,7 @@
             end
 
             % Create figure and other UI components.
-            app.UIFigure = uifigure();
-            app.UIFigure.Position = [100, 100, 800, 495];
-            app.UIFigure.Name = app.getAppName();
-            app.UIFigure.Resize = "off";
+            app.UIFigure = uifigure(Name = app.getAppName(), Position = [100, 100, 800, 495], Resize = "off");
 
             pathToAppIcons = fullfile(fileparts(mfilename("fullpath")), "icons");
             app.ToolbarManager = mag.app.manage.ToolbarManager(app, pathToAppIcons);

app/mission/imap/+mag/+app/+imap/+control/CPT.m

@@ -37,7 +37,7 @@ function instantiate(this, parent)
             primaryModeLabel.Layout.Column = 1;
 
             this.PrimaryModePatternField = uieditfield(this.Layout, Value = this.encodeForEditField(this.PrimaryModePattern), ...
-                ValueChangingFcn = @(~, value) this.validatePattern(value));
+                ValueChangedFcn = @(~, value) this.validatePattern(value));
             this.PrimaryModePatternField.Layout.Row = 2;
             this.PrimaryModePatternField.Layout.Column = [2, 3];
 
@@ -48,7 +48,7 @@ function instantiate(this, parent)
             secondryModeLabel.Layout.Column = 1;
 
             this.SecondaryModePatternField = uieditfield(this.Layout, Value = this.encodeForEditField(this.SecondaryModePattern), ...
-                ValueChangingFcn = @(~, value) this.validatePattern(value));
+                ValueChangedFcn = @(~, value) this.validatePattern(value));
             this.SecondaryModePatternField.Layout.Row = 3;
             this.SecondaryModePatternField.Layout.Column = [2, 3];
 
@@ -59,7 +59,7 @@ function instantiate(this, parent)
             rangeLabel.Layout.Column = 1;
 
             this.RangePatternField = uieditfield(this.Layout, Value = this.encodeForEditField(this.RangePattern), ...
-                ValueChangingFcn = @(~, value) this.validatePattern(value));
+                ValueChangedFcn = @(~, value) this.validatePattern(value));
             this.RangePatternField.Layout.Row = 4;
             this.RangePatternField.Layout.Column = [2, 3];
         end
@@ -99,7 +99,7 @@ function validatePattern(~, changingData)
             pattern = asManyOfPattern(digitsPattern() + optionalPattern(characterListPattern(",") + whitespacePattern()));
 
             if ~matches(value, pattern)
-                error("Value must match the pattern '1, 2, 3'.");
+                error("mag:app:invalidPattern", "Value must match the pattern ""1, 2, 3"".");
             end
         end
     end

resources/release-notes.md

@@ -1,5 +1,10 @@
+## App
+
+- (IMAP) CPT view settings must match pattern only once finished typing (not while typing)
+
 ## Software
 
+- (All) Force figures to appear in the figures container in MATLAB R2025a and above
 - (IMAP) Events recorded before the start of a test are discarded
 
 ## Project

src/visualize/+mag/+graphics/+factory/DefaultFactory.m

@@ -28,11 +28,19 @@
             % Force MATLAB to finish opening any previous figure.
             drawnow();
 
+            % In MATLAB R2025a and above, force figures in the figures
+            % container.
+            if matlabRelease().Release >= "R2025a"
+                windowStyle = "docked";
+            else
+                windowStyle = "normal";
+            end
+
             % Create and populate figure.
             % Make sure figure is hidden while being populated, and only
             % shown, if requested, at the end.
-            f = figure(Name = options.Name, NumberTitle = "off", WindowState = options.WindowState, Visible = "off");
-            setVisibility = onCleanup(@() set(f, Visible = matlab.lang.OnOffSwitchState(options.Visible)));
+            f = figure(Name = options.Name, NumberTitle = "off", WindowState = options.WindowState, WindowStyle = windowStyle, Visible = "off");
+            resetVisibility = onCleanup(@() set(f, Visible = matlab.lang.OnOffSwitchState(options.Visible)));
 
             if mag.internal.isThemeable(f)
                 f.Theme = options.Theme;