Changeset 663 for trunk/src/xml2struct.m

Timestamp:

Jul 11, 2013, 6:45:32 PM (12 years ago)

Author:

sommeria

Message:

bug corrected again in xml2struct, PLOT and copy of points improved in geometry_calib

File:

• trunk/src/xml2struct.m (modified) (2 diffs)

trunk/src/xml2struct.m

@@ -46 +46 @@
             out.(names{k})=convert_string(ss.(names{k}));
         end
-    case 'char'   
-        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 isnan(out)
-            sep_ind=regexp(ss,'\s&\s');% check for separator ' & ' which indicates column separation in tables
-            if ~isempty(sep_ind)
-                sep_ind=[-2 sep_ind length(ss)+1];
-                for icolumn=1:length(sep_ind)-1
-                    out{1,icolumn}=ss(sep_ind(icolumn)+3:sep_ind(icolumn+1)-1);
+    case 'char' 
+        out=ss; %reproduce the input string
+        if ~strcmp(ss,'image')% bug with Matlab str2num('image')-> child face
+            out=str2num(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)
+                sep_ind=regexp(ss,'\s&\s');% check for separator ' & ' which indicates column separation in tables
+                if ~isempty(sep_ind)
+                    sep_ind=[-2 sep_ind length(ss)+1];
+                    for icolumn=1:length(sep_ind)-1
+                        out{1,icolumn}=ss(sep_ind(icolumn)+3:sep_ind(icolumn+1)-1);
+                    end
+                else
+                    out=ss; %reproduce the input string
                 end
-            else
-                out=ss; %reproduce the input string
             end
         end
@@ -64 +67 @@
         check_numeric=zeros(size(ss));
         for ilist=1:numel(ss)
-            if ~isempty(str2num(ss{ilist}))
+            if ~strcmp(ss{ilist},'image') && ~isempty(str2num(ss{ilist}))
                 out{ilist,1}=str2num(ss{ilist});
                 check_numeric(ilist)=1;