From c455f5c220837cad81f2b59e6cd939218ecae65a Mon Sep 17 00:00:00 2001 From: Colin Eles Date: Wed, 14 Jul 2010 18:59:33 +0000 Subject: [PATCH] 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 --- EMLGenerator.m | 14 +++++++------- GUI.m | 2 +- TableBlock.m | 4 ++-- 3 files changed, 10 insertions(+), 10 deletions(-) diff --git a/EMLGenerator.m b/EMLGenerator.m index d9b17f8..751f65b 100644 --- a/EMLGenerator.m +++ b/EMLGenerator.m @@ -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 = []; diff --git a/GUI.m b/GUI.m index e014a65..3f3aeba 100644 --- a/GUI.m +++ b/GUI.m @@ -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); diff --git a/TableBlock.m b/TableBlock.m index d3c0cc8..4682948 100644 --- a/TableBlock.m +++ b/TableBlock.m @@ -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 -- GitLab