Changeset 551 for trunk/src/series

Timestamp:

Oct 11, 2012, 10:44:35 PM (12 years ago)

Author:

sommeria

Message:

bugs corrected

Location:

trunk/src/series

Files:

• ima_levels.m (modified) (2 diffs)
• merge_proj.m (modified) (5 diffs)

trunk/src/series/ima_levels.m

@@ -79 +79 @@
 NomType=Param.InputTable(:,4);
 FileExt=Param.InputTable(:,5);
+OutputSubDir=[Param.OutputSubDir Param.OutputDirExt];% subdirectory for output files
 
 % get the set of input file names (cell array filecell), and the lists of
@@ -170 +171 @@
         % operation on images
         A=levels(A);
-        filename_new=fullfile_uvmat(RootPath{1},Param.OutputSubDir,RootFile{1},FileExtOut,NomTypeOut,i1_series{1}(ifile),[],j1);
+        filename_new=fullfile_uvmat(RootPath{1},OutputSubDir,RootFile{1},FileExtOut,NomTypeOut,i1_series{1}(ifile),[],j1);
+%         OutputFile=fullfile_uvmat(RootPath{1},OutputSubDir,RootFile{1},FileExtOut,NomType{1},i1,i2,j1,j2);
         imwrite(A,filename_new)
         display([filename_new ' written'])

trunk/src/series/merge_proj.m

@@ -83 +83 @@
     Param.InputFields.FieldName='';
 end
-OutputSubDir=[Param.OutputSubDir Param.OutputDirExt];
 
 %% root input file(s) and type
@@ -91 +90 @@
 NomType=Param.InputTable(:,4);
 FileExt=Param.InputTable(:,5);
+OutputSubDir=[Param.OutputSubDir Param.OutputDirExt];% subdirectory for output files
 [filecell,i1_series,i2_series,j1_series,j2_series]=get_file_series(Param);
 %%%%%%%%%%%%
@@ -195 +195 @@
         nbtime=0;
         for iview=1:nbview
-            % reading input file(s)
+            %% reading input file(s)
             [Data{iview},tild,errormsg] = read_field(filecell{iview,index},FileType{iview},Param.InputFields,frame_index{iview}(index));
             if ~isempty(errormsg)
@@ -211 +211 @@
             end
             
-            %transform the input field (e.g; phys) if requested
+            %% transform the input field (e.g; phys) if requested
             if ~isempty(transform_fct)
-                switch nargin(transform_fct)
-                    case {2,3,4}
-                       Data{iview}=transform_fct(Data{iview},XmlData{iview});
-                    case 1
-                        Data{iview}=transform_fct(Data{iview});
+                if nargin(transform_fct)>=2
+                    Data{iview}=transform_fct(Data{iview},XmlData{iview});
+                else
+                    Data{iview}=transform_fct(Data{iview});
                 end
             end
@@ -236 +235 @@
              check_proj_tps= ~isempty(Param.ProjObject)&& strcmp(Param.ProjObject.ProjMode,'filter')&&~isfield(Data{iview},'Coord_tps');
             Data{iview}=calc_tps(Data{iview},check_proj_tps);
-              
-%             % field calculation (vort, div...)    
-%             if strcmp(FileType{iview},'civx')||strcmp(FileType{iview},'civdata')
-%                 if isfield(Data{iview},'Coord_tps')
-%                     Data{iview}.FieldList=Param.InputFields.FieldName;
-%                 else
-%                     Data{iview}=calc_field(Param.InputFields.FieldName,Data{iview});%calculate field (vort..)
-%                 end
-%             end
-            
-            %projection on object (gridded plane)
+
+            %% projection on object (gridded plane)
             if Param.CheckObject
                 [Data{iview},errormsg]=proj_field(Data{iview},Param.ProjObject);