Changeset 89 for trunk/src/name_generator.m

Timestamp:

May 20, 2010, 1:48:25 AM (14 years ago)

Author:

sommeria

Message:

many bug corrections and cleaning. Activation of the BW option in uvmat. Improvement of the interaction of get_field with uvmat.

File:

• trunk/src/name_generator.m (modified) (8 diffs)

trunk/src/name_generator.m

@@ -1 +1 @@
 %'name_generator': creates a file name from a root name and indices. 
-%---------------------------------------------------------------------
+%------------------------------------------------------------------------
 % [filename,idetect,num_i1_out,num_j1_out,num_i2_out,num_j2_out,subdir_out]=...
 %        name_generator(filebase,num_i1,num_j1,ext,nom_type,comp_input,num_i2,num_j2,subdir);
-%---------------------------------------------------------------------           
+%------------------------------------------------------------------------           
 % This function detects the existence the constructed file name and it can
 % find indices according to file existence if they are not specified
 % rmq: this function is related to the reverse functions display2name and name2diplay 
-%---------------------------------------------------------------------
+%------------------------------------------------------------------------
 % OUTPUT:
 % filename: string representing the file name (including path)
@@ -13 +13 @@
 % num_i1_out,num_j1_out,num_i2_out,num_j2_out,subdir_out: index numbers and subdirectory detected 
 %            for free input (= to the corresponding input indices when comp_input=1)
-%---------------------------------------------------------------------
+%------------------------------------------------------------------------
 % INPUT:
 % 'filebase': the root name, 
@@ -22 +22 @@
 %       nom_type='': constant name [filebase ext] (default output if 'nom_type' is undefined)
 %       nom_type='*': the same  file [filebase ext] contains successive fields (ex avi movies)
+%       nom_type='%03d' or '%04d', series of indexed images with numbers completed with zeros to 3 or 4 digits, e.g.'aa045.tif'
 %       nom_type='_i': series of files with a single index i preceded by '_'(e.g. 'aa_45.png').
+%       nom_type='_%03d', '_%04d', or '_%05d', series of indexed images with _ and numbers completed with zeros to 3, 4 or 5 digits, e.g.'aa_045.tif'
 %       nom_type='#' series of indexed images wich is not series_i [filebase index ext], e.g. 'aa045.jpg' or 'aa45.tif'
 %       nom_type='_i_j' matrix of files with two indices i and j separated by '_'(e.g. 'aa_45_2.png')
@@ -28 +30 @@
 %       nom_type='_i_j1-j2'pairs of j indices (e.g. 'aa_45_2-3.nc')
 %       nom_type='_i1-i2_j' pairs of i indices (e.g. 'aa_45-46_2.nc')
+%       nom_type='%3da','%3dA' with a numerical index and an index letter(e.g.'aa045b.png'), 
 %       nom_type='#a','#A' with a numerical index and an index letter(e.g.'aa045b.png'), OBSOLETE (replaced by 'series_i_j')
-%       nom_type='%03d' or '%04d', series of indexed images with numbers completed with zeros to 3 or 4 digits, e.g.'aa045.tif'
-%       nom_type='_%03d', '_%04d', or '_%05d', series of indexed images with _ and numbers completed with zeros to 3, 4 or 5 digits, e.g.'aa_045.tif'
-%       nom_type='raw_SMD', same as '#a' but with no extension ext='', OBSOLETE
-%       nom_type='#_ab' from pairs of '#a' images (e.g. 'aa045bc.nc'), ext='.nc', OBSOLETE (replaced by 'netc_2D')
-%       nom_type='%3dab' from pairs of '%3da' images (e.g. 'aa045bc.nc'), ext='.nc', OBSOLETE (replaced by 'netc_2D')
+%       nom_type='#_ab' from pairs of '#a' images (e.g. 'aa045bc.nc'),
+%       nom_type='%3d_ab' from pairs of '%3da' images (e.g. 'aa045bc.nc')
 %'comp_input' (for nom_type involving index pairs (e.g. netc))
 %       comp_input=1: the index pair is imposed, 
