Commit e000013c authored by Matthew Dawson's avatar Matthew Dawson
Browse files

Put in futher changes forward. 


git-svn-id: https://groke.mcmaster.ca/svn/grad/colin/branches/TableTool_refactor@8704 57e6efec-57d4-0310-aeb1-a6c144bb1a8b
parent 5ae3166e

@GUI/check_call.m

+1 −1
Original line number Diff line number Diff line
@@ -16,7 +16,7 @@ error = 0; 
msg = object.check_inputs;

if (isempty(msg))

    set(object.function_inputs_control,'BackgroundColor',[1 1 1]);

    msg = object.check_grid_condition(object.Grid2);

    msg = object.check_grid_condition(object.data.left_cond); %TODO: Rename this function

    if object.multi_mode == 0

        msg = [msg object.check_grid_condition(object.Grid1)];

    end

@GUI/check_grid_condition.m

+3 −1
Original line number Diff line number Diff line
@@ -10,9 +10,11 @@ 
%   none

% Author: Colin Eles elesc@mcmaster.ca

% Organization: McMaster Centre for Software Certification



%TODO: Merge this back into the grid itself

function msg = check_grid_condition(object,grid)

msg = [];

for i = 1:size(grid.cells,2)

for i = 1:size(grid.grid,2)

    

    error = '';

    string = get(grid.cells(i).cond,'String');

@HierarchicalGrid/HierarchicalGrid.m

+4 −0
Original line number Diff line number Diff line
@@ -29,6 +29,10 @@ classdef HierarchicalGrid < handle 
            width = object.max_width_impl(object.grid, 1);

        end

        

        function cell = get_cell(object, cell_index)

            cell = object.grid{cell_index};

        end

        

    end

@HierarchicalGridCell/HierarchicalGridCell.m

+4 −1
Original line number Diff line number Diff line
@@ -6,7 +6,7 @@ classdef HierarchicalGridCell < handle 
    

    properties

        text = '';

        grid = [];

        grid = {};

    end
@@ -23,6 +23,9 @@ classdef HierarchicalGridCell < handle 
            

        end

        

        function cell = get_cell(object, cell_index)

            cell = object.grid{cell_index};

        end

    end