Changeset 905 for trunk/src/series

Timestamp:

May 30, 2015, 8:44:20 PM (9 years ago)

Author:

sommeria

Message:

projection with tps corrected + minor changes

Location:

trunk/src/series

Files:

• civ_series.m (modified) (1 diff)
• merge_proj.m (modified) (4 diffs)

trunk/src/series/civ_series.m

@@ -333 +333 @@
     if ~isempty(RUNHandle)% update the waitbar in interactive mode with GUI series  (checkrun=1)
         update_waitbar(WaitbarHandle,ifield/NbField)
-        if  ~strcmp(get(RUNHandle,'BusyAction'),'queue')
+        if  checkrun && ~strcmp(get(RUNHandle,'BusyAction'),'queue')
             disp('program stopped by user')
             break

trunk/src/series/merge_proj.m

@@ -73 +73 @@
     ParamOut.OutputFileMode='NbInput';% '=NbInput': 1 output file per input file index, '=NbInput_i': 1 file per input file index i, '=NbSlice': 1 file per slice
       %check the input files
+    ParamOut.CheckOverwriteVisible='on'; % manage the overwrite of existing files (default=1)
     first_j=[];
     if isfield(Param.IndexRange,'first_j'); first_j=Param.IndexRange.first_j; end
@@ -90 +91 @@
 %%%%%%%%%%%% STANDARD PART (DO NOT EDIT) %%%%%%%%%%%%
 ParamOut=[]; %default output
+RUNHandle=[];
+WaitbarHandle=[];
 %% read input parameters from an xml file if input is a file name (batch mode)
 checkrun=1;
@@ -95 +98 @@
     Param=xml2struct(Param);% read Param as input file (batch case)
     checkrun=0;
-end
-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
+else
+    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
+end
 
 %% define the directory for result file (with path=RootPath{1})
@@ -407 +411 @@
     end
 end
-disp(['total ellapsed time ' num2str(toc(tstart))])
+ellapsed_time=toc(tstart);
+disp(['total ellapsed time ' num2str(ellapsed_time/60,2) ' minutes'])
+disp([ num2str(ellapsed_time/(60*NbField),3) ' minutes per iteration'])
 
 %'merge_field': concatene fields