Changeset 440


Ignore:
Timestamp:
Jun 5, 2012, 4:49:46 PM (9 years ago)
Author:
sommeria
Message:

bug repaired in series

Location:
trunk/src
Files:
3 edited

Legend:

Unmodified
Added
Removed
  • trunk/src/civ.m

    r438 r440  
    768768set(handles.SubdirCiv1,'Visible','on')
    769769set(handles.TitleSubdirCiv1,'Visible','on')
    770 if ~opening
     770if opening==0
    771771    errormsg=find_netcpair_civ(handles,1); % select the available netcdf files
    772772    if ~isempty(errormsg)
  • trunk/src/get_file_series.m

    r408 r440  
    4141        %r=regexp(pair_string,'.*\D(?<num1>[\d+|*])(?<delim>[-||])(?<num2>[\d+|*])','names');
    4242    end
    43     if isempty(r.mode)
    44         r.num1='';
    45         r.num2='';
     43    if isempty(r)||isempty(r.mode)
     44        r(1).num1='';
     45        r(1).num2='';
     46        r(1).mode='';
    4647    end
    4748    [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);
  • trunk/src/series.m

    r428 r440  
    10681068function update_mode(handles,i1_series,i2_series,j1_series,j2_series,time)
    10691069%------------------------------------------------------------------------   
    1070 check_burst=1;
     1070check_burst=0;
    10711071if isempty(j2_series)% no pair menu to display
    10721072    if isempty(i2_series)
     
    10811081    set(handles.mode,'String',{'bursts';'series(Dj)'})
    10821082    if nbfield2>10 || nbfield==1
    1083         set(handles.mode,'Value',2);
     1083        set(handles.mode,'Value',2);%set mode to series(Dj) if more than 10 j values
    10841084    else
    10851085        set(handles.mode,'Value',1);
     
    10921092else
    10931093    enable_i(handles,'On')
    1094     enable_j(handles,'Off')
     1094    enable_j(handles,'On')
    10951095end
    10961096fill_ListPair(handles,i1_series,i2_series,j1_series,j2_series,time)
     
    11991199set(handles.ListPairs,'String',displ_pair)
    12001200if isempty(displ_pair)
    1201     msgbox_uvmat('ERROR',['no file available for the selected subdirectory ' subdir])
     1201    msgbox_uvmat('ERROR',['no file available for the selected subdirectory ' SubDir])
    12021202end
    12031203
Note: See TracChangeset for help on using the changeset viewer.