Changeset 757 for trunk/src/series.m

Timestamp:

Apr 29, 2014, 10:10:30 AM (10 years ago)

Author:

sommeria

Message:

a few bug repairs

File:

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

trunk/src/series.m

@@ -757 +757 @@
         set(handles.num_incr_i,'String',num2str(diff_i_max(1)))% detect an increment to dispaly by default
     end
-    if isequal (diff_j_max,diff_j_max(1)*ones(size(diff_j_max)))
+    if ~isempty(diff_j_max) && isequal (diff_j_max,diff_j_max(1)*ones(size(diff_j_max)))
         set(handles.num_incr_j,'String',num2str(diff_j_max(1)))
     end
@@ -771 +771 @@
 MaxIndex_i_table=get(handles.MaxIndex_i,'Data');%retrieve the min indices in the table MinIndex
 MaxIndex_j_table=get(handles.MaxIndex_j,'Data');%retrieve the min indices in the table MinIndex
+if ~isempty(MinIndex_i)&&~isempty(MaxIndex_i)
 MinIndex_i_table(iview,1)=MinIndex_i;
+MaxIndex_i_table(iview,1)=MaxIndex_i;
+end
+if ~isempty(MinIndex_j)&&~isempty(MaxIndex_j)
 MinIndex_j_table(iview,1)=MinIndex_j;
-MaxIndex_i_table(iview,1)=MaxIndex_i;
 MaxIndex_j_table(iview,1)=MaxIndex_j;
+end
 set(handles.MinIndex_i,'Data',MinIndex_i_table)%display the min indices in the table MinIndex
 set(handles.MinIndex_j,'Data',MinIndex_j_table)%display the max indices in the table MaxIndex
@@ -969 +973 @@
     pair_max=squeeze(max(SeriesData.i1_series{iview},[],1)); %max on pair index
     j_max{iview}=max(pair_max,[],1);%max on j index
+    if ~isempty(j_max{iview})
     MaxIndex_i(iview)=max(find(j_max{iview}))-1;% max ref index i
     MinIndex_i(iview)=min(find(j_max{iview}))-1;% min ref index i
+    end
 end
 MinIndex_i=min(MinIndex_i);
@@ -1135 +1141 @@
 pos_first=(ref_i_1-MinIndex_i)/(MaxIndex_i-MinIndex_i+1);
 pos_last=(ref_i_2-MinIndex_i+1)/(MaxIndex_i-MinIndex_i+1);
+if isempty(pos_first), pos_first=0; end
+if isempty(pos_last), pos_last=1; end
 Position=get(handles.Waitbar,'Position');% position of the waitbar:= [ x,y, width, height]
 Position_status=get(handles.FileStatus,'Position');
 Position(1)=Position_status(1)+Position_status(3)*pos_first;
-Position(3)=Position_status(3)*(pos_last-pos_first);
+Position(3)=max(Position_status(3)*(pos_last-pos_first),0.001);% width must remain positive
 set(handles.Waitbar,'Position',Position)
 update_waitbar(handles.Waitbar,0)