Commit 3569ceda authored by Matthew Dawson's avatar Matthew Dawson
Browse files

Make the GUI load the function name/inputs properly, and re-enable close button. 

The close button now does what it used to.  Also fix loading the function name/function
inputs.


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

@GUI/GUI.m

+0 −2
Original line number Diff line number Diff line
@@ -36,8 +36,6 @@ classdef GUI < handle 
        input_pb = [];

        settings_pb = [];

        function_name_control = [];

        function_name_text = [];

        function_inputs_text = [];

        function_inputs_control = [];

        edit = 1;

        initialized = 0;

@GUI/close_fig.m

+2 −6
Original line number Diff line number Diff line
@@ -10,17 +10,13 @@ 
% Author: Colin Eles elesc@mcmaster.ca

% Organization: McMaster Centre for Software Certification

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

if ishandle(object.fig)

    delete(object.fig);

end

return ;

if (object.validation_report_handle ~= 0)

    delete(object.validation_report_handle);

    object.validation_report_handle = 0;

end

object.save_data;

object.Data.open = 0;

object.Data.fig = [];

object.data.open = 0;

object.data.fig = [];

delete(object.fig);

% remove reference to the old figure.

object.fig = [];

@GUI/evaluate_counter.m

+2 −2
Original line number Diff line number Diff line
@@ -11,9 +11,9 @@ 
% Organization: McMaster Centre for Software Certification

function [] = evaluate_counter(object,counter)



problem = object.evaluate_counter_grid(object.Grid2, counter);

problem = object.evaluate_counter_grid(object.data.left_cond, counter);

if(~problem && object.multi_mode == 0)

    object.evaluate_counter_grid(object.Grid1, counter);

    object.evaluate_counter_grid(object.data.top_cond, counter);

end

end

@GUI/init.m

+4 −6
Original line number Diff line number Diff line
@@ -132,11 +132,11 @@ object.function_inputs_control = uicontrol('style','edit',... 




% load the function name and inputs

if (~isempty(object.function_name_text))

    set(object.function_name_control,'String',object.function_name_text);

if (~isempty(object.data.function_name))

    set(object.function_name_control,'String',object.data.function_name);

end

if (~isempty(object.function_inputs_text))

    set(object.function_inputs_control,'String',object.function_inputs_text);

if (~isempty(object.data.function_inputs))

    set(object.function_inputs_control,'String',object.data.function_inputs);

end
@@ -227,8 +227,6 @@ object.vbox_layout.addlistener('BoundingBoxChanged', @(src, event)set_command_po 
object.set_command_pos;



object.pvs_checked = object.data.checked;

object.function_name_text = object.data.function_name;

object.function_inputs_text = object.data.function_inputs;

object.multi_mode = object.data.multi_mode;

if isempty(object.multi_mode)

    object.multi_mode = 0;

@GUI/save_data.m

+0 −3
Original line number Diff line number Diff line
@@ -8,9 +8,6 @@ 
% Author: Colin Eles elesc@mcmaster.ca

% Organization: McMaster Centre for Software Certification

function [] = save_data(object)

% depricated

object.function_name_text = get(object.function_name_control,'String');

object.function_inputs_text = get(object.function_inputs_control,'String');

% new storage

object.data.function_name = get(object.function_name_control,'String');

object.data.function_inputs = get(object.function_inputs_control,'String');