publish release v1.1.6

Author: teasit

CHANGELOG.md

@@ -1,3 +1,3 @@
 # Changelog
 
-- fix: `tydex.parsers` package was not delivered
+- new: fitmodes now also selectable using "App" menu in menu bar

MFTyreToolApp.prj

@@ -1,5 +1,5 @@
 <deployment-project plugin="plugin.apptool" plugin-version="1.0">
-  <configuration build-checksum="3610955114" file="C:\Users\Tom\Documents\mftyre-tool-matlab\MFTyreToolApp.prj" location="C:\Users\Tom\Documents\mftyre-tool-matlab" name="MFTyreToolApp" target="target.mlapps" target-name="Package App">
+  <configuration build-checksum="2220732703" file="C:\Users\Tom\Documents\mftyre-tool-matlab\MFTyreToolApp.prj" location="C:\Users\Tom\Documents\mftyre-tool-matlab" name="MFTyreToolApp" target="target.mlapps" target-name="Package App">
     <param.appname>MFTyreToolApp</param.appname>
     <param.authnamewatermark>Tom Teasdale</param.authnamewatermark>
     <param.email>teasdale@lightsaber.red</param.email>
@@ -13,7 +13,7 @@
     <param.summary>Create, fit and evaluate MF-Tyre model with a convenient MATLAB GUI.</param.summary>
     <param.description />
     <param.screenshot>${PROJECT_ROOT}\assets\img\MFTyreTool_Screenshot_Main.jpg</param.screenshot>
-    <param.version>1.1.5</param.version>
+    <param.version>1.1.6</param.version>
     <param.products.name>
       <item>MATLAB</item>
     </param.products.name>

MFTyreToolToolboxPackager.prj

@@ -7,7 +7,7 @@
     <param.summary>Create, fit and evaluate MF-Tyre models with a convenient MATLAB GUI.</param.summary>
     <param.description />
     <param.screenshot>${PROJECT_ROOT}\assets\img\MFTyreTool_Screenshot_Main.jpg</param.screenshot>
-    <param.version>1.1.5</param.version>
+    <param.version>1.1.6</param.version>
     <param.output>${PROJECT_ROOT}\MFTyreTool.mltbx</param.output>
     <param.products.name />
     <param.products.id />

src/+ui/TyreFitterPanel.m

@@ -8,8 +8,7 @@
     end
 
     events (NotifyAccess = public)
-        FitterStarted
-        FitterCanceled
+        TyreFitterModesChanged
     end
 
     properties (Access = private, Transient, NonCopyable)
@@ -42,6 +41,10 @@ function onSolverSettingsChanged(obj, ~, event)
         function onRunStateButtonValueChanged(obj, ~, ~)
             notify(obj, 'FitterStartRequested')
         end
+        function onTyreFitterModesChanged(obj, ~, event)
+            fitmodes = event.FitModes;
+            obj.FittingModesPanel.FitModes = fitmodes;
+        end
     end
 
     methods (Access = protected)
@@ -69,6 +72,9 @@ function setup(obj)
                 'Text', 'Start Fitter', ...
                 'Icon', 'play-solid.svg', ...
                 'ButtonPushedFcn', @obj.onRunStateButtonValueChanged);
+        
+            addlistener(obj, 'TyreFitterModesChanged', ...
+                @obj.onTyreFitterModesChanged);
         end
         function update(obj)
         end

src/+ui/TyreModelPanel.m

@@ -45,6 +45,7 @@
     end
     events (NotifyAccess = public)
         TyreModelChanged
+        TyreFitterModesChanged
         TyreModelFitterFinished
         ViewSettingsChanged
     end
@@ -114,6 +115,11 @@ function onStructToMatRequested(obj, ~, ~)
         function onTyreModelEdited(obj, ~, ~)
             notify(obj, 'TyreModelEdited')
         end
+        function onTyreFitterModesChanged(obj, ~, event)
+            fitmodes = event.FitModes;
+            e = events.FittingModesChangedEventData(fitmodes);
+            notify(obj.FitterPanel, 'TyreFitterModesChanged', e)
+        end
         function onUiFigureSizeChanged(obj, ~, ~)
             parent = obj.Parent;
             while isa(parent, 'matlab.ui.container.GridLayout')