@@ -48 +48 @@
 sizf=size(filebase);
 if (~ischar(filebase)||~isequal(sizf(1),1)),filebase='';end
+if ~exist('ext','var')
+    ext='';
+end
+if ~exist('nom_type','var')
+    nom_type='';
+end
 if ~ischar(ext),ext='';end
-% filename=[filebase ext];%default
 idetect=0;
-if ~exist('num_i1','var') || isequal(num_i1,[]) 
+if ~exist('num_i1','var') || isempty(num_i1) || isnan(num_i1)
     num_i1=1; %default
 end
-if ~exist('num_j1','var') || isequal(num_j1,[]) 
+if ~exist('num_j1','var') ||  isempty(num_j1) || isnan(num_j1)
     num_j1=1; %default
 end
-if ~exist('num_i2','var') || isequal(num_i2,[]) 
+if ~exist('num_i2','var') ||  isempty(num_i2) || isnan(num_i2)
     num_i2=num_i1; %default
 end
-if ~exist('num_j2','var') || isequal(num_i2,[]) 
+if ~exist('num_j2','var') || isempty(num_j2) || isnan(num_j2)
     num_j2=num_j1; %default
 end
@@ -71 +76 @@
 num_j2_out=num_j2;%default output
 
-test_pairs=isequal(nom_type,'netc_old')| isequal(nom_type,'netc_2D') | isequal(nom_type,'netc_3D')| isequal(nom_type,'_i1-i2_j1-j2')| ...
-  isequal(nom_type,'netc_series')| isequal(nom_type,'#_ab')| isequal(nom_type,'_i_j1-j2')| isequal(nom_type,'_i1-i2_j')| isequal(nom_type,'_i1-i2');
-test_2D= isequal(nom_type,'netc_old') |isequal(nom_type,'netc_2D')|isequal(nom_type,'#_ab') |isequal(nom_type,'_i_j1-j2');
-test_3D=isequal(nom_type,'netc_3D') |isequal(nom_type,'netc_series')| isequal(nom_type,'_i1-i2_j')| isequal(nom_type,'_i1-i2');
-if isequal(nom_type,'series_i')| isequal(nom_type,'_i');
+test_pairs=strcmp(nom_type,'netc_old')| strcmp(nom_type,'netc_2D') | strcmp(nom_type,'netc_3D')| strcmp(nom_type,'_i1-i2_j1-j2')| ...
+  strcmp(nom_type,'netc_series')| strcmp(nom_type,'#_ab')| strcmp(nom_type,'_i_j1-j2')| strcmp(nom_type,'_i1-i2_j')| strcmp(nom_type,'_i1-i2');
+test_2D= strcmp(nom_type,'netc_old') |strcmp(nom_type,'netc_2D')|strcmp(nom_type,'#_ab') |strcmp(nom_type,'_i_j1-j2');
+test_3D=strcmp(nom_type,'netc_3D') |strcmp(nom_type,'netc_series')| strcmp(nom_type,'_i1-i2_j')| strcmp(nom_type,'_i1-i2');
+if strcmp(nom_type,'series_i')| strcmp(nom_type,'_i');
         filename=[filebase '_' num2str(num_i1) ext];
         num_i2_out=num_i1;
         num_j1_out=[];
         num_j2_out=[]; 
-elseif length(nom_type)==5 && isequal(nom_type(1:3),'_%0')&& isequal(nom_type(5),'d');
+elseif length(nom_type)==5 && strcmp(nom_type(1:3),'_%0')&& strcmp(nom_type(5),'d');
         filename=[filebase '_' num2str(num_i1,nom_type(2:5)) ext];
         num_i2_out=num_i1;
         num_j2_out=num_j1;
