Changeset 858 for trunk

Timestamp:

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

Author:

sommeria

Message:

bugs_corrected

Location:

trunk/src

Files:

• mouse_motion.m (modified) (4 diffs)
• series/civ_input.m (modified) (4 diffs)
• series/civ_series.m (modified) (3 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

trunk/src/series/civ_input.m

@@ -1888 +1888 @@
      Param=rmfield(Param,'OutputSubDir'); %remove output file option from civ_series
      Param.ActionInput.Civ2.SmoothParam=0;% launch Civ2 with no data point (to get the image names for A and B)
+     set(handles.Civ1,'BackgroundColor',[1 1 0])
      [Data,errormsg]=civ_series(Param);% get the civ1+fix1 results
      
@@ -1904 +1905 @@
     hview_field=view_field(ImageData); %view the image in the GUI view_field 
     set(0,'CurrentFigure',hview_field)
+    % plot the boundaries of the subdomains used for patch
     RectCentre=squeeze(mean(Data.Civ1_SubRange,2));
     for isub=1:size(Data.Civ1_SubRange,3);
@@ -1912 +1914 @@
         rectangle('Position',[pos_x pos_y width height],'EdgeColor',[0 0 1])
     end
-    hhview_field=guihandles(hview_field);
+    hhview_field=guihandles(hview_field);%
     set(hview_field,'CurrentAxes',hhview_field.PlotAxes)
-    ViewData=get(hview_field,'UserData');
+    %ViewData=get(hview_field,'UserData'); 
+    % store info in the UserData of view-field
     ViewData.CivHandle=handles.civ_input;% indicate the handle of the civ GUI in view_field
     ViewData.PlotAxes.B=imread(Data.Civ2_ImageB);%store the second image in the UserData of the GUI view_field
@@ -1927 +1930 @@
     ViewData.PlotAxes.Civ1_V_tps=Data.Civ1_V_tps;
     ViewData.PlotAxes.Civ1_Dt=Data.Civ1_Dt;
+    ViewData.PlotAxes.Civ2_Dt=Data.Civ2_Dt;
     set(hview_field,'UserData',ViewData)% store the info in the UserData of image view_field
     

trunk/src/series/civ_series.m

@@ -671 +671 @@
             V_tps=par_civ2.Civ1_V_tps;
             Civ1_Dt=par_civ2.Civ1_Dt;
+            Civ2_Dt=par_civ2.Civ1_Dt;
                          Data.ListVarName={};
                 Data.VarDimName={};
@@ -709 +710 @@
         par_civ2.SearchBoxSize(1)=2*ibx2+9;% search ara +-4 pixels around the guess
         par_civ2.SearchBoxSize(2)=2*iby2+9;
-        if strcmp(Param.ActionInput.ListCompareMode,'displacement')
-            Civ1_Dt=1;
-            Civ2_Dt=1;
-        elseif exist('time','var')
-            Civ2_Dt=time(i2+1,j2+1)-time(i1+1,j1+1);
-        else 
-            Civ2_Dt=1;%TO CHECK, TEST
+        if CheckInputFile % else Dt given by par_civ2
+            if strcmp(Param.ActionInput.ListCompareMode,'displacement')
+                Civ1_Dt=1;
+                Civ2_Dt=1;
+            else
+                Civ2_Dt=time(i2+1,j2+1)-time(i1+1,j1+1);
+            end
         end
         par_civ2.SearchBoxShift=(Civ2_Dt/Civ1_Dt)*[Shiftx(nbval>=1)./nbval(nbval>=1) Shifty(nbval>=1)./nbval(nbval>=1)];
@@ -725 +726 @@
             par_civ2.DVDY=DVDY./nbval;
         end
+        par_civ2
         % calculate velocity data (y and v in indices, reverse to y component)
         [xtable, ytable, utable, vtable, ctable, F,result_conv,errormsg] = civ (par_civ2);