Changeset 736 for trunk/src


Ignore:
Timestamp:
Apr 9, 2014, 9:38:04 AM (11 years ago)
Author:
sommeria
Message:

various corrections

Location:
trunk/src/series
Files:
3 edited

Legend:

Unmodified
Added
Removed
  • trunk/src/series/civ_series.m

    r731 r736  
    267267end
    268268if isempty(time) && ~isempty(find(strcmp(FileType_A,{'mmreader','video'})))% case of video input
    269     time=zeros(2,FileInfo_A.NumberOfFrames+1);
    270     time(2,:)=(0:1/FileInfo_A.FrameRate:(FileInfo_A.NumberOfFrames)/FileInfo_A.FrameRate);
     269    time=zeros(FileInfo_A.NumberOfFrames+1,2);
     270    time(:,2)=(0:1/FileInfo_A.FrameRate:(FileInfo_A.NumberOfFrames)/FileInfo_A.FrameRate)';
    271271    TimeSource='video';
    272     % set(han:dles.Dt_txt,'String',['Dt=' num2str(1000/imainfo.FrameRate) 'ms']);%display the elementary time interval in millisec
    273272    ColorType='truecolor';
    274273end
  • trunk/src/series/relabel_i_j.m

    r635 r736  
    116116    end
    117117end
     118XmlData=[];
    118119if ~isempty(filexml)
    119120    [XmlData,error]=imadoc2struct_special(filexml);
     
    218219            SubDirBase=regexprep(SubDir{1},'\..*','');%take the root part of SubDir, before the first dot '.'
    219220    filexml_new=[fullfile(RootPath{1},SubDirBase) '.xml'];
    220        % save(t,filexml_new)
     221        save(t,filexml_new)
    221222end
    222223
    223224%% main loop on images
    224225%j1=[];%default
     226nbfield2=1;
     227if isfield(XmlData,'Time')
    225228nbfield2=size(XmlData.Time,2);
     229end
    226230for ifile=1:nbfield
    227231            update_waitbar(WaitbarHandle,ifile/nbfield)
     
    231235    end
    232236    filename=fullfile_uvmat(RootPath{1},SubDir{1},RootFile{1},FileExt{1},NomType{1},i1_series{1}(ifile));
     237    j1=[];
     238    if ~isequal(nbfield2,1)
    233239    j1=mod(ifile-1+first_label,nbfield2)+1;
     240    end
    234241    i1=floor((ifile-1+first_label)/nbfield2)+1;
    235242    filename_new=fullfile_uvmat(RootPath{1},SubDir{1},RootFile{1},FileExt{1},NomTypeNew,i1,[],j1);
  • trunk/src/series/time_series.m

    r716 r736  
    223223%%%%%%%%%%%%%%%% loop on field indices %%%%%%%%%%%%%%%%
    224224for index=1:nbfield
    225     index
    226225            update_waitbar(WaitbarHandle,index/nbfield)
    227226    if ~isempty(RUNHandle) && ~strcmp(get(RUNHandle,'BusyAction'),'queue')
Note: See TracChangeset for help on using the changeset viewer.