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

fixed multi output problems 

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

@Cell/set_pb.m

+1 −1
Original line number Diff line number Diff line
@@ -14,7 +14,7 @@ 
                'position',pos,...   

                'callback',@(src,event)pb_call(object,src,event));

            elseif (object.pb_flag == 1 && ~isempty(object.grid_pb))

                    set(object.grid_pb,'position',pos);

                    set(object.grid_pb,'Position',pos);

                else

                end

        end

@EMLGenerator/EMLGenerator.m

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

        

        

        converted = type_convert(type,expression)

        converted = type_convert(name,type,expression)

@EMLGenerator/generate_eml_cond.m

+2 −2
Original line number Diff line number Diff line
@@ -64,7 +64,7 @@ 
                        

                        resultcell = object.data.Grid0.search_return(g1.cells(1),g2.cells(i));

                        if(~isempty(resultcell))

                                code = [code sprintf('%soutput = %s;\n',[space '  '],EMLGenerator.type_convert(object.datatype,strtrim(char(resultcell.result_text))))];

                                code = [code sprintf('%soutput = %s;\n',[space '  '],EMLGenerator.type_convert('output',object.datatype,strtrim(char(resultcell.result_text))))];



                        else

                        end
@@ -85,7 +85,7 @@ 
                

                        resultcell = object.data.Grid0.search_return(g1.cells(1),elsecell);

                        if(~isempty(resultcell))

                             code = [code sprintf('%soutput = %s;\n',[space '  '],EMLGenerator.type_convert(object.datatype,strtrim(char(resultcell.result_text))))];

                             code = [code sprintf('%soutput = %s;\n',[space '  '],EMLGenerator.type_convert('output',object.datatype,strtrim(char(resultcell.result_text))))];

                                

                        end

                    end

@EMLGenerator/generate_eml_horizontal.m

+2 −2
Original line number Diff line number Diff line
@@ -36,14 +36,14 @@ 
                end

                resultcell = object.data.Grid0.search_return(g1.cells(i),g2_cell);

                if(~isempty(resultcell))

                     code = [code sprintf('%soutput = %s;\n',[space '  '],EMLGenerator.type_convert(object.datatype,strtrim(char(resultcell.result_text))))];

                     code = [code sprintf('%soutput = %s;\n',[space '  '],EMLGenerator.type_convert('output',object.datatype,strtrim(char(resultcell.result_text))))];

                                      

                else

                end

            end

            if(~isempty(elsecell))

                 resultcell = object.data.Grid0.search_return(elsecell,g2_cell);

                code = [code sprintf('%selse\n%soutput = %s;\n',space,[space '  '],EMLGenerator.type_convert(object.datatype,strtrim(char(resultcell.result_text))))];

                code = [code sprintf('%selse\n%soutput = %s;\n',space,[space '  '],EMLGenerator.type_convert('output',object.datatype,strtrim(char(resultcell.result_text))))];



            end

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

@EMLGenerator/generate_preamble.m

+4 −2
Original line number Diff line number Diff line
@@ -52,12 +52,14 @@ 


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

                           

                            code = [code sprintf('%s=%s;\n',output_str,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.Cells(i).result_text)))];



                    end

                    

                else

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

                    test  = 'output';

                    output_string = EMLGenerator.type_convert(test,object.datatype,char(object.data.Grid0.Cells(1).result_text) );

                      code = [code sprintf('output=%s;\n', output_string )];



                end