Changeset 662


Ignore:
Timestamp:
Jul 11, 2013, 4:34:29 PM (7 years ago)
Author:
sommeria
Message:

bug corrected in xml2struct

Location:
trunk/src
Files:
2 edited

Legend:

Unmodified
Added
Removed
  • trunk/src/civ.m

    r648 r662  
    900900    set(hfig,'tag','civ_status')
    901901    set(hfig,'UserData',civ_files)
    902     hlist= uicontrol('Style','listbox','Units','normalized', 'Position',[0.05 0.09 0.9 0.71], 'Callback', {'open_uvmat'},'tag','list');
     902    hlist= uicontrol('Style','listbox','Units','normalized', 'Position',[0.05 0.09 0.9 0.71], 'Callback', {@open_uvmat},'tag','list');
    903903    uicontrol('Style','edit','Units','normalized', 'Position', [0.05 0.87 0.9 0.1],'tag','msgbox','Max',2,'String','checking files...');
    904904    uicontrol('Style','frame','Units','normalized', 'Position', [0.05 0.81 0.9 0.05]);
  • trunk/src/xml2struct.m

    r655 r662  
    4747        end
    4848    case 'char'   
    49         out=str2num(ss);
     49        out=str2double(ss);
    5050        %if isempty(regexp(ss,'^(-*\d+\.*\d*\ *)+$'))% if the string does not contain a set of numbers (with possible sign and decimal) separated by blanks
    51         if isempty(out)
     51        if isnan(out)
    5252            sep_ind=regexp(ss,'\s&\s');% check for separator ' & ' which indicates column separation in tables
    5353            if ~isempty(sep_ind)
     
    5959                out=ss; %reproduce the input string
    6060            end
    61 %         else
    62 %             out=str2num(ss);
    6361        end
    6462    case 'cell'
Note: See TracChangeset for help on using the changeset viewer.