Changeset 387 for trunk/src/civ_matlab.m

Timestamp:

Apr 4, 2012, 3:31:30 PM (12 years ago)

Author:

sommeria

Message:

several bugs corrected: mask, color image...

File:

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

trunk/src/civ_matlab.m

@@ -14 +14 @@
 %INPUT:
 % Param: input images and processing parameters
+%     .Civ1: for civ1
+%     .Fix1: 
+%     .Patch1: 
+%     .Civ2: for civ2
+%     .Fix2: 
+%     .Patch2:
 % ncfile: name of a netcdf file to be created for the result (extension .nc)
 %
@@ -47 +53 @@
 
 if ischar(Param)
-    Param=xml2struct(Param);
+    Param=xml2struct(Param); %if Param is the name of an xml file, read this file as a Matlab structure
 end
 
@@ -66 +72 @@
         end
     else
-        if ischar(par_civ1.ImageA)
+        if isfield(par_civ1,'ImageA') && ischar(par_civ1.ImageA) % case with no image: only the PIV grid is calculated
             par_civ1.ImageA=sum(imread(par_civ1.ImageA),3);
         end
-        if ischar(par_civ1.ImageB)
+        if isfield(par_civ1,'ImageB')&& ischar(par_civ1.ImageB)
             par_civ1.ImageB=sum(imread(par_civ1.ImageB),3);
         end
@@ -245 +251 @@
     end
     mask='';
-    if par_civ2.CheckMask&&~isempty(par_civ2.maskname)&& ~strcmp(maskname,par_civ2.maskname)% mask exist, not already read in civ1
-        mask=imread(par_civ2.maskname);
+    if par_civ2.CheckMask&&~isempty(par_civ2.Mask)&& ~strcmp(maskname,par_civ2.Mask)% mask exist, not already read in civ1
+        mask=imread(par_civ2.Mask);
     end
     par_civ2.Searchx=2*isx2+1;