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

seperated functionality appears to be working now, may need more testing though 

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

EMLGenerator.m

+7 −7
Original line number Diff line number Diff line
@@ -90,7 +90,7 @@ classdef EMLGenerator < handle 
        function code = generate_eml_code(obj)

            code = [];

            code = [code obj.generate_preamble];

            code = [code obj.generate_conditional(obj.data.Grid1,obj.data.Grid2)];

            code = [code obj.generate_conditional(obj.data.Grid1,obj.data.Grid2,0)];

            

        end
@@ -142,7 +142,7 @@ classdef EMLGenerator < handle 
                        code = [code sprintf('%selseif(%s)\n',space,strtrim(char(g1.cells(j).cond_text)))];

                    end

                    

                    cell = obj.Grid0.search_return(g1.cells(j),g2.cells(1));

                    cell = obj.data.Grid0.search_return(g1.cells(j),g2.cells(1));

                    if(~isempty(cell))

                        depth = depth + 1;

                        space = [];
@@ -173,7 +173,7 @@ classdef EMLGenerator < handle 
                if (~isempty(elsecell))

                    code = [code sprintf('%selse\n',space)];



                    cell = obj.Grid0.search_return(elsecell,g2.cells(1));

                    cell = obj.data.Grid0.search_return(elsecell,g2.cells(1));

                    if(~isempty(cell))

                        depth = depth + 1;

                        space = [];
@@ -250,7 +250,7 @@ classdef EMLGenerator < handle 
                                    end

                                end

                                

                                cell = obj.Grid0.search_return(g1.cells(j),g2.cells(i))

                                cell = obj.data.Grid0.search_return(g1.cells(j),g2.cells(i))

                                if(~isempty(cell))

                                    depth = depth + 1;

                                    space = [];
@@ -284,7 +284,7 @@ classdef EMLGenerator < handle 
                                if (~isempty(elsecell1))

                                    code = [code sprintf('%selse\n',space)];



                                    cell = obj.Grid0.search_return(elsecell1,g2.cells(i))

                                    cell = obj.data.Grid0.search_return(elsecell1,g2.cells(i))

                                    if(~isempty(cell))

                                        depth = depth + 1;

                                        space = [];
@@ -353,7 +353,7 @@ classdef EMLGenerator < handle 
                                    end

                                end

                                

                                cell = obj.Grid0.search_return(g1.cells(j),g2.cells(elseindex));

                                cell = obj.data.Grid0.search_return(g1.cells(j),g2.cells(elseindex));

                                if(~isempty(cell))

                                    depth = depth + 1;

                                    space = [];
@@ -387,7 +387,7 @@ classdef EMLGenerator < handle 
                                if (~isempty(elsecell1))

                                    code = [code sprintf('%selse\n',space)];



                                    cell = obj.Grid0.search_return(elsecell1,g2.cells(elseindex));

                                    cell = obj.data.Grid0.search_return(elsecell1,g2.cells(elseindex));

                                    if(~isempty(cell))

                                        depth = depth + 1;

                                        space = [];

GUI.m

+1 −1
Original line number Diff line number Diff line
@@ -491,7 +491,7 @@ classdef GUI < handle 
                %code = [code object.generate_code(object.Grid1,object.Grid2,0)];

                %fprintf('%s',code);



               TableBlock.set_code(object.block_handle,code,obj.data.function_name);

               TableBlock.set_code(object.block_handle,code,object.Data.function_name);

TableBlock.m

+2 −2
Original line number Diff line number Diff line
@@ -112,7 +112,7 @@ classdef TableBlock < handle 
                    % for each line, call delete_recursive if handle still exist

                    for i=1:length( lines )

                        if ishandle( lines( i ) )

                            object.delete_recursive( lines( i ) )

                            TableBlock.delete_recursive( lines( i ) )

                        end

                    end

                % end copyright
@@ -236,7 +236,7 @@ classdef TableBlock < handle 
                    % for each line, call delete_recursive if handle still exist

                    for i=1:length( lines )

                        if ishandle( lines( i ) )

                            object.delete_recursive( lines( i ) )

                            TableBlock.delete_recursive( lines( i ) )

                        end

                    end   

                % end copyright