Changeset 624 for trunk/src/series/aver_stat.m

Timestamp:

Apr 29, 2013, 11:28:23 PM (12 years ago)

Author:

sommeria

Message:

waitbar system for series improved to aloow use as stand alone fcts.

to add at the head of series fcts:
hseries=findobj(allchild(0),'Tag','series');
RUNHandle=findobj(hseries,'Tag','RUN');%handle of RUN button in GUI series
WaitbarHandle?=findobj(hseries,'Tag','Waitbar');%handle of waitbar in GUI series

call to waitbar:

update_waitbar(WaitbarHandle?,index/nbfield)
if ishandle(RUNHandle) && ~strcmp(get(RUNHandle,'BusyAction?'),'queue')

disp('program stopped by user')
break

end

File:

• trunk/src/series/aver_stat.m (modified) (8 diffs)

trunk/src/series/aver_stat.m

@@ -61 +61 @@
 
 %%%%%%%%%%%%  STANDARD PART  %%%%%%%%%%%%
-ParamOut=[];
+ParamOut=[];%default output
 %% read input parameters from an xml file if input is a file name (batch mode)
 checkrun=1;
@@ -68 +68 @@
     checkrun=0;
 end
-
-%% define the directory for result file
+hseries=findobj(allchild(0),'Tag','series');
+RUNHandle=findobj(hseries,'Tag','RUN');%handle of RUN button in GUI series
+WaitbarHandle=findobj(hseries,'Tag','Waitbar');%handle of waitbar in GUI series
+
+%% define the directory for result file (with path=RootPath{1})
 OutputDir=[Param.OutputSubDir Param.OutputDirExt];
     
@@ -173 +176 @@
 %%%%%%%%%%%%%%%% loop on field indices %%%%%%%%%%%%%%%%
 for index=1:nbfield
-%for index=index_slice
-      if checkrun
-            stopstate=get(Param.RUNHandle,'BusyAction');
-            update_waitbar(Param.WaitbarHandle,index/nbfield)
-      else
-            stopstate='queue';
-      end
-    if isequal(stopstate,'queue')% enable STOP command
-
+    update_waitbar(WaitbarHandle,index/nbfield)
+    if ishandle(RUNHandle) && ~strcmp(get(RUNHandle,'BusyAction'),'queue')
+        disp('program stopped by user')
+        break
+    end
+    
     %%%%%%%%%%%%%%%% loop on views (input lines) %%%%%%%%%%%%%%%%
     for iview=1:nbview
@@ -194 +194 @@
         end
     end
-    else
-        errormsg='stop';
-    end
     %%%%%%%%%%%%%%%% end loop on views (input lines) %%%%%%%%%%%%%%%%
     %%%%%%%%%%%% END STANDARD PART  %%%%%%%%%%%%
     % EDIT FROM HERE
-
+    
     if isempty(errormsg)
         Field=Data{1}; % default input field structure
@@ -224 +221 @@
             end
         end
-
+        
         %% calculate tps coefficients if needed
         if isfield(Param,'ProjObject')&&isfield(Param.ProjObject,'ProjMode')&& strcmp(Param.ProjObject.ProjMode,'interp_tps')
             Field=tps_coeff_field(Field,check_proj_tps);
         end
-
+        
         %field projection on an object
         if Param.CheckObject
@@ -239 +236 @@
         end
         nbfiles=nbfiles+1;
-
+        
         %%%%%%%%%%%% MAIN RUNNING OPERATIONS  %%%%%%%%%%%%
         %update sum
@@ -288 +285 @@
     end
 else  % time from ImaDoc prevails if it exists
-%         j1=1;%default
-%         if ~isempty(j1_series{1})
-%             j1=j1_series{1};
-%         end
+    %         j1=1;%default
+    %         if ~isempty(j1_series{1})
+    %             j1=j1_series{1};
+    %         end
     %DataOut.Time=time(1,i1_series{1}(1),j1);
     %DataOut.Time_end=time(end,i1_series{end}(end),j1_series{end}(end));
@@ -317 +314 @@
     end
 end  % end averaging  loop
-% end
-%%%%%%%%%%%%%%%% end loop on slices %%%%%%%%%%%%%%%%
 
 %% open the result file with uvmat (in RUN mode)