Changeset 531

Timestamp:

Aug 27, 2012, 4:39:28 PM (12 years ago)

Author:

sommeria

Message:

bug on times corrected

File:

• trunk/src/series/time_series.m (modified) (9 diffs)

trunk/src/series/time_series.m

@@ -132 +132 @@
         displ_uvmat('WARNING',['times of series differ by (max) ' num2str(diff_time)],checkrun)
     end   
+    time=time(1,:);% choose the time data from the first sequence
 end
 
@@ -225 +226 @@
         end
         if isequal(stopstate,'queue')% enable STOP command
-            Data=cell(1,nbview);%initiate the set Data
+            Data=cell(1,nbview);%initiate the set Data;
             nbtime=0;
             dt=[];
@@ -233 +234 @@
                 [Data{iview},tild,errormsg] = read_field(filecell{iview,index},FileType{iview},InputFields{iview},frame_index{iview}(index));
                 if ~isempty(errormsg)
-                    errormsg=['time_series/read_field/' errormsg];
+                    errormsg=['time_series / read_field / ' errormsg];
                     display(errormsg)
                     break
-                end
-                timeread(iview)=0;
-                if isfield(Data{iview},'Time')
-                    timeread(iview)=Data{iview}.Time;
-                    nbtime=nbtime+1;
                 end
                 if ~isempty(NbSlice_calib)
@@ -279 +275 @@
                 [Field,errormsg]=proj_field(Field,Param.ProjObject);
                 if ~isempty(errormsg)
-                    msgbox_uvmat('ERROR',['error in aver_stat/proj_field:' errormsg])
+                    msgbox_uvmat('ERROR',['time_series / proj_field / ' errormsg])
                     return
                 end
@@ -289 +285 @@
                 % stop program if the first field reading is in error
                 if ~isempty(errormsg)
-                    displ_uvmat('ERROR',['error in time_series/sub_field:' errormsg],checkrun)
+                    displ_uvmat('ERROR',['time_series / sub_field / ' errormsg],checkrun)
                     return
                 end
@@ -296 +292 @@
                 nbvar=length(Field.ListVarName);
                 if nbvar==0
-                    displ_uvmat('ERROR','no input variable selected in get_field',checkrun)
+                    displ_uvmat('ERROR','no input variable selected',checkrun)
                     return
                 end
@@ -363 +359 @@
             
             % record the time:
-            if isempty(time)% time read in ncfiles
-                if isfield(Field,'Time')
+            if isempty(time)% time not set by xml filer(s)
+                if isfield(Data{1},'Time')
                     DataOut.Time(nbfile,1)=Field.Time;
                 else
@@ -370 +366 @@
                 end
             else % time from ImaDoc prevails  TODO: correct
-                DataOut.Time(nbtime,1)=i1_series{1}(index);% TODO : generalise
+                DataOut.Time(nbfile,1)=time(index);%
             end
             
@@ -419 +415 @@
     test_time=diff(DataOut.Time)>0;% test that the readed time is increasing (not constant)
     if ~test_time
-        DataOut.Time=[1:filecounter];
+        DataOut.Time=1:filecounter;
     end