Changeset 440 for trunk

Timestamp:

Jun 5, 2012, 4:49:46 PM (13 years ago)

Author:

sommeria

Message:

bug repaired in series

Location:

trunk/src

Files:

• civ.m (modified) (1 diff)
• get_file_series.m (modified) (1 diff)
• series.m (modified) (4 diffs)

trunk/src/civ.m

@@ -768 +768 @@
 set(handles.SubdirCiv1,'Visible','on')
 set(handles.TitleSubdirCiv1,'Visible','on')
-if ~opening
+if opening==0
     errormsg=find_netcpair_civ(handles,1); % select the available netcdf files
     if ~isempty(errormsg)

trunk/src/get_file_series.m

@@ -41 +41 @@
         %r=regexp(pair_string,'.*\D(?<num1>[\d+|*])(?<delim>[-||])(?<num2>[\d+|*])','names');
     end
-    if isempty(r.mode)
-        r.num1='';
-        r.num2='';
+    if isempty(r)||isempty(r.mode)
+        r(1).num1='';
+        r(1).num2='';
+        r(1).mode='';
     end
     [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

@@ -1068 +1068 @@
 function update_mode(handles,i1_series,i2_series,j1_series,j2_series,time)
 %------------------------------------------------------------------------    
-check_burst=1;
+check_burst=0;
 if isempty(j2_series)% no pair menu to display
     if isempty(i2_series)
@@ -1081 +1081 @@
     set(handles.mode,'String',{'bursts';'series(Dj)'})
     if nbfield2>10 || nbfield==1
-        set(handles.mode,'Value',2);
+        set(handles.mode,'Value',2);%set mode to series(Dj) if more than 10 j values
     else
         set(handles.mode,'Value',1);
@@ -1092 +1092 @@
 else
     enable_i(handles,'On')
-    enable_j(handles,'Off')
+    enable_j(handles,'On')
 end
 fill_ListPair(handles,i1_series,i2_series,j1_series,j2_series,time)
@@ -1199 +1199 @@
 set(handles.ListPairs,'String',displ_pair)
 if isempty(displ_pair)
-    msgbox_uvmat('ERROR',['no file available for the selected subdirectory ' subdir])
+    msgbox_uvmat('ERROR',['no file available for the selected subdirectory ' SubDir])
 end