Commit 2803df7c authored by Matthew Dawson's avatar Matthew Dawson
Browse files

Get Let statements fully hooked up into the gui. 

Let statements are that much closer to working.


git-svn-id: https://groke.mcmaster.ca/svn/grad/colin/branches/TableTool_refactor@8750 57e6efec-57d4-0310-aeb1-a6c144bb1a8b
parent 1ae3673a

+GUIHelpers/update_cell.m

0 → 100644
+7 −0
Original line number Diff line number Diff line 
function update_cell( src, event, cell )

%UPDATE_CELL Updates the cell with the control's string

%   A helper callback for updating the cell given to the controls text.

cell.set_string(get(src, 'String'));



end

@Data/Data.m

+3 −0
Original line number Diff line number Diff line
@@ -8,6 +8,7 @@ classdef Data < handle 
        left_cond = [];

        top_cond = [];

        outputs_grid = [];

        let_statements = [];

        function_name = [];

        function_inputs = [];

        settings = [];
@@ -32,6 +33,8 @@ classdef Data < handle 
            object.top_cond = HierarchicalGrid();

            object.outputs_grid = TableGrid();

            

            object.let_statements = LetStatments();

        

            object.left_cond.addlistener('AddedOuterCell', @(src, event) left_grid_added_cell(object, src, event));

            object.left_cond.addlistener('RemovedOuterCell', @(src, event) object.outputs_grid.delete_row(event.changed_cell));

            object.top_cond.addlistener('AddedOuterCell', @(src, event) top_grid_added_cell(object, src, event));

@GUI/GUI.m

+7 −1
Original line number Diff line number Diff line
@@ -12,10 +12,16 @@ classdef GUI < handle 
        %output grid

        outputs_grid = [];

        

        %Let statements grid

        let_statments_grid = [];

        

        %grid layouter

        grid_layout = [];

        

        %Box layouter

        vbox_layout = [];

        %And its panel ...

        grid_layout_panel = [];

        vbox_layout_panel = [];

        

        main_fig = [];

        frame = [];

@GUI/init.m

+10 −3
Original line number Diff line number Diff line
@@ -200,15 +200,22 @@ object.vertical_grid = VerticalHierarchicalGridDraw(object.data.left_cond); 
object.horizontal_grid = HorizontalLineGridDraw(object.data.top_cond);

object.outputs_grid = TableGridDraw(object.data.outputs_grid);



object.let_statments_grid = LetStatmentsDraw(object.data.let_statements);



object.grid_layout = GridLayout();

object.grid_layout.insert_drawable(object.vertical_grid, 1, 2);

object.grid_layout.insert_drawable(object.horizontal_grid, 2, 1);

object.grid_layout.insert_drawable(object.outputs_grid, 2, 2);



object.grid_layout_panel = uipanel(object.fig);

object.grid_layout.draw(object.grid_layout_panel);



object.grid_layout.addlistener('BoundingBoxChanged', @(src, event)set_command_pos(object) );

object.vbox_layout = VLayout();

object.vbox_layout.add_child(object.grid_layout);

object.vbox_layout.add_child(object.let_statments_grid);

object.vbox_layout_panel = uipanel(object.fig);



object.vbox_layout.draw(object.vbox_layout_panel);



object.vbox_layout.addlistener('BoundingBoxChanged', @(src, event)set_command_pos(object) );



object.set_command_pos;

@GUI/resize_fig.m

+1 −1
Original line number Diff line number Diff line
@@ -12,7 +12,7 @@ 
% Organization: McMaster Centre for Software Certification

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

if(object.initialized == 1)

    object.grid_layout.draw_onto(object.grid_layout_panel);

    object.vbox_layout.redraw;

    object.set_command_pos;

end

end