Commit 285c662a authored by Matthew Dawson's avatar Matthew Dawson
Browse files

Preform some more cleanup of code. 

 - Remove some extra output that creeped in.
 - s/Data/data/ for member variable.


git-svn-id: https://groke.mcmaster.ca/svn/grad/colin/branches/TableTool_refactor@8777 57e6efec-57d4-0310-aeb1-a6c144bb1a8b
parent 3fe4e5a0

@EMLGenerator/generate_eml_cond.m

+2 −3
Original line number Diff line number Diff line
@@ -12,9 +12,8 @@ 
%   code:string - string of eml code

% Author: Colin Eles elesc@mcmaster.ca

% Organization: McMaster Centre for Software Certification

function code = generate_eml_cond(object,g1,g2,depth,g1p,g2p)

function code = generate_eml_cond(object,g1,g2,depth,g2p)

if nargin == 4

    g1p = [];

    g2p = [];

end
@@ -39,7 +38,7 @@ else 
    

    elsecell = [];

    for i=1:g2.get_children_count(g2p)

        g2cond = g2.get_child_cell(g2p, i).get_matlab_string

        g2cond = g2.get_child_cell(g2p, i).get_matlab_string;

        % condition string of otherwise corresponds to an else

        % statement, we allow this statement to be in any order

        % in the cells of the grid, so we need to find where it

@GUI/init.m

+1 −1
Original line number Diff line number Diff line
@@ -183,7 +183,7 @@ object.default_prover = object.CVC_const; 


object.settings = TTSettings();

if isfield(object.data.settings, 'set')

    object.settings.setvalues(object.Data.settings);

    object.settings.setvalues(object.data.settings);

else

    object.settings.init();

end

@ValidationReport/close_req_call.m

+1 −1
Original line number Diff line number Diff line
@@ -11,7 +11,7 @@ 
% Author: Colin Eles elesc@mcmaster.ca

% Organization: McMaster Centre for Software Certification

function [] = close_req_call(object,src,event)

if (object.gui.Data.open)

if (object.gui.data.open)

    object.gui.check_call([],[]);

end

object.gui.validation_report_handle = 0;

TTdiag.m

+1 −1
Original line number Diff line number Diff line
@@ -129,7 +129,7 @@ if mode == 1 
elseif mode == 0

    gui = GUI(data, [],0);

end

data.outputs_grid



gui.init();

if(mode == 1)

    set_param(blockHandleTTTopMask,'UserData',data);