Commit c1974580 authored by Matthew Dawson's avatar Matthew Dawson
Browse files

Create new branch for TT refactor. 


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

@CVC_checker/generate_file.m

+1 −1
Original line number Diff line number Diff line
@@ -39,7 +39,7 @@ if size(object.data.Grid2.cells,2) > 1 
end

code = [code new_code];



if size(object.data.Grid1.cells,2) > 1

if object.data.multi_mode == 0 && size(object.data.Grid1.cells,2) > 1

    [new_code,new_queries] = CVC_checker.generate_cvc_grid(object.data.Grid1,size(queries,2));

    queries = [queries new_queries];

    code = [code new_code];

@EMLGenerator/generate_preamble.m

+8 −2
Original line number Diff line number Diff line
@@ -59,13 +59,19 @@ end 
% guaranteed to

% be filled in, regardless of the dimensionality of the table.



left_top_right_top_cell = object.data.Grid2.cells(1);

while size(left_top_right_top_cell.subgrid) ~= 0

    left_top_right_top_cell = left_top_right_top_cell.subgrid.cells(1);

end





if (object.data.multi_mode == 1)

    for i=1:size(object.data.Grid1.cells,2)

        parsed_output = EMLGenerator.parse_inputs(strtrim(char(object.data.Grid1.cells(i).cond_text)));

        

        output_str = char(parsed_output{1}(1));



        code = [code sprintf('%s=%s;\n',output_str,EMLGenerator.type_convert(output_str,object.datatype,char(object.data.Grid0.Cells(i).result_text)))];

        code = [code sprintf('%s=%s;\n',output_str,EMLGenerator.type_convert(output_str,object.datatype,char(object.data.Grid0.search_return(object.data.Grid1.cells(i), left_top_right_top_cell).result_text)))];

        

    end

@GUI/check_grid_condition.m

+6 −4
Original line number Diff line number Diff line
@@ -17,11 +17,13 @@ for i = 1:size(grid.cells,2) 
    error = '';

    string = get(grid.cells(i).cond,'String');



    if size(string) > 0

        s = [string(1,:)];

        for j = 2:size(string,1)

           s = [s ' ' string(j,:)];

        end

        string = s;

    end

    

    if ( strcmp(string,'') || isempty(string)) && i == 1 && isempty(grid.parent_grid) && size(grid.cells,2) == 1

        break;

@PVS_checker/pvs_check_for_imports_g.m

+6 −4
Original line number Diff line number Diff line
@@ -24,11 +24,13 @@ for i=1:size(grid.cells,2) 
    end

    text = char(grid.cells(i).cond_text);



    if size(text) > 0

        s = [text(1,:)];

        for j = 2:size(text,1)

           s = [s ' ' text(j,:)];

        end

        text = s;

    end

    

    vars = regexp(text,'([a-zA-Z][a-zA-Z0-9_]*)','match');