Changeset 427 for trunk/src/series

Timestamp:

May 17, 2012, 11:33:21 PM (12 years ago)

Author:

sommeria

Message:

merge_proj corrected to project simulataneously velocity, vort, div...
Time reintroduced correctly
bug corrections for objects

Location:

trunk/src/series

Files:

• check_data_files.m (modified) (1 diff)
• merge_proj.m (modified) (3 diffs)

trunk/src/series/check_data_files.m

@@ -158 +158 @@
         set(hfig,'Position',pos)
     end
-    set(hfig,'name',['view= ' num2str(iview)])
-   
+    set(hfig,'name',['check_data_files:view= ' num2str(iview)])
+    set(hfig,'MenuBar','none')% suppress the menu bar
+    set(hfig,'NumberTitle','off')%suppress the fig number in the title
     h=uicontrol('Style','listbox', 'Position', [20 20 500 300], 'String', Tabchar, 'Callback', {'open_uvmat'});
     hh=uicontrol('Style','listbox', 'Position', [20 340 500 40], 'String', message);

trunk/src/series/merge_proj.m

@@ +1 @@
+
+
 
 
@@ -157 +159 @@
         msgbox_uvmat('WARNING',['times of series differ by more than ' num2str(diff_time)])
     end   
+    time=sqeeze(mean(time,1));
 end
 % if size(time,2) < i2_series{1}(end) || size(time,3) < j2_series{1}(end)% ime array absent or too short in ImaDoc xml file' 
@@ -364 +367 @@
             time_i=sum(timeread)/nbtime;
         else
-            time_i=i1;
-            %time_i=(time(iview,i1,j1)+time(iview,i2,j2))/2; TODO: upgrade
+           % time_i=i1;
+            time_i=(time(i1,j1)+time(i2,j2))/2; %TODO: upgrade
         end