Changeset 456 for trunk/src/imadoc2struct.m

Timestamp:

Jun 17, 2012, 10:50:20 PM (12 years ago)

Author:

sommeria

Message:

various bugs corrected

File:

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

trunk/src/imadoc2struct.m

@@ -28 +28 @@
 
 %% opening the xml file
-if exist(ImaDoc,'file')~=2, errormsg=[ ImaDoc ' does not exist']; return;end;%input file does not exist
+[tild,tild,FileExt]=fileparts(ImaDoc);
+if strcmp(FileExt,'.civ')
+    [errormsg,time,TimeUnit,mode,npx,npy,XmlData{iview}.GeometryCalib]=read_imatext(ImaDoc);
+    return
+end
 try
     t=xmltree(ImaDoc);
-catch
-    errormsg={[ImaDoc ' is not a valid xml file']; lasterr};
+catch ME
+    errormsg={['error reading ' ImaDoc ': ']; ME.message};
     display(errormsg);
     return
 end
 uid_root=find(t,'/ImaDoc');
-if isempty(uid_root), errormsg=[ImaDoc ' is not an image documentation file ImaDoc']; return; end;%not an ImaDoc .xml file
-
+if isempty(uid_root), return; end;%not an ImaDoc .xml file
 
 %% Heading
@@ -283 +286 @@
    end
 end
+
+%------------------------------------------------------------------------
+%'read_imatext': reads the .civ file for image documentation (obsolete)
+% fileinput: name of the documentation file 
+% time: matrix of times for the set of images
+%pxcmx: scale along x in pixels/cm
+%pxcmy: scale along y in pixels/cm
+function [error,time,TimeUnit,mode,npx,npy,GeometryCalib]=read_imatext(fileinput)
+%------------------------------------------------------------------------
+error=0;%default
+time=[]; %default
+TimeUnit='s';
+mode='pairs';
+npx=[]; %default
+npy=[]; %default
+pxcmx=1;%default
+pxcmy=1;%default
+if exist(fileinput,'file')~=2, error=2, return;end;%input file does not exist
+dotciv=textread(fileinput);
+sizdot=size(dotciv);
+if ~isequal(sizdot(1)-8,dotciv(1,1));
+    error=1; %inconsistent number of bursts
+end
+nbfield=sizdot(1)-8;
+npx=(dotciv(2,1));
+npy=(dotciv(2,2));
+pxcmx=(dotciv(6,1));% pixels/cm in the .civ file 
+pxcmy=(dotciv(6,2));
+% nburst=dotciv(3,1); % nbre of bursts
+abs_time1=dotciv([9:nbfield+8],2);
+dtime=dotciv(5,1)*(dotciv([9:nbfield+8],[3:end-1])+1);
+timeshift=[abs_time1 dtime];
+time=cumsum(timeshift,2);
+
+GeometryCalib.R=[pxcmx 0 0; 0 pxcmy 0;0 0 0];
+GeometryCalib.Tx=0;
+GeometryCalib.Ty=0;
+GeometryCalib.Tz=1;
+GeometryCalib.dpx=1;
+GeometryCalib.dpy=1;
+GeometryCalib.sx=1;
+GeometryCalib.Cx=0;
+GeometryCalib.Cy=0;
+GeometryCalib.f=1;
+GeometryCalib.kappa1=0;
+GeometryCalib.CoordUnit='cm';