-elseif isequal(nom_type,'series_i_j')| isequal(nom_type,'_i_j')
+elseif strcmp(nom_type,'series_i_j')| strcmp(nom_type,'_i_j')
         filename=[filebase '_' num2str(num_i1) '_' num2str(num_j1) ext];
         num_i2_out=num_i1;
         num_j2_out=num_j1;
-elseif isequal(nom_type,'png_old')| isequal(nom_type,'#a')| isequal(nom_type,'#A')
+elseif strcmp(nom_type,'png_old')| strcmp(nom_type,'#a')| strcmp(nom_type,'#A')
         filename=[filebase num2str(num_i1,'%03d') num2stra(num_j1,nom_type) ext];
         num_i2_out=num_i1;
         num_j2_out=num_j1;
-elseif  length(nom_type)>=5 & isequal(nom_type(2:3),'%0') & isequal(nom_type(5),'d')  %isequal(nom_type,'_%04dA') %camera PCO Toulouse
+elseif  length(nom_type)>=5 & strcmp(nom_type(2:3),'%0') & strcmp(nom_type(5),'d')  %strcmp(nom_type,'_%04dA') %camera PCO Toulouse
         filename=[filebase nom_type(1) num2str(num_i1,nom_type(2:4)) num2stra(num_j1,nom_type) ext];
         num_i2_out=num_i1;
         num_j2_out=num_j1;   
-elseif isequal(nom_type,'raw_SMD') %suffix a, b, c without extension
+elseif strcmp(nom_type,'raw_SMD') %suffix a, b, c without extension
         filename=[filebase num2str(num_i1,'%03d') num2stra(num_j1,nom_type)];
         num_i2_out=num_i1;
         num_j2_out=num_j1;
-elseif isequal(nom_type,'ima_num')| isequal(nom_type,'#')
+elseif strcmp(nom_type,'ima_num')| strcmp(nom_type,'#')
         filename=[filebase num2str(num_i1) ext];
         num_i2_out=num_i1;
         num_j1_out=[];
         num_j2_out=[];
-elseif length(nom_type)>=4 & isequal(nom_type(1:2),'%0') & isequal(nom_type(end),'d')
+elseif length(nom_type)>=4 & strcmp(nom_type(1:2),'%0') & strcmp(nom_type(end),'d')
         filename=[filebase num2str(num_i1,nom_type) ext]; %test number with a 0 before
         num_i2_out=num_i1;
@@ -115 +120 @@
     filebasesub=filebase;
     % get the root name filebasesub for the netcdf files
-    if  ~isequal(subdir,'') && ~isequal(subdir,'?') 
+    if  ~strcmp(subdir,'') && ~strcmp(subdir,'?') 
             [Path,Name]=fileparts(filebase);
             filebasesub=fullfile(Path,subdir,Name);
     end
      %inexistant pair if num_i2=0 or num_j2=0
-%     if isequal(num_i2,0)
+%     if strcmp(num_i2,0)
 %         filename=[filebasesub '*-*_' num2str(num_i1) ext];
 %         return
 %     end
-%     if isequal(num_j2,0)
+%     if strcmp(num_j2,0)
 %         filename=[filebasesub '_' num2str(num_i1) '_*-*' ext];
 %         return
@@ -232 +237 @@
 if ~isequal(subdir,'?'), subdir_out=subdir; else, subdir_out='';end;
 
-%---------------------------------------------------------------
-% search the appropriate image pair (netcdf file) corresponding to a given
-% image number
-%-------------------------------------------------------------------
+%------------------------------------------------------------------------
+% --- search the appropriate image pair (netcdf file) corresponding to a given image number
 function [filename,num_i1,num_j1,num_i2,num_j2,idetect]=search_pair(filebasesub,num_i1,num_j1,num_i2,nom_type)
+%------------------------------------------------------------------------
 % for nom_type=netc_2D or netc_old, it searches all the pairs corresponding
 % to num_i1, and chooses the most recent file.