Changeset 707
- Timestamp:
- Feb 12, 2014, 11:16:03 AM (11 years ago)
- Location:
- trunk/src/series
- Files:
-
- 2 edited
Legend:
- Unmodified
- Added
- Removed
-
trunk/src/series/civ_input.m
r692 r707 89 89 FileType=SeriesData.FileType{1};%type of the first input file series 90 90 FileInfo=SeriesData.FileInfo{1}; 91 FileInput=SeriesData.RefFile{1}; 91 92 92 93 93 %% case of netcdf file as input, get the processing stage and look for corresponding images … … 115 115 end 116 116 imageinput=''; 117 FileInput=SeriesData.RefFile{1}; 117 118 Data=nc2struct(FileInput,'ListGlobalAttribute','Civ2_ImageA','Civ1_ImageA','Civ2_ImageB','Civ1_ImageB'); 118 119 [PathCiv1_ImageA,Civ1_ImageA,FileExtA]=fileparts(Data.Civ1_ImageA); … … 122 123 [PathCiv2_ImageB,Civ2_ImageB,FileExtA]=fileparts(Data.Civ2_ImageB); 123 124 end 124 hhseries=guidata( gcbf);125 hhseries=guidata(hseries); 125 126 if size(Param.InputTable,1)==1 126 127 series('display_file_name',hhseries,Data.Civ1_ImageA,'append');%append the image series to the input list -
trunk/src/series/civ_series.m
r703 r707 279 279 break 280 280 end 281 if strcmp(Param.ActionInput.ListCompareMode,'PIV') 282 ncfile=fullfile_uvmat(RootPath_A,OutputDir,RootFile_A,'.nc',NomTypeNc,i1_series_Civ1(ifield),i2_series_Civ1(ifield),... 283 j1_series_Civ1(ifield),j2_series_Civ1(ifield)); 284 else 285 ncfile=fullfile_uvmat(RootPath_A,OutputDir,RootFile_A,'.nc',NomTypeNc,i2_series_Civ1(ifield),[],... 286 j1_series_Civ1(ifield),j2_series_Civ1(ifield)); 287 end 288 281 289 %% Civ1 290 % if Civ1 computation is requested 282 291 if isfield (Param.ActionInput,'Civ1') 283 292 par_civ1=Param.ActionInput.Civ1; … … 297 306 ImageName_B=fullfile_uvmat(RootPath_B,SubDir_B,RootFile_B,FileExt_B,NomType_B,i2_series_Civ1(ifield),[],j2_series_Civ1(ifield)); 298 307 [par_civ1.ImageB,VideoObject_B] = read_image(ImageName_B,FileType_B,VideoObject_B,FrameIndex_B_Civ1(ifield)); 299 end300 if strcmp(Param.ActionInput.ListCompareMode,'PIV')301 ncfile=fullfile_uvmat(RootPath_A,OutputDir,RootFile_A,'.nc',NomTypeNc,i1_series_Civ1(ifield),i2_series_Civ1(ifield),...302 j1_series_Civ1(ifield),j2_series_Civ1(ifield));303 else304 ncfile=fullfile_uvmat(RootPath_A,OutputDir,RootFile_A,'.nc',NomTypeNc,i2_series_Civ1(ifield),[],...305 j1_series_Civ1(ifield),j2_series_Civ1(ifield));306 308 end 307 309 par_civ1.ImageWidth=FileInfo_A.Width; … … 376 378 Data.Civ1_F=reshape(F,[],1); 377 379 end 378 else 380 else% we use existing Civ1 data 379 381 if exist('ncfile','var') 380 382 CivFile=ncfile;
Note: See TracChangeset
for help on using the changeset viewer.