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

Timestamp:

Jun 26, 2012, 8:41:27 AM (12 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/time_series.m (modified) (13 diffs)

trunk/src/series/time_series.m

@@ -72 +72 @@
 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)
@@ -140 +139 @@
 %% 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);
@@ -169 +168 @@
 %     end
 % end
+if checkrun==1
+    return % stop here for input checks
+end
 
 %% Set field names and velocity types
@@ -242 +244 @@
 for i_slice=1:NbSlice
     index_slice=i_slice:NbSlice:nbfield;% select file indices of the slice
-    nbfiles=0;
+    nbfile=0;
     nbmissing=0;
     
@@ -248 +250 @@
     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
@@ -255 +257 @@
         
         %%%%%%%%%%%%%%%% loop on views (input lines) %%%%%%%%%%%%%%%%
-        Data=cell(1,nbview);%initiate the set Data
-        nbtime=0;
-        dt=[];
         if isequal(stopstate,'queue')% enable STOP command
+            Data=cell(1,nbview);%initiate the set Data
+            nbtime=0;
+            dt=[];
             % loop on views (in case of multiple input series)
             for iview=1:nbview
@@ -277 +279 @@
                 end
             end
+            
             % coordinate transform (or other user defined transform)
             if ~isempty(transform_fct)
@@ -288 +291 @@
                 end
             end
+            
+            % field calculation (vort, div...)
+            if strcmp(FileType{1},'civx')||strcmp(FileType{1},'civdata')
+                Data{1}=calc_field(InputFields{1}.FieldName,Data{1});%calculate field (vort..)
+            end
+            
+            % field substration (for two input file series)
             if length(Data)==2
                 [Field,errormsg]=sub_field(Data{1},Data{2}); %substract the two fields
@@ -296 +306 @@
                 [Field,errormsg]=proj_field(Field,Param.ProjObject);
             end
-            nbtime=nbtime+1;
+            nbfile=nbfile+1;
             
             % initiate the time series at the first iteration
-            if nbtime==1
+            if nbfile==1
                 % stop program if the first field reading is in error
                 if ~isempty(errormsg)
@@ -356 +366 @@
                         if isequal(Param.ProjObject.ProjMode,'inside')% take the average in the domain for 'inside' mode
                             if isempty(VarVal)
-                                displ_uvmat('ERROR',['empty result at frame index ' num2str(i1_series{iview}(ifile))],checkrun)
+                                displ_uvmat('ERROR',['empty result at frame index ' num2str(i1_series{iview}(index))],checkrun)
                                 return
                             end
@@ -378 +388 @@
             if isempty(time)% time read in ncfiles
                 if isfield(Field,'Time')
-                    DataOut.Time(filecounter,1)=Field.Time;
+                    DataOut.Time(nbfile,1)=Field.Time;
                 else
-                    DataOut.Time(filecounter,1)=ifile;%default
+                    DataOut.Time(nbfile,1)=index;%default
                 end
             else % time from ImaDoc prevails  TODO: correct
-                %  DataOut.Time(filecounter,1)=time{1}(i1_series{1})(ifile),j1_series{1}(ifile))+time(end,i2_series{end}(ifile),j2_series{end}(ifile)))/2;
-                DataOut.Time(filecounter,1)=i1_series{1}(ifile);% TODO : generalise
+                DataOut.Time(nbtime,1)=i1_series{1}(index);% TODO : generalise
             end
             
@@ -390 +399 @@
             if ~isempty(errormsg)
                 nbmissing=nbmissing+1;
-                display(['ifile=' num2str(ifile) ':' errormsg])
+                display(['index=' num2str(index) ':' errormsg])
             end
         end
@@ -452 +461 @@
 
 %% plot the time series (the last one in case of multislices)
-figure
-haxes=axes;
 if checkrun
-plot_field(DataOut,haxes)
-end
-
-%% display the result file using the GUI get_field
-hget_field=findobj(allchild(0),'name','get_field');
-if ~isempty(hget_field)
-    delete(hget_field)
-end
-get_field(OutputFile,DataOut)
-    
-
-
+    figure
+    haxes=axes;
+    plot_field(DataOut,haxes)
+       
+    %% display the result file using the GUI get_field
+    hget_field=findobj(allchild(0),'name','get_field');
+    if ~isempty(hget_field)
+        delete(hget_field)
+    end
+    get_field(OutputFile,DataOut)
+end
+
+