Changeset 662 for trunk

Timestamp:

Jul 11, 2013, 4:34:29 PM (11 years ago)

Author:

sommeria

Message:

bug corrected in xml2struct

Location:

trunk/src

Files:

• civ.m (modified) (1 diff)
• xml2struct.m (modified) (2 diffs)

trunk/src/civ.m

@@ -900 +900 @@
     set(hfig,'tag','civ_status')
     set(hfig,'UserData',civ_files)
-    hlist= uicontrol('Style','listbox','Units','normalized', 'Position',[0.05 0.09 0.9 0.71], 'Callback', {'open_uvmat'},'tag','list');
+    hlist= uicontrol('Style','listbox','Units','normalized', 'Position',[0.05 0.09 0.9 0.71], 'Callback', {@open_uvmat},'tag','list');
     uicontrol('Style','edit','Units','normalized', 'Position', [0.05 0.87 0.9 0.1],'tag','msgbox','Max',2,'String','checking files...');
     uicontrol('Style','frame','Units','normalized', 'Position', [0.05 0.81 0.9 0.05]);

trunk/src/xml2struct.m

@@ -47 +47 @@
         end
     case 'char'   
-        out=str2num(ss);
+        out=str2double(ss);
         %if isempty(regexp(ss,'^(-*\d+\.*\d*\ *)+$'))% if the string does not contain a set of numbers (with possible sign and decimal) separated by blanks
-        if isempty(out)
+        if isnan(out)
             sep_ind=regexp(ss,'\s&\s');% check for separator ' & ' which indicates column separation in tables
             if ~isempty(sep_ind)
@@ -59 +59 @@
                 out=ss; %reproduce the input string
             end
-%         else
-%             out=str2num(ss);
         end
     case 'cell'