Changeset 981 for trunk/src

Timestamp:

Jan 14, 2017, 8:46:35 PM (8 years ago)

Author:

sommeria

Message:

read cine updated

Location:

trunk/src/series

Files:

• civ2vel_3C.m (modified) (2 diffs)
• civ_series.m (modified) (1 diff)

trunk/src/series/civ2vel_3C.m

@@ -232 +232 @@
     % get the surface shape corresponding to the PIV measurements
     for indextemp=field_index:field_index+1;%TODO: generalise to field index intervals>1 for PIV
-        idtemp=idtemp+1;
-        InputFile_3=fullfile(Param.InputTable{3,1},Param.InputTable{3,2},[Param.InputTable{3,3} '_' int2str(first_img+indextemp-1) '.nc']);
+        idtemp=idtemp+1;        
         if NbView==3 % if there is only 1 stereo folder (2 cameras only), extract directly Xphys,Yphys and Zphys  
+            InputFile_3=fullfile(Param.InputTable{3,1},Param.InputTable{3,2},[Param.InputTable{3,3} '_' int2str(first_img+indextemp-1) '.nc']);
             % Data{1}: =raw PIV camera 1 only
             % Data{2}: =raw PIV camera 2 only
@@ -321 +321 @@
             
         end
-        
+        if NbView>2
         ZItemp(:,:,idtemp)=griddata(Xphys,Yphys,Zphys,XI,YI); %interpolation on the choosen grid
+        end
         
     end

trunk/src/series/civ_series.m

@@ -302 +302 @@
         end
     end
-    if isempty(Time) && ~isempty(find(strcmp(FileType_A,{'mmreader','video'})))% case of video input
+    if isempty(Time) && ~isempty(find(strcmp(FileType_A,{'mmreader','video','cine_phantom'})))% case of video input
         Time=zeros(FileInfo_A.NumberOfFrames+1,2);
         Time(:,2)=(0:1/FileInfo_A.FrameRate:(FileInfo_A.NumberOfFrames)/FileInfo_A.FrameRate)';