Changeset 369

Timestamp:

Jan 12, 2012, 7:48:00 PM (13 years ago)

Author:

sommeria

Message:

image interpolation introduced in civ2_matlab (option decimal shift)
bug corrected in xml2struct (reading of decimal numbers fixed)

Location:

trunk/src

Files:

• civ_matlab.m (modified) (1 diff)
• xml2struct.m (modified) (1 diff)

trunk/src/civ_matlab.m

@@ -524 +524 @@
                 yi=(1:mesh:size(image1_crop,1))';
                 image1_crop=interp2(image1_crop,xi,yi);
+                xi=(1:mesh:size(image2_crop,2));
+                yi=(1:mesh:size(image2_crop,1))';
                 image2_crop=interp2(image2_crop,xi,yi);
             end

trunk/src/xml2struct.m

@@ -24 +24 @@
         end
     case 'char'
-        if isempty(regexp(s,'^\d+$'))
+        
+        if isempty(regexp(s,'^\d+\.*\d*$'))% if the string contains numerical characters and decimal . only
             out=s;
         else