Changeset 633

Timestamp:

May 13, 2013, 8:45:45 PM (12 years ago)

Author:

sommeria

Message:

bug on waitbar corrected for background mode

Location:

trunk/src/series

Files:

• aver_stat.m (modified) (1 diff)
• civ_input.m (modified) (6 diffs)
• civ_series.m (modified) (1 diff)
• ima_levels.m (modified) (1 diff)
• merge_proj.m (modified) (1 diff)
• sub_background.m (modified) (1 diff)
• time_series.m (modified) (1 diff)

trunk/src/series/aver_stat.m

@@ -177 +177 @@
 for index=1:nbfield
     update_waitbar(WaitbarHandle,index/nbfield)
-    if ishandle(RUNHandle) && ~strcmp(get(RUNHandle,'BusyAction'),'queue')
+    if ~isempty(RUNHandle)&& ishandle(RUNHandle) && ~strcmp(get(RUNHandle,'BusyAction'),'queue')
         disp('program stopped by user')
         break

trunk/src/series/civ_input.m

@@ -199 +199 @@
 MinIndex_i=Param.IndexRange.MinIndex_i{1};
 MinIndex_j=Param.IndexRange.MinIndex_j{1};
+CivInputData.MaxIndex_i=MaxIndex_i;
+CivInputData.MaxIndex_j=MaxIndex_j;
+CivInputData.MinIndex_i=MinIndex_i;
+CivInputData.MinIndex_j=MinIndex_j;
 if ~isfield(Param.IndexRange,'first_j')
     set(handles.ListPairMode,'Value',1)
@@ -286 +290 @@
 set(handles.dt_unit,'String',['dt in m' TimeUnit]);%display dt in unit 10-3 of the time (e.g ms)
 set(handles.TimeUnit,'String',TimeUnit);
-set(handles.nb_field,'String',num2str(MaxIndex_i));
-set(handles.nb_field2,'String',num2str(MaxIndex_j));
+% set(handles.nb_field,'String',num2str(MaxIndex_i));
+% set(handles.nb_field2,'String',num2str(MaxIndex_j));
+
 set(handles.CoordUnit,'String',CoordUnit)
 set(handles.SearchRange,'UserData', pxcm_search);
@@ -1124 +1129 @@
 CivInputData=get(handles.civ_input,'UserData');
 TimeUnit=get(handles.TimeUnit,'String');
-time=CivInputData.Time;
+Time=CivInputData.Time;
 checkframe=strcmp(TimeUnit,'frame');
 %displ_num=get(handles.ListPairCiv1,'UserData');
@@ -1234 +1239 @@
             if select(ipair)
                 displ_pair{ipair}=['Di= ' num2str(-floor(ipair/2)) '|' num2str(ceil(ipair/2))];
-                %if ~checkframe && size(time,1)>=ref_i+1+displ_num(4,ipair) && size(time,2)>=ref_j+1+displ_num(2,ipair)&&displ_num(2,ipair)>=1 &&displ_num(1,ipair)>=1
-                 %   dt=time(ref_i+1+displ_num(4,ipair),ref_j+1+displ_num(2,ipair))-time(ref_i+1+displ_num(3,ipair),ref_j+1+displ_num(1,ipair));%time interval dt
-               if ~checkframe && size(time,1)>=ref_i+1+ceil(ipair/2) && size(time,2)>=ref_j+1&& ref_i-floor(ipair/2)>=0 && ref_j>=0
-                 dt=time(ref_i+1+ceil(ipair/2),ref_j+1)-time(ref_i+1-floor(ipair/2),ref_j+1);%time interval dtref_j+1
+                %if ~checkframe && size(Time,1)>=ref_i+1+displ_num(4,ipair) && size(Time,2)>=ref_j+1+displ_num(2,ipair)&&displ_num(2,ipair)>=1 &&displ_num(1,ipair)>=1
+                 %   dt=Time(ref_i+1+displ_num(4,ipair),ref_j+1+displ_num(2,ipair))-Time(ref_i+1+displ_num(3,ipair),ref_j+1+displ_num(1,ipair));%Time interval dt
+               if ~checkframe && size(Time,1)>=ref_i+1+ceil(ipair/2) && size(Time,2)>=ref_j+1&& ref_i-floor(ipair/2)>=0 && ref_j>=0
+                 dt=Time(ref_i+1+ceil(ipair/2),ref_j+1)-Time(ref_i+1-floor(ipair/2),ref_j+1);%Time interval dtref_j+1
                 else
                     dt=1;
@@ -1254 +1259 @@
             if select(ipair)
                 displ_pair{ipair}=['Dj= ' num2str(-floor(ipair/2)) '|' num2str(ceil(ipair/2))];
