Commit b3ea8731 authored by Colin Eles's avatar Colin Eles
Browse files

fixed issue with inability to close report window, as well as a few other minor fixes 

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

@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 = 1;

        multi_output = 0;

    end

    

    methods(Static)

@EMLGenerator/parse_inputs.m

+4 −1
Original line number Diff line number Diff line
@@ -11,7 +11,7 @@ 
        function revised_input = parse_inputs(input_string)

            revised_input = [];

            input_string2 = reshape(input_string',1,size(input_string,1)*size(input_string,2));

           inputs = regexprep(input_string2,'\s','');

           inputs = regexprep(input_string2,'\n','');

           inputs = regexp(inputs,',','split');

           

           % need to be careful here because pvs dependant types can have
@@ -21,6 +21,7 @@ 
           % variable any thing following is considered the type

           c_locations = regexp(inputs,':','start');

           for i= 1:size(inputs,2)

               sub_input = [];

                if size(c_locations{i},2) == 0

                    sub_input{1} = inputs{i};

                    new_inputs{i} = sub_input;
@@ -36,6 +37,8 @@ 
           %inputs = regexp(inputs,':','split')

           

           for i=1:size(new_inputs,2)

                new_inputs{i}(1) = regexprep(new_inputs{i}(1),'\s','');



                valid = regexp(new_inputs{i}(1),'[a-zA-Z][_a-zA-Z0-9]*','match');

                if isempty(char(new_inputs{i}(1))) || ~strcmp(new_inputs{i}(1),valid{1})

                    new_inputs{i}(2) = {'error'};

@GUI/GUI.m

+1 −0
Original line number Diff line number Diff line
@@ -53,6 +53,7 @@ classdef GUI < handle 
        EMLGen = [];

        TableBlk = [];

        saved = [];

        validation_report_handle = [];

    end

    

    methods

@GUI/close_fig.m

+8 −1
Original line number Diff line number Diff line
@@ -8,12 +8,19 @@ 
        % outputs:

        %   none

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



            if (object.validation_report_handle ~= 0)

                delete(object.validation_report_handle)

            end

            object.save_data;

            object.Data.open = 0;

            object.Data.fig = [];

            delete(object.fig);

            % remove reference to the old figure.

            object.fig = [];

            % in simulink mode

            if(object.mode == 1)

                parent = get_param(object.block_handle,'Parent');

                open_system(parent);

            end

        end

@GUI/evaluate_counter_grid.m

+6 −1
Original line number Diff line number Diff line
@@ -11,7 +11,12 @@ 
        function problem = evaluate_counter_grid(object,grid,counter)

        % split the list of inputs to get inputs seperatly

           inputs = get(object.function_inputs_control,'String');

           inputs = regexp(inputs,',','split');

           inputs2 = [];

           for i=1:size(inputs,1)

               inputs2 = [inputs2 inputs(i,:)]

           end

           inputs2 = regexprep(inputs2,'\s','');        

           inputs = regexp(inputs2,',','split');

           check_string = [];

           

           % keep track of the number of condtitions that evaulate to true