Changeset 414

Timestamp:

May 8, 2012, 6:42:58 PM (12 years ago)

Author:

sommeria

Message:

bug corrected in civ (index j)
bug corrected in update_imadoc (geomtetry_calib)

Location:

trunk/src

Files:

• civ.m (modified) (2 diffs)
• update_imadoc.m (modified) (2 diffs)

trunk/src/civ.m

@@ -1431 +1431 @@
             Param.Civ2.ImageWidth=ImageInfo.Width;
             Param.Civ2.ImageHeight=ImageInfo.Height;
-            Param.Civ2.i1=i1_civ2(ifile,j);
-            Param.Civ2.i2=i2_civ2(ifile,j);
+            Param.Civ2.i1=i1_civ2(ifile);
+            Param.Civ2.i2=i2_civ2(ifile);
             switch CivMode
                 case 'CivX'
@@ -3017 +3017 @@
 else
     ref_j=str2double(get(handles.ref_j,'String'));
+    if isnan(ref_j)
+        ref_j=1;
+    end
 end
 time=get(handles.ImaDoc,'UserData');%get the set of times

trunk/src/update_imadoc.m

@@ -47 +47 @@
     % in case of movie (avi file), copy timing info in the new xml file
     [pp,outputroot]=fileparts(outputfile);
-    imainfo=[];
+    %     imainfo=[];
     if exist(fullfile(pp,[outputroot '.avi']),'file')
         FileName=fullfile(pp,[outputroot '.avi']);
@@ -66 +66 @@
             t=struct2xml(Camera,t,uid_camera);
         end
-        [t,uid_calib]=add(t,1,'element','GeometryCalib');
     end
+    [t,uid_calib]=add(t,1,'element','GeometryCalib');
 end
 t=struct2xml(GeometryCalib,t,uid_calib);