Commit 37dc7dba authored by Colin Eles's avatar Colin Eles
Browse files

latest version, improved menu 

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

GUI.m

+34 −8
Original line number Diff line number Diff line
@@ -209,15 +209,15 @@ classdef GUI < handle 
            filemenu = uimenu('Label','File');

            editmenu = uimenu('Label','Edit');

            pvsmenu = uimenu('Label','PVS');

            uimenu(filemenu,'Label','New','Accelerator','n');

            uimenu(filemenu,'Label','New','Accelerator','n','Callback',@(src,event)new_call(obj,src,event));

            uimenu(filemenu,'Label','Open...');

            uimenu(filemenu,'Label','Save to Block','Separator','on');

            uimenu(filemenu,'Label','Save to M-File');

                       

            uimenu(filemenu,'Label','Save to Block','Separator','on','Accelerator','s','Callback',@(src,event)save_call(obj,src,event));

            uimenu(filemenu,'Label','Save to M-File','Callback',@(src,event)save_ext_call(obj,src,event));

            uimenu(filemenu,'Label','Close','Accelerator','w','Separator','on','Callback',@(src,event)close_fig(obj,src,event));     

    

            uimenu(editmenu,'Label','Show edit controls','Checked','on');

            uimenu(pvsmenu,'Label','Typecheck');

            uimenu(pvsmenu,'Label','PVS Settings');

            uimenu(pvsmenu,'Label','Typecheck','Accelerator','t','Callback',@(src,event)pvs_ext_call(obj,src,event));

            uimenu(pvsmenu,'Label','PVS Settings','Callback',@(src,event)settings_call(obj,src,event));

            

            obj.set_command_pos;

            obj.reset_wh();
@@ -243,6 +243,10 @@ classdef GUI < handle 
            

        end

        

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

            TableToolMatlab

        end

        

        %% set_command_pos

        %    sets the location of all the command buttons, labels and edit

        %    boxes, places objects at the top of the figure which it
@@ -377,7 +381,29 @@ classdef GUI < handle 
        % outputs;

        %   none

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

            if object.mode == 1

            if object.mode == 0

                model = gcs;

                %make sure we are not looking at the library model

                %if (strcmp(model,'eml_lib') || strcmp(model,'simulink'))

                    %create a new model

                    found = find_system('Table')

                    if isempty(found)

                       

                   

                        new_system('Table','Model')



                    end

                    model = 'Table'

                %end

                open_system(model);

                load_system('TableLibrary');

                new_block = add_block('TableLibrary/Tabular Expression',[model '/' get(object.function_name_control,'String')]);

                set_param(new_block,'UserData',object.Data)

                set_param(new_block, 'UserDataPersistent', 'on');

                object.mode = 1;

                object.block_handle = new_block;

                object.save_call([],[]);

            elseif object.mode == 1

                

                load_system('simulink')

                % generate the code