Commit 3ad73b0d authored by Colin Eles's avatar Colin Eles
Browse files

multiple outputs for pvs supported, need to add gui element to select which mode 

git-svn-id: https://groke.mcmaster.ca/svn/grad/colin/trunk/TableTool@6099 57e6efec-57d4-0310-aeb1-a6c144bb1a8b
parent b3ea8731

@EMLGenerator/EMLGenerator.m

+1 −1
Original line number Diff line number Diff line
@@ -5,7 +5,7 @@ classdef EMLGenerator < handle 
    properties

        data = [];

        datatype = [];

        multi_output = 0;

        multi_output = 1;

    end

    

    methods(Static)

@GUI/GUI.m

+2 −0
Original line number Diff line number Diff line
@@ -54,6 +54,8 @@ classdef GUI < handle 
        TableBlk = [];

        saved = [];

        validation_report_handle = [];

                multi_type = 1;



    end

    

    methods

@GUI/pvs_ext_call.m

+5 −0
Original line number Diff line number Diff line
@@ -13,8 +13,13 @@ 
                delete(object.validation_report_handle)

            end

            error = object.check_call;

            

            if(object.multi_type == 0)

            object.PVS.output_type = object.output_data_type;

            

            object.PVS.input_type = object.input_data_type;

            end

            

            if (~error)

                [check,result] = object.PVS.pvs_check;

                if (check == 1)

@GUI/save_call.m

+1 −2
Original line number Diff line number Diff line
@@ -11,7 +11,6 @@ 
        % outputs:

        %   none

        function eml_handle = save_call(object,src,event)

        multi_type = 0;

             if(object.check_call([],[]) == 1)

                 return;

             end
@@ -45,7 +44,7 @@ 
                

                load_system('simulink')

                % generate the code

                if multi_type == 0

                if object.multi_type == 0

                object.EMLGen.set_datatype(object.output_data_type);

                end

                code = object.EMLGen.generate_eml_code;

@PVS_checker/PVS_checker.m

+1 −0
Original line number Diff line number Diff line
@@ -10,6 +10,7 @@ classdef PVS_checker < handle 
        input_type = [];

        data = [];

        mode = []; % 0 - graphical, 1 - command

        multi_mode = 1;

    end

    

    % Static Functions