Changeset 478 for trunk/src/series/merge_proj.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/merge_proj.m (modified) (4 diffs)

trunk/src/series/merge_proj.m

@@ -73 +73 @@
 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)
@@ -139 +138 @@
 %% 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);
@@ -183 +182 @@
   
         if checkrun
-            update_waitbar(hseries.waitbar_frame,WaitbarPos,index/(nbfield))
+            update_waitbar(hseries.Waitbar,index/(nbfield))
             stopstate=get(hseries.RUN,'BusyAction');
         else
@@ -213 +212 @@
             end
             % field calculation (vort, div...)
-            if strcmp(FileType{iview},'civx')||strcmp(FileType{iview},'civ')
+            if strcmp(FileType{iview},'civx')||strcmp(FileType{iview},'civdata')
                 Data{iview}=calc_field(Param.InputFields.FieldName,Data{iview});%calculate field (vort..)
             end