Changeset 639
 Timestamp:
 May 21, 2013, 1:14:02 AM (8 years ago)
 Location:
 trunk/src
 Files:

 1 added
 2 edited
Legend:
 Unmodified
 Added
 Removed

trunk/src/get_file_series.m
r635 r639 58 58 end 59 59 end 60 61 if isempty(incr_i)  isempty(incr_j)  isequal(r(1).mode,'**') % free pairs60 61 if isempty(incr_i)  isempty(incr_j)  isequal(r(1).mode,'**') isequal(r(1).mode,'**')% free pairs or increment 62 62 FilePath=fullfile(InputTable{iview,1},InputTable{iview,2}); 63 63 fileinput=[InputTable{iview,3} InputTable{iview,4} InputTable{iview,5}]; … … 65 65 i1_input,i2_input,j1_input,j2_input]=find_file_series(FilePath,fileinput); 66 66 i1_series{iview}=squeeze(i1_series{iview}(1,:,:)); %select first pair index as ordered by find_file_series 67 i2_series{iview}=squeeze(i2_series{iview}(1,:,:)); %select first pair index as ordered by find_file_series 67 68 j1_series{iview}=squeeze(j1_series{iview}(1,:,:)); %first pair index 68 69 j2_series{iview}=squeeze(j2_series{iview}(1,:,:)); %second pair index 69 %check_select=i1_series{iview}>=first_i & i1_series{iview}<=last_i;70 70 if isempty(incr_i) 71 if isempty( incr_j)71 if isempty(first_j)  isempty(incr_j) % no j index or no defined increment for j 72 72 [ref_j,ref_i]=find(i1_series{iview}); 73 73 ref_i=ref_i1; … … 83 83 else 84 84 ref_i=first_i:incr_i:last_i;%default 85 if isempty( incr_j)85 if isempty(first_j) isempty(incr_j)% no j index or no defined increment for j 86 86 [ref_j,tild]=find(i1_series{iview}); 87 87 ref_j=ref_j1; … … 91 91 end 92 92 end 93 i1_series{iview}=i1_series{iview}(ref_j,ref_i); 94 j1_series{iview}=j1_series{iview}(ref_j,ref_i); 95 if ~isempty(j2_series{iview}) 96 j2_series{iview}=j2_series{iview}(ref_j,ref_i); 93 if isempty(ref_j) 94 i1_series{iview}=i1_series{iview}(2,ref_i+1); 95 if ~isempty(i2_series{iview}) 96 i2_series{iview}=i2_series{iview}(2,ref_i+1); 97 end 98 else 99 i1_series{iview}=i1_series{iview}(ref_j+1,ref_i+1); 100 if ~isempty(i2_series{iview}) 101 i2_series{iview}=i2_series{iview}(ref_j+1,ref_i+1); 102 end 103 end 104 if ~isempty(j1_series{iview}) 105 j1_series{iview}=j1_series{iview}(ref_j+1,ref_i+1); 106 if ~isempty(j2_series{iview}) 107 j2_series{iview}=j2_series{iview}(ref_j+1,ref_i+1); 108 end 97 109 end 98 110 else 99 111 ref_i=first_i:incr_i:last_i;%default 100 112 ref_j=first_j:incr_j:last_j;%default 101 end102 if ~isequal(r(1).mode,'**')% imposed pairs or single i and/or j index103 113 [i1_series{iview},i2_series{iview},j1_series{iview},j2_series{iview}]=find_file_indices(ref_i,ref_j,str2num(r.num1),str2num(r.num2),r.mode); 104 114 end 115 % if ~isequal(r(1).mode,'**')% imposed pairs or single i and/or j index 116 % [i1_series{iview},i2_series{iview},j1_series{iview},j2_series{iview}]=find_file_indices(ref_i,ref_j,str2num(r.num1),str2num(r.num2),r.mode); 117 % end 105 118 106 % case of pairs (.nc files)119 %list of files 107 120 i2=[];j1=[];j2=[]; 108 121 for ifile=1:numel(i1_series{iview}) 
trunk/src/series.m
r638 r639 907 907 set(handles.FileStatus,'CData',CData); 908 908 909 910 %% enable field and veltype menus, in accordance with the current action911 ActionName_Callback([],[], handles)912 913 909 %% check for pair display 914 910 check_pairs=0; … … 925 921 set(handles.PairString,'Visible','off') 926 922 end 923 924 925 %% enable field and veltype menus, in accordance with the current action 926 ActionName_Callback([],[], handles) 927 927 928 928 %% set length of waitbar … … 2086 2086 MaskVisible=ParamOut.Mask; 2087 2087 end 2088 set(handles.Mask,'Visible',MaskVisible)2088 %set(handles.Mask,'Visible',MaskVisible) 2089 2089 set(handles.CheckMask,'Visible',MaskVisible); 2090 2090 … … 2407 2407 2408 2408 if get(handles.CheckMask,'Value') 2409 set(handles.Mask,'Visible','on') 2409 2410 InputTable=get(handles.InputTable,'Data'); 2410 2411 defaultname=InputTable{1,1}; … … 2414 2415 end 2415 2416 else 2417 set(handles.Mask,'Visible','off') 2416 2418 set(handles.Mask,'String','') 2417 2419 end
Note: See TracChangeset
for help on using the changeset viewer.