Changeset 460 for trunk/src/imadoc2struct.m

Timestamp:

Jun 20, 2012, 12:01:16 PM (12 years ago)

Author:

sommeria

Message:

cleaning and bugs corrected

File:

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

trunk/src/imadoc2struct.m

@@ -30 +30 @@
 [tild,tild,FileExt]=fileparts(ImaDoc);
 if strcmp(FileExt,'.civ')
-    [errormsg,time,TimeUnit,mode,npx,npy,XmlData{iview}.GeometryCalib]=read_imatext(ImaDoc);
+    [errormsg,time,TimeUnit,mode,npx,npy,s.GeometryCalib]=read_imatext(ImaDoc);
     return
 end
@@ -295 +295 @@
 function [error,time,TimeUnit,mode,npx,npy,GeometryCalib]=read_imatext(fileinput)
 %------------------------------------------------------------------------
-error=0;%default
+error='';%default
 time=[]; %default
 TimeUnit='s';
@@ -301 +301 @@
 npx=[]; %default
 npy=[]; %default
-pxcmx=1;%default
-pxcmy=1;%default
-if exist(fileinput,'file')~=2, error=2, return;end;%input file does not exist
+GeometryCalib=[];
+if ~exist(fileinput,'file'), error=['image doc file ' fileinput ' does not exist']; return;end;%input file does not exist
 dotciv=textread(fileinput);
 sizdot=size(dotciv);