Changeset 611 for trunk/src/uvmat.m

Timestamp:

Apr 18, 2013, 9:02:03 AM (12 years ago)

Author:

sommeria

Message:

problem of time display repaired

File:

• trunk/src/uvmat.m (modified) (7 diffs)

trunk/src/uvmat.m

@@ -353 +353 @@
 end
 fileinput=uigetfile_uvmat('select an input file:',oldfile);
+
+%% display the selected field and related information
 if ~isempty(fileinput)
     display_file_name(handles,fileinput)
 end
-
-%% display the selected field and related information
-% display_file_name( handles,fileinput)
 
 % -----------------------------------------------------------------------
@@ -895 +894 @@
 warntext='';%default warning message
 NbSlice=1;%default
+ImaDoc_str='';
 set(handles.RootPath,'BackgroundColor',[1 1 1])
 if ~isempty(XmlFileName)
     set(handles.view_xml,'Visible','on')
-    set(handles.view_xml,'BackgroundColor',[1 1 0])
+    set(handles.view_xml,'BackgroundColor',[1 1 0])% paint  to yellow color to indicate reading of the xml file
     set(handles.view_xml,'String','view .xml')
     drawnow
@@ -905 +905 @@
         msgbox_uvmat('WARNING',warntext)
     end
-    if isempty(XmlDataRead)
-        set(handles.view_xml,'Visible','off')
-    else
-        set(handles.view_xml,'String',['view ' DocExt])   
+    if ~isempty(XmlDataRead)
+        ImaDoc_str=['view ' DocExt];   
         XmlData=XmlDataRead;
         if isfield(XmlData,'TimeUnit')
@@ -915 +913 @@
             end
         end
-        set(handles.view_xml,'BackgroundColor',[1 1 1])
+        set(handles.view_xml,'BackgroundColor',[1 1 1])% paint black to white
         drawnow
         if isfield(XmlData, 'GeometryCalib') && ~isempty(XmlData.GeometryCalib)
@@ -936 +934 @@
 if ~(isfield(XmlData,'Time')&& ~isempty(XmlData.Time))
     XmlData.Time=Time; %time set by video
+end
+if isempty(ImaDoc_str)
+    set(handles.view_xml,'Visible','off')
+else
+    set(handles.view_xml,'String',ImaDoc_str)
 end
 
@@ -2378 +2381 @@
     end
     siz=size(UvData.XmlData{1}.Time);
-    if ~isempty(num_i1)&& ~isempty(num_i2) && num_i1>0 &&siz(1)>=max(num_i1,num_i2) && siz(2)>=max(num_j1,num_j2)
-        abstime=(UvData.XmlData{1}.Time(num_i1,num_j1)+UvData.XmlData{1}.Time(num_i2,num_j2))/2;%overset the time read from files
-        dt=(UvData.XmlData{1}.Time(num_i2,num_j2)-UvData.XmlData{1}.Time(num_i1,num_j1));
+    if ~isempty(num_i1)&& ~isempty(num_i2) && num_i1>=0 &&siz(1)>=max(num_i1,num_i2) && siz(2)>=max(num_j1,num_j2)
+        abstime=(UvData.XmlData{1}.Time(num_i1+1,num_j1+1)+UvData.XmlData{1}.Time(num_i2+1,num_j2+1))/2;%overset the time read from files
+        dt=(UvData.XmlData{1}.Time(num_i2+1,num_j2+1)-UvData.XmlData{1}.Time(num_i1+1,num_j1+1));
         Field{1}.Dt=dt;
         if isfield(UvData.XmlData{1},'TimeUnit')
@@ -5301 +5304 @@
     end
 end
+
+
+