Changeset 370 for trunk/src/civ_matlab.m

Timestamp:

Jan 13, 2012, 10:51:16 AM (12 years ago)

Author:

sommeria

Message:

bug corrected in civ_uvmat civ2, opening new files made more convenient in civ

File:

• trunk/src/civ_matlab.m (modified) (5 diffs)

trunk/src/civ_matlab.m

@@ -215 +215 @@
     [GridX,GridY]=meshgrid(minix:par_civ2.Dx:maxix,miniy:par_civ2.Dy:maxiy);
     GridX=reshape(GridX,[],1);
-    GridY=reshape(GridY,[],1);
+    GridY=reshape(GridY,[],1); 
     Shiftx=zeros(size(GridX));% shift expected from civ1 data
     Shifty=zeros(size(GridX));
@@ -254 +254 @@
     par_civ2.Grid=[GridX(nbval>=1)-par_civ2.Shiftx/2 GridY(nbval>=1)-par_civ2.Shifty/2];% grid taken at the extrapolated origin of the displacement vectors   
     if par_civ2.CheckDeformation
-        DUDX=DUDX./nbval;
-        DUDY=DUDY./nbval;
-        DVDX=DVDX./nbval;
-        DVDY=DVDY./nbval;
+        par_civ2.DUDX=DUDX./nbval;
+        par_civ2.DUDY=DUDY./nbval;
+        par_civ2.DVDX=DVDX./nbval;
+        par_civ2.DVDY=DVDY./nbval;
     end
     % caluclate velocity data (y and v in indices, reverse to y component)
@@ -494 +494 @@
 if CheckDecimal
     mesh=0.2;%mesh in pixels for subpixel image interpolation
+    CheckDeformation=isfield(par_civ,'CheckDeformation')&& par_civ.CheckDeformation==1;
 end
 % vector=[0 0];%default
 for ivec=1:nbvec
-    iref=par_civ.Grid(ivec,1);% xindex on the image A for the middle of the correlation box
-    jref=par_civ.Grid(ivec,2);% yindex on the image B for the middle of the correlation box
+    iref=round(par_civ.Grid(ivec,1)+0.5);% xindex on the image A for the middle of the correlation box
+    jref=round(par_civ.ImageHeight-par_civ.Grid(ivec,2)+0.5);% yindex on the image B for the middle of the correlation box
     if ~(checkmask && par_civ.Mask(jref,iref)<=20) %velocity not set to zero by the black mask
         if jref-iby2<1 || jref+iby2>par_civ.ImageHeight|| iref-ibx2<1 || iref+ibx2>par_civ.ImageWidth||...
@@ -520 +521 @@
             image1_crop=image1_crop-image1_mean;%substract the mean
             image2_crop=image2_crop-image2_mean;
-            if isfield(par_civ,'CheckDecimal')&& par_civ.CheckDecimal==1
+            if CheckDecimal
                 xi=(1:mesh:size(image1_crop,2));
                 yi=(1:mesh:size(image1_crop,1))';
-                image1_crop=interp2(image1_crop,xi,yi);
+                if CheckDeformation
+                    [XI,YI]=meshgrid(xi-ceil(size(image1_crop,2)/2),yi-ceil(size(image1_crop,1)/2));
+                    XIant=XI-par_civ.DUDX(ivec)*XI-par_civ.DUDY(ivec)*YI+ceil(size(image1_crop,2)/2);
+                    YIant=YI-par_civ.DVDX(ivec)*XI-par_civ.DVDY(ivec)*YI+ceil(size(image1_crop,1)/2);
+                    image1_crop=interp2(image1_crop,XIant,YIant);
+                else
+                    image1_crop=interp2(image1_crop,xi,yi);
+                end
                 xi=(1:mesh:size(image2_crop,2));
                 yi=(1:mesh:size(image2_crop,1))';
@@ -544 +552 @@
                     utable(ivec)=vector(1)*mesh+shiftx(ivec);
                     vtable(ivec)=vector(2)*mesh+shifty(ivec);                 
-                    xtable(ivec)=iref+utable(ivec)/2;% convec flow (velocity taken at the point middle from imgae1 and 2)
-                    ytable(ivec)=jref+vtable(ivec)/2;
+                    xtable(ivec)=iref+utable(ivec)/2-0.5;% convec flow (velocity taken at the point middle from imgae 1 and 2)
+                    ytable(ivec)=jref+vtable(ivec)/2-0.5;% and position of pixel 1=0.5 (convention for image coordinates=0 at the edge)
                     iref=round(xtable(ivec));% image index for the middle of the vector
                     jref=round(ytable(ivec));