Changeset 736 for trunk/src

Timestamp:

Apr 9, 2014, 9:38:04 AM (11 years ago)

Author:

sommeria

Message:

various corrections

Location:

trunk/src/series

Files:

• civ_series.m (modified) (1 diff)
• relabel_i_j.m (modified) (3 diffs)
• time_series.m (modified) (1 diff)

trunk/src/series/civ_series.m

@@ -267 +267 @@
 end
 if isempty(time) && ~isempty(find(strcmp(FileType_A,{'mmreader','video'})))% case of video input
-    time=zeros(2,FileInfo_A.NumberOfFrames+1);
-    time(2,:)=(0:1/FileInfo_A.FrameRate:(FileInfo_A.NumberOfFrames)/FileInfo_A.FrameRate);
+    time=zeros(FileInfo_A.NumberOfFrames+1,2);
+    time(:,2)=(0:1/FileInfo_A.FrameRate:(FileInfo_A.NumberOfFrames)/FileInfo_A.FrameRate)';
     TimeSource='video';
-    % set(han:dles.Dt_txt,'String',['Dt=' num2str(1000/imainfo.FrameRate) 'ms']);%display the elementary time interval in millisec
     ColorType='truecolor';
 end

trunk/src/series/relabel_i_j.m

@@ -116 +116 @@
     end
 end
+XmlData=[];
 if ~isempty(filexml)
     [XmlData,error]=imadoc2struct_special(filexml);
@@ -218 +219 @@
             SubDirBase=regexprep(SubDir{1},'\..*','');%take the root part of SubDir, before the first dot '.'
     filexml_new=[fullfile(RootPath{1},SubDirBase) '.xml'];
-       % save(t,filexml_new)
+        save(t,filexml_new)
 end
 
 %% main loop on images
 %j1=[];%default
+nbfield2=1;
+if isfield(XmlData,'Time')
 nbfield2=size(XmlData.Time,2);
+end
 for ifile=1:nbfield
             update_waitbar(WaitbarHandle,ifile/nbfield)
@@ -231 +235 @@
     end
     filename=fullfile_uvmat(RootPath{1},SubDir{1},RootFile{1},FileExt{1},NomType{1},i1_series{1}(ifile));
+    j1=[];
+    if ~isequal(nbfield2,1)
     j1=mod(ifile-1+first_label,nbfield2)+1;
+    end
     i1=floor((ifile-1+first_label)/nbfield2)+1;
     filename_new=fullfile_uvmat(RootPath{1},SubDir{1},RootFile{1},FileExt{1},NomTypeNew,i1,[],j1);

trunk/src/series/time_series.m

@@ -223 +223 @@
 %%%%%%%%%%%%%%%% loop on field indices %%%%%%%%%%%%%%%%
 for index=1:nbfield
-    index
             update_waitbar(WaitbarHandle,index/nbfield)
     if ~isempty(RUNHandle) && ~strcmp(get(RUNHandle,'BusyAction'),'queue')