Skip to content

Commit

Permalink
package release 2.0.0
Browse files Browse the repository at this point in the history
  • Loading branch information
rjackey committed Nov 24, 2020
1 parent ff4263b commit c8a758e
Show file tree
Hide file tree
Showing 41 changed files with 151 additions and 60 deletions.
35 changes: 19 additions & 16 deletions deploy/Toolbox Packaging Project.prj
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
<deployment-project plugin="plugin.toolbox" plugin-version="1.0">
<configuration file="C:\Work\widgets-toolbox-2020\deploy\Toolbox Packaging Project.prj" location="C:\Work\widgets-toolbox-2020\deploy" name="Toolbox Packaging Project" target="target.toolbox" target-name="Package Toolbox">
<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>[email protected]</param.email>
Expand Down Expand Up @@ -30,9 +30,15 @@ Planning a complex or business-critical app? MathWorks Consulting can advise you
<param.screenshot>${PROJECT_ROOT}\widgets_logo.png</param.screenshot>
<param.version>2.0.0</param.version>
<param.output>${PROJECT_ROOT}\Widgets Toolbox - MATLAB App Building Components.mltbx</param.output>
<param.products.name />
<param.products.id />
<param.products.version />
<param.products.name>
<item>MATLAB</item>
</param.products.name>
<param.products.id>
<item>1</item>
</param.products.id>
<param.products.version>
<item>9.9</item>
</param.products.version>
<param.platforms />
<param.guid>78895307-cc36-4970-8b66-0697da8f9352</param.guid>
<param.exclude.filters />
Expand All @@ -51,7 +57,7 @@ Planning a complex or business-critical app? MathWorks Consulting can advise you
<param.apps />
<param.registered.apps />
<param.docs />
<param.getting.started.guide>C:\Work\widgets-toolbox-2020\widgets\doc\GettingStarted.mlx</param.getting.started.guide>
<param.getting.started.guide>C:\Work\widgets-toolbox\widgets\doc\GettingStarted.mlx</param.getting.started.guide>
<param.matlabpath.excludes />
<param.javaclasspath.excludes />
<param.exported.on.package>true</param.exported.on.package>
Expand All @@ -76,9 +82,6 @@ Planning a complex or business-critical app? MathWorks Consulting can advise you
<param.email />
<param.company />
<param.output />
<param.products.name />
<param.products.id />
<param.products.version />
<param.platforms />
<param.exclude.filters />
<param.exclude.pcodedmfiles />
Expand All @@ -104,21 +107,21 @@ Planning a complex or business-critical app? MathWorks Consulting can advise you
<param.additional.sw.linux.url />
</unset>
<fileset.rootdir>
<file>C:\Work\widgets-toolbox-2020\widgets</file>
<file>C:\Work\widgets-toolbox\widgets</file>
</fileset.rootdir>
<fileset.rootfiles>
<file>C:\Work\widgets-toolbox-2020\widgets\+wt</file>
<file>C:\Work\widgets-toolbox-2020\widgets\Contents.m</file>
<file>C:\Work\widgets-toolbox-2020\widgets\demos.xml</file>
<file>C:\Work\widgets-toolbox-2020\widgets\doc</file>
<file>C:\Work\widgets-toolbox-2020\widgets\examples</file>
<file>C:\Work\widgets-toolbox-2020\widgets\icons</file>
<file>C:\Work\widgets-toolbox\widgets\+wt</file>
<file>C:\Work\widgets-toolbox\widgets\Contents.m</file>
<file>C:\Work\widgets-toolbox\widgets\demos.xml</file>
<file>C:\Work\widgets-toolbox\widgets\doc</file>
<file>C:\Work\widgets-toolbox\widgets\examples</file>
<file>C:\Work\widgets-toolbox\widgets\icons</file>
</fileset.rootfiles>
<fileset.depfun.included />
<fileset.depfun.excluded />
<fileset.package />
<build-deliverables>
<file location="${PROJECT_ROOT}" name="Widgets Toolbox - MATLAB App Building Components.mltbx" optional="false">C:\Work\widgets-toolbox-2020\deploy\Widgets Toolbox - MATLAB App Building Components.mltbx</file>
<file location="${PROJECT_ROOT}" name="Widgets Toolbox - MATLAB App Building Components.mltbx" optional="false">C:\Work\widgets-toolbox\deploy\Widgets Toolbox - MATLAB App Building Components.mltbx</file>
</build-deliverables>
<workflow />
<matlab>
Expand Down
Binary file modified release/Widgets Toolbox 2.0.0.mltbx
Binary file not shown.

This file was deleted.

This file was deleted.

This file was deleted.

This file was deleted.

This file was deleted.

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.0.mltbx" type="File" />
Original file line number Diff line number Diff line change
@@ -0,0 +1,2 @@
<?xml version='1.0' encoding='UTF-8'?>
<Info location="DependencyAnalysis" type="Extension" />
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="DisplayNonScalarObjectAsTable.m" type="File" />

