Changeset 931 for trunk/src/series

Timestamp:

Mar 13, 2016, 6:29:07 PM (9 years ago)

Author:

sommeria

Message:

various

Location:

trunk/src/series

Files:

• extract_multitif.m (modified) (3 diffs)
• extract_rdvision.m (modified) (5 diffs)

trunk/src/series/extract_multitif.m

@@ -142 +142 @@
 ImagesPerLevel=100;%100;
 count=0;
-%count=933;%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%CORRECTION EXP08: 67->_11_1
-%count=1934%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%CORRECTION EXP07: 
+%count=316;%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%CORRECTION EXP08: 4684 images -> start at 316 start 67->_11_1
+%count=1934%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%CORRECTION EXP07: 3066 images
 %% loop on the files 
 for ifile=1:numel(ListFile)
@@ -156 +156 @@
     for iframe=1:NbFrames      
         A=imread(ImageName,iframe);
-        count=count+1;
+
         if isequal(ImagesPerLevel,1)% mode series 
             
-            OutputFile=fullfile(OutputDir,['img_' num2str(count) '.png']);
+            OutputFile=fullfile(OutputDir,['img_' num2str(count+1) '.png']);
         else % mode multilevel or volume (indices i and j)
             i_index=fix(count/ImagesPerLevel)+1;
@@ -166 +166 @@
         end
         imwrite(A,OutputFile,'BitDepth',16)
+        count=count+1;
     end
 end

trunk/src/series/extract_rdvision.m

@@ -4 +4 @@
 %------------------------------------------------------------------------
 %
-%%%%%%%%%%% GENERAL TO ALL SERIES ACTION FCTS %%%%%%%%%%%%%%%%%%%%%%%%%%%
+%%%%%%%%%%% GENERAL TO ALL SERIES ACTION FCTS %
+%%%%%%%%%%%%%%%%%%%%%%%%%%
 %
 %OUTPUT
@@ -243 +244 @@
    
     
+    
     %% reading the .sqb file
     m = memmapfile(filename_sqb,'Format', { 'uint32' [1 1] 'offset'; ...
@@ -286 +288 @@
         checkpreserve=1;% will not erase the initial files, possibility of error
     end
+    
+        %% checking consistency with the xml file
+    if ~isequal(SeqData.nb_frames,numel(timestamp))
+        disp_uvmat('ERRROR',['inconsistent number of images ' num2str(SeqData.nb_frames) ' with respect to the xml file: ' num2str(numel(timestamp))] ,checkrun);
+        return
+    end    
+    
     if nbfield2>1
         NomTypeNew='_1_1';
@@ -301 +310 @@
     FileDir=SeqData.sequencename;
      FileDir=regexprep(FileDir,'_Master_Dalsa_4M180$','');%suppress '_Master_Dalsa_4M180'
-    for i1=1:npi-1
-        for j1=1:npj-1
+    for i1=1:numel(timestamp)/nbfield2
+        for j1=1:nbfield2
             OutputFile=fullfile_uvmat(RootPath,FileDir,'img','.png',NomTypeNew,i1,[],j1);% TODO: set NomTypeNew from SeqData.mode
+            try 
             A=imread(OutputFile);% check image reading (stop if error)
+            catch ME
+                disp(['checking ' OutputFile])
+                disp(ME.message)
+            end
         end
     end
@@ -378 +392 @@
     OutputFile=fullfile_uvmat(PathDir,FileDir,'img','.png',NomTypeNew,i1,[],j1);% TODO: set NomTypeNew from SeqData.mode
     fname=fullfile(binrepertoire,sprintf('%s%.5d.bin',SeqData.binfile,SqbData(ii).file_idx));
-    if exist(OutputFile,'file')
+    if exist(OutputFile,'file')% do not recreate existing image file
         fid=0;
     else