Changeset 309 for trunk/src/mouse_motion.m

Timestamp:

Nov 30, 2011, 11:09:12 PM (13 years ago)

Author:

sommeria

Message:

many bugs corrected, cleaning of civ.m, resize of the GUI 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=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];
                         % mark the correlation box with a rectangle
-                        ibx2=floor((str2double(par.ibx)-1)/2);
-                        iby2=floor((str2double(par.iby)-1)/2);
-                        isx2=floor((str2double(par.isx)-1)/2);
-                        isy2=floor((str2double(par.isy)-1)/2);
-                        shiftx=str2double(par.shiftx);
-                        shifty=str2double(par.shifty);
+                        par.filename_ima_a=Field.A;
+                        par.filename_ima_b=Field.B;
+                        Param.Civ1=par;
+                        ibx2=floor((par.Bx-1)/2);
+                        iby2=floor((par.By-1)/2);
+                        isx2=floor((par.Searchx-1)/2);
+                        isy2=floor((par.Searchy-1)/2);
+                        shiftx=par.Shiftx;
+                        shifty=par.Shifty;     
                         hhh=findobj(haxes,'Tag','PIV_box_marker');
                         hhhh=findobj(haxes,'Tag','PIV_search_marker');
@@ -244 +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, []);
+                        %[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)
                         rangx(1)=-(isx2-ibx2)+shiftx;
                         rangx(2)=isx2-ibx2+shiftx;
@@ -261 +268 @@
                                 set(0,'CurrentFigure',corrfig(1))
                                 AxeData.CurrentCorrImage=imagesc(rangx,-rangy,result_conv,[0 1]);
-                                AxeData.CurrentVector=line([0 utable],[0 vtable],'Tag','vector');
+                                AxeData.CurrentVector=line([0 Data.Civ1_U],[0 -Data.Civ1_V],'Tag','vector');
                                 
                                 colorbar
@@ -271 +278 @@
                             set(AxeData.CurrentCorrImage,'XData',rangx)
                             set(AxeData.CurrentCorrImage,'YData',-rangy)
-                            set(AxeData.CurrentVector,'XData',[0 utable],'YData',[0 -vtable])
+                            set(AxeData.CurrentVector,'XData',[0 Data.Civ1_U],'YData',[0 -Data.Civ1_V])
                         end
                     end