Ignore:
Timestamp:
Jan 26, 2015, 7:43:23 PM (6 years ago)
Author:
sommeria
Message:

bugs_corrected

File:
1 edited

Legend:

Unmodified
Added
Removed
  • trunk/src/mouse_motion.m

    r856 r858  
    247247                   par_civ.Civ1_V_tps=Field.Civ1_V_tps;
    248248                   par_civ.Civ1_Dt=Field.Civ1_Dt;
     249                   par_civ.Civ2_Dt=Field.Civ2_Dt;
    249250                   shiftx=Field.ShiftX(ind_pt);
    250251                   shifty=Field.ShiftY(ind_pt);
     
    290291                par_civ.ImageWidth=size(par_civ.ImageA,2);
    291292                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 sub-pixel 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;     
    312294                [Data,errormsg,result_conv]= civ_series(Param);
    313295                if ~isempty(errormsg)
     
    330312                            set(0,'CurrentFigure',corrfig(1))
    331313                            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));
    334316                            colorbar
    335317                            set(CurrentAxes,'UserData',AxeData)
     
    340322                        set(AxeData.CurrentCorrImage,'XData',rangx)
    341323                        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))
    344326                    end
    345327                end
Note: See TracChangeset for help on using the changeset viewer.