Changeset 858
 Timestamp:
 Jan 26, 2015, 7:43:23 PM (6 years ago)
 Location:
 trunk/src
 Files:

 3 edited
Legend:
 Unmodified
 Added
 Removed

trunk/src/mouse_motion.m
r856 r858 247 247 par_civ.Civ1_V_tps=Field.Civ1_V_tps; 248 248 par_civ.Civ1_Dt=Field.Civ1_Dt; 249 par_civ.Civ2_Dt=Field.Civ2_Dt; 249 250 shiftx=Field.ShiftX(ind_pt); 250 251 shifty=Field.ShiftY(ind_pt); … … 290 291 par_civ.ImageWidth=size(par_civ.ImageA,2); 291 292 par_civ.Grid=[xround yround];% PIV calculation with a single point 292 Param.ActionInput.(CivOption)=par_civ; 293 294 % .ImageA: first image for correlation (matrix) 295 % .ImageB: second image for correlation(matrix) 296 % .CorrBoxSize: 1,2 vector giving the size of the correlation box in x and y 297 % .SearchBoxSize: 1,2 vector giving the size of the search box in x and y 298 % .SearchBoxShift: 1,2 vector or 2 column matrix (for civ2) giving the shift of the search box in x and y 299 % .CorrSmooth: =1 or 2 determines the choice of the subpixel determination of the correlation max 300 % .ImageWidth: nb of pixels of the image in x 301 % .Dx, Dy: mesh for the PIV calculation 302 % .Grid: grid giving the PIV calculation points (alternative to .Dx .Dy) 303 % .Mask: name of a mask file or mask image matrix itself 304 % .MinIma: thresholds for image luminosity 305 % .MaxIma 306 % .CheckDeformation=1 for subpixel interpolation and image deformation (linear transform) 307 % .DUDX: matrix of deformation obtained from patch at each grid point 308 % .DUDY 309 % .DVDX: 310 % .DVDY 311 293 Param.ActionInput.(CivOption)=par_civ; 312 294 [Data,errormsg,result_conv]= civ_series(Param); 313 295 if ~isempty(errormsg) … … 330 312 set(0,'CurrentFigure',corrfig(1)) 331 313 AxeData.CurrentCorrImage=imagesc(rangx,rangy,result_conv,[0 1]); 332 AxeData.CurrentVector=line([0 Data. Civ1_U],[0 Data.Civ1_V],'Tag','vector');333 AxeData.TitleHandle=title(num2str(par .Grid));314 AxeData.CurrentVector=line([0 Data.([CivOption '_U'])],[0 Data.([CivOption '_V'])],'Tag','vector'); 315 AxeData.TitleHandle=title(num2str(par_civ.Grid)); 334 316 colorbar 335 317 set(CurrentAxes,'UserData',AxeData) … … 340 322 set(AxeData.CurrentCorrImage,'XData',rangx) 341 323 set(AxeData.CurrentCorrImage,'YData',rangy) 342 set(AxeData.CurrentVector,'XData',[0 Data. Civ1_U],'YData',[0 Data.Civ1_V])343 set(AxeData.TitleHandle,'String',num2str(par .Grid))324 set(AxeData.CurrentVector,'XData',[0 Data.([CivOption '_U'])],'YData',[0 Data.([CivOption '_V'])]); 325 set(AxeData.TitleHandle,'String',num2str(par_civ.Grid)) 344 326 end 345 327 end 
trunk/src/series/civ_input.m
r856 r858 1888 1888 Param=rmfield(Param,'OutputSubDir'); %remove output file option from civ_series 1889 1889 Param.ActionInput.Civ2.SmoothParam=0;% launch Civ2 with no data point (to get the image names for A and B) 1890 set(handles.Civ1,'BackgroundColor',[1 1 0]) 1890 1891 [Data,errormsg]=civ_series(Param);% get the civ1+fix1 results 1891 1892 … … 1904 1905 hview_field=view_field(ImageData); %view the image in the GUI view_field 1905 1906 set(0,'CurrentFigure',hview_field) 1907 % plot the boundaries of the subdomains used for patch 1906 1908 RectCentre=squeeze(mean(Data.Civ1_SubRange,2)); 1907 1909 for isub=1:size(Data.Civ1_SubRange,3); … … 1912 1914 rectangle('Position',[pos_x pos_y width height],'EdgeColor',[0 0 1]) 1913 1915 end 1914 hhview_field=guihandles(hview_field); 1916 hhview_field=guihandles(hview_field);% 1915 1917 set(hview_field,'CurrentAxes',hhview_field.PlotAxes) 1916 ViewData=get(hview_field,'UserData'); 1918 %ViewData=get(hview_field,'UserData'); 1919 % store info in the UserData of viewfield 1917 1920 ViewData.CivHandle=handles.civ_input;% indicate the handle of the civ GUI in view_field 1918 1921 ViewData.PlotAxes.B=imread(Data.Civ2_ImageB);%store the second image in the UserData of the GUI view_field … … 1927 1930 ViewData.PlotAxes.Civ1_V_tps=Data.Civ1_V_tps; 1928 1931 ViewData.PlotAxes.Civ1_Dt=Data.Civ1_Dt; 1932 ViewData.PlotAxes.Civ2_Dt=Data.Civ2_Dt; 1929 1933 set(hview_field,'UserData',ViewData)% store the info in the UserData of image view_field 1930 1934 
trunk/src/series/civ_series.m
r856 r858 671 671 V_tps=par_civ2.Civ1_V_tps; 672 672 Civ1_Dt=par_civ2.Civ1_Dt; 673 Civ2_Dt=par_civ2.Civ1_Dt; 673 674 Data.ListVarName={}; 674 675 Data.VarDimName={}; … … 709 710 par_civ2.SearchBoxSize(1)=2*ibx2+9;% search ara +4 pixels around the guess 710 711 par_civ2.SearchBoxSize(2)=2*iby2+9; 711 if strcmp(Param.ActionInput.ListCompareMode,'displacement')712 Civ1_Dt=1;713 Civ2_Dt=1;714 elseif exist('time','var')715 Civ2_Dt=time(i2+1,j2+1)time(i1+1,j1+1);716 else717 Civ2_Dt=1;%TO CHECK, TEST712 if CheckInputFile % else Dt given by par_civ2 713 if strcmp(Param.ActionInput.ListCompareMode,'displacement') 714 Civ1_Dt=1; 715 Civ2_Dt=1; 716 else 717 Civ2_Dt=time(i2+1,j2+1)time(i1+1,j1+1); 718 end 718 719 end 719 720 par_civ2.SearchBoxShift=(Civ2_Dt/Civ1_Dt)*[Shiftx(nbval>=1)./nbval(nbval>=1) Shifty(nbval>=1)./nbval(nbval>=1)]; … … 725 726 par_civ2.DVDY=DVDY./nbval; 726 727 end 728 par_civ2 727 729 % calculate velocity data (y and v in indices, reverse to y component) 728 730 [xtable, ytable, utable, vtable, ctable, F,result_conv,errormsg] = civ (par_civ2);
Note: See TracChangeset
for help on using the changeset viewer.