-                if ~checkframe && size(time,1)>=ref_i+1+displ_num(4,ipair) && size(time,2)>=ref_j+1+displ_num(2,ipair)
-                    dt=time(ref_i+1+displ_num(4,ipair),ref_j+1+displ_num(2,ipair))-time(ref_i+1+displ_num(3,ipair),ref_j+1+displ_num(1,ipair));%time interval dt
+                if ~checkframe && size(Time,1)>=ref_i+1+displ_num(4,ipair) && size(Time,2)>=ref_j+1+displ_num(2,ipair)
+                    dt=Time(ref_i+1+displ_num(4,ipair),ref_j+1+displ_num(2,ipair))-Time(ref_i+1+displ_num(3,ipair),ref_j+1+displ_num(1,ipair));%Time interval dt
                     displ_pair{ipair}=[displ_pair{ipair} ' :dt= ' num2str(dt*1000)];
                 end
@@ -1264 +1269 @@
     end
 elseif isequal(mode,'pair j1-j2')%case of pairs
-    for ipair=1:nbpair
-        if select(ipair)
-            if ~checkframe && size(time,2)>1 
-            dt=time(ref_i+1+displ_num(4,ipair),displ_num(2,ipair)+1)-time(ref_i+1+displ_num(3,ipair),displ_num(1,ipair)+1);%time interval dt
-            else % time set by default to i index
-                dt=1;
+    MinIndex_j=CivInputData.MinIndex_j;
+    MaxIndex_j=min(CivInputData.MaxIndex_j,10);%limitate the number of pairs to 10x10
+    index_pair=0;
+    %get all the Time intervals in bursts   
+   for numod_a=MinIndex_j:MaxIndex_j-1 %nbfield2 always >=2 for 'pair j1-j2' mode
+        for numod_b=(numod_a+1):MaxIndex_j
+            index_pair=index_pair+1;
+            displ_pair{index_pair}=['j= ' num2stra(numod_a,nom_type_ima) '-' num2stra(numod_b,nom_type_ima)];
+            dt(index_pair)=numod_b-numod_a;%default dt
+            if size(Time,1)>ref_i && size(Time,2)>numod_b  % && ~checkframe
+                dt(index_pair)=Time(ref_i+1,numod_b+1)-Time(ref_i+1,numod_a+1);% Time interval dt
+                 displ_pair{index_pair}=[displ_pair{index_pair} ' :dt= ' num2str(dt(index_pair)*1000)];
             end
-            displ_pair{ipair}=['j= ' num2stra(displ_num(1,ipair),nom_type_ima) '-' num2stra(displ_num(2,ipair),nom_type_ima) ...
-                ' :dt= ' num2str(dt*1000)];
-        else
-            displ_pair{ipair}='...'; %pair not displayed in the menu
-        end
-    end
+        end
+    end
+    [dtsort,indsort]=sort(dt);
+    displ_pair=displ_pair(indsort);
 elseif isequal(mode,'displacement')
     displ_pair={'Di=Dj=0'};

trunk/src/series/civ_series.m

@@ -218 +218 @@
 for ifield=1:NbField
     update_waitbar(WaitbarHandle,index/nbfield)
-    if ishandle(RUNHandle) && ~strcmp(get(RUNHandle,'BusyAction'),'queue')
+    if ~isempty(RUNHandle) && ishandle(RUNHandle) && ~strcmp(get(RUNHandle,'BusyAction'),'queue')
         disp('program stopped by user')
         break

trunk/src/series/ima_levels.m

@@ -151 +151 @@
 for ifile=1:nbfield
             update_waitbar(WaitbarHandle,ifile/nbfield)
-    if ishandle(RUNHandle) && ~strcmp(get(RUNHandle,'BusyAction'),'queue')
+    if ~isempty(RUNHandle) &&ishandle(RUNHandle) && ~strcmp(get(RUNHandle,'BusyAction'),'queue')
         disp('program stopped by user')
         return

trunk/src/series/merge_proj.m

@@ -174 +174 @@
 for index=1:NbField
         update_waitbar(WaitbarHandle,index/NbField)
-    if ishandle(RUNHandle) && ~strcmp(get(RUNHandle,'BusyAction'),'queue')
+    if ~isempty(RUNHandle) &&ishandle(RUNHandle) && ~strcmp(get(RUNHandle,'BusyAction'),'queue')
         disp('program stopped by user')
         return

trunk/src/series/sub_background.m

@@ -367 +367 @@
     for ifield = step*ceil(nbaver/2)+1:step:nbfield_i-step*floor(nbaver/2)
                 update_waitbar(WaitbarHandle,ifield/nbfield_i)
-    if ishandle(RUNHandle) && ~strcmp(get(RUNHandle,'BusyAction'),'queue')
+    if ~isempty(RUNHandle) &&ishandle(RUNHandle) && ~strcmp(get(RUNHandle,'BusyAction'),'queue')
         disp('program stopped by user')
         return

trunk/src/series/time_series.m

@@ -210 +210 @@
 for index=1:nbfield
             update_waitbar(WaitbarHandle,index/nbfield)
-    if ishandle(RUNHandle) && ~strcmp(get(RUNHandle,'BusyAction'),'queue')
+    if ~isempty(RUNHandle) &&ishandle(RUNHandle) && ~strcmp(get(RUNHandle,'BusyAction'),'queue')
         disp('program stopped by user')
         break % leave the loop if stop is ordered