Changeset 414


Ignore:
Timestamp:
May 8, 2012, 6:42:58 PM (9 years ago)
Author:
sommeria
Message:

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

Location:
trunk/src
Files:
2 edited

Legend:

Unmodified
Added
Removed
  • trunk/src/civ.m

    r413 r414  
    14311431            Param.Civ2.ImageWidth=ImageInfo.Width;
    14321432            Param.Civ2.ImageHeight=ImageInfo.Height;
    1433             Param.Civ2.i1=i1_civ2(ifile,j);
    1434             Param.Civ2.i2=i2_civ2(ifile,j);
     1433            Param.Civ2.i1=i1_civ2(ifile);
     1434            Param.Civ2.i2=i2_civ2(ifile);
    14351435            switch CivMode
    14361436                case 'CivX'
     
    30173017else
    30183018    ref_j=str2double(get(handles.ref_j,'String'));
     3019    if isnan(ref_j)
     3020        ref_j=1;
     3021    end
    30193022end
    30203023time=get(handles.ImaDoc,'UserData');%get the set of times
  • trunk/src/update_imadoc.m

    r397 r414  
    4747    % in case of movie (avi file), copy timing info in the new xml file
    4848    [pp,outputroot]=fileparts(outputfile);
    49     imainfo=[];
     49    %     imainfo=[];
    5050    if exist(fullfile(pp,[outputroot '.avi']),'file')
    5151        FileName=fullfile(pp,[outputroot '.avi']);
     
    6666            t=struct2xml(Camera,t,uid_camera);
    6767        end
    68         [t,uid_calib]=add(t,1,'element','GeometryCalib');
    6968    end
     69    [t,uid_calib]=add(t,1,'element','GeometryCalib');
    7070end
    7171t=struct2xml(GeometryCalib,t,uid_calib);
Note: See TracChangeset for help on using the changeset viewer.