Changeset 109 for trunk/src/imadoc2struct.m

Timestamp:

Oct 4, 2010, 10:39:11 PM (14 years ago)

Author:

sommeria

Message:

merge_proj.m, proj_field.m: bugs repaired merging of images
plot_field.m: minor cleaning
imadoc2struct: introduce the possibility of readying the calibration point coordinates
sub_field.m:bugs repaired
geometry_calib, create_grid: introduction of new calibration methods, improvement of detect_grid

File:

• trunk/src/imadoc2struct.m (modified) (6 diffs)

trunk/src/imadoc2struct.m

@@ -1 +1 @@
 %'imadoc2struct': reads the xml file for image documentation 
 %------------------------------------------------------------------------
-% function [s,errormsg]=imadoc2struct(ImaDoc) 
+% function [s,errormsg]=imadoc2struct(ImaDoc,option) 
 %
 % OUTPUT:
@@ -13 +13 @@
 % INPUT:
 % ImaDoc: full name of the xml input file with head key ImaDoc
-
-function [s,errormsg]=imadoc2struct(ImaDoc) 
-
+% option: ='GeometryCalib': read  the data of GeometryCalib, including source point coordinates
+
+function [s,errormsg]=imadoc2struct(ImaDoc,option) 
+if ~exist('option','var')
+    option='default';
+end
 errormsg=[];%default
 s.Heading=[];%default
@@ -88 +91 @@
                 Dtj=reshape(Dtj'*ones(1,NbDtj),1,NbDtj*numel(Dtj)); %concatene Dti vector NbDti times
                 Dtj=[0 Dtj];
-%                 Time_val'
-%                 ones(1,numel(Dtj))
-%                 ones(numel(Time_val'),1)
-%                 cumsum(Dtj)
                 Time_val=Time_val*ones(1,numel(Dtj))+ones(numel(Time_val),1)*cumsum(Dtj);% produce a time matrix with Dtj
             end
@@ -107 +106 @@
         end
     end
-%     if size(s.Time,1)==1
-%         s.Time=(s.Time)'; %change vector into column
-%     end
 end
 
@@ -210 +206 @@
             end         
         end
+        if strcmp(option,'GeometryCalib')
+            tsai.PointCoord=get_value(subt,'/GeometryCalib/SourceCalib/PointCoord',[0 0 0 0 0]);%time in TimeUnit
+        end
         s.GeometryCalib=tsai;
     end
@@ -228 +227 @@
                val_read=str2num(get(t,uid_child(icell),'value'));
                if ~isempty(val_read)
-                   val(icell)=val_read;
+                   val(icell,:)=val_read;
                end
            end