Changeset 332 for trunk/src/uvmat.m
- Timestamp:
- Dec 13, 2011, 11:20:07 AM (13 years ago)
- File:
-
- 1 edited
Legend:
- Unmodified
- Added
- Removed
-
trunk/src/uvmat.m
r326 r332 660 660 end 661 661 end 662 if ~strcmp(hhh,'') && mmreader.isPlatformSupported()% if the functionis found (recent version of matlab)662 if ~strcmp(hhh,'')% if the function mmreader is found (recent version of matlab) 663 663 UvData.MovieObject=mmreader([FileBase FileIndices FileExt]); 664 664 elseif isfield(UvData,'MovieObject') … … 1360 1360 % NomType=get(handles.FileIndex,'UserData'); 1361 1361 switch NomType 1362 case {'_ i_j1-j2','#_ab','%3dab'},% pair with j index1362 case {'_1_1-2','#_ab','%3dab'},% pair with j index 1363 1363 set(handles.fix_pair,'Visible','on')% option fixed pair on/off made visible (choice of avaible pair with buttons + and - if ='off') 1364 1364 otherwise … … 1778 1778 %% read the current input file name(s) and field indices 1779 1779 InputFile=read_GUI(handles.InputFile); 1780 InputFile.RootFile=regexprep(InputFile.RootFile,' \<[\\/]|[\\/]\>','');%suppress possible / or \ separator at the beginning or the end of the string1781 InputFile.SubDir=regexprep(InputFile.SubDir,' \<[\\/]|[\\/]\>','');%suppress possible / or \ separator at the beginning or the end of the string1780 InputFile.RootFile=regexprep(InputFile.RootFile,'^[\\/]|[\\/]$','');%suppress possible / or \ separator at the beginning or the end of the string 1781 InputFile.SubDir=regexprep(InputFile.SubDir,'^[\\/]|[\\/]$','');%suppress possible / or \ separator at the beginning or the end of the string 1782 1782 if isempty(InputFile.RootFile) 1783 1783 filebase=InputFile.RootPath; … … 3149 3149 NomTypeNew=NomType;%default 3150 3150 if isequal(field,'image') 3151 if isequal(NomType,'_ i1-i2_j')||isequal(NomType,'_i_j1-j2')3152 NomTypeNew='_ i_j';3151 if isequal(NomType,'_1-2_1')||isequal(NomType,'_1_1-2') 3152 NomTypeNew='_1_1'; 3153 3153 elseif isequal(NomType,'#_ab') 3154 3154 NomTypeNew='#a'; 3155 elseif isequal(NomType,'_ i1-i2')3156 NomTypeNew='_ i';3155 elseif isequal(NomType,'_1-2') 3156 NomTypeNew='_1'; 3157 3157 end 3158 3158 imagename=name_generator(FileBase,str2double(str1),str2double(str_a),'.png',NomTypeNew,1,str2double(str2),str2double(str_b),''); … … 3270 3270 if isequal(field_1,'image') 3271 3271 % transform netc type to the corresponding image type 3272 if isequal(NomType_1,'_ i1-i2_j')||isequal(NomType_1,'_i_j1-j2')|| isequal(NomType_1,'#_ab')|| isequal(NomType_1,'_i1-i2')3272 if isequal(NomType_1,'_1-2_1')||isequal(NomType_1,'_1_1-2')|| isequal(NomType_1,'#_ab')|| isequal(NomType_1,'_1-2') 3273 3273 UvData.SubDir_1=get(handles.SubDir_1,'String'); %preserve the InputFile.SubDir in memory 3274 if isequal(NomType_1,'_ i1-i2_j')||isequal(NomType_1,'_i_j1-j2')3275 NomTypeNew='_ i_j';3274 if isequal(NomType_1,'_1-2_1')||isequal(NomType_1,'_1_1-2') 3275 NomTypeNew='_1_1'; 3276 3276 elseif isequal(NomType_1,'#_ab') 3277 3277 NomTypeNew='#a'; 3278 elseif isequal(NomType_1,'_ i1-i2')3279 NomTypeNew='_ i';3278 elseif isequal(NomType_1,'_1-2') 3279 NomTypeNew='_1'; 3280 3280 end 3281 3281 end … … 3321 3321 str1=get(handles.i1,'String'); 3322 3322 str_a=get(handles.j1,'String'); 3323 if isequal(NomType_1,'#_ab')||isequal(NomType_1,'_ i1-i2_j')||isequal(NomType_1,'_i_j1-j2')||isequal(NomType_1,'_i1-i2')3323 if isequal(NomType_1,'#_ab')||isequal(NomType_1,'_1-2_1')||isequal(NomType_1,'_1_1-2')||isequal(NomType_1,'_1-2') 3324 3324 NomTypeNew=NomType_1; 3325 3325 elseif isequal(NomType_1,'#a') 3326 3326 [filename, n1,na,n2,nb,SubDir_1]=name_generator(filebase_1, str2num(str1),stra2num(str_a),'.nc','#_ab',0,[],[],SubDir_1); 3327 3327 NomTypeNew='#_ab'; 3328 elseif isequal(NomType_1,'_ i_j')3329 [filename,n1,na,n2,nb,SubDir_1]=name_generator(filebase_1,str2num(str1),stra2num(str_a),'.nc','_ i1-i2_j',0,str2num(str1),[],SubDir_1);3328 elseif isequal(NomType_1,'_1_1') 3329 [filename,n1,na,n2,nb,SubDir_1]=name_generator(filebase_1,str2num(str1),stra2num(str_a),'.nc','_1-2_1',0,str2num(str1),[],SubDir_1); 3330 3330 if idetect==1 3331 NomTypeNew='_ i1-i2_j';3331 NomTypeNew='_1-2_1'; 3332 3332 else 3333 NomTypeNew='_ i_j1-j2';3333 NomTypeNew='_1_1-2'; 3334 3334 end 3335 3335 else %for instance avi files or any ima_num series 3336 [filename,n1,na,n2,nb,SubDir_1]=name_generator(filebase_1,str2num(str1),stra2num(str_a),'.nc','_ i1-i2',0,str2num(str1),[],SubDir_1);3337 NomTypeNew='_ i1-i2';3336 [filename,n1,na,n2,nb,SubDir_1]=name_generator(filebase_1,str2num(str1),stra2num(str_a),'.nc','_1-2',0,str2num(str1),[],SubDir_1); 3337 NomTypeNew='_1-2'; 3338 3338 end 3339 3339 [Path,Name]=fileparts(filebase_1);
Note: See TracChangeset
for help on using the changeset viewer.