This file was deleted.

Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
<?xml version='1.0' encoding='UTF-8'?>
<Info />
<Info File0="createNewSession" />
Original file line number Diff line number Diff line change
@@ -0,0 +1,2 @@
<?xml version='1.0' encoding='UTF-8'?>
<Info location="ExternalFiles" type="Extension" />

This file was deleted.

This file was deleted.

This file was deleted.

This file was deleted.

2 changes: 2 additions & 0 deletions resources/project/root/HoHDHQ_WvHAAKj5aJOrvrg_vpt8p.xml
Original file line number Diff line number Diff line change
@@ -0,0 +1,2 @@
<?xml version='1.0' encoding='UTF-8'?>
<Info location="Extensions" type="Root" />
4 changes: 2 additions & 2 deletions widgets/+wt/+apps/BaseSingleSessionApp.m
Original file line number Diff line number Diff line change
Expand Up @@ -38,7 +38,7 @@


%% Abstract Methods (subclass must implement these)
methods(Abstract, Access = protected)
methods (Abstract, Access = protected)

% Creates a new session object for the app. It must return a
% subclass of wt.model.BaseSession
Expand Down Expand Up @@ -196,7 +196,7 @@ function close(app)


%% Protected Methods
methods (Access=protected)
methods (Access = protected)

function setup_internal(app)
% Preform internal pre-setup necessary
Expand Down
92 changes: 92 additions & 0 deletions widgets/+wt/+mixin/DisplayNonScalarObjectAsTable.m
Original file line number Diff line number Diff line change
@@ -0,0 +1,92 @@
classdef (HandleCompatible) DisplayNonScalarObjectAsTable < matlab.mixin.CustomDisplay
% DisplayNonScalarObjectAsTable -
% ---------------------------------------------------------------------
% Abstract: This mixin class overrides displayNonScalarObject() to
% display an array of objects as a table.
%

% Copyright 2018-2019 The MathWorks, Inc.
%
% Auth/Revision:
% MathWorks Consulting
% $Author: rjackey $
% $Revision: 348 $ $Date: 2018-03-02 15:51:54 -0500 (Fri, 02 Mar 2018) $
% ---------------------------------------------------------------------


%% Public Methods
methods (Sealed)

function t = toDisplayTable(obj)
% Convert the object to a table

% Prepare indices as row names
numObj = numel(obj);
if isrow(obj)
indices = string(1:numObj)';
else
varargout = cell(1,ndims(obj));
[varargout{:}] = ind2sub(size(obj),1:numObj);
indices = string(vertcat(varargout{:})');
indices = join(indices,',',2);
end
rowNames = "(" + indices + ")";

% Check for deleted handle objects
if isa(obj,'handle')
isDeleted = ~isvalid(obj);
obj(isDeleted) = [];
rowNames(isDeleted) = [];
end

% Gather property info
props = string( properties(obj) )';

% Preallocate a cell to store values
numProps = numel(props);
numObj = numel(obj);
values = cell(numObj,numProps);

% Populate cell with property values
for pIdx = 1:numProps
thisProp = props(pIdx);
values(:,pIdx) = {obj.(thisProp)}';
end %for

% Convert to table
t = cell2table(values,'VariableNames',props,'RowNames',rowNames);

end %function

end %methods


%% Protected Methods
methods (Sealed, Access=protected)

function displayNonScalarObject(obj)

% Format text to display
className = matlab.mixin.CustomDisplay.getClassNameForHeader(obj);
dimStr = matlab.mixin.CustomDisplay.convertDimensionsToString(obj);

% Display the header
if isa(obj,'matlab.mixin.Heterogeneous')
fprintf(' %s Heterogeneous %s with common properties:\n\n',dimStr,className);
else
fprintf(' %s %s with properties:\n\n',dimStr,className);
end

% Show the group list in a table
disp( obj.toDisplayTable() );

if isa(obj,'handle') && any(~isvalid(obj))
fprintf(' Object array contains deleted handles.\n');
end

end %function

end %methods


end % classdef
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
2 changes: 1 addition & 1 deletion widgets/+wt/ColorSelector.m
Original file line number Diff line number Diff line change
Expand Up @@ -35,7 +35,7 @@


%% Internal Properties
properties (Access = {?wt.ColorPicker, ?wt.test.BaseWidgetTest}, Transient, NonCopyable)
properties (Access = {?wt.ColorSelector, ?wt.test.BaseWidgetTest}, Transient, NonCopyable)

% Button
ButtonControl (1,1) matlab.ui.control.Button
Expand Down
Binary file modified widgets/examples/WidgetExamples.mlx
Binary file not shown.
40 changes: 20 additions & 20 deletions widgets/examples/html/WidgetExamples.html

Large diffs are not rendered by default.

0 comments on commit c8a758e

Please sign in to comment.