Changeset 441 for trunk/src/series.m

Timestamp:

Jun 6, 2012, 2:45:37 PM (12 years ago)

Author:

sommeria

Message:

many bugs corrected for the new file organisation

File:

• trunk/src/series.m (modified) (7 diffs)

trunk/src/series.m

@@ -693 +693 @@
 
 %% update pair menus
+set(handles.Pairs,'Visible','on')
+set(handles.PairString,'Visible','on')
 ListView=get(handles.ListView,'String');
 ListView{iview}=num2str(iview);
@@ -698 +700 @@
 set(handles.ListView,'Value',iview)
 update_mode(handles,i1_series,i2_series,j1_series,j2_series,time)
+
 
 %% display the set of existing files as an image
@@ -851 +854 @@
 
 %% store the series info in 'UserData'
-
 SeriesData.i1_series{iview}=i1_series;
 SeriesData.i2_series{iview}=i2_series;
@@ -860 +862 @@
 set(handles.series,'UserData',SeriesData)
 
-
+%% check for pair display
+check_pairs=0;
+for iview=1:numel(SeriesData.i2_series)
+    if ~isempty(SeriesData.i2_series{iview})||~isempty(SeriesData.j2_series{iview})
+        check_pairs=1;
+    end
+end
+if check_pairs
+    set(handles.Pairs,'Visible','on')
+    set(handles.PairString,'Visible','on')
+else
+    set(handles.Pairs,'Visible','off')
+    set(handles.PairString,'Visible','off')
+end
 
 return
@@ -1041 +1056 @@
 %------------------------------------------------------------
 list_pair=get(handles.ListPairs,'String');%get the menu of image pairs
-string=list_pair{get(handles.ListPairs,'Value')};
-string=regexprep(string,',.*','');%removes time indication (after ',')
+if isempty(list_pair)
+    string='';
+else
+    string=list_pair{get(handles.ListPairs,'Value')};
+    string=regexprep(string,',.*','');%removes time indication (after ',')
+end
 PairString=get(handles.PairString,'Data');
 iview=get(handles.ListView,'Value');
@@ -1198 +1217 @@
 end
 set(handles.ListPairs,'String',displ_pair)
-if isempty(displ_pair)
-    msgbox_uvmat('ERROR',['no file available for the selected subdirectory ' SubDir])
-end
+% if isempty(displ_pair)
+%     msgbox_uvmat('ERROR',['no file available for the selected subdirectory' ])
+% end
 
 
@@ -1543 +1562 @@
 ref_j=ceil((first_j+last_j)/2);
 set(handles.num_ref_j,'String', num2str(ref_j))
-ref_j_Callback(hObject, eventdata, handles)
+num_ref_j_Callback(hObject, eventdata, handles)
 SeriesData=get(handles.series,'UserData');
 if ~isfield(SeriesData,'Time')