@@ -247,6 +253,8 @@ function setupListeners(obj)
                 @obj.onTyreModelFitterFinished);
             addlistener(obj, 'ViewSettingsChanged', ...
                 @obj.onViewSettingsChanged);
+            addlistener(obj, 'TyreFitterModesChanged', ...
+                @obj.onTyreFitterModesChanged);
         end
     end
     methods (Access = protected)

src/MFTyreTool.m

@@ -39,6 +39,7 @@
         AppMenu                 matlab.ui.container.Menu
         HelpMenu                matlab.ui.container.Menu
         ViewMenu                matlab.ui.container.Menu
+        SelectFitModesMenu      matlab.ui.container.Menu
 
         TyreModelFittingTab     matlab.ui.container.Tab
         TyreModelPanel          ui.TyreModelPanel
@@ -85,6 +86,19 @@
             end
         end
     end
+    methods
+        function set.TyreModelFitterFitModes(app, fitmodes)
+            app.TyreModelFitterFitModes = fitmodes;
+            menus = app.SelectFitModesMenu.Children;
+            menuTexts = {menus.Text};
+            set(menus, 'Checked', 'off')
+            for i = 1:numel(fitmodes)
+                fitmodeName = char(fitmodes(i));
+                I = strcmp(menuTexts, {fitmodeName});
+                menus(I).Checked = 'on';
+            end
+        end
+    end
     methods (Access = private)
         function params = extractNominalParametersFromMeasurements(app)
             measurements = app.TyreMeasurements;
@@ -192,6 +206,27 @@ function onFitterFittingModesChanged(app, ~, event)
             modes = event.FitModes;
             app.TyreModelFitterFitModes = modes;
         end
+        function onSelectFitModesMenuSelected(app, source, ~)
+            [fitmodes, fitmodeNames] = enumeration('mftyre.v62.FitMode');
+            fitmodeName = source.Text;
+            I = strcmp(fitmodeNames, fitmodeName);
+            fitmode = fitmodes(I);
+            enable = ~logical(source.Checked);
+            fitmodesEnabled = app.TyreModelFitterFitModes;
+            if enable
+                fitmodesEnabled = [fitmodesEnabled fitmode];
+                fitmodesEnabled = sort(fitmodesEnabled);
+                fitmodesEnabled = unique(fitmodesEnabled);
+            else
+                I = fitmodesEnabled == fitmode;
+                fitmodesEnabled(I) = [];
+            end
+            app.TyreModelFitterFitModes = fitmodesEnabled;
+            source.Checked = matlab.lang.OnOffSwitchState(enable);
+            
+            e = events.FittingModesChangedEventData(fitmodesEnabled);
+            notify(app.TyreModelPanel, 'TyreFitterModesChanged', e)
+        end
         function onLoadModelRequested(app, ~, ~)
             [fileName, path] = uigetfile('.tir', ...
                 'Select Tyre Properties File');
@@ -746,11 +781,24 @@ function createAppMenu(app)
                 'Text', 'Clear Tyre Data', ...
                 'MenuSelectedFcn', @app.onClearMeasurementsRequested);
 
+            app.SelectFitModesMenu = uimenu(app.AppMenu, ...
+                'Text', 'Select Fit-Modes', ...
+                'Separator', 'on');
+            fitmodes = {
+                char(mftyre.v62.FitMode.Fx0)
+                char(mftyre.v62.FitMode.Fy0)
+                char(mftyre.v62.FitMode.Fx)
+                char(mftyre.v62.FitMode.Fy)
+                };
+            for i = 1:numel(fitmodes)
+                fitmode = fitmodes{i};
+                uimenu(app.SelectFitModesMenu, 'Text', fitmode, ...
+                    'MenuSelectedFcn', @app.onSelectFitModesMenuSelected);
+            end
             uimenu(app.AppMenu, ...
                 'Text', 'Start &Fitter', ...
                 'Accelerator', 'F', ...
-                'MenuSelectedFcn', @app.onStartFittingRequested, ...
-                'Separator', 'on');
+                'MenuSelectedFcn', @app.onStartFittingRequested);
 
             uimenu(app.AppMenu, ...
                 'Text', '&Reset Application', ...

src/about.json

@@ -1,6 +1,6 @@
 {
     "Name": "MFTyreTool",
-    "Version": "1.1.5",
+    "Version": "1.1.6",
     "Authors": [
         "Tom Teasdale"
     ],