Changeset 784 for trunk/src/series

Timestamp:

Jun 7, 2014, 6:17:53 PM (11 years ago)

Author:

sommeria

Message:

adpat uvmat to reading data from rdvision

Location:

trunk/src/series

Files:

• aver_stat.m (modified) (1 diff)
• aver_synchro.m (modified) (1 diff)
• beam_forming.m (modified) (1 diff)
• check_data_files.m (modified) (3 diffs)
• check_peaklock.m (modified) (1 diff)
• civ_input.m (modified) (1 diff)
• civ_series.m (modified) (4 diffs)
• float_tracking.m (modified) (1 diff)
• ima_levels.m (modified) (2 diffs)
• merge_proj.m (modified) (1 diff)
• particle_tracking.m (modified) (1 diff)
• relabel_i_j.m (modified) (1 diff)
• sub_background.m (modified) (2 diffs)
• time_series.m (modified) (1 diff)
• turb_stat.m (modified) (1 diff)

trunk/src/series/aver_stat.m

@@ -121 +121 @@
         return
     end
-    [FileInfo{iview},MovieObject{iview}]=get_file_type(filecell{iview,1});
+    [FileInfo{iview},MovieObject{iview}]=get_file_info(filecell{iview,1});
     FileType{iview}=FileInfo{iview}.FileType;
     CheckImage{iview}=~isempty(find(strcmp(FileType{iview},ImageTypeOptions)));% =1 for images

trunk/src/series/aver_synchro.m

@@ -93 +93 @@
 FileExt=Param.InputTable(:,5);
 [filecell,i1_series,i2_series,j1_series,j2_series]=get_file_series(Param);
-FileInfo=get_file_type(filecell{1,1});
+FileInfo=get_file_info(filecell{1,1});
  FileType=FileInfo.FileType;
 %%%%%%%%%%%%

trunk/src/series/beam_forming.m

@@ -82 +82 @@
         return
     end
-    [FileInfo{iview},MovieObject{iview}]=get_file_type(filecell{iview,1});
+    [FileInfo{iview},MovieObject{iview}]=get_file_info(filecell{iview,1});
     FileType{iview}=FileInfo{iview}.FileType;
     CheckImage{iview}=~isempty(find(strcmp(FileType{iview},ImageTypeOptions)));% =1 for images

trunk/src/series/check_data_files.m

@@ -92 +92 @@
 NcTypeOptions={'netcdf','civx','civdata'};
 for iview=1:nbview
-    [FileInfo{iview},Object{iview}]=get_file_type(filecell{iview,1});
+    [FileInfo{iview},Object{iview}]=get_file_info(filecell{iview,1});
     FileType{iview}=FileInfo{iview}.FileType;
     CheckImage{iview}=~isempty(find(strcmp(FileType{iview},ImageTypeOptions)));% =1 for images
@@ -101 +101 @@
 for iview=1:nbview
     if isequal(FileType{iview},'mmreader')||isequal(FileType{iview},'video')||isequal(FileType{iview},'multimage')
-        [FileInfo]=get_file_type(filecell{iview,1});
+        [FileInfo]=get_file_info(filecell{iview,1});
         Tabchar{1}=filecell{iview,1};%info.Filename;
         Tabchar{2}='';
@@ -131 +131 @@
                     end
                     lastfield='';
-                    [FileInfo,Object]=get_file_type(file);
+                    [FileInfo,Object]=get_file_info(file);
                     FileType{iview}=FileInfo.FileType;
                     if strcmp(FileType{iview},'civx')||strcmp(FileType{iview},'civdata')

trunk/src/series/check_peaklock.m

@@ -113 +113 @@
         return
     end
-    [FileInfo{iview},MovieObject{iview}]=get_file_type(filecell{iview,1});
+    [FileInfo{iview},MovieObject{iview}]=get_file_info(filecell{iview,1});
     FileType{iview}=FileInfo{iview}.FileType;
     CheckImage{iview}=~isempty(find(strcmp(FileType{iview},ImageTypeOptions)));% =1 for images

trunk/src/series/civ_input.m

@@ -2068 +2068 @@
  Data.CoordUnit='pixel';% used to set equal scaling for x and y in image dispa=ly
  par_civ1=read_GUI(handles.Civ1);
- FileInfo=get_file_type(ImageName_A);
+ FileInfo=get_file_info(ImageName_A);
  par_civ1.FileTypeA=FileInfo.FileType;
  par_civ1.ImageWidth=size(Data.A,2);

trunk/src/series/civ_series.m

@@ -220 +220 @@
             return
         end
-        [FileInfo_A,VideoObject_A]=get_file_type(ImageName_A);
+        [FileInfo_A,VideoObject_A]=get_file_info(ImageName_A);
         FileType_A=FileInfo_A.FileType;
         if strcmp(FileInfo_A.FileType,'netcdf')
@@ -234 +234 @@
             return
         end
-        [FileInfo_B,VideoObject_B]=get_file_type(ImageName_B);
+        [FileInfo_B,VideoObject_B]=get_file_info(ImageName_B);
         FileType_B=FileInfo_B.FileType;
         if strcmp(FileInfo_B.FileType,'netcdf')
@@ -250 +250 @@
             return
         end
