Changeset 662
- Timestamp:
- Jul 11, 2013, 4:34:29 PM (11 years ago)
- Location:
- trunk/src
- Files:
-
- 2 edited
Legend:
- Unmodified
- Added
- Removed
-
trunk/src/civ.m
r648 r662 900 900 set(hfig,'tag','civ_status') 901 901 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'); 903 903 uicontrol('Style','edit','Units','normalized', 'Position', [0.05 0.87 0.9 0.1],'tag','msgbox','Max',2,'String','checking files...'); 904 904 uicontrol('Style','frame','Units','normalized', 'Position', [0.05 0.81 0.9 0.05]); -
trunk/src/xml2struct.m
r655 r662 47 47 end 48 48 case 'char' 49 out=str2 num(ss);49 out=str2double(ss); 50 50 %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 is empty(out)51 if isnan(out) 52 52 sep_ind=regexp(ss,'\s&\s');% check for separator ' & ' which indicates column separation in tables 53 53 if ~isempty(sep_ind) … … 59 59 out=ss; %reproduce the input string 60 60 end 61 % else62 % out=str2num(ss);63 61 end 64 62 case 'cell'
Note: See TracChangeset
for help on using the changeset viewer.