Changeset 858 for trunk/src/mouse_motion.m

Timestamp:

Jan 26, 2015, 7:43:23 PM (9 years ago)

Author:

sommeria

Message:

bugs_corrected

File:

• trunk/src/mouse_motion.m (modified) (4 diffs)

trunk/src/mouse_motion.m

@@ -247 +247 @@
                    par_civ.Civ1_V_tps=Field.Civ1_V_tps;
                    par_civ.Civ1_Dt=Field.Civ1_Dt;
+                   par_civ.Civ2_Dt=Field.Civ2_Dt;
                    shiftx=Field.ShiftX(ind_pt);
                    shifty=Field.ShiftY(ind_pt);
@@ -290 +291 @@
                 par_civ.ImageWidth=size(par_civ.ImageA,2);
                 par_civ.Grid=[xround yround];% PIV calculation with a single point 
-                Param.ActionInput.(CivOption)=par_civ;
-                
-                %  .ImageA: first image for correlation (matrix)
-%  .ImageB: second image for correlation(matrix)
-%  .CorrBoxSize: 1,2 vector giving the size of the correlation box in x and y
-%  .SearchBoxSize:  1,2 vector giving the size of the search box in x and y
-%  .SearchBoxShift: 1,2 vector or 2 column matrix (for civ2) giving the shift of the search box in x and y
-%  .CorrSmooth: =1 or 2 determines the choice of the sub-pixel determination of the correlation max
-%  .ImageWidth: nb of pixels of the image in x
-%  .Dx, Dy: mesh for the PIV calculation
-%  .Grid: grid giving the PIV calculation points (alternative to .Dx .Dy)
-%  .Mask: name of a mask file or mask image matrix itself
-%  .MinIma: thresholds for image luminosity
-%  .MaxIma
-%  .CheckDeformation=1 for subpixel interpolation and image deformation (linear transform)
-%  .DUDX: matrix of deformation obtained from patch at each grid point
-%  .DUDY
-%  .DVDX:
-%  .DVDY
-                
+                Param.ActionInput.(CivOption)=par_civ;      
                 [Data,errormsg,result_conv]= civ_series(Param);
                 if ~isempty(errormsg)
@@ -330 +312 @@
                             set(0,'CurrentFigure',corrfig(1))
                             AxeData.CurrentCorrImage=imagesc(rangx,-rangy,result_conv,[0 1]);
-                            AxeData.CurrentVector=line([0 Data.Civ1_U],[0 Data.Civ1_V],'Tag','vector');
-                            AxeData.TitleHandle=title(num2str(par.Grid));
+                            AxeData.CurrentVector=line([0 Data.([CivOption '_U'])],[0 Data.([CivOption '_V'])],'Tag','vector');
+                            AxeData.TitleHandle=title(num2str(par_civ.Grid));
                             colorbar
                             set(CurrentAxes,'UserData',AxeData)
@@ -340 +322 @@
                         set(AxeData.CurrentCorrImage,'XData',rangx)
                         set(AxeData.CurrentCorrImage,'YData',-rangy)
-                        set(AxeData.CurrentVector,'XData',[0 Data.Civ1_U],'YData',[0 Data.Civ1_V])
-                        set(AxeData.TitleHandle,'String',num2str(par.Grid))
+                        set(AxeData.CurrentVector,'XData',[0 Data.([CivOption '_U'])],'YData',[0 Data.([CivOption '_V'])]);
+                        set(AxeData.TitleHandle,'String',num2str(par_civ.Grid))
                     end
                 end