Changeset 861 for trunk

Timestamp:

Jan 28, 2015, 11:48:49 AM (10 years ago)

Author:

sommeria

Message:

bugsrepaired

Location:

trunk/src/series

Files:

• civ_input.m (modified) (1 diff)
• civ_series.m (modified) (3 diffs)

trunk/src/series/civ_input.m

@@ -1756 +1756 @@
      Param.ActionInput.Civ1.CorrSmooth=0;% launch Civ1 with no data point (to get the image names for A and B)
      [Data,errormsg]=civ_series(Param);% get the civ1+fix1 results 
-    
+     if ~isempty(errormsg), return, end % rmq: error msg displayed in civ_series
+     
  %% create image data ImageData for display
      ImageData.ListVarName={'ny','nx','A'};

trunk/src/series/civ_series.m

@@ -401 +401 @@
                 j2=j2_series_Civ1(ifield);
             end
-            Data.Civ1_Time=(time(i2+1,j2+1)+time(i1+1,j1+1))/2;
+            if strcmp(Param.ActionInput.ListCompareMode,'displacement')
+                Data.Civ1_Time=time(i2+1,j2+1);% the time is the time of the secodn image
+                Data.Civ1_Dt=1;% time interval is 1, to yield displacement instead of velocity=displacement/Dt at reading
+            else
+            Data.Civ1_Time=(time(i2+1,j2+1)+time(i1+1,j1+1))/2;% the time is the time at the middle of the image pair
             Data.Civ1_Dt=time(i2+1,j2+1)-time(i1+1,j1+1);
+            end
             for ilist=1:length(list_param)
                 Data.(Civ1_param{4+ilist})=Param.ActionInput.Civ1.(list_param{ilist});
@@ -421 +426 @@
                 par_civ1.Mask=mask; %use mask already opened
             else
-                par_civ1.Mask=imread(par_civ1.Mask);%update the mask, an store it for future use
+                try
+                    par_civ1.Mask=imread(par_civ1.Mask);%update the mask, an store it for future use
+                catch ME
+                    if ~isempty(ME.message)
+                        errormsg=['error reading input image: ' ME.message];
+                        disp_uvmat('ERROR',errormsg,checkrun)
+                        return
+                    end
+                end
                 mask=par_civ1.Mask;
                 maskname=par_civ1.Mask;
@@ -710 +723 @@
             Data.Civ2_ImageA=ImageName_A;
             Data.Civ2_ImageB=ImageName_B;
+             if strcmp(Param.ActionInput.ListCompareMode,'displacement')
+                Data.Civ2_Time=time(i2+1,j2+1);% the time is the time of the secodn image
+                Data.Civ2_Dt=1;% time interval is 1, to yield displacement instead of velocity=displacement/Dt at reading
+             else
             Data.Civ2_Time=(time(i2+1,j2+1)+time(i1+1,j1+1))/2;
             Data.Civ2_Dt=Civ2_Dt;
+             end
         end
         %         Data.Civ2_Time=1;