Ignore:
Timestamp:
Oct 4, 2010, 10:39:11 PM (13 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:
1 edited

Legend:

Unmodified
Added
Removed
  • trunk/src/imadoc2struct.m

    r89 r109  
    11%'imadoc2struct': reads the xml file for image documentation
    22%------------------------------------------------------------------------
    3 % function [s,errormsg]=imadoc2struct(ImaDoc)
     3% function [s,errormsg]=imadoc2struct(ImaDoc,option)
    44%
    55% OUTPUT:
     
    1313% INPUT:
    1414% ImaDoc: full name of the xml input file with head key ImaDoc
    15 
    16 function [s,errormsg]=imadoc2struct(ImaDoc)
    17 
     15% option: ='GeometryCalib': read  the data of GeometryCalib, including source point coordinates
     16
     17function [s,errormsg]=imadoc2struct(ImaDoc,option)
     18if ~exist('option','var')
     19    option='default';
     20end
    1821errormsg=[];%default
    1922s.Heading=[];%default
     
    8891                Dtj=reshape(Dtj'*ones(1,NbDtj),1,NbDtj*numel(Dtj)); %concatene Dti vector NbDti times
    8992                Dtj=[0 Dtj];
    90 %                 Time_val'
    91 %                 ones(1,numel(Dtj))
    92 %                 ones(numel(Time_val'),1)
    93 %                 cumsum(Dtj)
    9493                Time_val=Time_val*ones(1,numel(Dtj))+ones(numel(Time_val),1)*cumsum(Dtj);% produce a time matrix with Dtj
    9594            end
     
    107106        end
    108107    end
    109 %     if size(s.Time,1)==1
    110 %         s.Time=(s.Time)'; %change vector into column
    111 %     end
    112108end
    113109
     
    210206            end         
    211207        end
     208        if strcmp(option,'GeometryCalib')
     209            tsai.PointCoord=get_value(subt,'/GeometryCalib/SourceCalib/PointCoord',[0 0 0 0 0]);%time in TimeUnit
     210        end
    212211        s.GeometryCalib=tsai;
    213212    end
     
    228227               val_read=str2num(get(t,uid_child(icell),'value'));
    229228               if ~isempty(val_read)
    230                    val(icell)=val_read;
     229                   val(icell,:)=val_read;
    231230               end
    232231           end
Note: See TracChangeset for help on using the changeset viewer.