Changeset 551


Ignore:
Timestamp:
Oct 11, 2012, 10:44:35 PM (9 years ago)
Author:
sommeria
Message:

bugs corrected

Location:
trunk/src/series
Files:
2 edited

Legend:

Unmodified
Added
Removed
  • trunk/src/series/ima_levels.m

    r478 r551  
    7979NomType=Param.InputTable(:,4);
    8080FileExt=Param.InputTable(:,5);
     81OutputSubDir=[Param.OutputSubDir Param.OutputDirExt];% subdirectory for output files
    8182
    8283% get the set of input file names (cell array filecell), and the lists of
     
    170171        % operation on images
    171172        A=levels(A);
    172         filename_new=fullfile_uvmat(RootPath{1},Param.OutputSubDir,RootFile{1},FileExtOut,NomTypeOut,i1_series{1}(ifile),[],j1);
     173        filename_new=fullfile_uvmat(RootPath{1},OutputSubDir,RootFile{1},FileExtOut,NomTypeOut,i1_series{1}(ifile),[],j1);
     174%         OutputFile=fullfile_uvmat(RootPath{1},OutputSubDir,RootFile{1},FileExtOut,NomType{1},i1,i2,j1,j2);
    173175        imwrite(A,filename_new)
    174176        display([filename_new ' written'])
  • trunk/src/series/merge_proj.m

    r550 r551  
    8383    Param.InputFields.FieldName='';
    8484end
    85 OutputSubDir=[Param.OutputSubDir Param.OutputDirExt];
    8685
    8786%% root input file(s) and type
     
    9190NomType=Param.InputTable(:,4);
    9291FileExt=Param.InputTable(:,5);
     92OutputSubDir=[Param.OutputSubDir Param.OutputDirExt];% subdirectory for output files
    9393[filecell,i1_series,i2_series,j1_series,j2_series]=get_file_series(Param);
    9494%%%%%%%%%%%%
     
    195195        nbtime=0;
    196196        for iview=1:nbview
    197             % reading input file(s)
     197            %% reading input file(s)
    198198            [Data{iview},tild,errormsg] = read_field(filecell{iview,index},FileType{iview},Param.InputFields,frame_index{iview}(index));
    199199            if ~isempty(errormsg)
     
    211211            end
    212212           
    213             %transform the input field (e.g; phys) if requested
     213            %% transform the input field (e.g; phys) if requested
    214214            if ~isempty(transform_fct)
    215                 switch nargin(transform_fct)
    216                     case {2,3,4}
    217                        Data{iview}=transform_fct(Data{iview},XmlData{iview});
    218                     case 1
    219                         Data{iview}=transform_fct(Data{iview});
     215                if nargin(transform_fct)>=2
     216                    Data{iview}=transform_fct(Data{iview},XmlData{iview});
     217                else
     218                    Data{iview}=transform_fct(Data{iview});
    220219                end
    221220            end
     
    236235             check_proj_tps= ~isempty(Param.ProjObject)&& strcmp(Param.ProjObject.ProjMode,'filter')&&~isfield(Data{iview},'Coord_tps');
    237236            Data{iview}=calc_tps(Data{iview},check_proj_tps);
    238              
    239 %             % field calculation (vort, div...)   
    240 %             if strcmp(FileType{iview},'civx')||strcmp(FileType{iview},'civdata')
    241 %                 if isfield(Data{iview},'Coord_tps')
    242 %                     Data{iview}.FieldList=Param.InputFields.FieldName;
    243 %                 else
    244 %                     Data{iview}=calc_field(Param.InputFields.FieldName,Data{iview});%calculate field (vort..)
    245 %                 end
    246 %             end
    247            
    248             %projection on object (gridded plane)
     237
     238            %% projection on object (gridded plane)
    249239            if Param.CheckObject
    250240                [Data{iview},errormsg]=proj_field(Data{iview},Param.ProjObject);
Note: See TracChangeset for help on using the changeset viewer.