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

Timestamp:

Jun 26, 2012, 8:41:27 AM (13 years ago)

Author:

sommeria

Message:

series fcts updated to fit with new waitbar fct and background run mode, and various bug repairs

File:

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

trunk/src/series/aver_stat.m

@@ -71 +71 @@
 % RUN case: parameters introduced as the input structure Param
 else
-    hseries=guidata(Param.hseries);%handles of the GUI series
-    WaitbarPos=get(hseries.waitbar_frame,'Position');%position of the waitbar on the GUI series
     if isfield(Param,'Specific')&& strcmp(Param.Specific,'?')
         checkrun=1;% will only search interactive input parameters (preparation of BATCH mode)
@@ -78 +76 @@
         checkrun=2; % indicate the RUN option is used
     end
+    hseries=guidata(Param.hseries);%handles of the GUI series
 end
 ParamOut=Param; %default output
@@ -137 +136 @@
 %% coordinate transform or other user defined transform
 transform_fct='';%default
-if isfield(Param,'FieldTransform')
+if isfield(Param,'FieldTransform')&&~isempty(Param.FieldTransform.TransformName)
     addpath(Param.FieldTransform.TransformPath)
     transform_fct=str2func(Param.FieldTransform.TransformName);
@@ -192 +191 @@
     for index=index_slice
         if checkrun
-            update_waitbar(hseries.waitbar_frame,WaitbarPos,index/(nbfield))
+            update_waitbar(hseries.Waitbar,index/(nbfield))
             stopstate=get(hseries.RUN,'BusyAction');
         else
@@ -229 +228 @@
             
             % field calculation (vort, div...)
-            if strcmp(FileType{1},'civx')||strcmp(FileType{1},'civ')
+            if strcmp(FileType{1},'civx')||strcmp(FileType{1},'civdata')
                 Data{1}=calc_field(InputFields{1}.FieldName,Data{1});%calculate field (vort..)
             end