Skip to content

Commit

Permalink
Updates for 2.0.3 (#3)
Browse files Browse the repository at this point in the history
* fix SliderSpinner Orientation to use enum

* investigate issues

* bugfix for toolbar section not popping up correctly beneath the toolbar, add unit tests for toolbar

* tweak comments

* tag test files

* work on remaining unit tests. Fixes to ButtonGrid, ProgressBar, TaskStatusTable

* work on unit tests

* work on unit tests

* bugfix to TaskStatusTable on list shrinking, updated several mixins to use fastSet utility

* update copyrights, versioning to 2.0.3, build release

* tweaks to initialization in BaseApp

* update release 2.0.3
  • Loading branch information
rjackey authored Feb 1, 2021
1 parent 218994b commit 3608ca3
Show file tree
Hide file tree
Showing 108 changed files with 1,884 additions and 209 deletions.
6 changes: 3 additions & 3 deletions deploy/Toolbox Packaging Project.prj
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
<deployment-project plugin="plugin.toolbox" plugin-version="1.0">
<configuration file="C:\Work\widgets-toolbox\deploy\Toolbox Packaging Project.prj" location="C:\Work\widgets-toolbox\deploy" name="Toolbox Packaging Project" target="target.toolbox" target-name="Package Toolbox">
<param.appname>Widgets Toolbox - MATLAB App Building Components</param.appname>
<param.authnamewatermark>Robyn Jackey</param.authnamewatermark>
<param.email>rjackey@mathworks.com</param.email>
<param.authnamewatermark>MathWorks Consulting</param.authnamewatermark>
<param.email>consulting@mathworks.com</param.email>
<param.company>MathWorks Consulting</param.company>
<param.summary>Additional app building components to efficiently develop advanced user interfaces in MATLAB</param.summary>
<param.description>Widgets Toolbox helps you efficiently develop advanced user interfaces in MATLAB. Widgets combine existing control functionalities together into larger, reusable, common functionality to accelerate development of graphical user interfaces.
Expand All @@ -28,7 +28,7 @@ https://www.mathworks.com/matlabcentral/fileexchange/66235-widgets-toolbox

Planning a complex or business-critical app? MathWorks Consulting can advise you on design and architecture: https://www.mathworks.com/services/consulting/proven-solutions/software-development-with-matlab.html</param.description>
<param.screenshot>${PROJECT_ROOT}\widgets_logo.png</param.screenshot>
<param.version>2.0.2</param.version>
<param.version>2.0.3</param.version>
<param.output>${PROJECT_ROOT}\Widgets Toolbox - MATLAB App Building Components.mltbx</param.output>
<param.products.name>
<item>MATLAB</item>
Expand Down
40 changes: 40 additions & 0 deletions issues/abortset_update_bug/MyComponent.m
Original file line number Diff line number Diff line change
@@ -0,0 +1,40 @@
classdef MyComponent < matlab.ui.componentcontainer.ComponentContainer

%% Public properties
properties (AbortSet)

Name (1,1) string = "My Component"

end %properties


%% Internal Properties
properties (Transient, NonCopyable, Access = protected)

Label matlab.ui.control.Label

end %properties


%% Protected methods
methods (Access = protected)

function setup(obj)

obj.Position(3:4) = [200 25];
grid = uigridlayout(obj,[1 1],'Padding',[0 0 0 0]);
obj.Label = uilabel(grid,'BackgroundColor','green');

end %function


function update(obj)

disp("MyComponent update called");
obj.Label.Text = obj.Name;

end %function

end %methods

end %classdef
23 changes: 23 additions & 0 deletions issues/toolbar_pulldown_bug/reproduceToolbarBug.m
Original file line number Diff line number Diff line change
@@ -0,0 +1,23 @@
f = uifigure;
g = uigridlayout(f,[2 1]);
g.RowHeight = {80, '1x'};

tb = wt.Toolbar(g);
dummy = uipanel(g,'BackgroundColor','red');

tb.Section = [
addSection()
addSection()
addSection()
addSection()
];


function s = addSection()

s = wt.toolbar.HorizontalSection();
for idx = 1:4
s.addButton("", string(idx));
end

end
2 changes: 1 addition & 1 deletion license.txt
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
Copyright (c) 2020, The MathWorks, Inc.
Copyright (c) 2020-2021, The MathWorks, Inc.
All rights reserved.

Redistribution and use in source and binary forms, with or without modification, are permitted provided that the following conditions are met:
Expand Down
Binary file added release/Widgets Toolbox 2.0.3.mltbx
Binary file not shown.
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
<?xml version='1.0' encoding='UTF-8'?>
<Info>
<Category UUID="FileClassCategory">
<Label UUID="design" />
</Category>
</Info>
Original file line number Diff line number Diff line change
@@ -0,0 +1,2 @@
<?xml version='1.0' encoding='UTF-8'?>
<Info location="MyComponent.m" type="File" />
Original file line number Diff line number Diff line change
@@ -0,0 +1,2 @@
<?xml version='1.0' encoding='UTF-8'?>
<Info />
Original file line number Diff line number Diff line change
@@ -0,0 +1,2 @@
<?xml version='1.0' encoding='UTF-8'?>
<Info location="1" type="DIR_SIGNIFIER" />
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
<?xml version='1.0' encoding='UTF-8'?>
<Info>
<Category UUID="FileClassCategory">
<Label UUID="design" />
</Category>
</Info>
Original file line number Diff line number Diff line change
@@ -0,0 +1,2 @@
<?xml version='1.0' encoding='UTF-8'?>
<Info location="reproduceToolbarBug.m" type="File" />
Original file line number Diff line number Diff line change
@@ -0,0 +1,2 @@
<?xml version='1.0' encoding='UTF-8'?>
<Info />
Original file line number Diff line number Diff line change
@@ -0,0 +1,2 @@
<?xml version='1.0' encoding='UTF-8'?>
<Info location="1" type="DIR_SIGNIFIER" />
Original file line number Diff line number Diff line change
@@ -0,0 +1,2 @@
<?xml version='1.0' encoding='UTF-8'?>
<Info />
Original file line number Diff line number Diff line change
@@ -0,0 +1,2 @@
<?xml version='1.0' encoding='UTF-8'?>
<Info location="abortset_update_bug" type="File" />
Original file line number Diff line number Diff line change
@@ -0,0 +1,2 @@
<?xml version='1.0' encoding='UTF-8'?>
<Info />
Original file line number Diff line number Diff line change
@@ -0,0 +1,2 @@
<?xml version='1.0' encoding='UTF-8'?>
<Info location="toolbar_pulldown_bug" type="File" />
Original file line number Diff line number Diff line change
@@ -0,0 +1,2 @@
<?xml version='1.0' encoding='UTF-8'?>
<Info Ref="issues/toolbar_pulldown_bug" Type="Relative" />
Original file line number Diff line number Diff line change
@@ -0,0 +1,2 @@
<?xml version='1.0' encoding='UTF-8'?>
<Info location="bf5c30d4-02b3-40dd-8556-da39891600d9" type="Reference" />
Original file line number Diff line number Diff line change
@@ -0,0 +1,2 @@
<?xml version='1.0' encoding='UTF-8'?>
<Info Ref="issues/abortset_update_bug" Type="Relative" />
Original file line number Diff line number Diff line change
@@ -0,0 +1,2 @@
<?xml version='1.0' encoding='UTF-8'?>
<Info location="a2cc9bef-7faf-4741-9f46-0d90c26a4d0e" type="Reference" />
Original file line number Diff line number Diff line change
@@ -0,0 +1,2 @@
<?xml version='1.0' encoding='UTF-8'?>
<Info />
Original file line number Diff line number Diff line change
@@ -0,0 +1,2 @@
<?xml version='1.0' encoding='UTF-8'?>
<Info location="Widgets Toolbox 2.0.3.mltbx" type="File" />
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
<?xml version='1.0' encoding='UTF-8'?>
<Info>
<Category UUID="FileClassCategory">
<Label UUID="design" />
<Label UUID="test" />
</Category>
</Info>
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
<?xml version='1.0' encoding='UTF-8'?>
<Info>
<Category UUID="FileClassCategory">
<Label UUID="design" />
<Label UUID="test" />
</Category>
</Info>
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
<?xml version='1.0' encoding='UTF-8'?>
<Info>
<Category UUID="FileClassCategory">
<Label UUID="test" />
</Category>
</Info>
Original file line number Diff line number Diff line change
@@ -0,0 +1,2 @@
<?xml version='1.0' encoding='UTF-8'?>
<Info location="Toolbar.m" type="File" />
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
<?xml version='1.0' encoding='UTF-8'?>
<Info>
<Category UUID="FileClassCategory">
<Label UUID="test" />
</Category>
</Info>
Original file line number Diff line number Diff line change
@@ -0,0 +1,2 @@
<?xml version='1.0' encoding='UTF-8'?>
<Info location="TaskStatusTable.m" type="File" />
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
<?xml version='1.0' encoding='UTF-8'?>
<Info>
<Category UUID="FileClassCategory">
<Label UUID="test" />
</Category>
</Info>
Original file line number Diff line number Diff line change
@@ -0,0 +1,2 @@
<?xml version='1.0' encoding='UTF-8'?>
<Info location="ProgressBar.m" type="File" />
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
<?xml version='1.0' encoding='UTF-8'?>
<Info>
<Category UUID="FileClassCategory">
<Label UUID="test" />
</Category>
</Info>
Original file line number Diff line number Diff line change
@@ -0,0 +1,2 @@
<?xml version='1.0' encoding='UTF-8'?>
<Info location="ButtonGrid.m" type="File" />
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
<?xml version='1.0' encoding='UTF-8'?>
<Info>
<Category UUID="FileClassCategory">
<Label UUID="test" />
</Category>
</Info>
Original file line number Diff line number Diff line change
@@ -0,0 +1,2 @@
<?xml version='1.0' encoding='UTF-8'?>
<Info location="CheckboxList.m" type="File" />
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
<?xml version='1.0' encoding='UTF-8'?>
<Info>
<Category UUID="FileClassCategory">
<Label UUID="design" />
<Label UUID="test" />
</Category>
</Info>
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
<?xml version='1.0' encoding='UTF-8'?>
<Info>
<Category UUID="FileClassCategory">
<Label UUID="test" />
</Category>
</Info>
Original file line number Diff line number Diff line change
@@ -0,0 +1,2 @@
<?xml version='1.0' encoding='UTF-8'?>
<Info location="PasswordField.m" type="File" />
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
<?xml version='1.0' encoding='UTF-8'?>
<Info>
<Category UUID="FileClassCategory">
<Label UUID="design" />
</Category>
</Info>
Original file line number Diff line number Diff line change
@@ -0,0 +1,2 @@
<?xml version='1.0' encoding='UTF-8'?>
<Info location="rjImageGallery.m" type="File" />
Original file line number Diff line number Diff line change
@@ -0,0 +1,2 @@
<?xml version='1.0' encoding='UTF-8'?>
<Info />
Original file line number Diff line number Diff line change
@@ -0,0 +1,2 @@
<?xml version='1.0' encoding='UTF-8'?>
<Info location="1" type="DIR_SIGNIFIER" />
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
<?xml version='1.0' encoding='UTF-8'?>
<Info>
<Category UUID="FileClassCategory">
<Label UUID="design" />
</Category>
</Info>
Original file line number Diff line number Diff line change
@@ -0,0 +1,2 @@
<?xml version='1.0' encoding='UTF-8'?>
<Info location="ImageGallery.m" type="File" />
Original file line number Diff line number Diff line change
@@ -0,0 +1,2 @@
<?xml version='1.0' encoding='UTF-8'?>
<Info />
Original file line number Diff line number Diff line change
@@ -0,0 +1,2 @@
<?xml version='1.0' encoding='UTF-8'?>
<Info location="sandbox" type="File" />
14 changes: 11 additions & 3 deletions runTestSuite.m
Original file line number Diff line number Diff line change
@@ -1,11 +1,11 @@
function [testSuite, result] = runTestSuite()
% Run the test suite

% Copyright 2019-2020 The MathWorks, Inc.
% Copyright 2019-2021 The MathWorks, Inc.


%% Create test suite
testSuite = matlab.unittest.TestSuite.fromPackage('wt.test');
testSuite = matlab.unittest.TestSuite.fromProject(currentProject);


%% Run tests
Expand All @@ -14,4 +14,12 @@

%% Display Results
ResultTable = result.table();
disp(ResultTable);
disp(ResultTable);


%% Did results all pass?
if all([result.Passed])
disp("All Tests Passed");
else
warning("widgets:runTestSuite","Not all tests passed. Check results.");
end
Loading

0 comments on commit 3608ca3

Please sign in to comment.