Changeset 790 for trunk

Timestamp:

Jul 2, 2014, 9:30:32 AM (10 years ago)

Author:

sommeria

Message:

read_rdvision corrected to get both cameras

Location:

trunk/src

Files:

• find_file_series.m (modified) (2 diffs)
• get_file_info.m (modified) (2 diffs)
• read_rdvision.m (modified) (5 diffs)

trunk/src/find_file_series.m

@@ -48 +48 @@
 %% get input root name and nomenclature type
 fullfileinput=fullfile(FilePath,fileinput);% input file name with path
-[RootPath,SubDir,RootFile,i1_input,i2_input,j1_input,j2_input,FileExt,NomType]=fileparts_uvmat(fullfileinput);
-
+[FileInfo,MovieObject]=get_file_info(fullfileinput);
 
 %% check for particular file types: images, movies, civ data
-i1_series=zeros(1,1,1);
-i2_series=zeros(1,1,1);
-j1_series=zeros(1,1,1);
-j2_series=zeros(1,1,1);
-[FileInfo,MovieObject]=get_file_info(fullfileinput);
+checkfileindexing=0;
+if isfield(FileInfo,'FileIndexing') && strcmp(FileInfo.FileIndexing,'on')
+    [RootPath,SubDir,RootFile,i1_input,i2_input,j1_input,j2_input,FileExt,NomType]=fileparts_uvmat(fullfileinput);
+    i1_series=zeros(1,1,1);
+    i2_series=zeros(1,1,1);
+    j1_series=zeros(1,1,1);
+    j2_series=zeros(1,1,1);
+    checkfileindexing=1;
+else % no file indexing
+    [PathDir,RootFile]=fileparts(fullfileinput);
+    [RootPath,SubDir,DirExt]=fileparts(PathDir);
+    SubDir=[SubDir DirExt];% include part after . in the name (considered as a file extension)
+    NomType='*';
+    i1_series=[];i2_series=[];j1_series=[];j2_series=[];
+    i1_input=1;i2_input=[];j1_input=[];j2_input=[];
+end
 if ~exist(FilePath,'dir')
     return % don't go further if the dir path does not exist
 end
+if checkfileindexing
 NomTypePref='';
 if isempty(NomType)
@@ -251 +262 @@
 if isequal(j1_series,0), j1_series=[]; end
 if isequal(j2_series,0), j2_series=[]; end
-
-%% detect rdvision format
-if strcmp(FileExt,'.bin')
-    if exist(fullfile(RootPath,SubDir,[RootFile '.seq']),'file')
-        FileInfo.FileType='rdvision';
-        FileInfo.SeqFile=[RootFile '.seq'];
-    end
-end
+end
+% %% detect rdvision format
+% if strcmp(FileExt,'.bin')
+%     if exist(fullfile(RootPath,SubDir,[RootFile '.seq']),'file')
+%         FileInfo.FileType='rdvision';
+%         FileInfo.SeqFile=[RootFile '.seq'];
+%     end
+% end
 
 %% introduce the frame index in case of movies or multimage type

trunk/src/get_file_info.m

@@ -32 +32 @@
     case {'.xml','.xls','.dat','.bin'}
         FileInfo.FileType=regexprep(FileExt,'^.','');% eliminate the dot of the extension;
-    case '.seq'
-        FileInfo=ini2struct(fileinput);
-        if isfield(FileInfo,'sequenceSettings')&& isfield(FileInfo.sequenceSettings,'numberoffiles')
-            FileInfo.NumberOfFrames=str2double(FileInfo.sequenceSettings.numberoffiles);
-            FileInfo.FrameRate=str2double(FileInfo.sequenceSettings.framepersecond);
-            FileInfo.ColorType='grayscale';
-        else
-            FileInfo.FileType='';
-            return
-        end
-        FileInfo.FileType='rdvision'; % file used to store info from image acquisition systems of rdvision
-        nbfield=numel(fieldnames(FileInfo));
-        FileInfo=orderfields(FileInfo,[nbfield nbfield-1 nbfield-2 (1:nbfield-3)]); %reorder the fields of fileInfo for clarity
+    case {'.seq','.sqb'}
+        [A,FileInfo,timestamps,errormsg]=read_rdvision(fileinput,[]);
+        
     otherwise
         if ~isempty(FileExt)% exclude empty extension
@@ -120 +110 @@
         end
 end
+switch FileInfo.FileType
+    case {'image','multimage','mmreader','video','netcdf','civdata'}
+        FileInfo.FileIndexing='on'; % allow to detect file index for scanning series
+end

trunk/src/read_rdvision.m

@@ -1 @@
-function [A,FileInfo,timestamps]=read_rdvision(filename,frame_idx)
+function [A,FileInfo,timestamps,errormsg]=read_rdvision(filename,frame_idx)
 % BINREAD_RDV Permet de lire les fichiers bin générés par Hiris à partir du
 % fichier seq associé.
@@ -21 +21 @@
 %   NB_FRAMES   : Nombres d'images dans la séquence.
 
-
+errormsg='';
 if nargin<2% no frame indices specified
    frame_idx=-1;% all the images in the series are read
@@ -27 +27 @@
 A=[];
 timestamps=[];
-s=ini2struct(filename);
+[PathDir,RootFile,Ext]=fileparts(filename);
+RootPath=fileparts(PathDir);
+switch Ext
+    case '.seq'
+        filename_seq=filename;
+        filename_sqb=fullfile(PathDir,[RootFile '.sqb']);
+    case '.sqb'
+        filename_seq=fullfile(PathDir,[RootFile '.seq']);
+        filename_sqb=filename;
+    otherwise
+        errormsg='input file extension must be .seq or .sqb';
+end
+if ~exist(filename_seq,'file')
+    errormsg=[filename_seq ' does not exist'];
+    return
+end
+s=ini2struct(filename_seq);
 FileInfo=s.sequenceSettings;
+if isfield(s.sequenceSettings,'numberoffiles')
+    FileInfo.NumberOfFrames=str2double(s.sequenceSettings.numberoffiles);
+    FileInfo.FrameRate=str2double(s.sequenceSettings.framepersecond);
+    FileInfo.ColorType='grayscale';
+else
+    FileInfo.FileType='';
+    return
+end
+FileInfo.FileType='rdvision'; % file used to store info from image acquisition systems of rdvision
+nbfield=numel(fieldnames(FileInfo));
+FileInfo=orderfields(FileInfo,[nbfield nbfield-1 nbfield-2 (1:nbfield-3)]); %reorder the fields of fileInfo for clarity
 
 % read the images the input frame_idxis not empty
@@ -37 +64 @@
     bin_file=FileInfo.binfile;
     nb_frames=str2double(FileInfo.numberoffiles);
-    
-    [bin_dir,f]=fileparts(filename);
-    
-    sqb_file=fullfile(bin_dir,[f '.sqb']);
-    m = memmapfile(sqb_file,'Format', { 'uint32' [1 1] 'offset'; ...
+    m = memmapfile(filename_sqb,'Format', { 'uint32' [1 1] 'offset'; ...
         'uint32' [1 1] 'garbage1';...
         'double' [1 1] 'timestamp';...
@@ -61 +84 @@
     for i=1:length(frame_idx)
         ii=frame_idx(i);
-        binfile=fullfile(bin_dir,sprintf('%s%.5d.bin',bin_file,data(ii).file_idx));
+        binfile=fullfile(RootPath,FileInfo.binrepertoire,sprintf('%s%.5d.bin',bin_file,data(ii).file_idx));
         fid=fopen(binfile,'rb');
         fseek(fid,data(ii).offset,-1);