Changeset 315 for trunk/src/mouse_motion.m

Timestamp:

Dec 3, 2011, 10:25:45 PM (12 years ago)

Author:

sommeria

Message:

many corrections, use of the new GUI civ with mask, grid and the new matlab civ1 and fix
pivlab now included in civ_matlab which contains all matlab subfunctions for civ.

File:

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

trunk/src/mouse_motion.m

@@ -218 +218 @@
              % case of PIV correlation display
                     if test_piv
-                        %par=civ('read_param_civ1',hhciv);
                         par=read_GUI(hhciv.Civ1);
                         [dd,ind_pt]=min(abs(Field.X-xy(1,1))+abs(Field.Y-xy(1,2)));
                         xround=Field.X(ind_pt);
                         yround=Field.Y(ind_pt);
-                        par.PointCoord=[xround size(Field.A,1)-yround+1];
+                        par.Grid=[xround size(Field.A,1)-yround+1];
                         % mark the correlation box with a rectangle
-                        par.filename_ima_a=Field.A;
-                        par.filename_ima_b=Field.B;
+                        par.ImageA=Field.A;
+                        par.ImageB=Field.B;
+                        [par.ImageHeight,par.ImageWidth]=size(par.ImageA);
                         Param.Civ1=par;
                         ibx2=floor((par.Bx-1)/2);
@@ -249 +249 @@
                             set(hhhh,'Position',[xround-isx2+shiftx yround-isy2+shifty 2*isx2 2*isy2])
                         end
-                        %[xtable, ytable, utable, vtable, ctable, typevector, result_conv] = ...
-                         %               pivlab (Field.A,Field.B,ibx2,iby2,isx2,isy2,shiftx,shifty,[xround size(Field.A,1)-yround+1], 1, []);
-                        [Data,errormsg,result_conv]= civ_matlab(Param)
+                        [Data,errormsg,result_conv]= civ_matlab(Param);
                         rangx(1)=-(isx2-ibx2)+shiftx;
                         rangx(2)=isx2-ibx2+shiftx;
@@ -268 +266 @@
                                 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.CurrentVector=line([0 Data.Civ1_U],[0 Data.Civ1_V],'Tag','vector');               
                                 colorbar
                                 set(haxes,'UserData',AxeData)
@@ -278 +275 @@
                             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.CurrentVector,'XData',[0 Data.Civ1_U],'YData',[0 Data.Civ1_V])
                         end
                     end