Changeset 466 for trunk

Timestamp:

Jun 21, 2012, 7:27:59 PM (13 years ago)

Author:

sommeria

Message:

bugs corrected

Location:

trunk/src

Files:

• civ_matlab.m (modified) (5 diffs)
• read_field.m (modified) (3 diffs)

trunk/src/civ_matlab.m

@@ -51 +51 @@
 check_civ1=0;%default
 check_patch1=0;%default
-        ImageFileA=Param.Civ1.ImageA;
-        ImageFileB=Param.Civ1.ImageB;
-        if isfield(Param,'Civ2')
-            ImageFileA_civ2=Param.Civ2.ImageA;
-             ImageFileB_civ2=Param.Civ2.ImageB;
-        end
+%         ImageFileA=Param.Civ1.ImageA;
+%         ImageFileB=Param.Civ1.ImageB;
+%         if isfield(Param,'Civ2')
+%             ImageFileA_civ2=Param.Civ2.ImageA;
+%              ImageFileB_civ2=Param.Civ2.ImageB;
+%         end
 % case of input Param set by an xml file (batch mode)
 if ischar(Param)
@@ -103 +103 @@
     else
         if isfield(par_civ1,'ImageA')&&(ischar(par_civ1.ImageA)||strcmp(class(par_civ1.ImageA),'VideoReader')) % case with no image: only the PIV grid is calculated           
-            [Field,ParamOut,errormsg] = read_field(ImageFileA,par_civ1.FileTypeA,par_civ1.ImageA,par_civ1.FrameIndexA);
+            [Field,ParamOut,errormsg] = read_field(Param.Civ1.ImageA,par_civ1.FileTypeA,par_civ1.ImageA,par_civ1.FrameIndexA);
             if ~isempty(errormsg)
                 errormsg=['error in civ_matlab/read_field:' errormsg];
@@ -111 +111 @@
         end
         if isfield(par_civ1,'ImageB')&& (ischar(par_civ1.ImageB)||strcmp(class(par_civ1.ImageB),'VideoReader'))
-            [Field,ParamOut,errormsg] = read_field(ImageFileB,par_civ1.FileTypeB,par_civ1.ImageB,par_civ1.FrameIndexB);
+            [Field,ParamOut,errormsg] = read_field(Param.Civ1.ImageB,par_civ1.FileTypeB,par_civ1.ImageB,par_civ1.FrameIndexB);
             if ~isempty(errormsg)
                 errormsg=['error in civ_matlab/read_field:' errormsg];
@@ -247 +247 @@
     if ~isfield (Param,'Civ1') || ~strcmp(Param.Civ1.ImageA,par_civ2.ImageA)
         %read first image if not already done for civ1
-        [Field,ParamOut,errormsg] = read_field(ImageFileA_civ2,par_civ2.FileTypeA,par_civ2.ImageA,par_civ2.FrameIndexA);
+        [Field,ParamOut,errormsg] = read_field(Param.Civ2.ImageA,par_civ2.FileTypeA,par_civ2.ImageA,par_civ2.FrameIndexA);
                     if ~isempty(errormsg)
                 errormsg=['error in civ_matlab/read_field:' errormsg];
@@ -258 +258 @@
     if ~isfield (Param,'Civ1') || ~strcmp(Param.Civ1.ImageB,par_civ2.ImageB)
         %read first image if not already done for civ1
-        [Field,ParamOut,errormsg] = read_field(ImageFileB_civ2,par_civ2.FileTypeB,par_civ2.ImageB,par_civ2.FrameIndexB);
+        [Field,ParamOut,errormsg] = read_field(Param.Civ2.ImageB,par_civ2.FileTypeB,par_civ2.ImageB,par_civ2.FrameIndexB);
          if ~isempty(errormsg)
                 errormsg=['error in civ_matlab/read_field:' errormsg];

trunk/src/read_field.m

@@ -15 +15 @@
 %
 %INPUT
-% ObjectName: name of the input file, or movie object when the Matlab function mmreader is used
+% FileName: name of the input file
 % FileType: type of file
 %     = netcdf : netcdf file 
@@ -28 +28 @@
 %     .ColorVar: variable used for vector color
 %     .Npx, .Npy: nbre of pixels along x and y (used for .vol input files)
+% num: frame number for movies
+
 function [Field,ParamOut,errormsg] = read_field(FileName,FileType,ParamIn,num)
 Field=[];
@@ -38 +40 @@
 ParamOut=ParamIn;%default
 errormsg='';
-if isfield(ParamIn,'VelType')
-VelType=ParamIn.VelType;
-end
+% if isfield(ParamIn,'VelType')
+% VelType=ParamIn.VelType;
+% end
 A=[];
 %% distingush different input file types