-        [FileType_A,FileInfo_A,VideoObject_A]=get_file_type(ImageName_A);
+        [FileType_A,FileInfo_A,VideoObject_A]=get_file_info(ImageName_A);
         [par_civ1.ImageA,VideoObject_A] = read_image(ImageName_A,FileInfo_A.FileType,VideoObject_A,FrameIndex_A_Civ2(1));
         ImageName_B=fullfile_uvmat(RootPath_B,SubDir_B,RootFile_B,FileExt_B,NomType_B,i2_series_Civ2(1),[],j2_series_Civ2(1));
@@ -257 +257 @@
             return
         end
-        [FileInfo_B,VideoObject_B]=get_file_type(ImageName_B);
+        [FileInfo_B,VideoObject_B]=get_file_info(ImageName_B);
         FileType_B=FileInfo_B.FileType;
         [par_civ1.ImageB,VideoObject_B] = read_image(ImageName_B,FileType_B,VideoObject_B,FrameIndex_B_Civ2(1));

trunk/src/series/float_tracking.m

@@ -124 +124 @@
 
 %% check the input file type  
-[FileInfo,VideoObject]=get_file_type(filecell{1,1});
+[FileInfo,VideoObject]=get_file_info(filecell{1,1});
 FileType=FileInfo.FileType;
 ImageTypeOptions={'image','multimage','mmreader','video'};

trunk/src/series/ima_levels.m

@@ -65 +65 @@
         msgbox_uvmat('WARNING','the first input file does not exist')
     else
-        FileInfo=get_file_type(filecell{1,1});
+        FileInfo=get_file_info(filecell{1,1});
         FileType=FileInfo.FileType;
         if isempty(find(strcmp(FileType,{'image','multimage','mmreader','video'})));% =1 for images
@@ -107 +107 @@
 nbfield_i=size(i1_series{1},2); %nb of fields for the i index
 nbfield=nbfield_j*nbfield_i; %total number of fields
-[FileInfo{1},VideoObject{1}]=get_file_type(filecell{1,1});% type of input file
+[FileInfo{1},VideoObject{1}]=get_file_info(filecell{1,1});% type of input file
 FileType{1}=FileInfo{1}.FileType;
 

trunk/src/series/merge_proj.m

@@ -121 +121 @@
         return
     end
-    [FileInfo{iview},MovieObject{iview}]=get_file_type(filecell{iview,1});
+    [FileInfo{iview},MovieObject{iview}]=get_file_info(filecell{iview,1});
     FileType{iview}=FileInfo{iview}.FileType;
     CheckImage{iview}=~isempty(find(strcmp(FileType{iview},ImageTypeOptions)));% =1 for images

trunk/src/series/particle_tracking.m

@@ -124 +124 @@
 
 %% check the input file type  
-[FileInfo,VideoObject]=get_file_type(filecell{1,1});
+[FileInfo,VideoObject]=get_file_info(filecell{1,1});
 FileType=FileInfo.FileType;
 ImageTypeOptions={'image','multimage','mmreader','video'};

trunk/src/series/relabel_i_j.m

@@ -95 +95 @@
     return
 end
-[FileInfo{1},MovieObject{1}]=get_file_type(filecell{1,1});
+[FileInfo{1},MovieObject{1}]=get_file_info(filecell{1,1});
 FileType{1}=FileInfo{1}.FileType;
 CheckImage=~isempty(find(strcmp(FileType{1},ImageTypeOptions)));% =1 for images

trunk/src/series/sub_background.m

@@ -90 +90 @@
     %% check the validity of  input file types
     ImageTypeOptions={'image','multimage','mmreader','video'};%allowed input file types(images)
-    FileInfo=get_file_type(FirstFileName);
+    FileInfo=get_file_info(FirstFileName);
     FileType=FileInfo.FileType;
     CheckImage=~isempty(find(strcmp(FileType,ImageTypeOptions), 1));% =1 for images
@@ -201 +201 @@
     % i1_series(iview,fileindex) expresses the same indices as a 1D array in file indices
 %%%%%%%%%%%%
-[FileInfo{1},MovieObject{1}]=get_file_type(filecell{1,1});
+[FileInfo{1},MovieObject{1}]=get_file_info(filecell{1,1});
 FileType{1}=FileInfo{1}.FileType;
     if ~isempty(j1_series{1})

trunk/src/series/time_series.m

@@ -124 +124 @@
         return
     end
-    [FileInfo{iview},MovieObject{iview}]=get_file_type(filecell{iview,1});
+    [FileInfo{iview},MovieObject{iview}]=get_file_info(filecell{iview,1});
     FileType{iview}=FileInfo{iview}.FileType;
     if strcmp(FileType{iview},'civdata')||strcmp(FileType{iview},'civx')

trunk/src/series/turb_stat.m

@@ -103 +103 @@
         return
     end
-    [FileInfo{iview},MovieObject{iview}]=get_file_type(filecell{iview,1});
+    [FileInfo{iview},MovieObject{iview}]=get_file_info(filecell{iview,1});
     FileType{iview}=FileInfo{iview}.FileType;
     CheckImage{iview}=~isempty(find(strcmp(FileType{iview},ImageTypeOptions)));% =1 for images