Changeset 861 for trunk/src/series
- Timestamp:
- Jan 28, 2015, 11:48:49 AM (10 years ago)
- Location:
- trunk/src/series
- Files:
-
- 2 edited
Legend:
- Unmodified
- Added
- Removed
-
trunk/src/series/civ_input.m
r860 r861 1756 1756 Param.ActionInput.Civ1.CorrSmooth=0;% launch Civ1 with no data point (to get the image names for A and B) 1757 1757 [Data,errormsg]=civ_series(Param);% get the civ1+fix1 results 1758 1758 if ~isempty(errormsg), return, end % rmq: error msg displayed in civ_series 1759 1759 1760 %% create image data ImageData for display 1760 1761 ImageData.ListVarName={'ny','nx','A'}; -
trunk/src/series/civ_series.m
r860 r861 401 401 j2=j2_series_Civ1(ifield); 402 402 end 403 Data.Civ1_Time=(time(i2+1,j2+1)+time(i1+1,j1+1))/2; 403 if strcmp(Param.ActionInput.ListCompareMode,'displacement') 404 Data.Civ1_Time=time(i2+1,j2+1);% the time is the time of the secodn image 405 Data.Civ1_Dt=1;% time interval is 1, to yield displacement instead of velocity=displacement/Dt at reading 406 else 407 Data.Civ1_Time=(time(i2+1,j2+1)+time(i1+1,j1+1))/2;% the time is the time at the middle of the image pair 404 408 Data.Civ1_Dt=time(i2+1,j2+1)-time(i1+1,j1+1); 409 end 405 410 for ilist=1:length(list_param) 406 411 Data.(Civ1_param{4+ilist})=Param.ActionInput.Civ1.(list_param{ilist}); … … 421 426 par_civ1.Mask=mask; %use mask already opened 422 427 else 423 par_civ1.Mask=imread(par_civ1.Mask);%update the mask, an store it for future use 428 try 429 par_civ1.Mask=imread(par_civ1.Mask);%update the mask, an store it for future use 430 catch ME 431 if ~isempty(ME.message) 432 errormsg=['error reading input image: ' ME.message]; 433 disp_uvmat('ERROR',errormsg,checkrun) 434 return 435 end 436 end 424 437 mask=par_civ1.Mask; 425 438 maskname=par_civ1.Mask; … … 710 723 Data.Civ2_ImageA=ImageName_A; 711 724 Data.Civ2_ImageB=ImageName_B; 725 if strcmp(Param.ActionInput.ListCompareMode,'displacement') 726 Data.Civ2_Time=time(i2+1,j2+1);% the time is the time of the secodn image 727 Data.Civ2_Dt=1;% time interval is 1, to yield displacement instead of velocity=displacement/Dt at reading 728 else 712 729 Data.Civ2_Time=(time(i2+1,j2+1)+time(i1+1,j1+1))/2; 713 730 Data.Civ2_Dt=Civ2_Dt; 731 end 714 732 end 715 733 % Data.Civ2_Time=1;
Note: See TracChangeset
for help on using the changeset viewer.