Commit 168dbdd4 authored by Matthew Dawson's avatar Matthew Dawson
Browse files

Merge branch 'master' into jtet_int 

Conflicts:
	@GUI/GUI.m
parents e2975dd3 e16aee40

+TableBlock/set_code.m

+4 −0
Original line number Diff line number Diff line
@@ -87,6 +87,8 @@ for i=1:size(inports,1) 
    

    for j=1:size(in_handles,1)

        if strcmp(get_param(inports(i),'Name'),get_param(in_handles(j),'Name'))

            % Make sure the port numbers agree.

            set_param(inports(i), 'Port', get_param(in_handles(j), 'Port'));

            found = 1;

        end

    end
@@ -121,6 +123,8 @@ for j = 1:size(in_handles,1) 
        add_block('simulink/Sources/In1',new_port);

        new_port_num = sprintf('%s/1',get_param(in_handles(j),'Name'));

        dest_port = sprintf('%s/%d','code',j);

        % Set the port number so the ports line up properly.

        set_param(new_port, 'Port', get_param(in_handles(j), 'Port'));

        % sometimes line will be created automatically

        try

            add_line(getfullname(block_handle),new_port_num,dest_port);

@Cell/purge.m

0 → 100644
+19 −0
Original line number Diff line number Diff line 
%% purge

%    Removes useless data from the block on saving, avoiding unnecessary

%    changes and data storage.

% inputs:

%   object - Cell object

% outputs:

%   none

% Author: Matthew Dawson <matthew@mjdsystems.ca>

% Organization: McMaster Centre for Software Certification

function  purge( object )

object.grid_pb = [];

object.cond = [];

object.color = []; % This is always regenerated, so it is safe to kill.



for i=1:size(object.subgrid,2)

    object.subgrid(i).purge;

end

end

@Cell/upgrade.m

0 → 100644
+18 −0
Original line number Diff line number Diff line 
%% upgrade

%    Preforms any necessary upgrades to the TET to comply with the latest version.

% inputs:

%   object - Cell object

% outputs:

%   none

% Author: Matthew Dawson <matthew@mjdsystems.ca>

% Organization: McMaster Centre for Software Certification

function  upgrade( object )

if iscell(object.cond_text)

    object.cond_text = object.cond_text{1};

end



for i=1:size(object.subgrid,2)

    object.subgrid(i).upgrade;

end

end

@Data/purge.m

0 → 100644
+16 −0
Original line number Diff line number Diff line 
%% purge

%    Removes useless data from the block on saving, avoiding unnecessary

%    changes and data storage.

% inputs:

%   object - Data object

% outputs:

%   none

% Author: Matthew Dawson <matthew@mjdsystems.ca>

% Organization: McMaster Centre for Software Certification

function purge( object )

object.Grid0.purge



object.Grid1.purge

object.Grid2.purge

end

@Data/upgrade.m

0 → 100644
+15 −0
Original line number Diff line number Diff line 
%% upgrade

%    Preforms any necessary upgrades to the TET to comply with the latest version.

% inputs:

%   object - Data object

% outputs:

%   none

% Author: Matthew Dawson <matthew@mjdsystems.ca>

% Organization: McMaster Centre for Software Certification

function upgrade( object )

object.Grid0.upgrade



object.Grid1.upgrade

object.Grid2.upgrade

end